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/main.gd | 11 +++++++++++ scenes/main.tscn | 6 +++++- scenes/microgames/ad/ad_window.gd | 8 +++++++- scenes/microgames/ad/ad_window.tscn | 4 ++++ scenes/microgames/fishin/fishin.gd | 2 ++ scenes/microgames/microgame_window.gd | 2 ++ scenes/score_window/score_window.gd | 2 +- scenes/title.gd | 2 ++ 8 files changed, 34 insertions(+), 3 deletions(-) (limited to 'scenes') diff --git a/scenes/main.gd b/scenes/main.gd index bfee6d1..496edcc 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -31,10 +31,20 @@ func _on_microgame_spawn_timer_timeout() -> void: # Connect signals window_instance.win.connect(_on_microgame_win) + window_instance.lose.connect(_on_microgame_lose) + window_instance.ad_open.connect(_on_ad_open) + $"Score window (real)/Score window".net_worth.timesEquals(0.9) + +func _on_ad_open(window: MicrogameWindow): + $"Score window (real)/Score window".net_worth.timesEquals(0.95) func _on_microgame_win(window: MicrogameWindow): print("yay") + +func _on_microgame_lose(window: MicrogameWindow): + print("noooooo") + $"Score window (real)/Score window".net_worth.timesEquals(0.8) func _on_fishin_win() -> void: @@ -44,6 +54,7 @@ func _on_fishin_win() -> void: $Clippette.visible = true $Clippette.start_dialogue() $"Score window (real)".visible = true + $AudioStreamPlayer.play() func _on_score_window_donezo() -> void: diff --git a/scenes/main.tscn b/scenes/main.tscn index c805906..4b71867 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=50 format=3 uid="uid://d06d1vihf2oqp"] +[gd_scene load_steps=51 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"] @@ -10,6 +10,7 @@ [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"] [ext_resource type="PackedScene" uid="uid://c4s4pigu4pr48" path="res://scenes/microgames/fishin/node_2d.tscn" id="10_sx2ad"] +[ext_resource type="AudioStream" uid="uid://di3mxkflh6a3o" path="res://funny_sounds/gamblecore.mp3" id="11_33353"] [sub_resource type="AtlasTexture" id="AtlasTexture_uyge7"] atlas = ExtResource("8_oj2tc") @@ -339,6 +340,9 @@ $00000000000000000000" position = Vector2(0, 0) scale = Vector2(1, 1) +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("11_33353") + [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] [connection signal="donezo" from="Score window (real)/Score window" to="." method="_on_score_window_donezo"] [connection signal="buy" from="Stock ticker" to="Score window (real)/Score window" method="_on_stock_ticker_buy"] diff --git a/scenes/microgames/ad/ad_window.gd b/scenes/microgames/ad/ad_window.gd index 3e3fc33..88111a9 100644 --- a/scenes/microgames/ad/ad_window.gd +++ b/scenes/microgames/ad/ad_window.gd @@ -6,6 +6,7 @@ extends "res://scenes/microgames/microgame_window.gd" # Called when the node enters the scene tree for the first time. func _ready() -> void: + # Choose a random ad var all_ads := $"All ads" var sprite := all_ads.get_children().pick_random() as Sprite2D @@ -20,7 +21,6 @@ func _ready() -> void: float(window_size.y) / float(sprite.texture.get_height()) ) - # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: pass @@ -34,3 +34,9 @@ func _on_close_requested() -> void: func _on_texture_button_pressed() -> void: OS.shell_open("https://www.youtube.com/watch?v=dQw4w9WgXcQ") + lose.emit(self) + + + +func _on_timer_timeout() -> void: + ad_open.emit(self) diff --git a/scenes/microgames/ad/ad_window.tscn b/scenes/microgames/ad/ad_window.tscn index 7c98b6e..dd89a93 100644 --- a/scenes/microgames/ad/ad_window.tscn +++ b/scenes/microgames/ad/ad_window.tscn @@ -110,4 +110,8 @@ texture = ExtResource("25_o5yc3") offset_right = 1000.0 offset_bottom = 1000.0 +[node name="Timer" type="Timer" parent="." index="2"] +autostart = true + [connection signal="pressed" from="TextureButton" to="." method="_on_texture_button_pressed"] +[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] 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: diff --git a/scenes/microgames/microgame_window.gd b/scenes/microgames/microgame_window.gd index 40d3d63..5b44f23 100644 --- a/scenes/microgames/microgame_window.gd +++ b/scenes/microgames/microgame_window.gd @@ -3,6 +3,8 @@ class_name MicrogameWindow signal win(this: MicrogameWindow) +signal lose(this: MicrogameWindow) +signal ad_open(this: MicrogameWindow) func _on_close_requested() -> void: diff --git a/scenes/score_window/score_window.gd b/scenes/score_window/score_window.gd index 76fb983..d6c465d 100644 --- a/scenes/score_window/score_window.gd +++ b/scenes/score_window/score_window.gd @@ -17,7 +17,7 @@ func _ready() -> void: func _process(delta: float) -> void: $Score.text = "Net worth: \n$%s" % net_worth.toString() - if net_worth.isLessThan(Big.new(0)): + if net_worth.isLessThan(Big.new(0)) or net_worth.toString()[0] == '-': donezo.emit() diff --git a/scenes/title.gd b/scenes/title.gd index d5c2159..afb1b34 100644 --- a/scenes/title.gd +++ b/scenes/title.gd @@ -23,6 +23,8 @@ func _on_minimize_button_up() -> void: func _on_start_pressed() -> void: #get_window().size = Vector2(0,0) This messes up the text for some godforesaken reason get_window().position = Vector2(-1000,-1000) + var audio = $AudioStreamPlayer + audio.stop() var new_window = Window.new() new_window.size = Vector2i(1280, 720) -- cgit v1.2.3 From d267483d31c93e6070badbc5f22ff300a9349d1a Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 17 Nov 2024 14:54:34 -0600 Subject: add losing sound effect --- scenes/main.gd | 5 ++++- scenes/main.tscn | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'scenes') diff --git a/scenes/main.gd b/scenes/main.gd index 496edcc..d128e3f 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -44,6 +44,7 @@ func _on_microgame_win(window: MicrogameWindow): func _on_microgame_lose(window: MicrogameWindow): print("noooooo") + $LosingSoundEffect.play() $"Score window (real)/Score window".net_worth.timesEquals(0.8) @@ -54,7 +55,7 @@ func _on_fishin_win() -> void: $Clippette.visible = true $Clippette.start_dialogue() $"Score window (real)".visible = true - $AudioStreamPlayer.play() + $Music.play() func _on_score_window_donezo() -> void: @@ -65,6 +66,8 @@ func _on_score_window_donezo() -> void: $"Stock ticker".queue_free() get_window().position = Vector2i(10000, 10000) + $Music.volume_db = 10 + var new_window = Window.new() new_window.size = Vector2i(1280, 720) new_window.initial_position = Window.WINDOW_INITIAL_POSITION_CENTER_SCREEN_WITH_MOUSE_FOCUS diff --git a/scenes/main.tscn b/scenes/main.tscn index 4b71867..6c1f5ff 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=51 format=3 uid="uid://d06d1vihf2oqp"] +[gd_scene load_steps=52 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"] @@ -11,6 +11,7 @@ [ext_resource type="Texture2D" uid="uid://dohsqvvi8y64h" path="res://UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png" id="8_oj2tc"] [ext_resource type="PackedScene" uid="uid://c4s4pigu4pr48" path="res://scenes/microgames/fishin/node_2d.tscn" id="10_sx2ad"] [ext_resource type="AudioStream" uid="uid://di3mxkflh6a3o" path="res://funny_sounds/gamblecore.mp3" id="11_33353"] +[ext_resource type="AudioStream" uid="uid://b45557wwianh8" path="res://funny_sounds/Super Mario 64 (Waaah) - Sound effect.mp3" id="12_xycxa"] [sub_resource type="AtlasTexture" id="AtlasTexture_uyge7"] atlas = ExtResource("8_oj2tc") @@ -340,9 +341,12 @@ $00000000000000000000" position = Vector2(0, 0) scale = Vector2(1, 1) -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +[node name="Music" type="AudioStreamPlayer" parent="."] stream = ExtResource("11_33353") +[node name="LosingSoundEffect" type="AudioStreamPlayer" parent="."] +stream = ExtResource("12_xycxa") + [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] [connection signal="donezo" from="Score window (real)/Score window" to="." method="_on_score_window_donezo"] [connection signal="buy" from="Stock ticker" to="Score window (real)/Score window" method="_on_stock_ticker_buy"] -- 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/gameover.tscn | 2 +- scenes/main.tscn | 1 + scenes/microgames/fishin/fishin.gd | 31 ++++++++++++++++++++++--------- scenes/stockticker/transactions.gd | 9 +++++++++ scenes/title.tscn | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) (limited to 'scenes') diff --git a/scenes/gameover.tscn b/scenes/gameover.tscn index 7759edd..1732111 100644 --- a/scenes/gameover.tscn +++ b/scenes/gameover.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=46 format=3 uid="uid://be813saajvxxs"] +[gd_scene load_steps=46 format=3 uid="uid://dv67unre56t5b"] [ext_resource type="Texture2D" uid="uid://dobiydav6k32e" path="res://UI/GameOverScreen.png" id="1_60m3n"] [ext_resource type="Script" path="res://scenes/gameover.gd" id="1_clwwq"] diff --git a/scenes/main.tscn b/scenes/main.tscn index 6c1f5ff..4de6e4f 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -351,4 +351,5 @@ stream = ExtResource("12_xycxa") [connection signal="donezo" from="Score window (real)/Score window" to="." method="_on_score_window_donezo"] [connection signal="buy" from="Stock ticker" to="Score window (real)/Score window" method="_on_stock_ticker_buy"] [connection signal="sell" from="Stock ticker" to="Score window (real)/Score window" method="_on_stock_ticker_sell"] +[connection signal="fish_chosen" from="Fishin" to="Stock ticker" method="_on_fishin_fish_chosen"] [connection signal="win" from="Fishin" to="." method="_on_fishin_win"] 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 diff --git a/scenes/stockticker/transactions.gd b/scenes/stockticker/transactions.gd index 39e25b9..98cad35 100644 --- a/scenes/stockticker/transactions.gd +++ b/scenes/stockticker/transactions.gd @@ -19,3 +19,12 @@ func _on_stonks_sell(amount: Variant) -> void: # Scope creep! func start(): $Timer.start() + + +func set_icon(sprite: Sprite2D): + $Node2D/Sprite2D.texture = sprite.texture + + +func _on_fishin_fish_chosen(fish_sprite: Sprite2D, fish_name: String) -> void: + $Sprite2D.texture = fish_sprite.texture + $Label.text = fish_name diff --git a/scenes/title.tscn b/scenes/title.tscn index efb165e..f2c950a 100644 --- a/scenes/title.tscn +++ b/scenes/title.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=47 format=3 uid="uid://uqljciqhbulx"] +[gd_scene load_steps=47 format=3 uid="uid://bhcfvjkkpmtr4"] [ext_resource type="Script" path="res://scenes/title.gd" id="1_q3sds"] [ext_resource type="Texture2D" uid="uid://bmgnk2m8rj1n1" path="res://UI/StartScreen.png" id="1_xa24a"] -- 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 ++- scenes/stockticker/Stock Ticker.tscn | 1 + scenes/stockticker/transactions.gd | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'scenes') 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: diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn index 6afa1af..5a56e1b 100644 --- a/scenes/stockticker/Stock Ticker.tscn +++ b/scenes/stockticker/Stock Ticker.tscn @@ -30,6 +30,7 @@ scale = Vector2(0.671875, 0.622) texture = ExtResource("9_bv8iw") [node name="Label" type="Label" parent="."] +visible = false offset_left = 823.0 offset_top = 588.0 offset_right = 1082.0 diff --git a/scenes/stockticker/transactions.gd b/scenes/stockticker/transactions.gd index 98cad35..3a56c5a 100644 --- a/scenes/stockticker/transactions.gd +++ b/scenes/stockticker/transactions.gd @@ -6,6 +6,8 @@ extends Node2D signal buy(amount: Variant) signal sell(amount: Variant) +var fish_name: String + func _on_stonks_buy(amount: Variant) -> void: print("-$%s" % amount.toString()) buy.emit(amount) @@ -19,6 +21,7 @@ func _on_stonks_sell(amount: Variant) -> void: # Scope creep! func start(): $Timer.start() + get_window().title = fish_name func set_icon(sprite: Sprite2D): @@ -27,4 +30,5 @@ func set_icon(sprite: Sprite2D): func _on_fishin_fish_chosen(fish_sprite: Sprite2D, fish_name: String) -> void: $Sprite2D.texture = fish_sprite.texture - $Label.text = fish_name + self.fish_name = fish_name + -- 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') 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') 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