Differential D2808 Diff 13649 binaries/data/mods/public/simulation/helpers/Attacking.js

Changeset View

Standalone View

binaries/data/mods/public/simulation/helpers/Attacking.js

Show All 14 Lines	const DirectEffectsSchema =
"<element name='Capture' a:help='Capture points value'>" +		"<element name='Capture' a:help='Capture points value'>" +
"<ref name='nonNegativeDecimal'/>" +		"<ref name='nonNegativeDecimal'/>" +
"</element>";		"</element>";

const StatusEffectsSchema =		const StatusEffectsSchema =
"<element name='ApplyStatus' a:help='Effects like poisoning or burning a unit.'>" +		"<element name='ApplyStatus' a:help='Effects like poisoning or burning a unit.'>" +
"<oneOrMore>" +		"<oneOrMore>" +
"<element>" +		"<element>" +
"<anyName/>" +		"<anyName/>" +
		wraitiiUnsubmitted Done Inline Actions You might add that it must match a JSON file's name. wraitii: You might add that it must match a JSON file's name.
"<interleave>" +		"<interleave>" +
"<optional>" +		"<optional>" +
"<element name='StatusName'><text/></element>" +
bbUnsubmitted Not Done Inline Actions Didn't test, but I expect these strings not being required to pass through the guiinterface anymore, which is nice. Piping translatable strings through guiinterface can be argued to be bad (elexis), and when not really needed (as here) beter avoided. refs D2995. They probably also don't need to be loaded in the Templates.js bb: Didn't test, but I expect these strings not being required to pass through the guiinterface…
"</optional>" +
"<optional>" +
"<element name='Icon' a:help='Icon for the status effect.'><text/></element>" +
"</optional>" +
"<optional>" +
"<element name='ApplierTooltip' a:help='The tooltip shown on the entity giving the effect, e.g. the attacker.'><text/></element>" +
"</optional>" +
"<optional>" +
"<element name='ReceiverTooltip' a:help='The tooltip shown on the affected entity while the effect occurs.'><text/></element>" +
"</optional>" +
"<optional>" +
"<element name='Duration' a:help='The duration of the status while the effect occurs.'><ref name='nonNegativeDecimal'/></element>" +		"<element name='Duration' a:help='The duration of the status while the effect occurs.'><ref name='nonNegativeDecimal'/></element>" +
"</optional>" +		"</optional>" +
"<optional>" +		"<optional>" +
"<interleave>" +		"<interleave>" +
"<element name='Interval' a:help='Interval between the occurances of the effect.'><ref name='nonNegativeDecimal'/></element>" +		"<element name='Interval' a:help='Interval between the occurances of the effect.'><ref name='nonNegativeDecimal'/></element>" +
"<oneOrMore>" +		"<oneOrMore>" +
"<choice>" +		"<choice>" +
DirectEffectsSchema +		DirectEffectsSchema +
▲ Show 20 Lines • Show All 145 Lines • ▼ Show 20 Lines	Attacking.prototype.GetTotalAttackEffects = function(target, effectData, effectType, bonusMultiplier, cmpResistance)
{		{
total = effectData.Capture * Math.pow(0.9, resistanceStrengths.Capture \|\| 0);		total = effectData.Capture * Math.pow(0.9, resistanceStrengths.Capture \|\| 0);

// If Health is lower we are more susceptible to capture attacks.		// If Health is lower we are more susceptible to capture attacks.
let cmpHealth = Engine.QueryInterface(target, IID_Health);		let cmpHealth = Engine.QueryInterface(target, IID_Health);
if (cmpHealth)		if (cmpHealth)
total /= 0.1 + 0.9 * cmpHealth.GetHitpoints() / cmpHealth.GetMaxHitpoints();		total /= 0.1 + 0.9 * cmpHealth.GetHitpoints() / cmpHealth.GetMaxHitpoints();
}		}
else if (effectType == "ApplyStatus")		if (effectType != "ApplyStatus")
		return total * bonusMultiplier;

		if (!resistanceStrengths.ApplyStatus)
		bbUnsubmitted Done Inline Actions One could argue it is more esthetic to have an early return bb: One could argue it is more esthetic to have an early return
		FreagarachAuthorUnsubmitted Done Inline Actions Or not ^^' Freagarach: Or not ^^'
return effectData[effectType];		return effectData[effectType];

return total * bonusMultiplier;		let result = {};
		for (let statusEffect in effectData[effectType])
		{
		if (!resistanceStrengths.ApplyStatus[statusEffect])
		{
		result[statusEffect] = effectData[effectType][statusEffect];
		continue;
		}

		if (randBool(resistanceStrengths.ApplyStatus[statusEffect].blockChance))
		continue;

		result[statusEffect] = effectData[effectType][statusEffect];

		if (effectData[effectType][statusEffect].Duration)
		result[statusEffect].Duration = effectData[effectType][statusEffect].Duration *
		resistanceStrengths.ApplyStatus[statusEffect].duration;
		}
		return result;

};		};

/**		/**
* Gives the position of the given entity, taking the lateness into account.		* Gives the position of the given entity, taking the lateness into account.
* @param {number} ent - Entity id of the entity we are finding the location for.		* @param {number} ent - Entity id of the entity we are finding the location for.
* @param {number} lateness - The time passed since the expected time to fire the function.		* @param {number} lateness - The time passed since the expected time to fire the function.
* @return {Vector3D} The location of the entity.		* @return {Vector3D} The location of the entity.
*/		*/
▲ Show 20 Lines • Show All 239 Lines • Show Last 20 Lines