dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes a bug related to foundations and animals corpses (previously, when an animal has already been ordered to leave a foundation once, it will not leave the construction site if you place an another building on top of it).

Browse source 
This was SVN commit r9531.
This commit is contained in:
Badmadblacksad 2011-05-17 16:26:47 +00:00
parent ea455fa983
commit 1fac936d68
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
binaries/data/mods/public/simulation/components/UnitAI.js
View file

@ -186,7 +186,10 @@ var UnitFsmSpec = {
if (ok)
{
// We've started fleeing from the given target
this.SetNextState("INDIVIDUAL.FLEEING");
if (this.IsAnimal())
this.SetNextState("ANIMAL.FLEEING");
else
this.SetNextState("INDIVIDUAL.FLEEING");
}
else
{
@ -1068,7 +1071,7 @@ var UnitFsmSpec = {
this.template.NaturalBehaviour == "passive")
{
this.MoveToTargetRangeExplicit(msg.data.attacker, +this.template.FleeDistance, +this.template.FleeDistance);
this.SetNextState("FLEEING");
this.Flee(msg.data.attacker);
}
else if (this.template.NaturalBehaviour == "violent" ||
this.template.NaturalBehaviour == "aggressive" ||
@ -1138,7 +1141,7 @@ var UnitFsmSpec = {
if (msg.data.added.length > 0)
{
this.MoveToTargetRangeExplicit(msg.data.added[0], +this.template.FleeDistance, +this.template.FleeDistance);
this.SetNextState("FLEEING");
this.Flee(msg.data.added[0]);
return;
}
}
@ -1183,7 +1186,7 @@ var UnitFsmSpec = {
if (msg.data.added.length > 0)
{
this.MoveToTargetRangeExplicit(msg.data.added[0], +this.template.FleeDistance, +this.template.FleeDistance);
this.SetNextState("FLEEING");
this.Flee(msg.data.added[0]);
return;
}
}
@ -1201,26 +1204,7 @@ var UnitFsmSpec = {
},
},
"FLEEING": { // TODO: would be nice to share more of this with non-animal units
"enter": function() {
this.PlaySound("panic");
// Run quickly
var speed = this.GetRunSpeed();
this.SelectAnimation("run", false, speed);
this.SetMoveSpeed(speed);
},
"leave": function() {
// Reset normal speed
this.SetMoveSpeed(this.GetWalkSpeed());
},
"MoveCompleted": function() {
// When we've run far enough, go back to the roaming state
this.SetNextState("ROAMING");
},
},
"FLEEING": "INDIVIDUAL.FLEEING", // reuse the same fleeing behaviour for animals
"COMBAT": "INDIVIDUAL.COMBAT", // reuse the same combat behaviour for animals
},
@ -2073,6 +2057,11 @@ UnitAI.prototype.Repair = function(target, autocontinue, queued)
this.AddOrder("Repair", { "target": target, "autocontinue": autocontinue }, queued);
};
UnitAI.prototype.Flee = function(target, queued)
{
this.AddOrder("Flee", { "target": target }, queued);
};
UnitAI.prototype.Cheer = function()
{
this.AddOrder("Cheering", null, false);