merging stuff

Zennysoft.Game.Ma/src/audio/AMB/amb_beach.wav.import

@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://ddii3pi8x75xc"
-path="res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.sample"
+path="res://.godot/imported/amb_beach.wav-e64adf8f733e6a108ae15edd5f0499ab.sample"
 
 [deps]
 
-source_file="res://src/audio/AMB/amb_beach.wav"
+source_file="res://src/audio/amb/amb_beach.wav"
-dest_files=["res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.sample"]
+dest_files=["res://.godot/imported/amb_beach.wav-e64adf8f733e6a108ae15edd5f0499ab.sample"]
 
 [params]
 

Zennysoft.Game.Ma/src/audio/AMB/amb_perlin.wav.import

@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://ym4ur8a2qxhp"
-path="res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.sample"
+path="res://.godot/imported/amb_perlin.wav-dea63667b2a56d37d48ba209f56f8900.sample"
 
 [deps]
 
-source_file="res://src/audio/AMB/amb_perlin.wav"
+source_file="res://src/audio/amb/amb_perlin.wav"
-dest_files=["res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.sample"]
+dest_files=["res://.godot/imported/amb_perlin.wav-dea63667b2a56d37d48ba209f56f8900.sample"]
 
 [params]
 

Zennysoft.Game.Ma/src/audio/AMB/amb_white_noise.wav.import

@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://b7wxddjx3qw5o"
-path="res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.sample"
+path="res://.godot/imported/amb_white_noise.wav-c98b45aa94120bc0c660bf2d6af1c696.sample"
 
 [deps]
 
-source_file="res://src/audio/AMB/amb_white_noise.wav"
+source_file="res://src/audio/amb/amb_white_noise.wav"
-dest_files=["res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.sample"]
+dest_files=["res://.godot/imported/amb_white_noise.wav-c98b45aa94120bc0c660bf2d6af1c696.sample"]
 
 [params]
 

Zennysoft.Game.Ma/src/audio/AMB/amb_wind_loop_altar.wav.import

@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://bmiitw4fcs68e"
-path="res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.sample"
+path="res://.godot/imported/amb_wind_loop_altar.wav-b9d60e3c3c10ec00833903539a7f3796.sample"
 
 [deps]
 
-source_file="res://src/audio/AMB/amb_wind_loop_altar.wav"
+source_file="res://src/audio/amb/amb_wind_loop_altar.wav"
-dest_files=["res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.sample"]
+dest_files=["res://.godot/imported/amb_wind_loop_altar.wav-b9d60e3c3c10ec00833903539a7f3796.sample"]
 
 [params]
 

Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=90 format=3 uid="uid://bimjnsu52y3xi"]
+[gd_scene load_steps=91 format=3 uid="uid://bimjnsu52y3xi"]
 
 [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"]
 [ext_resource type="Texture2D" uid="uid://dd0ia6isdqg61" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 1.png" id="1_pbx41"]
@@ -59,6 +59,7 @@
 [ext_resource type="Texture2D" uid="uid://b3gndmrlrvexy" path="res://src/enemy/enemy_types/01. sproingy/animations/IDLE_WALK_SIDE/Layer 13.png" id="53_nr2vc"]
 [ext_resource type="Texture2D" uid="uid://b1cmx8l4ia3fv" path="res://src/enemy/enemy_types/01. sproingy/animations/IDLE_WALK_SIDE/Layer 14.png" id="54_jdvn0"]
 [ext_resource type="Texture2D" uid="uid://c7t4626rox02s" path="res://src/enemy/enemy_types/01. sproingy/animations/IDLE_WALK_SIDE/Layer 15.png" id="55_2eqor"]
+[ext_resource type="AudioStream" uid="uid://dfa3i8ukq1kdl" path="res://src/audio/sfx/ENEMY_sproing_attack.ogg" id="60_mnr4r"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://cbq8xog50cjjy" path="res://src/enemy/animation_state_machines/PrimaryAttackStateMachine.tres" id="60_x7uye"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://cy2ngl55c0rws" path="res://src/enemy/animation_state_machines/WalkingStateMachine.tres" id="61_djeua"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://co7lshemjrro8" path="res://src/enemy/animation_state_machines/IdleStateMachine.tres" id="62_8wbs7"]
@@ -638,6 +639,21 @@ tracks/2/keys = {
 "update": 1,
 "values": [true, false, true]
 }
+tracks/3/type = "audio"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("Atk")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("60_mnr4r")
+}],
+"times": PackedFloat32Array(0.0833333)
+}
+tracks/3/use_blend = true
 
 [sub_resource type="Animation" id="Animation_djeua"]
 resource_name = "primary_attack_back"
@@ -679,6 +695,21 @@ tracks/2/keys = {
 "update": 1,
 "values": [&"attack"]
 }
+tracks/3/type = "audio"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("Atk")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("60_mnr4r")
+}],
+"times": PackedFloat32Array(0.0833333)
+}
+tracks/3/use_blend = true
 
 [sub_resource type="Animation" id="Animation_ivy74"]
 resource_name = "primary_attack_left"
@@ -720,6 +751,21 @@ tracks/2/keys = {
 "update": 1,
 "values": [&"attack"]
 }
+tracks/3/type = "audio"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("Atk")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("60_mnr4r")
+}],
+"times": PackedFloat32Array(0.0833333)
+}
+tracks/3/use_blend = true
 
 [sub_resource type="Animation" id="Animation_x7uye"]
 resource_name = "primary_attack_right"
@@ -773,6 +819,21 @@ tracks/3/keys = {
 "update": 1,
 "values": [&"attack"]
 }
+tracks/4/type = "audio"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("Atk")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("60_mnr4r")
+}],
+"times": PackedFloat32Array(0.0833333)
+}
+tracks/4/use_blend = true
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_6tj5r"]
 _data = {
@@ -882,3 +943,7 @@ root_node = NodePath("%AnimationTree/..")
 tree_root = SubResource("AnimationNodeStateMachine_l2wq1")
 advance_expression_base_node = NodePath("..")
 anim_player = NodePath("../AnimationPlayer")
+
+[node name="Atk" type="AudioStreamPlayer3D" parent="."]
+process_mode = 3
+bus = &"SFX"

Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelModelView.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=144 format=3 uid="uid://bjg8wyvp8q6oc"]
+[gd_scene load_steps=145 format=3 uid="uid://bjg8wyvp8q6oc"]
 
 [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_o4cc2"]
 [ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_3eot4"]
@@ -71,6 +71,7 @@
 [ext_resource type="Texture2D" uid="uid://vxphbifafq0q" path="res://src/enemy/enemy_types/02. michael/animations/IDLE_WALK/LEFT SIDE/Michael_IdleWalk_Left (21).png" id="68_msiau"]
 [ext_resource type="Texture2D" uid="uid://7r30bjydumon" path="res://src/enemy/enemy_types/02. michael/animations/IDLE_WALK/LEFT SIDE/Michael_IdleWalk_Left (22).png" id="69_lec8c"]
 [ext_resource type="Texture2D" uid="uid://djspx2smexhme" path="res://src/enemy/enemy_types/02. michael/animations/IDLE_WALK/LEFT SIDE/Michael_IdleWalk_Left (23).png" id="70_f0jo7"]
+[ext_resource type="AudioStream" uid="uid://w6l4yoo1kcmq" path="res://src/audio/sfx/ENEMY_MICHAEL_ATTACK1.ogg" id="72_fxhv6"]
 [ext_resource type="PackedScene" uid="uid://dpoonda2dwwic" path="res://src/enemy/BasicEnemyAnimationTree.tscn" id="73_gby04"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://cbq8xog50cjjy" path="res://src/enemy/animation_state_machines/PrimaryAttackStateMachine.tres" id="74_fxhv6"]
 [ext_resource type="Texture2D" uid="uid://duygq1qfer5oa" path="res://src/vfx/Enemy/michael_attack.png" id="74_mip6u"]
@@ -572,6 +573,21 @@ tracks/3/keys = {
 "clips": PackedStringArray("Attack VFX"),
 "times": PackedFloat32Array(0)
 }
+tracks/4/type = "audio"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("AudioStreamPlayer3D")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("72_fxhv6")
+}],
+"times": PackedFloat32Array(0.15)
+}
+tracks/4/use_blend = true
 
 [sub_resource type="Animation" id="Animation_bk4gf"]
 resource_name = "primary_attack_back"
@@ -637,6 +653,21 @@ tracks/4/keys = {
 "update": 0,
 "values": [0, 41]
 }
+tracks/5/type = "audio"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("AudioStreamPlayer3D")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("72_fxhv6")
+}],
+"times": PackedFloat32Array(0.15)
+}
+tracks/5/use_blend = true
 
 [sub_resource type="Animation" id="Animation_gby04"]
 resource_name = "primary_attack_left"
@@ -702,6 +733,21 @@ tracks/4/keys = {
 "update": 0,
 "values": [0, 41]
 }
+tracks/5/type = "audio"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("AudioStreamPlayer3D")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("72_fxhv6")
+}],
+"times": PackedFloat32Array(0.15)
+}
+tracks/5/use_blend = true
 
 [sub_resource type="Animation" id="Animation_mip6u"]
 resource_name = "primary_attack_right"
@@ -779,6 +825,21 @@ tracks/5/keys = {
 "update": 1,
 "values": [true]
 }
+tracks/6/type = "audio"
+tracks/6/imported = false
+tracks/6/enabled = true
+tracks/6/path = NodePath("AudioStreamPlayer3D")
+tracks/6/interp = 1
+tracks/6/loop_wrap = true
+tracks/6/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("72_fxhv6")
+}],
+"times": PackedFloat32Array(0.15)
+}
+tracks/6/use_blend = true
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_346xs"]
 _data = {
@@ -1253,3 +1314,7 @@ transform = Transform3D(0.72, 0, 0, 0, 0.72, 0, 0, 0, 0.72, -0.129818, 0.274447,
 modulate = Color(0.977, 0.31, 1, 0.741176)
 billboard = 2
 sprite_frames = SubResource("SpriteFrames_suy1t")
+
+[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."]
+process_mode = 3
+bus = &"SFX"

Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=230 format=3 uid="uid://bli0t0d6ommvi"]
+[gd_scene load_steps=232 format=3 uid="uid://bli0t0d6ommvi"]
 
 [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"]
 [ext_resource type="Texture2D" uid="uid://nps7rrvkgews" path="res://src/enemy/enemy_types/04. sara/animations/IDLE+MOVE/FRONT/0001.png" id="2_8j76g"]
@@ -161,7 +161,9 @@
 [ext_resource type="Texture2D" uid="uid://bflrknmtl1ju5" path="res://src/enemy/enemy_types/04. sara/animations/ATTACK2/SIDE R/0016.png" id="159_4o5f2"]
 [ext_resource type="Texture2D" uid="uid://n2c8kfwt6ve3" path="res://src/enemy/enemy_types/04. sara/animations/ATTACK2/SIDE R/0019.png" id="160_r8ggx"]
 [ext_resource type="Texture2D" uid="uid://dykb4rwua8iyw" path="res://src/enemy/enemy_types/04. sara/animations/ATTACK2/SIDE R/0022.png" id="161_xafpd"]
+[ext_resource type="AudioStream" uid="uid://b4bseex34nu6c" path="res://src/audio/sfx/ENEMY_APSARA_STRIKE.ogg" id="162_veo2p"]
 [ext_resource type="PackedScene" uid="uid://diaxvpmwgl65u" path="res://src/enemy/TwoAttacksEnemyAnimationTree.tscn" id="163_e6etm"]
+[ext_resource type="AudioStream" uid="uid://dnnhfw6cgrca4" path="res://src/audio/sfx/enemy_sara_magic.ogg" id="163_xppqu"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://co7lshemjrro8" path="res://src/enemy/animation_state_machines/IdleStateMachine.tres" id="164_fc7i0"]
 [ext_resource type="Texture2D" uid="uid://cxibdrta6imfb" path="res://src/vfx/Enemy/nega.png" id="164_rrjme"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://cbq8xog50cjjy" path="res://src/enemy/animation_state_machines/PrimaryAttackStateMachine.tres" id="165_veo2p"]
@@ -1035,6 +1037,21 @@ tracks/2/keys = {
 "update": 1,
 "values": [true, false, true]
 }
+tracks/3/type = "audio"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("Attacks")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("162_veo2p")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/3/use_blend = true
 
 [sub_resource type="Animation" id="Animation_xppqu"]
 resource_name = "primary_attack_back"
@@ -1076,6 +1093,21 @@ tracks/2/keys = {
 "update": 1,
 "values": [true, false, true]
 }
+tracks/3/type = "audio"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("Attacks")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("162_veo2p")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/3/use_blend = true
 
 [sub_resource type="Animation" id="Animation_fc7i0"]
 resource_name = "primary_attack_left"
@@ -1117,6 +1149,21 @@ tracks/2/keys = {
 "update": 1,
 "values": [true, false, true]
 }
+tracks/3/type = "audio"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("Attacks")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("162_veo2p")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/3/use_blend = true
 
 [sub_resource type="Animation" id="Animation_veo2p"]
 resource_name = "primary_attack_right"
@@ -1158,6 +1205,21 @@ tracks/2/keys = {
 "update": 1,
 "values": [true, false, true]
 }
+tracks/3/type = "audio"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("Attacks")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("162_veo2p")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/3/use_blend = true
 
 [sub_resource type="Animation" id="Animation_wtyys"]
 resource_name = "secondary_attack"
@@ -1209,6 +1271,21 @@ tracks/3/keys = {
 "clips": PackedStringArray("Attack VFX"),
 "times": PackedFloat32Array(0)
 }
+tracks/4/type = "audio"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("Attacks")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("163_xppqu")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/4/use_blend = true
 
 [sub_resource type="Animation" id="Animation_gv7gi"]
 resource_name = "secondary_attack_back"
@@ -1260,6 +1337,21 @@ tracks/3/keys = {
 "clips": PackedStringArray("Attack VFX"),
 "times": PackedFloat32Array(0)
 }
+tracks/4/type = "audio"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("Attacks")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("163_xppqu")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/4/use_blend = true
 
 [sub_resource type="Animation" id="Animation_qbkgi"]
 resource_name = "secondary_attack_left"
@@ -1311,6 +1403,21 @@ tracks/3/keys = {
 "clips": PackedStringArray("Attack VFX"),
 "times": PackedFloat32Array(0)
 }
+tracks/4/type = "audio"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("Attacks")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("163_xppqu")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/4/use_blend = true
 
 [sub_resource type="Animation" id="Animation_k1pc0"]
 resource_name = "secondary_attack_right"
@@ -1362,6 +1469,21 @@ tracks/3/keys = {
 "clips": PackedStringArray("Attack VFX"),
 "times": PackedFloat32Array(0)
 }
+tracks/4/type = "audio"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("Attacks")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"clips": [{
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource("163_xppqu")
+}],
+"times": PackedFloat32Array(0)
+}
+tracks/4/use_blend = true
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_pkiq5"]
 _data = {
@@ -1766,3 +1888,7 @@ sprite_frames = SubResource("SpriteFrames_4o5f2")
 libraries = {
 &"": SubResource("AnimationLibrary_8wlnr")
 }
+
+[node name="Attacks" type="AudioStreamPlayer3D" parent="."]
+process_mode = 3
+bus = &"SFX"