From 8ccae5aad9d896d3ec4a4684c30ae35f14794569 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 17 Nov 2024 14:46:56 -0600 Subject: add losing money --- scenes/microgames/fishin/fishin.gd | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scenes/microgames/fishin') diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index abaf999..1aa911c 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -13,6 +13,7 @@ enum FishType { } signal win +signal lose const IN_GAME_WAIT_TIME = 10 @@ -170,6 +171,7 @@ func _on_in_game_timeout() -> void: $"Fart".play() get_window().title = "🙂👎" + lose.emit() func _on_success_fail_timeout() -> void: -- cgit v1.2.3 From 5283cc1d097b67c681e0eee80e2d85e7424a0d5c Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sun, 17 Nov 2024 15:03:36 -0600 Subject: Proof of concept (specialized generalized fish) --- scenes/microgames/fishin/fishin.gd | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'scenes/microgames/fishin') diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index 1aa911c..e657b22 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -14,6 +14,7 @@ enum FishType { signal win signal lose +signal fish_chosen(fish_sprite: Sprite2D, fish_name: String) const IN_GAME_WAIT_TIME = 10 @@ -108,17 +109,29 @@ func _on_texture_button_button_up() -> void: # show fish var fish_choice: FishType = randi_range(0,len(fishes)) + # hehe + fish_choice = FishType.GAR 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 + FishType.GAR: + gar.visible = true + fish_chosen.emit(gar.get_node("GarSprite"), "Gar :)") + 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 -- cgit v1.2.3 From 81027496117fc4310d15062ea93310cb62f07455 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sun, 17 Nov 2024 13:13:41 -0600 Subject: Salmon --- scenes/microgames/fishin/fishin.gd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scenes/microgames/fishin') diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index e657b22..a0db9f3 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -110,7 +110,7 @@ func _on_texture_button_button_up() -> void: var fish_choice: FishType = randi_range(0,len(fishes)) # hehe - fish_choice = FishType.GAR + fish_choice = FishType.SALMON match fish_choice: FishType.GAR: @@ -118,6 +118,7 @@ func _on_texture_button_button_up() -> void: fish_chosen.emit(gar.get_node("GarSprite"), "Gar :)") FishType.SALMON: salmon.visible = true + fish_chosen.emit(salmon.get_node("SalmonSprite"), "Salmon") FishType.BASS: bass.visible = true FishType.HUMUHUMUNUKUNUKUAPUA_A: -- cgit v1.2.3 From 6b563d96d5c6e445df7c2f34734549b54518d649 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sun, 17 Nov 2024 13:35:03 -0600 Subject: Oops I only committed the sounds (what is git amend) --- scenes/microgames/fishin/fishin.gd | 23 +++++++++++++++++------ scenes/microgames/fishin/node_2d.tscn | 14 +++++++++++++- 2 files changed, 30 insertions(+), 7 deletions(-) (limited to 'scenes/microgames/fishin') diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index a0db9f3..1a734bf 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -108,36 +108,47 @@ func _on_texture_button_button_up() -> void: # show fish var fish_choice: FishType = randi_range(0,len(fishes)) - - # hehe - fish_choice = FishType.SALMON - match fish_choice: FishType.GAR: gar.visible = true fish_chosen.emit(gar.get_node("GarSprite"), "Gar :)") + $"Yippee!".play() FishType.SALMON: salmon.visible = true - fish_chosen.emit(salmon.get_node("SalmonSprite"), "Salmon") + fish_chosen.emit(salmon.get_node("SalmonSprite"), "Sockeye Salmon") + $"Yippee!".play() FishType.BASS: bass.visible = true + fish_chosen.emit(bass.get_node("LargemouthBassSprite"), "Largemouth Bass") + $"Yippee!".play() FishType.HUMUHUMUNUKUNUKUAPUA_A: humuhumunukunukuapua_a.visible = true + fish_chosen.emit(humuhumunukunukuapua_a.get_node("Sprite2D"), "Humuhumunukunukuapua'a") + $"Yippee!".play() FishType.CATFSIH: catfsih.visible = true + fish_chosen.emit(catfsih.get_node("CatfishSprite"), "Catfish :3") + $Meow.play() FishType.DOGFISH: dogfish.visible = true + fish_chosen.emit(dogfish.get_node("DogfishSprite"), "Dogfish 🐶") + $Bark.play() FishType.ANGLERFISH: anglerfish.visible = true + fish_chosen.emit(anglerfish.get_node("AnglerfishSprirtre"), "Anglerfish") + $"Yippee!".play() FishType.MOBY_DICK: moby_dick.visible = true + fish_chosen.emit(moby_dick.get_node("Moby-DickSprite"), "Moby Dick") FishType.LEAPING_SMACKEREL: leaping_smackerel.visible = true + fish_chosen.emit(leaping_smackerel.get_node("LeapingSmackerelSprite"), "LEAPING SMACKEREL! WAHOO!") + $"THE LEAPING SMACKEREL!".play() + success_timer.wait_time *= 2 in_game_timer.stop() in_game_timer.wait_time = IN_GAME_WAIT_TIME success_timer.start() - $"Yippee!".play() get_window().title = "Yippee!" diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index 0c23b7c..3f6f3b4 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://c4s4pigu4pr48"] +[gd_scene load_steps=29 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"] @@ -22,6 +22,9 @@ [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"] +[ext_resource type="AudioStream" uid="uid://wtoxhk0tf8ev" path="res://funny_sounds/Cat Meow - Minecraft Sound Effect (HD).mp3" id="23_2n5pw"] +[ext_resource type="AudioStream" uid="uid://cr34g4np4h508" path="res://funny_sounds/boney boark.mp3" id="24_rbg0g"] +[ext_resource type="AudioStream" uid="uid://keguv7ldvk2e" path="res://funny_sounds/THE LEAPING SMACKEREL.mp3" id="25_qmt08"] [sub_resource type="Animation" id="Animation_bep6n"] length = 0.001 @@ -334,6 +337,15 @@ stream = ExtResource("12_4oxp1") [node name="Fart" type="AudioStreamPlayer" parent="."] stream = ExtResource("13_kxv5l") +[node name="Meow" type="AudioStreamPlayer" parent="."] +stream = ExtResource("23_2n5pw") + +[node name="Bark" type="AudioStreamPlayer" parent="."] +stream = ExtResource("24_rbg0g") + +[node name="THE LEAPING SMACKEREL!" type="AudioStreamPlayer" parent="."] +stream = ExtResource("25_qmt08") + [connection signal="button_up" from="TextureButton" to="." method="_on_texture_button_button_up"] [connection signal="timeout" from="StartGame" to="." method="_on_start_game_timeout"] [connection signal="timeout" from="InGame" to="." method="_on_in_game_timeout"] -- cgit v1.2.3 From cd2144e9bb8320285a1e374588621a1d2ccefb57 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sun, 17 Nov 2024 13:41:01 -0600 Subject: THE WHALE --- scenes/microgames/fishin/fishin.gd | 5 +++++ scenes/microgames/fishin/node_2d.tscn | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'scenes/microgames/fishin') diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index 1a734bf..9f62755 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -108,6 +108,9 @@ func _on_texture_button_button_up() -> void: # show fish var fish_choice: FishType = randi_range(0,len(fishes)) + + fish_choice = FishType.MOBY_DICK + match fish_choice: FishType.GAR: gar.visible = true @@ -140,6 +143,8 @@ func _on_texture_button_button_up() -> void: FishType.MOBY_DICK: moby_dick.visible = true fish_chosen.emit(moby_dick.get_node("Moby-DickSprite"), "Moby Dick") + $"Moby Dick".play() + success_timer.wait_time *= 2 FishType.LEAPING_SMACKEREL: leaping_smackerel.visible = true fish_chosen.emit(leaping_smackerel.get_node("LeapingSmackerelSprite"), "LEAPING SMACKEREL! WAHOO!") diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index 3f6f3b4..aff73ee 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=3 uid="uid://c4s4pigu4pr48"] +[gd_scene load_steps=30 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"] @@ -24,6 +24,7 @@ [ext_resource type="Texture2D" uid="uid://bquf4lqso1h0e" path="res://scenes/microgames/fishin/LeapingSmackerel.png" id="21_mppni"] [ext_resource type="AudioStream" uid="uid://wtoxhk0tf8ev" path="res://funny_sounds/Cat Meow - Minecraft Sound Effect (HD).mp3" id="23_2n5pw"] [ext_resource type="AudioStream" uid="uid://cr34g4np4h508" path="res://funny_sounds/boney boark.mp3" id="24_rbg0g"] +[ext_resource type="AudioStream" uid="uid://ctg556dx3qm6g" path="res://funny_sounds/whale.mp3" id="25_dpi4g"] [ext_resource type="AudioStream" uid="uid://keguv7ldvk2e" path="res://funny_sounds/THE LEAPING SMACKEREL.mp3" id="25_qmt08"] [sub_resource type="Animation" id="Animation_bep6n"] @@ -343,6 +344,10 @@ stream = ExtResource("23_2n5pw") [node name="Bark" type="AudioStreamPlayer" parent="."] stream = ExtResource("24_rbg0g") +[node name="Moby Dick" type="AudioStreamPlayer" parent="."] +stream = ExtResource("25_dpi4g") +volume_db = 6.537 + [node name="THE LEAPING SMACKEREL!" type="AudioStreamPlayer" parent="."] stream = ExtResource("25_qmt08") -- cgit v1.2.3