Merge branch 'main' into clippette-dialogue

1 files changed, 200 insertions, 14 deletions

diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn
index 5dc8da7..0c23b7c 100644
--- a/scenes/microgames/fishin/node_2d.tscn
+++ b/scenes/microgames/fishin/node_2d.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=3 uid="uid://c4s4pigu4pr48"]
+[gd_scene load_steps=26 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,9 +10,18 @@
 [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"]
 [ext_resource type="AudioStream" uid="uid://c6021mckr08w5" path="res://funny_sounds/Yippee - Meme Sound Effect.mp3" id="12_4oxp1"]
+[ext_resource type="Texture2D" uid="uid://i0kph8rvk6k6" path="res://scenes/microgames/fishin/gar.png" id="12_nygno"]
+[ext_resource type="Texture2D" uid="uid://b3hqockbev0uv" path="res://scenes/microgames/fishin/SockeyeSalmon.png" id="13_5d0lj"]
 [ext_resource type="AudioStream" uid="uid://beunakwyi8i82" path="res://funny_sounds/ROBLOX Oof Sound Effect.mp3" id="13_kxv5l"]
+[ext_resource type="Texture2D" uid="uid://4xt4563qgur6" path="res://scenes/microgames/fishin/LargemouthBass.png" id="14_xshfx"]
+[ext_resource type="Texture2D" uid="uid://bo5o2g152jhre" path="res://scenes/microgames/fishin/Humuhumunukunukuapua'a.png" id="15_6dhvf"]
+[ext_resource type="Texture2D" uid="uid://bpelie4yn48xn" path="res://scenes/microgames/fishin/Catfish.png" id="16_k5nba"]
+[ext_resource type="Texture2D" uid="uid://dms0kc5rduwcc" path="res://scenes/microgames/fishin/DogFish.png" id="17_op71e"]
+[ext_resource type="Texture2D" uid="uid://b18bnhle2j4l3" path="res://scenes/microgames/fishin/PorcupineFish.png" id="18_6a8wg"]
+[ext_resource type="Texture2D" uid="uid://dobgdcs2lkbwn" path="res://scenes/microgames/fishin/AnglerFish.png" id="19_64si4"]
+[ext_resource type="Texture2D" uid="uid://bi8wwmpxdr1sg" path="res://scenes/microgames/fishin/Moby-Dick.png" id="20_emk52"]
+[ext_resource type="Texture2D" uid="uid://bquf4lqso1h0e" path="res://scenes/microgames/fishin/LeapingSmackerel.png" id="21_mppni"]
 
 [sub_resource type="Animation" id="Animation_bep6n"]
 length = 0.001
@@ -52,7 +61,8 @@ _data = {
 }
 
 [node name="Fishin" type="Node2D"]
-position = Vector2(0, 36)
+position = Vector2(0, 2)
+scale = Vector2(0.984936, 0.988897)
 script = ExtResource("1_srw8b")
 
 [node name="background" type="Sprite2D" parent="."]
@@ -122,19 +132,195 @@ visible = false
 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="Gar" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="Gar Message" type="Label" parent="Happy/Gar"]
+offset_left = -634.0
+offset_top = -429.0
+offset_right = 609.0
+offset_bottom = -279.0
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 30
+text = "You caught Gar!
+You're telling me a gar licked this bread?"
+
+[node name="GarSprite" type="Sprite2D" parent="Happy/Gar"]
+position = Vector2(-385, 235)
+rotation = 1.56722
+scale = Vector2(0.353309, 0.473409)
+texture = ExtResource("12_nygno")
+
+[node name="SockeyeSalmon" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="Sockeye Message" type="Label" parent="Happy/SockeyeSalmon"]
+offset_left = -651.0
+offset_top = -437.0
+offset_right = 129.0
+offset_bottom = -372.0
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 49
+text = "You caught Sockeye Salmon!
+You caught Sockeye Salmon!"
+
+[node name="SalmonSprite" type="Sprite2D" parent="Happy/SockeyeSalmon"]
+position = Vector2(-384, 103)
+rotation = 1.56242
+scale = Vector2(0.211844, 0.246723)
+texture = ExtResource("13_5d0lj")
+
+[node name="LargemouthBass" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="LargemouthBassMessaage" type="Label" parent="Happy/LargemouthBass"]
+offset_left = -646.0
+offset_top = -441.0
+offset_right = 194.0
+offset_bottom = -308.0
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 45
+text = "You caught Largemouth Bass!
+You know what they say about
+fish with large mouths?...
+Large hook."
+
+[node name="LargemouthBassSprite" type="Sprite2D" parent="Happy/LargemouthBass"]
+position = Vector2(-373, 115)
+rotation = 1.58037
+scale = Vector2(0.234591, 0.298919)
+texture = ExtResource("14_xshfx")
+
+[node name="Humuhumunukunukuapua\'a" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="Humuhumunukunukuapua\'aMessage" type="Label" parent="Happy/Humuhumunukunukuapua\'a"]
+offset_left = -657.0
+offset_top = -448.0
+offset_right = 975.0
+offset_bottom = -298.0
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 47
+text = "You caught Humuhumunukunukuapua'a!
+Oh dear, I didn't plan for
+text boxes to be this big!"
 
-[node name="Victory message" type="Label" parent="Happy"]
-offset_left = -479.0
-offset_top = -398.0
-offset_right = 481.0
-offset_bottom = -334.0
+[node name="Sprite2D" type="Sprite2D" parent="Happy/Humuhumunukunukuapua\'a"]
+position = Vector2(-378.687, 68.8494)
+rotation = 1.57517
+scale = Vector2(0.126112, 0.203311)
+texture = ExtResource("15_6dhvf")
+
+[node name="Catfsih" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="CatfishMessage" type="Label" parent="Happy/Catfsih"]
+offset_left = -654.847
+offset_top = -444.854
+offset_right = -84.847
+offset_bottom = -379.854
 theme = ExtResource("5_7qce4")
-theme_override_font_sizes/font_size = 64
-text = "You caught GAR!"
+theme_override_font_sizes/font_size = 68
+text = "You caught Catfsih!
+Meow!"
+
+[node name="CatfishSprite" type="Sprite2D" parent="Happy/Catfsih"]
+position = Vector2(-362.442, 240.758)
+rotation = 1.57009
+scale = Vector2(0.329218, 0.426148)
+texture = ExtResource("16_k5nba")
+
+[node name="Dogfish" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="DogfishMessage" type="Label" parent="Happy/Dogfish"]
+offset_left = -649.771
+offset_top = -444.854
+offset_right = 100.229
+offset_bottom = -379.854
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 50
+text = "You caught Dogfish!
+He is excited for a walk!"
+
+[node name="DogfishSprite" type="Sprite2D" parent="Happy/Dogfish"]
+position = Vector2(-313.708, 66.827)
+scale = Vector2(0.529673, 0.55473)
+texture = ExtResource("17_op71e")
+
+[node name="Pupperfish" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="PufferfishMessage" type="Label" parent="Happy/Pupperfish"]
+offset_left = -653.832
+offset_top = -447.888
+offset_right = 96.1682
+offset_bottom = -382.888
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 51
+text = "You caught Pupperfish!
+Sorry I meant Pufferfish."
+
+[node name="PufferfishSprite" type="Sprite2D" parent="Happy/Pupperfish"]
+position = Vector2(-379.702, 105.254)
+rotation = 1.58793
+scale = Vector2(0.258293, 0.319705)
+texture = ExtResource("18_6a8wg")
+
+[node name="Anglerfish" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="AnglerfishMessage" type="Label" parent="Happy/Anglerfish"]
+offset_left = -650.786
+offset_top = -441.82
+offset_right = 99.2141
+offset_bottom = -376.82
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 51
+text = "You caught Anglerfish!
+I wonder what she caught?"
+
+[node name="AnglerfishSprirtre" type="Sprite2D" parent="Happy/Anglerfish"]
+position = Vector2(-378.687, 36.4902)
+rotation = 1.56059
+scale = Vector2(0.199247, 0.20022)
+texture = ExtResource("19_64si4")
+
+[node name="Moby-Dick" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="Moby-DickMessage" type="Label" parent="Happy/Moby-Dick"]
+offset_left = -652.816
+offset_top = -448.899
+offset_right = 607.184
+offset_bottom = -349.899
+theme = ExtResource("5_7qce4")
+text = "You caught Moby-Dick!
+Little did you know, but you were actually
+playing Moby-Dick 2 this whole time!"
+
+[node name="Moby-DickSprite" type="Sprite2D" parent="Happy/Moby-Dick"]
+position = Vector2(123.884, 958.73)
+rotation = 1.589
+scale = Vector2(1.37491, 2.51303)
+texture = ExtResource("20_emk52")
+
+[node name="LeapingSmackerel" type="Node2D" parent="Happy"]
+visible = false
+
+[node name="LeapingSmackerelMessage" type="Label" parent="Happy/LeapingSmackerel"]
+offset_left = -651.801
+offset_top = -433.73
+offset_right = 458.199
+offset_bottom = -368.73
+theme = ExtResource("5_7qce4")
+theme_override_font_sizes/font_size = 41
+text = "You caught Leaping Smackerel!
+LET'S DO THIS!!!!!!!!!!!!!!!!!!!!!!!!"
+
+[node name="LeapingSmackerelSprite" type="Sprite2D" parent="Happy/LeapingSmackerel"]
+position = Vector2(-409.146, 189.185)
+texture = ExtResource("21_mppni")
 
 [node name="SuccessFail" type="Timer" parent="."]
 wait_time = 3.0