Merge branch 'main' of https://gamejam.fachschaft.info/Florian/The_Dark_Side_of_Earth

enemies/boss/boss.gd

@@ -64,6 +64,7 @@ func slam():
 	damage = 2
 	velocity = up_direction * -1500
 	await grounded
+	$SoundSlam.play()
 	destroy_below()
 	damage = 1
 	velocity = up_direction * 500
@@ -71,6 +72,7 @@ func slam():
 	damage = 2
 	velocity = up_direction * -1500
 	await grounded
+	$SoundSlam.play()
 	destroy_below()
 	damage = 1
 	velocity = up_direction * 35

enemies/boss/boss.tscn

@@ -6,6 +6,7 @@
 [ext_resource type="Texture2D" uid="uid://q5mu3lxlsd6f" path="res://enemies/boss/boss2.png" id="3_opohk"]
 [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="4_lnbgr"]
 [ext_resource type="AudioStream" uid="uid://co07360hqn6fk" path="res://sounds/686321__cjspellsfish__punch-land-soft.wav" id="6_opohk"]
+[ext_resource type="AudioStream" uid="uid://c54uipjpvhal7" path="res://sounds/751710__el_boss__tree-hit-skier-tree-impact-variation-2-of-3.wav" id="7_auiwu"]
 [ext_resource type="AudioStream" uid="uid://ngkksuy3438s" path="res://sounds/slime-impact-352473.mp3" id="7_auiwu"]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_lnbgr"]
@@ -60,6 +61,9 @@ shape = SubResource("RectangleShape2D_lnbgr")
 stream = ExtResource("6_opohk")
 volume_db = 15.0
 
+[node name="SoundSlam" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("7_auiwu")
+volume_db = 12.0
 [node name="DeathSound" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("7_auiwu")
 volume_db = 10.0

items/active_items/bow/bow.gd

@@ -13,3 +13,4 @@ func activate():
 	arrow.position = player.position
 	arrow.rotation = player.rotation
 	arrow.direction = player.earth_aligner.global_from_local(Vector2(player.facing, 0))
+	$SoundBowRelease.play()

items/active_items/bow/bow.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=8 format=3 uid="uid://ddn025xnjngko"]
+[gd_scene load_steps=9 format=3 uid="uid://ddn025xnjngko"]
 
 [ext_resource type="Script" uid="uid://bkcip66at5sug" path="res://items/active_items/bow/bow.gd" id="1_xppub"]
 [ext_resource type="PackedScene" uid="uid://dfva4dhflxglr" path="res://items/active_items/bow/arrow.tscn" id="2_0id2q"]
@@ -6,6 +6,7 @@
 [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="4_0id2q"]
 [ext_resource type="AudioStream" uid="uid://bg1w0fyeyys2p" path="res://sounds/item-equip-6904.mp3" id="5_gfbg0"]
 [ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="5_o1smo"]
+[ext_resource type="AudioStream" uid="uid://10ljbd4djqgb" path="res://sounds/263675__porkmuncher__bow_release_cut.wav" id="7_o1smo"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_gllxn"]
 radius = 13.239409
@@ -37,3 +38,6 @@ texture = ExtResource("3_vkelq")
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("5_gfbg0")
 volume_db = 15.0
+
+[node name="SoundBowRelease" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("7_o1smo")

items/generic/item_spawn.gd

@@ -3,7 +3,8 @@ class_name ItemSpawn extends Node2D
 @export var common_items : Array[PackedScene]
 @export var rare_items : Array[PackedScene]
 static var unique_items : Array[PackedScene] = [
-	load("res://items/permanent_items/backslash.tscn")
+	load("res://items/permanent_items/backslash.tscn"),
+	load("res://items/permanent_items/high_jump.tscn")
 ] 
 
 @export var rarity_bonus = 0

items/permanent_items/backslash.gd

@@ -7,4 +7,3 @@ func collect() -> bool:
 	player.add_child(sword_instance)
 	sword_instance.facing_mult = -1
 	return true
-	

items/permanent_items/backslash.tscn

@@ -22,7 +22,6 @@ shape = SubResource("CircleShape2D_hvhjo")
 
 [node name="Sprite2D2" type="Sprite2D" parent="."]
 modulate = Color(0.725757, 0.519822, 5.77569e-07, 1)
-position = Vector2(2, 2)
 scale = Vector2(2.5, 2.5)
 texture = ExtResource("4_legpc")
 

items/permanent_items/high_jump.gd

@@ -0,0 +1,6 @@
+extends Item
+
+func collect():
+	player.jump_strength = 1500
+	$SoundCollect.play()
+	return true

items/permanent_items/high_jump.gd.uid

@@ -0,0 +1 @@
+uid://cq6h2iven3rly

items/permanent_items/high_jump.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c6pyyfgkhytu5"
+path="res://.godot/imported/high_jump.png-8bc003388f039950b2397263b61bf2a9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://items/permanent_items/high_jump.png"
+dest_files=["res://.godot/imported/high_jump.png-8bc003388f039950b2397263b61bf2a9.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+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/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+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

items/permanent_items/high_jump.tscn

@@ -0,0 +1,33 @@
+[gd_scene load_steps=7 format=3 uid="uid://bpgo1djj8f1rg"]
+
+[ext_resource type="Script" uid="uid://cq6h2iven3rly" path="res://items/permanent_items/high_jump.gd" id="1_7gixi"]
+[ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_s7mjt"]
+[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_ui5no"]
+[ext_resource type="Texture2D" uid="uid://c6pyyfgkhytu5" path="res://items/permanent_items/high_jump.png" id="4_7gixi"]
+[ext_resource type="AudioStream" uid="uid://pdd0sy3p4y0d" path="res://sounds/750240__universfield__coin-drop.mp3" id="5_s7mjt"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_bya24"]
+
+[node name="HighJump" type="Area2D"]
+script = ExtResource("1_7gixi")
+metadata/_custom_type_script = "uid://c0uftljafcroy"
+
+[node name="EarthAligner" parent="." instance=ExtResource("2_s7mjt")]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+visible = false
+scale = Vector2(7, 7)
+shape = SubResource("CircleShape2D_bya24")
+
+[node name="SpriteGlint" type="Sprite2D" parent="."]
+modulate = Color(0.725757, 0.519822, 5.77569e-07, 1)
+scale = Vector2(2.5, 2.5)
+texture = ExtResource("3_ui5no")
+
+[node name="SpriteItem" type="Sprite2D" parent="."]
+texture_filter = 1
+scale = Vector2(4, 4)
+texture = ExtResource("4_7gixi")
+
+[node name="SoundCollect" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("5_s7mjt")

player/player.gd

@@ -88,6 +88,7 @@ func manage_attack(delta : float):
 		if(Input.is_action_just_pressed("attack") and atk_timer <= 0):
 			attack.emit()
 			$AnimatedSprite2D.play("attack")
+			$SwordSwingAudio.play()
 			atk_timer = atk_cooldown
 
 func manage_active(_delta : float):

player/player.tscn

@@ -17,6 +17,7 @@
 [ext_resource type="PackedScene" uid="uid://beotdg4etmevc" path="res://player/double_jump/double_jump_animation.tscn" id="10_8t03j"]
 [ext_resource type="AudioStream" uid="uid://co07360hqn6fk" path="res://sounds/686321__cjspellsfish__punch-land-soft.wav" id="11_2ieo8"]
 [ext_resource type="AudioStream" uid="uid://ds0yw3au0quae" path="res://sounds/whoosh.mp3" id="12_ebec5"]
+[ext_resource type="AudioStream" uid="uid://c3pqq5yi1686n" path="res://sounds/sword_swing.wav" id="17_tqiix"]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_onrkg"]
 
@@ -105,7 +106,10 @@ volume_db = 15.0
 
 [node name="AirJumpAudio" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("12_ebec5")
-volume_db = -6.0
+volume_db = 4.0
 pitch_scale = 1.62
 
+[node name="SwordSwingAudio" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("17_tqiix")
+volume_db = -12.0
 [connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_attack_end"]

sounds/263675__porkmuncher__bow_release_cut.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://10ljbd4djqgb"
+path="res://.godot/imported/263675__porkmuncher__bow_release_cut.wav-ee391734f701fa70f133b49426577cf3.sample"
+
+[deps]
+
+source_file="res://sounds/263675__porkmuncher__bow_release_cut.wav"
+dest_files=["res://.godot/imported/263675__porkmuncher__bow_release_cut.wav-ee391734f701fa70f133b49426577cf3.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

sounds/750240__universfield__coin-drop.mp3.import

@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/750240__universfield__coin-drop.mp3-ff686fa24
 [params]
 
 loop=false
-loop_offset=0
-bpm=0
+loop_offset=0.0
+bpm=0.0
 beat_count=0
 bar_beats=4

sounds/751710__el_boss__tree-hit-skier-tree-impact-variation-2-of-3.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c54uipjpvhal7"
+path="res://.godot/imported/751710__el_boss__tree-hit-skier-tree-impact-variation-2-of-3.wav-16a1dfef3be36a56b586ac64c8b3d75c.sample"
+
+[deps]
+
+source_file="res://sounds/751710__el_boss__tree-hit-skier-tree-impact-variation-2-of-3.wav"
+dest_files=["res://.godot/imported/751710__el_boss__tree-hit-skier-tree-impact-variation-2-of-3.wav-16a1dfef3be36a56b586ac64c8b3d75c.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

sounds/sword_swing.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c3pqq5yi1686n"
+path="res://.godot/imported/sword_swing.wav-b950b6729fe085f49372f5c905feadec.sample"
+
+[deps]
+
+source_file="res://sounds/sword_swing.wav"
+dest_files=["res://.godot/imported/sword_swing.wav-b950b6729fe085f49372f5c905feadec.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