From 4e956f8f242eea5c52fb3f6bb6190494e55a7e79 Mon Sep 17 00:00:00 2001 From: bd Date: Sun, 25 May 2025 02:21:43 -0400 Subject: Add noise when losing morale, game over background --- assets/game_over.jpeg | Bin 0 -> 43966 bytes assets/game_over.jpeg.import | 34 ++++++++++++++++++++++++++++++++++ assets/game_over.xcf | Bin 0 -> 466101 bytes assets/morale_down.wav | Bin 0 -> 16794 bytes assets/morale_down.wav.import | 24 ++++++++++++++++++++++++ resources/game_stats_config.tres | 16 +++++++--------- scenes/game.tscn | 4 +++- scenes/game_over.tscn | 14 ++++++++++++-- scripts/game_data.gd | 5 +++++ scripts/game_stats_config.gd | 19 +++++++++---------- scripts/wyvern_projectile.gd | 1 - 11 files changed, 94 insertions(+), 23 deletions(-) create mode 100644 assets/game_over.jpeg create mode 100644 assets/game_over.jpeg.import create mode 100644 assets/game_over.xcf create mode 100644 assets/morale_down.wav create mode 100644 assets/morale_down.wav.import diff --git a/assets/game_over.jpeg b/assets/game_over.jpeg new file mode 100644 index 0000000..600d30a Binary files /dev/null and b/assets/game_over.jpeg differ diff --git a/assets/game_over.jpeg.import b/assets/game_over.jpeg.import new file mode 100644 index 0000000..e7e2c31 --- /dev/null +++ b/assets/game_over.jpeg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bvuippvjk57ru" +path="res://.godot/imported/game_over.jpeg-885dfaa254e96287f8e356fdf07878d6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game_over.jpeg" +dest_files=["res://.godot/imported/game_over.jpeg-885dfaa254e96287f8e356fdf07878d6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/game_over.xcf b/assets/game_over.xcf new file mode 100644 index 0000000..0054a86 Binary files /dev/null and b/assets/game_over.xcf differ diff --git a/assets/morale_down.wav b/assets/morale_down.wav new file mode 100644 index 0000000..c031033 Binary files /dev/null and b/assets/morale_down.wav differ diff --git a/assets/morale_down.wav.import b/assets/morale_down.wav.import new file mode 100644 index 0000000..7725f1d --- /dev/null +++ b/assets/morale_down.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c6104a0dr617o" +path="res://.godot/imported/morale_down.wav-846138064654c6bc93d97dc5de5f0608.sample" + +[deps] + +source_file="res://assets/morale_down.wav" +dest_files=["res://.godot/imported/morale_down.wav-846138064654c6bc93d97dc5de5f0608.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/resources/game_stats_config.tres b/resources/game_stats_config.tres index 78394a8..67df2a4 100644 --- a/resources/game_stats_config.tres +++ b/resources/game_stats_config.tres @@ -27,13 +27,6 @@ defenders = Array[Dictionary]([{ }, "sprite_panel": Vector2i(32, 5) }, { -"cost": 7, -"desc": "Sparrow (DUP)", -"effects": { -"fire_rate": 1.7 -}, -"sprite_panel": Vector2i(35, 5) -}, { "cost": 20, "desc": "Falcon (RNGE)", "effects": { @@ -43,6 +36,11 @@ defenders = Array[Dictionary]([{ "sprite_idle": Vector2i(31, 1) }, "sprite_panel": Vector2i(34, 4) +}, { +"cost": 9999, +"desc": "Sparrow (DUP)", +"effects": {}, +"sprite_panel": Vector2i(35, 5) }] }, { "cost": 15, @@ -56,7 +54,7 @@ defenders = Array[Dictionary]([{ "sprite_panel": Vector2i(28, 11), "upgrades": [] }, { -"cost": 1, +"cost": 9999, "damage": 1.0, "desc": "Werewolf", "fire_rate": 1.0, @@ -66,7 +64,7 @@ defenders = Array[Dictionary]([{ "sprite_panel": Vector2i(26, 11), "upgrades": [] }, { -"cost": 1, +"cost": 9999, "damage": 1.0, "desc": "Wellspring", "fire_rate": 1.0, diff --git a/scenes/game.tscn b/scenes/game.tscn index 1df2ade..5d5aac6 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -65,9 +65,11 @@ offset_top = 224.0 offset_right = 320.0 offset_bottom = 241.0 -[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] +[node name="BackgroundMusic" type="AudioStreamPlayer2D" parent="."] stream = SubResource("AudioStreamRandomizer_kvuet") volume_db = -4.0 script = ExtResource("10_vtaks") +[node name="Blips" type="AudioStreamPlayer2D" parent="."] + [connection signal="timeout" from="PathSpawner/Timer" to="PathSpawner" method="_on_timer_timeout"] diff --git a/scenes/game_over.tscn b/scenes/game_over.tscn index 9ef136a..fc5be4b 100644 --- a/scenes/game_over.tscn +++ b/scenes/game_over.tscn @@ -1,7 +1,15 @@ -[gd_scene load_steps=3 format=3 uid="uid://c2qy3yacnarar"] +[gd_scene load_steps=6 format=3 uid="uid://c2qy3yacnarar"] [ext_resource type="Script" uid="uid://d4ayvqargsfbd" path="res://scripts/game_over.gd" id="1_wqhvx"] +[ext_resource type="Texture2D" uid="uid://bvuippvjk57ru" path="res://assets/game_over.jpeg" id="2_tbwuq"] [ext_resource type="AudioStream" uid="uid://b6gqbdoic7lr4" path="res://assets/11 - Death's Respite.wav" id="2_wqhvx"] +[ext_resource type="Shader" uid="uid://d3ktu01mh01ao" path="res://resources/oscillating_text.gdshader" id="4_racf3"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_7m3ot"] +shader = ExtResource("4_racf3") +shader_parameter/height = 2.0 +shader_parameter/freq = 3.0 +shader_parameter/speed = 5.0 [node name="GameOver" type="Control"] layout_mode = 3 @@ -19,6 +27,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +texture = ExtResource("2_tbwuq") expand_mode = 2 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] @@ -27,6 +36,7 @@ pitch_scale = 0.7 autoplay = true [node name="Label" type="Label" parent="."] +material = SubResource("ShaderMaterial_7m3ot") layout_mode = 1 anchors_preset = 12 anchor_top = 1.0 @@ -37,5 +47,5 @@ grow_horizontal = 2 grow_vertical = 0 theme_override_colors/font_color = Color(1, 0.921569, 0.862745, 1) theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) -text = "space to go back..." +text = "press space..." horizontal_alignment = 2 diff --git a/scripts/game_data.gd b/scripts/game_data.gd index f03eaa7..6850b35 100644 --- a/scripts/game_data.gd +++ b/scripts/game_data.gd @@ -1,6 +1,7 @@ extends Node var game_stats_config = preload("res://resources/game_stats_config.tres") +var morale_down = preload("res://assets/morale_down.wav") signal life_changed signal morale_changed @@ -36,6 +37,10 @@ func subtract_morale(amount: int): emit_signal("morale_changed") if (_morale < 1): get_tree().change_scene_to_file("res://scenes/game_over.tscn") + else: + var ap = get_tree().current_scene.get_node("Blips") + ap.stream = morale_down + ap.play() func get_current_wave() -> int: return _current_wave diff --git a/scripts/game_stats_config.gd b/scripts/game_stats_config.gd index 38d9cd8..a10bef8 100644 --- a/scripts/game_stats_config.gd +++ b/scripts/game_stats_config.gd @@ -34,14 +34,6 @@ enum defenders_index {WARLOCK, WYVERN, WEREWOLF, WELLSPRING} "damage": 9.0, }, }, - { - "desc": "Sparrow (DUP)", - "sprite_panel": Vector2i(35, 5), - "cost": 7, - "effects": { - "fire_rate": 1.7 - } - }, { "desc": "Falcon (RNGE)", "sprite_panel": Vector2i(34, 4), @@ -53,6 +45,13 @@ enum defenders_index {WARLOCK, WYVERN, WEREWOLF, WELLSPRING} "sprite_idle": Vector2i(31, 1), } }, + { + "desc": "Sparrow (DUP)", + "sprite_panel": Vector2i(35, 5), + "cost": 9999, + "effects": { + } + }, ], }, { @@ -77,7 +76,7 @@ enum defenders_index {WARLOCK, WYVERN, WEREWOLF, WELLSPRING} "sprite_panel": Vector2i(26, 11), "sprite_attacking": Vector2i(26, 11), "sprite_idle": Vector2i(26, 11), - "cost": 1, + "cost": 9999, "upgrades": [], }, { @@ -88,7 +87,7 @@ enum defenders_index {WARLOCK, WYVERN, WEREWOLF, WELLSPRING} "sprite_panel": Vector2i(38, 11), "sprite_attacking": Vector2i(38, 11), "sprite_idle": Vector2i(38, 11), - "cost": 1, + "cost": 9999, "upgrades": [], } ] diff --git a/scripts/wyvern_projectile.gd b/scripts/wyvern_projectile.gd index 9b59bb0..7febbe0 100644 --- a/scripts/wyvern_projectile.gd +++ b/scripts/wyvern_projectile.gd @@ -3,7 +3,6 @@ extends CharacterBody2D var target var curr = "" var projectile_damage -# todo hook this up var damage_tick_rate func _on_damage_tick_timeout() -> void: -- cgit v1.2.3