diff options
| -rw-r--r-- | funny_sounds/whale.mp3 | bin | 0 -> 39029 bytes | |||
| -rw-r--r-- | funny_sounds/whale.mp3.import | 19 | ||||
| -rw-r--r-- | scenes/gameover.tscn | 2 | ||||
| -rw-r--r-- | scenes/microgames/fishin/fishin.gd | 5 | ||||
| -rw-r--r-- | scenes/microgames/fishin/node_2d.tscn | 7 | ||||
| -rw-r--r-- | scenes/title.tscn | 2 |
6 files changed, 32 insertions, 3 deletions
diff --git a/funny_sounds/whale.mp3 b/funny_sounds/whale.mp3 Binary files differnew file mode 100644 index 0000000..49af6f2 --- /dev/null +++ b/funny_sounds/whale.mp3 diff --git a/funny_sounds/whale.mp3.import b/funny_sounds/whale.mp3.import new file mode 100644 index 0000000..caa00c5 --- /dev/null +++ b/funny_sounds/whale.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://ctg556dx3qm6g" +path="res://.godot/imported/whale.mp3-09165a1d442eb9c48138196e4ecd3d81.mp3str" + +[deps] + +source_file="res://funny_sounds/whale.mp3" +dest_files=["res://.godot/imported/whale.mp3-09165a1d442eb9c48138196e4ecd3d81.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 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/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index ac359e8..7064bee 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -107,6 +107,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 @@ -139,6 +142,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") 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"] |