Merge branch 'main' into clippette-dialogue

1 files changed, 60 insertions, 0 deletions

diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd
index 91be725..abaf999 100644
--- a/scenes/microgames/fishin/fishin.gd
+++ b/scenes/microgames/fishin/fishin.gd
@@ -1,5 +1,17 @@
 extends Node2D
 
+enum FishType {
+	GAR,
+	SALMON,
+	BASS,
+	HUMUHUMUNUKUNUKUAPUA_A,
+	CATFSIH,
+	DOGFISH,
+	ANGLERFISH,
+	MOBY_DICK,
+	LEAPING_SMACKEREL,
+}
+
 signal win
 
 const IN_GAME_WAIT_TIME = 10
@@ -19,9 +31,22 @@ var in_game_timer: Timer
 var succfail_timer: Timer 
 var success_timer: Timer
 
+var gar 
+var salmon 
+var bass
+var humuhumunukunukuapua_a
+var catfsih
+var dogfish
+var pupperfish
+var anglerfish
+var moby_dick
+var leaping_smackerel
+
 var in_minigame = false
 var num_clicks = 0
 
+var fishes = [FishType.GAR, FishType.SALMON, FishType.BASS, FishType.HUMUHUMUNUKUNUKUAPUA_A, FishType.CATFSIH, FishType.DOGFISH, FishType.ANGLERFISH, FishType.MOBY_DICK, FishType.LEAPING_SMACKEREL]
+
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
 	pulling = $ShakePivot/pulling
@@ -40,6 +65,16 @@ func _ready() -> void:
 	
 	get_window().title = "Relaxing Fishing Game 🙂"
 
+	gar = $Happy/Gar
+	salmon = $Happy/SockeyeSalmon
+	bass = $Happy/LargemouthBass
+	humuhumunukunukuapua_a = $"Happy/Humuhumunukunukuapua'a"
+	catfsih = $Happy/Catfsih
+	dogfish = $Happy/Dogfish
+	pupperfish = $Happy/Pupperfish
+	anglerfish  = $Happy/Anglerfish
+	moby_dick = $"Happy/Moby-Dick"
+	leaping_smackerel = $Happy/LeapingSmackerel
 	
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -69,6 +104,21 @@ func _on_texture_button_button_up() -> void:
 			# show happy cat
 			happy.visible = true
 			
+			# show fish
+			var fish_choice: FishType = randi_range(0,len(fishes))
+			
+			
+			match fish_choice:
+				FishType.GAR: gar.visible = true
+				FishType.SALMON: salmon.visible = true
+				FishType.BASS: bass.visible = true
+				FishType.HUMUHUMUNUKUNUKUAPUA_A: humuhumunukunukuapua_a.visible = true
+				FishType.CATFSIH: catfsih.visible = true
+				FishType.DOGFISH: dogfish.visible = true
+				FishType.ANGLERFISH: anglerfish.visible = true
+				FishType.MOBY_DICK: moby_dick.visible = true
+				FishType.LEAPING_SMACKEREL: leaping_smackerel.visible = true
+			
 			in_game_timer.stop()
 			in_game_timer.wait_time = IN_GAME_WAIT_TIME
 			success_timer.start()
@@ -123,6 +173,16 @@ func _on_in_game_timeout() -> void:
 
 
 func _on_success_fail_timeout() -> void:
+	gar.visible = false
+	salmon.visible = false
+	bass.visible = false
+	humuhumunukunukuapua_a.visible = false
+	catfsih.visible = false
+	dogfish.visible = false
+	pupperfish.visible = false
+	anglerfish.visible = false
+	moby_dick.visible = false
+	leaping_smackerel.visible = false
 	sad.visible = false
 	happy.visible = false
 	you.visible = true