Differential D1973 Diff 9706 binaries/data/mods/public/simulation/components/Attack.js

Changeset View

Standalone View

binaries/data/mods/public/simulation/components/Attack.js

Show First 20 Lines • Show All 65 Lines • ▼ Show 20 Lines	"<Ranged>" +
"</Bonus1>" +		"</Bonus1>" +
"</Bonuses>" +		"</Bonuses>" +
"<Projectile>" +		"<Projectile>" +
"<Speed>50.0</Speed>" +		"<Speed>50.0</Speed>" +
"<Spread>2.5</Spread>" +		"<Spread>2.5</Spread>" +
"<ActorName>props/units/weapons/rock_flaming.xml</ActorName>" +		"<ActorName>props/units/weapons/rock_flaming.xml</ActorName>" +
"<ImpactActorName>props/units/weapons/rock_explosion.xml</ImpactActorName>" +		"<ImpactActorName>props/units/weapons/rock_explosion.xml</ImpactActorName>" +
"<ImpactAnimationLifetime>0.1</ImpactAnimationLifetime>" +		"<ImpactAnimationLifetime>0.1</ImpactAnimationLifetime>" +
		"<FriendlyFire>false</FriendlyFire>" +
"</Projectile>" +		"</Projectile>" +
"<RestrictedClasses datatype=\"tokens\">Champion</RestrictedClasses>" +		"<RestrictedClasses datatype=\"tokens\">Champion</RestrictedClasses>" +
"<Splash>" +		"<Splash>" +
"<Shape>Circular</Shape>" +		"<Shape>Circular</Shape>" +
"<Range>20</Range>" +		"<Range>20</Range>" +
"<FriendlyFire>false</FriendlyFire>" +		"<FriendlyFire>false</FriendlyFire>" +
"<Damage>" +		"<Damage>" +
"<Hack>0.0</Hack>" +		"<Hack>0.0</Hack>" +
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines	"<element name='Ranged'>" +
"<element name='PrepareTime' a:help='Time from the start of the attack command until the attack actually occurs (in milliseconds). This value relative to RepeatTime should closely match the \"event\" point in the actor's attack animation'>" +		"<element name='PrepareTime' a:help='Time from the start of the attack command until the attack actually occurs (in milliseconds). This value relative to RepeatTime should closely match the \"event\" point in the actor's attack animation'>" +
"<data type='nonNegativeInteger'/>" +		"<data type='nonNegativeInteger'/>" +
"</element>" +		"</element>" +
"<element name='RepeatTime' a:help='Time between attacks (in milliseconds). The attack animation will be stretched to match this time'>" +		"<element name='RepeatTime' a:help='Time between attacks (in milliseconds). The attack animation will be stretched to match this time'>" +
"<data type='positiveInteger'/>" +		"<data type='positiveInteger'/>" +
"</element>" +		"</element>" +
"<element name='Delay' a:help='Delay of the damage in milliseconds'><ref name='nonNegativeDecimal'/></element>" +		"<element name='Delay' a:help='Delay of the damage in milliseconds'><ref name='nonNegativeDecimal'/></element>" +
"<optional>" +		"<optional>" +
"<element name='Splash'>" +		"<element name='Splash'>" +
		FreagarachAuthorUnsubmitted Done Inline Actions When I remove this optional element entirely, the error does not appear when loading. So it seems that the error lies here or somewhere where this is parsed, but I cannot find it ;) Freagarach: When I remove this optional element entirely, the error does not appear when loading. So it…
		StanUnsubmitted Done Inline Actions you should use &quote; instead of "'" in the help sentence :) Stan: you should use &quote; instead of "'" in the help sentence :)
"<interleave>" +		"<interleave>" +
"<element name='Shape' a:help='Shape of the splash damage, can be circular or linear'><text/></element>" +		"<element name='Shape' a:help='Shape of the splash damage, can be circular or linear'><text/></element>" +
"<element name='Range' a:help='Size of the area affected by the splash'><ref name='nonNegativeDecimal'/></element>" +		"<element name='Range' a:help='Size of the area affected by the splash'><ref name='nonNegativeDecimal'/></element>" +
"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units'><data type='boolean'/></element>" +		"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units'><data type='boolean'/></element>" +
Attacking.BuildAttackEffectsSchema() +		Attacking.BuildAttackEffectsSchema() +
"</interleave>" +		"</interleave>" +
"</element>" +		"</element>" +
"</optional>" +		"</optional>" +
"<element name='Projectile'>" +		"<element name='Projectile'>" +
"<interleave>" +		"<interleave>" +
"<element name='Speed' a:help='Speed of projectiles (in meters per second).'>" +		"<element name='Speed' a:help='Speed of projectiles (in meters per second).'>" +
"<ref name='positiveDecimal'/>" +		"<ref name='positiveDecimal'/>" +
"</element>" +		"</element>" +
"<element name='Spread' a:help='Standard deviation of the bivariate normal distribution of hits at 100 meters. A disk at 100 meters from the attacker with this radius (2x this radius, 3x this radius) is expected to include the landing points of 39.3% (86.5%, 98.9%) of the rounds.'><ref name='nonNegativeDecimal'/></element>" +		"<element name='Spread' a:help='Standard deviation of the bivariate normal distribution of hits at 100 meters. A disk at 100 meters from the attacker with this radius (2x this radius, 3x this radius) is expected to include the landing points of 39.3% (86.5%, 98.9%) of the rounds.'><ref name='nonNegativeDecimal'/></element>" +
"<element name='Gravity' a:help='The gravity affecting the projectile. This affects the shape of the flight curve.'>" +		"<element name='Gravity' a:help='The gravity affecting the projectile. This affects the shape of the flight curve.'>" +
"<ref name='nonNegativeDecimal'/>" +		"<ref name='nonNegativeDecimal'/>" +
"</element>" +		"</element>" +
		"<element name='FriendlyFire' a:help='Whether stray missiles can hurt non enemy units.'><data type='boolean'/></element>" +
		StanUnsubmitted Done Inline Actions Maybe it could be optionnal ? Stan: Maybe it could be optionnal ?
		wraitiiUnsubmitted Done Inline Actions None of the other items are optional, so in terms of coherency it's probably better if it's not, but I agree that repeating these everywhere is kind of annoying... wraitii: None of the other items are optional, so in terms of coherency it's probably better if it's not…
		FreagarachAuthorUnsubmitted Done Inline Actions One could say the same of e.g. `Gravity` ;) Freagarach: One could say the same of e.g. `Gravity` ;)
		FreagarachAuthorUnsubmitted Done Inline Actions Okay, a thought here. The argument to have it non-optional is coherency. I like things being optional, to keep templates as clean as possible. Would it be an idea to make more things optional? E.g.: Delay Projectile gravity So just make everything that can be optional optional. However, I also acknowledge that making things optional blurs the code in the components, which would vote for non-optional. Freagarach: Okay, a thought here. The argument to have it non-optional is coherency. I like things being…
		SilierUnsubmitted Done Inline Actions I would say that gravity should be always stated and delay can be optional. Or friendlyfire is not optional or make it false by default so if not in template it is false. It goes against common sence. Element is called FriendlyFire so it should be false by default. It is not called DisableFriendylFire. Personally I think if there is good template inheritance for units, a lot of things does not have to be repeated. Problem can be with structures. Silier: I would say that gravity should be always stated and delay can be optional. Or friendlyfire…
		FreagarachAuthorUnsubmitted Done Inline Actions Could be, but: If you make it a non-optional element, then you can do template.Attack[type].FriendlyFire == "false", which is nicer. (See above in "Templates.js".) Freagarach: Could be, but: > If you make it a non-optional element, then you can do template.Attack[type].
"<optional>" +		"<optional>" +
"<element name='LaunchPoint' a:help='Delta from the unit position where to launch the projectile.'>" +		"<element name='LaunchPoint' a:help='Delta from the unit position where to launch the projectile.'>" +
"<attribute name='y'>" +		"<attribute name='y'>" +
"<data type='decimal'/>" +		"<data type='decimal'/>" +
"</attribute>" +		"</attribute>" +
"</element>" +		"</element>" +
"</optional>" +		"</optional>" +
"<optional>" +		"<optional>" +
▲ Show 20 Lines • Show All 366 Lines • ▼ Show 20 Lines	let data = {
"type": type,		"type": type,
"attackData": this.GetAttackEffectsData(type),		"attackData": this.GetAttackEffectsData(type),
"target": target,		"target": target,
"attacker": this.entity,		"attacker": this.entity,
"attackerOwner": attackerOwner,		"attackerOwner": attackerOwner,
"position": realTargetPosition,		"position": realTargetPosition,
"direction": missileDirection,		"direction": missileDirection,
"projectileId": id,		"projectileId": id,
"attackImpactSound": attackImpactSound		"attackImpactSound": attackImpactSound,
		StanUnsubmitted Done Inline Actions this will return true, and "false", I guess it should return boolean always ;) Stan: this will return true, and "false", I guess it should return boolean always ;)
		"friendlyFire": this.template[type].Projectile.FriendlyFire == "true",
};		};
if (this.template[type].Splash)		if (this.template[type].Splash)
data.splash = {		data.splash = {
"friendlyFire": this.template[type].Splash.FriendlyFire != "false",		"friendlyFire": this.template[type].Splash.FriendlyFire != "false",
		StanUnsubmitted Done Inline Actions could change that one as well. Stan: could change that one as well.
"radius": +this.template[type].Splash.Range,		"radius": +this.template[type].Splash.Range,
"shape": this.template[type].Splash.Shape,		"shape": this.template[type].Splash.Shape,
"attackData": this.GetAttackEffectsData(type, true),		"attackData": this.GetAttackEffectsData(type, true),
};		};
cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_DelayedDamage, "MissileHit", +this.template[type].Delay + timeToTarget * 1000, data);		cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_DelayedDamage, "MissileHit", +this.template[type].Delay + timeToTarget * 1000, data);
}		}
else		else
Attacking.HandleAttackEffects(type, this.GetAttackEffectsData(type), target, this.entity, attackerOwner);		Attacking.HandleAttackEffects(type, this.GetAttackEffectsData(type), target, this.entity, attackerOwner);
▲ Show 20 Lines • Show All 65 Lines • Show Last 20 Lines