diff --git a/Zennysoft.Game.Ma/default_bus_layout.tres b/Zennysoft.Game.Ma/default_bus_layout.tres index 63bb08b79..3749197b2 100644 --- a/Zennysoft.Game.Ma/default_bus_layout.tres +++ b/Zennysoft.Game.Ma/default_bus_layout.tres @@ -1,9 +1,12 @@ -[gd_resource type="AudioBusLayout" load_steps=4 format=3 uid="uid://c2mk6c27y0mdf"] +[gd_resource type="AudioBusLayout" load_steps=5 format=3 uid="uid://c2mk6c27y0mdf"] [sub_resource type="AudioEffectLimiter" id="AudioEffectLimiter_j3pel"] resource_name = "Limiter" soft_clip_db = 1.0 +[sub_resource type="AudioEffectHardLimiter" id="AudioEffectHardLimiter_j3pel"] +resource_name = "HardLimiter" + [sub_resource type="AudioEffectReverb" id="AudioEffectReverb_j3pel"] resource_name = "Reverb" room_size = 0.5 @@ -20,7 +23,9 @@ soft_clip_db = 1.5 [resource] bus/0/volume_db = -0.130497 bus/0/effect/0/effect = SubResource("AudioEffectLimiter_j3pel") -bus/0/effect/0/enabled = true +bus/0/effect/0/enabled = false +bus/0/effect/1/effect = SubResource("AudioEffectHardLimiter_j3pel") +bus/0/effect/1/enabled = true bus/1/name = &"AMBIENT" bus/1/solo = false bus/1/mute = false diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn index 5024deebe..1fa6342d4 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn @@ -101,12 +101,12 @@ script = ExtResource("1_5jip8") Dialogue = ExtResource("2_7xfp0") [node name="Model" type="Node3D" parent="."] -transform = Transform3D(1.75, 0, 0, 0, 1.75, 0, 0, 0, 1.75, 0, 5.42773, 0) +transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.91245, 0) [node name="02_ALTAR_FLOOR_ZER0_VER_1" parent="Model" instance=ExtResource("2_xpi6o")] [node name="Collision" type="Node3D" parent="."] -transform = Transform3D(1.75, 0, 0, 0, 1.75, 0, 0, 0, 1.75, 0, 5.42773, 0) +transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.91245, 0) visible = false [node name="StaticBody3D" type="StaticBody3D" parent="Collision"] @@ -154,14 +154,14 @@ shape = SubResource("BoxShape3D_aqomv") debug_color = Color(0.937255, 0, 0.623529, 1) [node name="Spawn Points" type="Node3D" parent="."] -transform = Transform3D(1.75, 0, 0, 0, 1.75, 0, 0, 0, 1.75, 0, 4.82241, 0) +transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.30713, 0) [node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"] unique_name_in_owner = true transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 39.3951, -2.89376, -1.035) [node name="Room" type="Node3D" parent="."] -transform = Transform3D(1.75, 0, 0, 0, 1.75, 0, 0, 0, 1.75, 0, 5.42773, 0) +transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.91245, 0) [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/player/Player.tscn b/Zennysoft.Game.Ma/src/player/Player.tscn index 3770672ef..bb69a2ee0 100644 --- a/Zennysoft.Game.Ma/src/player/Player.tscn +++ b/Zennysoft.Game.Ma/src/player/Player.tscn @@ -1153,6 +1153,48 @@ tracks/2/keys = { "values": [0, 30] } +[sub_resource type="Animation" id="Animation_aodty"] +resource_name = "Persuader" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Weapon Animations:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [&"persuader"] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Weapon Animations:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.333333), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [0, 63] +} +tracks/2/type = "audio" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("../Projectiles/PersuaderBullet/Bullet/ProjectileHitbox/BulletSFX") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"clips": [{ +"end_offset": 0.0, +"start_offset": 0.0, +"stream": ExtResource("7_cqsul") +}], +"times": PackedFloat32Array(0) +} +tracks/2/use_blend = true + [sub_resource type="Animation" id="Animation_w5dir"] resource_name = "Plasma Sword" length = 1.23334 @@ -1364,49 +1406,6 @@ tracks/2/keys = { "values": [0, 30] } -[sub_resource type="Animation" id="Animation_aodty"] -resource_name = "Persuader" -length = 1.0 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Weapon Animations:animation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"persuader"] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("Weapon Animations:frame") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.333333), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [0, 63] -} -tracks/2/type = "audio" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("../Projectiles/PersuaderBullet/Bullet/ProjectileHitbox/BulletSFX") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("7_cqsul") -}], -"times": PackedFloat32Array(0) -} -tracks/2/use_blend = true - [sub_resource type="AnimationLibrary" id="AnimationLibrary_ickvi"] _data = { &"Air Slash": SubResource("Animation_l7c4m"),