Index: binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- binaries/data/mods/public/gui/common/tooltips.js
+++ binaries/data/mods/public/gui/common/tooltips.js
@@ -273,7 +273,7 @@
"attackLabel": attackLabel,
"details":
type == "Capture" ?
- template.attack.Capture.value :
+ template.attack.Capture.Capture :
damageTypesToText(template.attack[type].damage),
"rate": rate
}));
Index: binaries/data/mods/public/simulation/components/Armour.js
===================================================================
--- binaries/data/mods/public/simulation/components/Armour.js
+++ binaries/data/mods/public/simulation/components/Armour.js
@@ -7,6 +7,7 @@
"0.0" +
"5.0" +
"" +
+
DamageTypes.BuildSchema("damage protection") +
"" +
"" +
@@ -35,33 +36,76 @@
/**
* Take damage according to the entity's armor.
* @param {Object} strengths - { "hack": number, "pierce": number, "crush": number } or something like that.
- * @param {number} multiplier - the damage multiplier.
+ * @param {number} bonusMultiplier - the damage multiplier.
* Returns object of the form { "killed": false, "change": -12 }.
*/
-Armour.prototype.TakeDamage = function(strengths, multiplier = 1)
+Armour.prototype.TakeDamage = function(effectData, attacker, attackerOwner, bonusMultiplier)
{
if (this.invulnerable)
- return { "killed": false, "change": 0 };
+ return { "killed": false };
+ let total = this.GetTotalEffect(effectData, "Damage", bonusMultiplier);
+
+ // Reduce health
+ let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
+ let change = cmpHealth.Reduce(total);
+
+ let cmpLoot = Engine.QueryInterface(this.entity, IID_Loot);
+ if (cmpLoot && cmpLoot.GetXp() > 0 && change.HPchange < 0)
+ change.xp = cmpLoot.GetXp() * -change.HPchange / cmpHealth.GetMaxHitpoints();
+ return change;
+};
+
+Armour.prototype.TakeCapture = function(effectData, attacker, attackerOwner, bonusMultiplier)
+{
+ let cmpCapturable = Engine.QueryInterface(this.entity, IID_Capturable);
+ let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
+
+ if (this.invulnerable || attackerOwner == INVALID_PLAYER ||
+ !cmpCapturable || !cmpCapturable.CanCapture(attackerOwner) ||
+ !cmpHealth || cmpHealth.GetHitpoints() == 0)
+ return { "killed": false };
+
+ bonusMultiplier *= cmpHealth.GetMaxHitpoints() / (0.1 * cmpHealth.GetMaxHitpoints() + 0.9 * cmpHealth.GetHitpoints());
+
+ let total = this.GetTotalEffect({ "Capture" : effectData }, "Capture", bonusMultiplier);
+
+ let change = cmpCapturable.Reduce(total, attackerOwner);
+
+ // TODO: implement loot
+ return { "killed": false, "captureChange": change };
+};
+
+Armour.prototype.TakeStatusEffects = function(effectData, attacker, attackerOwner, bonusMultiplier)
+{
+ let cmpStatusReceiver = Engine.QueryInterface(this.entity, IID_StatusEffectsReceiver);
+
+ if (this.invulnerable || !cmpStatusReceiver)
+ return { "killed": false };
+
+ cmpStatusReceiver.InflictEffects(data.statusEffects);
+
+ // TODO: implement loot / resistance.
+ return { "killed": false, "inflictedEffects": Object.keys(data.statusEffects) };
+};
+
+Armour.prototype.GetTotalEffect = function(effectData, effectType, bonusMultiplier)
+{
// Adjust damage values based on armour; exponential armour: damage = attack * 0.9^armour
- var armourStrengths = this.GetArmourStrengths();
+ let armourStrengths = this.GetArmourStrengths(effectType);
- // Total is sum of individual damages
// Don't bother rounding, since HP is no longer integral.
- var total = 0;
- for (let type in strengths)
- total += strengths[type] * multiplier * Math.pow(0.9, armourStrengths[type] || 0);
-
- // Reduce health
- var cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
- return cmpHealth.Reduce(total);
+ let total = 0;
+ for (let type in effectData)
+ total += effectData[type] * bonusMultiplier * Math.pow(0.9, armourStrengths[type] || 0);
+ return total;
};
-Armour.prototype.GetArmourStrengths = function()
+Armour.prototype.GetArmourStrengths = function(effectType)
{
// Work out the armour values with technology effects
- var applyMods = (type, foundation) => {
- var strength;
+ let applyMods = (type, foundation) => {
+ let strength;
if (foundation)
{
strength = +this.template.Foundation[type];
@@ -70,14 +114,17 @@
else
strength = +this.template[type];
- return ApplyValueModificationsToEntity("Armour/" + type, strength, this.entity);
+ return ApplyValueModificationsToEntity("Armour/" + effectType + "/" + type, strength, this.entity);
};
- var foundation = Engine.QueryInterface(this.entity, IID_Foundation) && this.template.Foundation;
+ let foundation = Engine.QueryInterface(this.entity, IID_Foundation) && this.template.Foundation;
let ret = {};
- for (let damageType of DamageTypes.GetTypes())
- ret[damageType] = applyMods(damageType, foundation);
+ if (effectType != "Damage")
+ return ret;
+ for (let damageType in this.template)
+ if (damageType != "Foundation")
+ ret[damageType] = applyMods(damageType, foundation);
return ret;
};
Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -56,6 +56,16 @@
"" +
"";
+Attack.prototype.EffectsSchema =
+ "" +
+ "" +
+ "" + DamageTypes.BuildSchema("damage strength") + "" +
+ "