Reorganize SFX

Zennysoft.Game.Ma.Implementation/Audio/state/InGameAudioLogic.Output.cs

@@ -15,6 +15,8 @@ public partial class InGameAudioLogic
 
     public readonly record struct PlayPlayerAttackWallSound;
 
+    public readonly record struct PlayPlayerAttackEnemySound;
+
     public readonly record struct PlayMenuScrollSound;
 
     public readonly record struct PlayEquipSound;

Zennysoft.Game.Ma.Implementation/Game/GameRepo.cs

@@ -23,6 +23,8 @@ public interface IGameRepo : IDisposable
 
   event Action? PlayerAttackedWall;
 
+  event Action? PlayerAttackedEnemy;
+
   void Pause();
 
   void Resume();
@@ -43,6 +45,8 @@ public interface IGameRepo : IDisposable
 
   public void OnPlayerAttackedWall();
 
+  public void OnPlayerAttackedEnemy();
+
   public void CloseInventory();
 
   public void GameEnded();
@@ -61,6 +65,7 @@ public class GameRepo : IGameRepo
   public event Action<InventoryItem>? RemoveItemFromInventoryEvent;
   public event Action? PlayerAttack;
   public event Action? PlayerAttackedWall;
+  public event Action? PlayerAttackedEnemy;
 
   public IAutoProp<bool> IsPaused => _isPaused;
   private readonly AutoProp<bool> _isPaused;
@@ -97,6 +102,7 @@ public class GameRepo : IGameRepo
   public void EndDoubleExp()
   {
     AnnounceMessageOnMainScreen("Experience points effect wore off.");
+    DoubleExpTimeEnd?.Invoke();
     ExpRate = 1;
   }
 
@@ -125,6 +131,11 @@ public class GameRepo : IGameRepo
     PlayerAttackedWall?.Invoke();
   }
 
+  public void OnPlayerAttackedEnemy()
+  {
+    PlayerAttackedEnemy?.Invoke();
+  }
+
   public void CloseInventory()
   {
     CloseInventoryEvent?.Invoke();

Zennysoft.Game.Ma/src/app/App.cs

@@ -1,4 +1,4 @@
-using Chickensoft.AutoInject;
+using Chickensoft.AutoInject;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.Introspection;
 using Godot;

Zennysoft.Game.Ma/src/audio/InGameAudio.cs

@@ -37,6 +37,8 @@ public partial class InGameAudio : Node
 
   [Node] public IAudioStreamPlayer PlayerAttackWallSFX { get; set; } = default!;
 
+  [Node] public IAudioStreamPlayer PlayerAttackEnemySFX { get; set; } = default!;
+
   [Node] public IAudioStreamPlayer MenuScrollSFX { get; set; } = default!;
 
   [Node] public IAudioStreamPlayer EquipSFX { get; set; } = default!;
@@ -77,7 +79,8 @@ public partial class InGameAudio : Node
       .Handle((in InGameAudioLogic.Output.PlayHealingItemSound _) => PlayHealingItemSound())
       .Handle((in InGameAudioLogic.Output.PlayTeleportSound _) => PlayTeleportSound())
       .Handle((in InGameAudioLogic.Output.PlayPlayerAttackSound _) => { PlayerAttackSFX.Stop(); PlayerAttackSFX.Play(); })
-      .Handle((in InGameAudioLogic.Output.PlayPlayerAttackWallSound _) => { PlayerAttackWallSFX.Stop(); PlayerAttackWallSFX.Play(); });
+      .Handle((in InGameAudioLogic.Output.PlayPlayerAttackWallSound _) => { PlayerAttackWallSFX.Stop(); PlayerAttackWallSFX.Play(); })
+      .Handle((in InGameAudioLogic.Output.PlayPlayerAttackEnemySound _) => { PlayerAttackEnemySFX.Stop(); PlayerAttackEnemySFX.Play(); });
 
     InGameAudioLogic.Start();
   }

Zennysoft.Game.Ma/src/audio/InGameAudio.tscn

@@ -3,17 +3,17 @@
 [ext_resource type="Script" uid="uid://2mnouyn1jcqs" path="res://src/audio/InGameAudio.cs" id="1_gpmcr"]
 [ext_resource type="AudioStream" uid="uid://dfu0fksb6slhx" path="res://src/audio/music/droney.mp3" id="2_8hfyr"]
 [ext_resource type="AudioStream" uid="uid://d2jrktp06xsba" path="res://src/audio/music/crossing-the-gate.mp3" id="3_wbmd6"]
-[ext_resource type="Script" path="res://src/audio/BGMPlayer.cs" id="3_wtvpb"]
+[ext_resource type="Script" uid="uid://d2usinntpmcry" path="res://src/audio/BGMPlayer.cs" id="3_wtvpb"]
 [ext_resource type="AudioStream" uid="uid://dn2e2hqujlia1" path="res://src/audio/music/tar-winds.mp3" id="4_surnl"]
 [ext_resource type="AudioStream" uid="uid://t3g04u722f2k" path="res://src/audio/music/useless immune system-1.mp3" id="6_agr3r"]
 [ext_resource type="AudioStream" uid="uid://cn8cugshq3o8k" path="res://src/audio/sfx/PlayerHitWallSFX.wav" id="7_8vh2f"]
-[ext_resource type="AudioStream" uid="uid://dor0in0x2fg48" path="res://src/audio/sfx/TempFFVII/menu-move.ogg" id="7_777nl"]
+[ext_resource type="AudioStream" uid="uid://dor0in0x2fg48" path="res://src/audio/sfx/MenuScrollSFX.ogg" id="7_777nl"]
 [ext_resource type="AudioStream" uid="uid://d1mlduwauechv" path="res://src/audio/sfx/PlayerAttackSFX.wav" id="7_wtvpb"]
-[ext_resource type="AudioStream" uid="uid://r1tryiit38i8" path="res://src/audio/sfx/TempFFVII/menu-back.ogg" id="8_1xcgo"]
+[ext_resource type="AudioStream" uid="uid://r1tryiit38i8" path="res://src/audio/sfx/MenuBackSFX.ogg" id="8_1xcgo"]
-[ext_resource type="AudioStream" uid="uid://bjj61s8q2gwb8" path="res://src/audio/sfx/TempFFVII/junction.ogg" id="8_kwybb"]
+[ext_resource type="AudioStream" uid="uid://bjj61s8q2gwb8" path="res://src/audio/sfx/EquipSFX.ogg" id="8_kwybb"]
-[ext_resource type="AudioStream" uid="uid://myx4s8lmarc2" path="res://src/audio/sfx/TempFFVII/something-earned.ogg" id="10_3lcw5"]
+[ext_resource type="AudioStream" uid="uid://myx4s8lmarc2" path="res://src/audio/sfx/HealSFX.ogg" id="10_3lcw5"]
-[ext_resource type="AudioStream" uid="uid://dci08kmwsu6k1" path="res://src/audio/sfx/TempFFVII/teleport.ogg" id="11_offhc"]
+[ext_resource type="AudioStream" uid="uid://dci08kmwsu6k1" path="res://src/audio/sfx/ExitSFX.ogg" id="11_offhc"]
-[ext_resource type="AudioStream" uid="uid://d3sn7c614uj2n" path="res://src/audio/sfx/TempFFVII/sort.ogg" id="12_wprjr"]
+[ext_resource type="AudioStream" uid="uid://d3sn7c614uj2n" path="res://src/audio/sfx/SortSFX.ogg" id="12_wprjr"]
 
 [node name="InGameAudio" type="Node"]
 process_mode = 3

Zennysoft.Game.Ma/src/audio/sfx/EquipSFX.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://bjj61s8q2gwb8"
+path="res://.godot/imported/EquipSFX.ogg-6a8dd8843f1eb38662d6d370e4b2f930.oggvorbisstr"
+
+[deps]
+
+source_file="res://src/audio/sfx/EquipSFX.ogg"
+dest_files=["res://.godot/imported/EquipSFX.ogg-6a8dd8843f1eb38662d6d370e4b2f930.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/ExitSFX.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dci08kmwsu6k1"
+path="res://.godot/imported/ExitSFX.ogg-c16c2cdec4e3d13c44aa79cc98a70d7b.oggvorbisstr"
+
+[deps]
+
+source_file="res://src/audio/sfx/ExitSFX.ogg"
+dest_files=["res://.godot/imported/ExitSFX.ogg-c16c2cdec4e3d13c44aa79cc98a70d7b.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/HealSFX.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://myx4s8lmarc2"
+path="res://.godot/imported/HealSFX.ogg-8e33fc432d3aa613fb5d921400562a51.oggvorbisstr"
+
+[deps]
+
+source_file="res://src/audio/sfx/HealSFX.ogg"
+dest_files=["res://.godot/imported/HealSFX.ogg-8e33fc432d3aa613fb5d921400562a51.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/MenuBackSFX.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://r1tryiit38i8"
+path="res://.godot/imported/MenuBackSFX.ogg-940782881d58f1c4c5f95977b5f42009.oggvorbisstr"
+
+[deps]
+
+source_file="res://src/audio/sfx/MenuBackSFX.ogg"
+dest_files=["res://.godot/imported/MenuBackSFX.ogg-940782881d58f1c4c5f95977b5f42009.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/MenuScrollSFX.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dor0in0x2fg48"
+path="res://.godot/imported/MenuScrollSFX.ogg-b1800108be1a856f464e62089f5b0279.oggvorbisstr"
+
+[deps]
+
+source_file="res://src/audio/sfx/MenuScrollSFX.ogg"
+dest_files=["res://.godot/imported/MenuScrollSFX.ogg-b1800108be1a856f464e62089f5b0279.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/SortSFX.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://d3sn7c614uj2n"
+path="res://.godot/imported/SortSFX.ogg-7f616a0a2af3902cddc2ea22947a5f02.oggvorbisstr"
+
+[deps]
+
+source_file="res://src/audio/sfx/SortSFX.ogg"
+dest_files=["res://.godot/imported/SortSFX.ogg-7f616a0a2af3902cddc2ea22947a5f02.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/Equip.wav.import

@@ -1,23 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://t28qhjuibv3f"
-valid=false
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/Equip.wav"
-
-[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=0

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/junction.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://bjj61s8q2gwb8"
-path="res://.godot/imported/junction.ogg-f4350086a08e048d3008edcdc25abf96.oggvorbisstr"
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/junction.ogg"
-dest_files=["res://.godot/imported/junction.ogg-f4350086a08e048d3008edcdc25abf96.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/menu-back.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://r1tryiit38i8"
-path="res://.godot/imported/menu-back.ogg-3ec385c1a9cfaaa1be4ba85197708f0c.oggvorbisstr"
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/menu-back.ogg"
-dest_files=["res://.godot/imported/menu-back.ogg-3ec385c1a9cfaaa1be4ba85197708f0c.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/menu-move.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dor0in0x2fg48"
-path="res://.godot/imported/menu-move.ogg-d71b0989e00dd1d4488a72c7dde3d41d.oggvorbisstr"
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/menu-move.ogg"
-dest_files=["res://.godot/imported/menu-move.ogg-d71b0989e00dd1d4488a72c7dde3d41d.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/menu.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://tce7m18vkgao"
-path="res://.godot/imported/menu.wav-3931712b8a8483f269018c4a880368b2.sample"
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/menu.wav"
-dest_files=["res://.godot/imported/menu.wav-3931712b8a8483f269018c4a880368b2.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=0

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/something-earned.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://myx4s8lmarc2"
-path="res://.godot/imported/something-earned.ogg-150627e4deb45db30e8dd2f98ddcc5a8.oggvorbisstr"
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/something-earned.ogg"
-dest_files=["res://.godot/imported/something-earned.ogg-150627e4deb45db30e8dd2f98ddcc5a8.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/sort.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://d3sn7c614uj2n"
-path="res://.godot/imported/sort.ogg-cb2a2c4769c8e6574221a3c313e75bcf.oggvorbisstr"
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/sort.ogg"
-dest_files=["res://.godot/imported/sort.ogg-cb2a2c4769c8e6574221a3c313e75bcf.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Zennysoft.Game.Ma/src/audio/sfx/TempFFVII/teleport.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dci08kmwsu6k1"
-path="res://.godot/imported/teleport.ogg-9024f7b675b201a391dee183da020b1d.oggvorbisstr"
-
-[deps]
-
-source_file="res://src/audio/sfx/TempFFVII/teleport.ogg"
-dest_files=["res://.godot/imported/teleport.ogg-9024f7b675b201a391dee183da020b1d.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

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

@@ -27,13 +27,13 @@ metadata/_custom_type_script = ExtResource("2_oln85")
 radius = 0.106078
 height = 1.23076
 
+[sub_resource type="SphereShape3D" id="SphereShape3D_8vcnq"]
+radius = 0.57308
+
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_jbgmx"]
 height = 5.0
 radius = 1.0
 
-[sub_resource type="SphereShape3D" id="SphereShape3D_8vcnq"]
-radius = 0.57308
-
 [node name="Sproingy" type="CharacterBody3D"]
 process_mode = 1
 collision_layer = 10
@@ -44,46 +44,54 @@ axis_lock_angular_z = true
 script = ExtResource("1_xsluo")
 _enemyStatResource = SubResource("Resource_oln85")
 
-[node name="NavigationAgentClient" parent="." instance=ExtResource("3_ut5m2")]
-unique_name_in_owner = true
-
 [node name="CollisionShape" type="CollisionShape3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 shape = SubResource("CapsuleShape3D_cwfph")
 
-[node name="LineOfSight" type="Area3D" parent="."]
+[node name="Navigation" type="Node3D" parent="."]
+
+[node name="NavigationAgentClient" parent="Navigation" instance=ExtResource("3_ut5m2")]
+unique_name_in_owner = true
+
+[node name="Collision" type="Node3D" parent="."]
+
+[node name="Collision" type="Area3D" parent="Collision"]
+collision_layer = 2048
+collision_mask = 0
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/Collision"]
+shape = SubResource("SphereShape3D_8vcnq")
+
+[node name="LineOfSight" type="Area3D" parent="Collision"]
 unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 collision_layer = 2
 collision_mask = 2
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="LineOfSight"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/LineOfSight"]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, -2)
 shape = SubResource("CylinderShape3D_jbgmx")
 
-[node name="PatrolTimer" type="Timer" parent="."]
+[node name="Raycast" type="RayCast3D" parent="Collision"]
-unique_name_in_owner = true
-wait_time = 10.0
-autostart = true
-
-[node name="AttackTimer" type="Timer" parent="."]
-unique_name_in_owner = true
-wait_time = 0.8
-autostart = true
-
-[node name="Raycast" type="RayCast3D" parent="."]
 unique_name_in_owner = true
 target_position = Vector3(0, 0, -5)
 collision_mask = 3
 
-[node name="EnemyModelView" parent="." instance=ExtResource("4_o3b7p")]
+[node name="Visual" type="Node3D" parent="."]
+
+[node name="EnemyModelView" parent="Visual" instance=ExtResource("4_o3b7p")]
 unique_name_in_owner = true
 transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 0.0862446, 0)
 
-[node name="Collision" type="Area3D" parent="."]
+[node name="Timers" type="Node" parent="."]
-collision_layer = 2048
-collision_mask = 0
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"]
+[node name="PatrolTimer" type="Timer" parent="Timers"]
-shape = SubResource("SphereShape3D_8vcnq")
+unique_name_in_owner = true
+wait_time = 10.0
+autostart = true
+
+[node name="AttackTimer" type="Timer" parent="Timers"]
+unique_name_in_owner = true
+wait_time = 0.8
+autostart = true

Zennysoft.Game.Ma/src/player/Player.cs

@@ -568,6 +568,8 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<ISaveChunk<Play
 
     if (((Weapon)EquippedWeapon.Value).WeaponTag == WeaponTag.Knockback)
       enemy.Knockback(0.3f, -CurrentBasis.Z.Normalized());
+
+    _gameRepo.OnPlayerAttackedEnemy();
   }
 
   private void CollisionDetector_AreaEntered(Area3D area)