summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoey Kitt <zoey.kitt@outlook.com>2024-11-16 19:05:07 -0600
committerZoey Kitt <zoey.kitt@outlook.com>2024-11-16 19:05:07 -0600
commit162f6ba656c3ed050526df7e0aa31d8e284b640c (patch)
treee3754e562ae3853eda836d689e1a298216ff4d5a
parentd74ecb966b03b46bed0e1720ef2ed029c3be99a1 (diff)
You caught GAR!
-rw-r--r--scenes/main.tscn6
-rw-r--r--scenes/microgames/fishin/node_2d.tscn35
-rw-r--r--scenes/stockticker/Stock Ticker.tscn2
3 files changed, 31 insertions, 12 deletions
diff --git a/scenes/main.tscn b/scenes/main.tscn
index 637f3a4..1a7ded1 100644
--- a/scenes/main.tscn
+++ b/scenes/main.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=49 format=3 uid="uid://d06d1vihf2oqp"]
+[gd_scene load_steps=50 format=3 uid="uid://d06d1vihf2oqp"]
[ext_resource type="Texture2D" uid="uid://b03ygtrwha22g" path="res://taytay/IMG_5199.jpeg" id="1_o2s48"]
[ext_resource type="Script" path="res://scenes/main.gd" id="1_y7a0r"]
[ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="2_fkfik"]
[ext_resource type="Theme" uid="uid://ve18rbkeiwti" path="res://UI/text.tres" id="3_d7ku7"]
[ext_resource type="AudioStream" uid="uid://wtoxhk0tf8ev" path="res://funny_sounds/Cat Meow - Minecraft Sound Effect (HD).mp3" id="3_gatxj"]
+[ext_resource type="PackedScene" uid="uid://g2veoq55y14i" path="res://scenes/stockticker/Stock Ticker.tscn" id="4_0ankd"]
[ext_resource type="PackedScene" uid="uid://bbg7lnak6kup7" path="res://scenes/LegallyDistinctPaperclipAssistant/window.tscn" id="5_6agvn"]
[ext_resource type="Script" path="res://scenes/score_window/score_window.gd" id="6_gvoxs"]
[ext_resource type="Texture2D" uid="uid://dohsqvvi8y64h" path="res://UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png" id="8_oj2tc"]
@@ -335,4 +336,7 @@ $00000000000000000000"
[node name="Fishin" parent="." instance=ExtResource("10_sx2ad")]
position = Vector2(0, 0)
+[node name="Stock ticker" parent="." instance=ExtResource("4_0ankd")]
+visible = false
+
[connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"]
diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn
index c763777..932fb56 100644
--- a/scenes/microgames/fishin/node_2d.tscn
+++ b/scenes/microgames/fishin/node_2d.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://c4s4pigu4pr48"]
+[gd_scene load_steps=15 format=3 uid="uid://c4s4pigu4pr48"]
[ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="1_cxqat"]
[ext_resource type="Script" path="res://scenes/microgames/fishin/fishin.gd" id="1_srw8b"]
@@ -10,6 +10,7 @@
[ext_resource type="Script" path="res://libs/shake_pivot.gd" id="7_vnrfy"]
[ext_resource type="Texture2D" uid="uid://d4kyih3ivlqqc" path="res://scenes/microgames/fishin/KibbbySad.png" id="9_blola"]
[ext_resource type="Texture2D" uid="uid://dcvie7ynwdfui" path="res://scenes/microgames/fishin/KibbbyHappy.png" id="10_1il5r"]
+[ext_resource type="Texture2D" uid="uid://dpp7abs35p6i5" path="res://scenes/stockticker/fishe/gar.png" id="11_gjj1w"]
[sub_resource type="Animation" id="Animation_bep6n"]
length = 0.001
@@ -59,7 +60,7 @@ scale = Vector2(1300.5, 725.5)
texture = ExtResource("1_cxqat")
[node name="you!" type="Sprite2D" parent="."]
-position = Vector2(535, 300)
+position = Vector2(665, 458)
texture = ExtResource("2_atppo")
[node name="TextureButton" type="TextureButton" parent="."]
@@ -78,7 +79,7 @@ script = ExtResource("7_vnrfy")
[node name="pulling" type="Sprite2D" parent="ShakePivot"]
visible = false
-position = Vector2(535, 300)
+position = Vector2(665, 458)
texture = ExtResource("3_don82")
[node name="ShakePivot2" type="Node2D" parent="."]
@@ -86,10 +87,10 @@ script = ExtResource("7_vnrfy")
[node name="MASH" type="Label" parent="ShakePivot2"]
visible = false
-offset_left = 150.0
-offset_top = 358.0
-offset_right = 570.0
-offset_bottom = 598.0
+offset_left = 286.0
+offset_top = 463.0
+offset_right = 706.0
+offset_bottom = 703.0
theme = ExtResource("5_7qce4")
theme_override_colors/font_color = Color(1, 0, 0, 1)
theme_override_font_sizes/font_size = 60
@@ -100,7 +101,7 @@ script = ExtResource("7_vnrfy")
[node name="Mouse" type="Sprite2D" parent="ShakePivot3"]
visible = false
-position = Vector2(412, 532)
+position = Vector2(548, 637)
scale = Vector2(0.216276, 0.249769)
[node name="StartGame" type="Timer" parent="."]
@@ -111,14 +112,28 @@ wait_time = 3.0
[node name="SAD" type="Sprite2D" parent="."]
visible = false
-position = Vector2(535, 300)
+position = Vector2(665, 458)
texture = ExtResource("9_blola")
[node name="Happy" type="Sprite2D" parent="."]
visible = false
-position = Vector2(535, 300)
+position = Vector2(665, 458)
texture = ExtResource("10_1il5r")
+[node name="Catch" type="Sprite2D" parent="Happy"]
+position = Vector2(-385, 50)
+scale = Vector2(0.475, 0.492)
+texture = ExtResource("11_gjj1w")
+
+[node name="Victory message" type="Label" parent="Happy"]
+offset_left = -479.0
+offset_top = -398.0
+offset_right = 481.0
+offset_bottom = -334.0
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 64
+text = "You caught GAR!"
+
[node name="SuccessFail" type="Timer" parent="."]
wait_time = 3.0
diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn
index f2b2ec6..ed94339 100644
--- a/scenes/stockticker/Stock Ticker.tscn
+++ b/scenes/stockticker/Stock Ticker.tscn
@@ -19,7 +19,7 @@ script = ExtResource("1_1gmdn")
[node name="Background" type="Sprite2D" parent="."]
modulate = Color(0.796078, 0.796078, 0.796078, 1)
position = Vector2(639.75, 359.75)
-scale = Vector2(1280.5, 720.5)
+scale = Vector2(1280, 720)
texture = ExtResource("1_wbfee")
[node name="Timer" type="Timer" parent="."]