Index: ps/trunk/binaries/data/mods/public/audio/interface/alarm/alarm_attacked_gaia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/interface/alarm/alarm_attacked_gaia.xml
+++ ps/trunk/binaries/data/mods/public/audio/interface/alarm/alarm_attacked_gaia.xml
@@ -0,0 +1,17 @@
+
+
+ 1
+ owner
+ 0.35
+ 100
+ 1
+ 0
+ 1
+ 1
+ 0.35
+ 0.30
+ 1
+ 1
+ audio/interface/alarm/
+ alarm_attacked_gaia_01.ogg
+
Index: ps/trunk/binaries/data/mods/public/globalscripts/AttackEffects.js
===================================================================
--- ps/trunk/binaries/data/mods/public/globalscripts/AttackEffects.js
+++ ps/trunk/binaries/data/mods/public/globalscripts/AttackEffects.js
@@ -7,7 +7,8 @@
},
"Capture": {
"IID": "IID_Capturable",
- "method": "Capture"
+ "method": "Capture",
+ "sound": "capture"
},
"ApplyStatus": {
"IID": "IID_StatusEffectsReceiver",
Index: ps/trunk/binaries/data/mods/public/simulation/components/AttackDetection.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/AttackDetection.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/AttackDetection.js
@@ -50,12 +50,12 @@
Engine.PostMessage(msg.target, MT_MinimapPing);
- this.AttackAlert(msg.target, msg.attacker, msg.attackerOwner);
+ this.AttackAlert(msg.target, msg.attacker, msg.type, msg.attackerOwner);
};
//// External interface ////
-AttackDetection.prototype.AttackAlert = function(target, attacker, attackerOwner)
+AttackDetection.prototype.AttackAlert = function(target, attacker, type, attackerOwner)
{
let playerID = Engine.QueryInterface(this.entity, IID_Player).GetPlayerID();
@@ -127,7 +127,15 @@
"attacker": atkOwner,
"targetIsDomesticAnimal": targetIsDomesticAnimal
});
- PlaySound("attacked", target);
+
+ let soundGroup = "attacked";
+ if (g_EffectReceiver[type] && g_EffectReceiver[type].sound)
+ soundGroup += '_' + g_EffectReceiver[type].sound;
+
+ if (attackerOwner === 0)
+ soundGroup += "_gaia";
+
+ PlaySound(soundGroup, target);
};
AttackDetection.prototype.GetSuppressionTime = function()
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -133,6 +133,9 @@
interface/complete/building/complete_universal.xml
attack/destruction/building_collapse_large.xml
interface/alarm/alarm_attackplayer.xml
+ interface/alarm/alarm_attacked_gaia.xml
+ interface/alarm/alarm_attackplayer.xml
+ interface/alarm/alarm_attacked_gaia.xml
attack/weapon/bow_attack.xml
attack/impact/arrow_impact.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -104,6 +104,9 @@
interface/alarm/alarm_attackplayer.xml
+ interface/alarm/alarm_attacked_gaia.xml
+ interface/alarm/alarm_attackplayer.xml
+ interface/alarm/alarm_attacked_gaia.xml
attack/weapon/sword_attack.xml