Index: binaries/data/mods/public/globalscripts/AttackEffects.js =================================================================== --- binaries/data/mods/public/globalscripts/AttackEffects.js +++ binaries/data/mods/public/globalscripts/AttackEffects.js @@ -7,7 +7,6 @@ { let effectsDataObj = {}; this.effectReceivers = []; - this.effectSounds = {}; for (let filename of Engine.ListDirectoryFiles("simulation/data/attack_effects", "*.json", false)) { @@ -28,7 +27,6 @@ "IID": data.IID, "method": data.method }); - this.effectSounds[data.code] = data.sound || ""; } let effDataSort = (a, b) => a.order < b.order ? -1 : a.order > b.order ? 1 : 0; @@ -39,7 +37,6 @@ this.effectReceivers.sort(effSort); deepfreeze(this.effectReceivers); - deepfreeze(this.effectSounds); } /** @@ -49,13 +46,4 @@ { return this.effectReceivers; } - - /** - * @param {string} type - The type of effect to get the receiving sound for. - * @return {string} - The name of the soundgroup to play. - */ - GetSound(type) - { - return this.effectSounds[type] || ""; - } } Index: binaries/data/mods/public/simulation/components/AttackDetection.js =================================================================== --- binaries/data/mods/public/simulation/components/AttackDetection.js +++ binaries/data/mods/public/simulation/components/AttackDetection.js @@ -128,7 +128,10 @@ "targetIsDomesticAnimal": targetIsDomesticAnimal }); - let soundGroup = g_AttackEffects.GetSound(type); + let soundGroup = "attacked"; + if (type == "capture") + soundGroup += "_capture"; + if (attackerOwner === 0) soundGroup += "_gaia"; Index: binaries/data/mods/public/simulation/data/attack_effects/applystatus.json =================================================================== --- binaries/data/mods/public/simulation/data/attack_effects/applystatus.json +++ binaries/data/mods/public/simulation/data/attack_effects/applystatus.json @@ -4,6 +4,5 @@ "IID": "IID_StatusEffectsReceiver", "method": "ApplyStatus", "name": "Apply Status", - "order": 3, - "sound": "attacked" + "order": 3 } Index: binaries/data/mods/public/simulation/data/attack_effects/capture.json =================================================================== --- binaries/data/mods/public/simulation/data/attack_effects/capture.json +++ binaries/data/mods/public/simulation/data/attack_effects/capture.json @@ -4,6 +4,5 @@ "IID": "IID_Capturable", "method": "Capture", "name": "Capture", - "order": 2, - "sound": "attacked_capture" + "order": 2 } Index: binaries/data/mods/public/simulation/data/attack_effects/damage.json =================================================================== --- binaries/data/mods/public/simulation/data/attack_effects/damage.json +++ binaries/data/mods/public/simulation/data/attack_effects/damage.json @@ -4,6 +4,5 @@ "IID": "IID_Health", "method": "TakeDamage", "name": "Damage", - "order": 1, - "sound": "attacked" + "order": 1 }