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') 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