Page MenuHomeWildfire Games
Differential D1960 Diff 12340 binaries/data/mods/public/simulation/components/UnitAI.js

Changeset View

Standalone View

View Options

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

Show All 18 Lines "<element name='FleeDistance'>" +
"<ref name='positiveDecimal'/>" + "<ref name='positiveDecimal'/>" +
"</element>" + "</element>" +
"<element name='CanGuard'>" + "<element name='CanGuard'>" +
"<data type='boolean'/>" + "<data type='boolean'/>" +
"</element>" + "</element>" +
"<element name='CanPatrol'>" + "<element name='CanPatrol'>" +
"<data type='boolean'/>" + "<data type='boolean'/>" +
"</element>" + "</element>" +
"<optional>" + "<optional>" +
StanUnsubmitted
Done
Inline Actions

It's consistent with the rest but it could be nice to make it a lone tag instead of a true false string

<controllable/>
Stan: It's consistent with the rest but it could be nice to make it a lone tag instead of a true…
FreagarachAuthorUnsubmitted
Done
Inline Actions

But we want to be able to change it in simulation. (E.g. demoralised units.)

Freagarach: But we want to be able to change it in simulation. (E.g. demoralised units.)
StanUnsubmitted
Done
Inline Actions

Can't you delete the key in that case ?

Stan: Can't you delete the key in that case ?
FreagarachAuthorUnsubmitted
Done
Inline Actions

It can be a lone tag (I like tags), but I remember that a boolean is preferred.

Freagarach: It can be a lone tag (I like tags), but I remember that a boolean is preferred.
StanUnsubmitted
Done
Inline Actions

IIRC @wraitii likes tags too.

Actually the boolean could be a tristate yes no not present ^^

Maybe it should be in coding conventions

Stan: IIRC @wraitii likes tags too. Actually the boolean could be a tristate yes no not present ^^…
wraitiiUnsubmitted
Done
Inline Actions

Template structure and the actual variable state are de-correlated.

TBH I do like better the <controllable/> or <uncontrollable/> over the boolean, since it's much shorter. But to delete it one has to do <controllable disable=""/> which is a bit odd... So maybe we should go with boolean arguments all the time.

wraitii: Template structure and the actual variable state are de-correlated. TBH I do like better the…
"<interleave>" + "<interleave>" +
"<element name='NaturalBehaviour' a:help='Behaviour of the unit in the absence of player commands (intended for animals)'>" + "<element name='NaturalBehaviour' a:help='Behaviour of the unit in the absence of player commands (intended for animals)'>" +
"<choice>" + "<choice>" +
"<value a:help='Will actively attack any unit it encounters, even if not threatened'>violent</value>" + "<value a:help='Will actively attack any unit it encounters, even if not threatened'>violent</value>" +
"<value a:help='Will attack nearby units if it feels threatened (if they linger within LOS for too long)'>aggressive</value>" + "<value a:help='Will attack nearby units if it feels threatened (if they linger within LOS for too long)'>aggressive</value>" +
"<value a:help='Will attack nearby units if attacked'>defensive</value>" + "<value a:help='Will attack nearby units if attacked'>defensive</value>" +
"<value a:help='Will never attack units but will attempt to flee when attacked'>passive</value>" + "<value a:help='Will never attack units but will attempt to flee when attacked'>passive</value>" +
"<value a:help='Will never attack units. Will typically attempt to flee for short distances when units approach'>skittish</value>" + "<value a:help='Will never attack units. Will typically attempt to flee for short distances when units approach'>skittish</value>" +
▲ Show 20 Lines • Show All 167 Lines • ▼ Show 20 LinesUnitAI.prototype.UnitFsmSpec = {
// Formation handlers: // Formation handlers:
"FormationLeave": function(msg) { "FormationLeave": function(msg) {
// ignore when we're not in FORMATIONMEMBER // ignore when we're not in FORMATIONMEMBER
}, },
// Called when being told to walk as part of a formation // Called when being told to walk as part of a formation
"Order.FormationWalk": function(msg) { "Order.FormationWalk": function(msg) {
// Let players move captured domestic animals around if (!this.AbleToMove())
wraitiiUnsubmitted
Done
Inline Actions

Even more accurately 'turrets can't be ordered to walk'

wraitii: Even more accurately 'turrets can't be ordered to walk'
if (this.IsAnimal() && !this.IsDomestic() || !this.AbleToMove())
bbUnsubmitted
Done
Inline Actions

cmpUnitAI.IsDomestic looks like unused after this patch

bb: cmpUnitAI.IsDomestic looks like unused after this patch
{ {
this.FinishOrder(); this.FinishOrder();
return; return;
} }
// For packable units: // For packable units:
// 1. If packed, we can move. // 1. If packed, we can move.
// 2. If unpacked, we first need to pack, then follow case 1. // 2. If unpacked, we first need to pack, then follow case 1.
Show All 20 Lines "Order.LeaveFoundation": function(msg) {
this.order.data.min = g_LeaveFoundationRange; this.order.data.min = g_LeaveFoundationRange;
this.SetNextState("INDIVIDUAL.WALKING"); this.SetNextState("INDIVIDUAL.WALKING");
}, },
// Individual orders: // Individual orders:
// (these will switch the unit out of formation mode) // (these will switch the unit out of formation mode)
"Order.Stop": function(msg) { "Order.Stop": function(msg) {
// We have no control over non-domestic animals.
if (this.IsAnimal() && !this.IsDomestic())
StanUnsubmitted
Done
Inline Actions

We don't need to check anymore?

Stan: We don't need to check anymore?
FreagarachAuthorUnsubmitted
Done
Inline Actions

Nope, since orders are caught higher up in the chain now.

Freagarach: Nope, since orders are caught higher up in the chain now.
wraitiiUnsubmitted
Done
Inline Actions

It's arguably the "feature" here, making it possible for triggers to give animals orders.

wraitii: It's arguably the "feature" here, making it possible for triggers to give animals orders.
{
this.FinishOrder();
return;
}
// Stop moving immediately. // Stop moving immediately.
this.StopMoving(); this.StopMoving();
this.FinishOrder(); this.FinishOrder();
// No orders left, we're an individual now // No orders left, we're an individual now
if (this.IsAnimal()) if (this.IsAnimal())
this.SetNextState("ANIMAL.IDLE"); this.SetNextState("ANIMAL.IDLE");
else if (this.IsFormationMember()) else if (this.IsFormationMember())
this.SetNextState("FORMATIONMEMBER.IDLE"); this.SetNextState("FORMATIONMEMBER.IDLE");
else else
this.SetNextState("INDIVIDUAL.IDLE"); this.SetNextState("INDIVIDUAL.IDLE");
}, },
"Order.Walk": function(msg) { "Order.Walk": function(msg) {
// Let players move captured domestic animals around if (!this.AbleToMove())
StanUnsubmitted
Done
Inline Actions

move maybe ? else walk everywhere (No biggie)

Stan: move maybe ? else walk everywhere (No biggie)
if (this.IsAnimal() && !this.IsDomestic() || !this.AbleToMove())
{ {
this.FinishOrder(); this.FinishOrder();
return; return;
} }
// For packable units: // For packable units:
// 1. If packed, we can move. // 1. If packed, we can move.
// 2. If unpacked, we first need to pack, then follow case 1. // 2. If unpacked, we first need to pack, then follow case 1.
if (this.CanPack()) if (this.CanPack())
{ {
this.PushOrderFront("Pack", { "force": true }); this.PushOrderFront("Pack", { "force": true });
return; return;
} }
this.SetHeldPosition(this.order.data.x, this.order.data.z); this.SetHeldPosition(this.order.data.x, this.order.data.z);
// It's not too bad if we don't arrive at exactly the right position. // It's not too bad if we don't arrive at exactly the right position.
this.order.data.relaxed = true; this.order.data.relaxed = true;
if (this.IsAnimal()) if (this.IsAnimal())
this.SetNextState("ANIMAL.WALKING"); this.SetNextState("ANIMAL.WALKING");
else else
this.SetNextState("INDIVIDUAL.WALKING"); this.SetNextState("INDIVIDUAL.WALKING");
}, },
"Order.WalkAndFight": function(msg) { "Order.WalkAndFight": function(msg) {
// Let players move captured domestic animals around if (!this.AbleToMove())
if (this.IsAnimal() && !this.IsDomestic() || !this.AbleToMove())
{ {
this.FinishOrder(); this.FinishOrder();
return; return;
} }
// For packable units: // For packable units:
// 1. If packed, we can move. // 1. If packed, we can move.
// 2. If unpacked, we first need to pack, then follow case 1. // 2. If unpacked, we first need to pack, then follow case 1.
Show All 9 Lines "Order.WalkAndFight": function(msg) {
if (this.IsAnimal()) if (this.IsAnimal())
this.SetNextState("ANIMAL.WALKING"); // WalkAndFight not applicable for animals this.SetNextState("ANIMAL.WALKING"); // WalkAndFight not applicable for animals
else else
this.SetNextState("INDIVIDUAL.WALKINGANDFIGHTING"); this.SetNextState("INDIVIDUAL.WALKINGANDFIGHTING");
}, },
"Order.WalkToTarget": function(msg) { "Order.WalkToTarget": function(msg) {
// Let players move captured domestic animals around if (!this.AbleToMove())
if (this.IsAnimal() && !this.IsDomestic() || !this.AbleToMove())
{ {
this.FinishOrder(); this.FinishOrder();
return; return;
} }
// For packable units: // For packable units:
// 1. If packed, we can move. // 1. If packed, we can move.
// 2. If unpacked, we first need to pack, then follow case 1. // 2. If unpacked, we first need to pack, then follow case 1.
▲ Show 20 Lines • Show All 6,064 Lines • Show Last 20 Lines
Wildfire Games · Phabricator