updated soundDefinitions

GregHib · May 8, 2024 · 96597ae · 96597ae
1 parent d94041c
commit 96597ae
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/combat/melee/Block.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/combat/melee/Block.kts
@@ -20,6 +20,7 @@ import world.gregs.voidps.world.interact.entity.sound.playSound
 val styleDefinitions: WeaponStyleDefinitions by inject()
 val weaponDefinitions: WeaponAnimationDefinitions by inject()
 val animationDefinitions: AnimationDefinitions by inject()
+val soundDefinitions: SoundDefinitions by inject()
 
 characterCombatAttack { character ->
     character.playSound(calculateHitSound(target), delay)
@@ -71,9 +72,9 @@ fun hitAnimation(npc: NPC): String {
 
 fun calculateHitSound(target: Character): String {
     if (target is NPC) {
-        var animation = "${target.id}_hit"
-        if (animationDefinitions.contains(animation)) {
-            return animation
+        var sound = "${target.id}_hit"
+        if (soundDefinitions.contains(sound)) {
+            return sound
         }
         return "${target.race}_hit"
     }