Merge branch 'develop' of https://github.com/beardgame/td into develop

beardgame · Nov 27, 2023 · f8036b5 · f8036b5
2 parents d98710a + 7c36122
commit f8036b5
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 4 deletions.
diff --git a/src/Bearded.TD/Game/Simulation/Elements/components/ArcEmitter.cs b/src/Bearded.TD/Game/Simulation/Elements/components/ArcEmitter.cs
@@ -1,3 +1,4 @@
+using Bearded.TD.Game.Simulation.Elements.events;
 using Bearded.TD.Game.Simulation.GameObjects;
 using Bearded.TD.Game.Simulation.Weapons;
 using Bearded.TD.Shared.Events;
@@ -26,5 +27,6 @@ public override void Update(TimeSpan elapsedTime) { }
     public void HandleEvent(FireWeapon e)
     {
         EmitArc(e.Damage, range.GetTilesInRange());
+        Events.Send(new EmittedArc());
     }
 }
diff --git a/src/Bearded.TD/Game/Simulation/Elements/events/EmittedArc.cs b/src/Bearded.TD/Game/Simulation/Elements/events/EmittedArc.cs
@@ -0,0 +1,6 @@
+using Bearded.TD.Game.Simulation.GameObjects;
+
+namespace Bearded.TD.Game.Simulation.Elements.events;
+
+[Trigger("emittedArc")]
+readonly record struct EmittedArc : IComponentEvent;
diff --git a/src/Bearded.TD/Game/Simulation/Physics/events/CollideWithLevel.cs b/src/Bearded.TD/Game/Simulation/Physics/events/CollideWithLevel.cs
@@ -3,4 +3,5 @@
 
 namespace Bearded.TD.Game.Simulation.Physics;
 
+[Trigger("collidedWithLevel")]
 readonly record struct CollideWithLevel(Impact Info, Tile Tile) : IComponentEvent;
diff --git a/...-stomp/kinetics1-steamHammer-weapon.json5 → ...Hammer/kinetics1-steamHammer-weapon.json5 b/...-stomp/kinetics1-steamHammer-weapon.json5 → ...Hammer/kinetics1-steamHammer-weapon.json5
@@ -54,8 +54,8 @@
         {
             id: "playSoundOnTrigger",
             parameters: {
-                trigger: "shotProjectile",
-                sound: "bang-deep",
+                trigger: "collidedWithLevel",
+                sound: "hit-metal",
             },
         },
         {

diff --git a/...netics1-stomp/kinetics1-steamHammer.json5 → ...1-steamHammer/kinetics1-steamHammer.json5 b/...netics1-stomp/kinetics1-steamHammer.json5 → ...1-steamHammer/kinetics1-steamHammer.json5
diff --git a/.../default/defs/blueprints/buildings/lightning1-teslaCoil/lightning1-teslaCoil-weapon.json5 b/.../default/defs/blueprints/buildings/lightning1-teslaCoil/lightning1-teslaCoil-weapon.json5
@@ -34,8 +34,11 @@
             }
         },
         {
-            id: "loopSoundWhileShooting",
-            parameters: { sound: "tesla-loop" },
+            id: "playSoundOnTrigger",
+            parameters: {
+                trigger: "emittedArc",
+                sound: "hit-electricity",
+            },
         }
     ]
 }
diff --git a/src/Bearded.TD/assets/mods/default/sfx/attribution.txt b/src/Bearded.TD/assets/mods/default/sfx/attribution.txt
@@ -0,0 +1,4 @@
+shots/hit-electricity
+- uses sample by newlocknew - https://creativecommons.org/licenses/by/4.0/
+shots/hit-metal
+- sample by newlocknew, mixed to mono and shortened - https://creativecommons.org/licenses/by/4.0/
diff --git a/src/Bearded.TD/assets/mods/default/sfx/shots/hit-electricity.json5 b/src/Bearded.TD/assets/mods/default/sfx/shots/hit-electricity.json5
@@ -0,0 +1,4 @@
+{
+    id: "hit-electricity",
+    pitchRange: [0.9, 1.1],
+}
diff --git a/src/Bearded.TD/assets/mods/default/sfx/shots/hit-electricity.wav b/src/Bearded.TD/assets/mods/default/sfx/shots/hit-electricity.wav
diff --git a/src/Bearded.TD/assets/mods/default/sfx/shots/hit-metal.json5 b/src/Bearded.TD/assets/mods/default/sfx/shots/hit-metal.json5
@@ -0,0 +1,5 @@
+{
+    id: "hit-metal",
+    gain: 0.7,
+    pitchRange: [0.95, 1.05],
+}
diff --git a/src/Bearded.TD/assets/mods/default/sfx/shots/hit-metal.wav b/src/Bearded.TD/assets/mods/default/sfx/shots/hit-metal.wav
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,5 @@

		namespace Bearded.TD.Game.Simulation.Physics;

		[Trigger("collidedWithLevel")]
		readonly record struct CollideWithLevel(Impact Info, Tile Tile) : IComponentEvent;