diff --git a/enemies/boss/boss.gd b/enemies/boss/boss.gd index bb927af..6a8350a 100644 --- a/enemies/boss/boss.gd +++ b/enemies/boss/boss.gd @@ -109,5 +109,4 @@ func die(): func _on_enemy_hurtbox_damage_taken(_damage, _dir) -> void: if dead: return - print("audio") $AudioStreamPlayer2D.play() diff --git a/enemies/ghost/ghost.tscn b/enemies/ghost/ghost.tscn index 492748f..820bc8f 100644 --- a/enemies/ghost/ghost.tscn +++ b/enemies/ghost/ghost.tscn @@ -54,6 +54,7 @@ shape = SubResource("CircleShape2D_6attn") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("7_eqcb8") +volume_db = 15.0 [connection signal="damage_taken" from="EnemyHurtbox" to="." method="_on_damage_taken"] [connection signal="died" from="EnemyHurtbox" to="." method="_on_death"] diff --git a/enemies/leech/leech.tscn b/enemies/leech/leech.tscn index 08428d7..adbc15e 100644 --- a/enemies/leech/leech.tscn +++ b/enemies/leech/leech.tscn @@ -55,3 +55,4 @@ shape = SubResource("RectangleShape2D_cq6dk") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("4_b1m5t") +volume_db = 15.0 diff --git a/items/active_items/bow/arror.png b/items/active_items/bow/arror.png new file mode 100644 index 0000000..dd3cf4d Binary files /dev/null and b/items/active_items/bow/arror.png differ diff --git a/items/active_items/bow/arror.png.import b/items/active_items/bow/arror.png.import new file mode 100644 index 0000000..b96ef8b --- /dev/null +++ b/items/active_items/bow/arror.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bavoghl2pxs83" +path="res://.godot/imported/arror.png-9ea2fbd842e6807dfd42e9ceed411fd2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://items/active_items/bow/arror.png" +dest_files=["res://.godot/imported/arror.png-9ea2fbd842e6807dfd42e9ceed411fd2.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=0 diff --git a/items/active_items/bow/arrow.tscn b/items/active_items/bow/arrow.tscn index 3f987d9..3c6c5b4 100644 --- a/items/active_items/bow/arrow.tscn +++ b/items/active_items/bow/arrow.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://dfva4dhflxglr"] [ext_resource type="Script" uid="uid://bglrm0bb4nla" path="res://items/active_items/bow/arrow.gd" id="1_lxthq"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="1_tl37p"] +[ext_resource type="Texture2D" uid="uid://bavoghl2pxs83" path="res://items/active_items/bow/arror.png" id="2_ilsew"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_tfcgf"] size = Vector2(20, 5) @@ -12,9 +12,11 @@ collision_mask = 18 script = ExtResource("1_lxthq") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -scale = Vector2(2, 2) +scale = Vector2(3, 2) shape = SubResource("RectangleShape2D_tfcgf") [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.31, 0.078) -texture = ExtResource("1_tl37p") +texture_filter = 1 +position = Vector2(0, -1) +scale = Vector2(2, 2) +texture = ExtResource("2_ilsew") diff --git a/items/active_items/bow/bow.tscn b/items/active_items/bow/bow.tscn index dd8a9ec..9704ed5 100644 --- a/items/active_items/bow/bow.tscn +++ b/items/active_items/bow/bow.tscn @@ -28,3 +28,4 @@ texture = ExtResource("2_gllxn") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("5_gfbg0") +volume_db = 15.0 diff --git a/items/active_items/updash/updash.tscn b/items/active_items/updash/updash.tscn index c96dbb7..f781993 100644 --- a/items/active_items/updash/updash.tscn +++ b/items/active_items/updash/updash.tscn @@ -40,8 +40,9 @@ texture = ExtResource("3_a5yxq") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("5_ssiqx") +volume_db = 15.0 [node name="UpdashSound" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("6_mbe12") -volume_db = -5.0 +volume_db = 7.0 pitch_scale = 1.23 diff --git a/items/immediate_items/heal_item/heal_item.tscn b/items/immediate_items/heal_item/heal_item.tscn index 4e1823e..b8d04db 100644 --- a/items/immediate_items/heal_item/heal_item.tscn +++ b/items/immediate_items/heal_item/heal_item.tscn @@ -29,4 +29,4 @@ texture = ExtResource("3_fvuym") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("5_1ujdq") -volume_db = -25.0 +volume_db = -3.0 diff --git a/items/immediate_items/healthup/healthup.tscn b/items/immediate_items/healthup/healthup.tscn index 562330b..ee2b78e 100644 --- a/items/immediate_items/healthup/healthup.tscn +++ b/items/immediate_items/healthup/healthup.tscn @@ -38,4 +38,4 @@ texture = ExtResource("5_m76tj") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("6_uq82b") -volume_db = -18.0 +volume_db = 2.0 diff --git a/items/permanent_items/backslash.tscn b/items/permanent_items/backslash.tscn index 1f101ec..583da3d 100644 --- a/items/permanent_items/backslash.tscn +++ b/items/permanent_items/backslash.tscn @@ -33,3 +33,4 @@ texture = ExtResource("5_qg660") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("6_qg660") +volume_db = 2.0 diff --git a/items/permanent_items/extrajump.tscn b/items/permanent_items/extrajump.tscn index c2a7b28..366f906 100644 --- a/items/permanent_items/extrajump.tscn +++ b/items/permanent_items/extrajump.tscn @@ -31,4 +31,3 @@ texture = ExtResource("3_t7gtn") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("5_kn13r") -volume_db = -5.0 diff --git a/main.tscn b/main.tscn index 37da4d0..b582c97 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://cxo6bq26huau7"] +[gd_scene load_steps=12 format=3 uid="uid://bjuak0sbjpamb"] [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"] [ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"] @@ -79,8 +79,6 @@ texture = ExtResource("3_kek77") script = ExtResource("10_efxa6") boss = ExtResource("11_efxa6") -[node name="Boss" parent="." instance=ExtResource("11_efxa6")] - [connection signal="active_item_changed" from="Player" to="UIOverlay/ItemUI" method="_on_player_active_item_changed"] [connection signal="health_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_health_changed"] [connection signal="max_hp_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_max_hp_changed"] diff --git a/player/player.tscn b/player/player.tscn index 89ded50..98c4b4f 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -69,8 +69,9 @@ one_shot = true [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("11_2ieo8") +volume_db = 15.0 [node name="AirJumpAudio" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("12_ebec5") -volume_db = -12.0 +volume_db = -6.0 pitch_scale = 1.62