Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Allow decaying only in enemy territory.

Browse Source 
Reviewed By: Freagarach
Differential Revision: https://code.wildfiregames.com/D3969
This was SVN commit r25458.
This commit is contained in:
wraitii 2021-05-18 12:43:01 +00:00
parent 0c23e595fa
commit 40f9372d29
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
binaries/data/mods/public/simulation/components/TerritoryDecay.js
View File

@ -1,9 +1,20 @@
function TerritoryDecay() {}
TerritoryDecay.prototype.Schema =
"<element name='DecayRate' a:help='Decay rate in capture points per second'>" +
"<choice><ref name='positiveDecimal'/><value>Infinity</value></choice>" +
"</element>";
TerritoryDecay.prototype.Schema = `
<element name='DecayRate' a:help='Decay rate in capture points per second'>
<choice><ref name='positiveDecimal'/><value>Infinity</value></choice>
</element>
<element name='Territory' a:help='Specifies territory in which this entity will decay.'>
<list>
<oneOrMore>
<choice>
<value>neutral</value>
<value>enemy</value>
</choice>
</oneOrMore>
</list>
</element>
`;
TerritoryDecay.prototype.Init = function()
{
@ -24,25 +35,29 @@ TerritoryDecay.prototype.IsConnected = function()
if (!cmpPlayer)
return true;// something without ownership can't decay
const decayTerritory = ApplyValueModificationsToEntity("TerritoryDecay/Territory", this.template.Territory, this.entity);
var cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager);
var pos = cmpPosition.GetPosition2D();
var tileOwner = cmpTerritoryManager.GetOwner(pos.x, pos.y);
if (tileOwner == 0)
{
this.connectedNeighbours[0] = 1;
return cmpPlayer.GetPlayerID() == 0; // Gaia building on gaia ground -> don't decay
return cmpPlayer.GetPlayerID() == 0 || decayTerritory.indexOf("neutral") === -1;
}
var tileConnected = cmpTerritoryManager.IsConnected(pos.x, pos.y);
if (tileConnected && !cmpPlayer.IsMutualAlly(tileOwner))
{
this.connectedNeighbours[tileOwner] = 1;
return false;
return decayTerritory.indexOf("enemy") === -1;
}
if (tileConnected)
return true;
// Special-case: if the tile is unconnected, non-own territory, decay towards gaia.
// TODO: this is not great, see #4749
if (cmpPlayer.GetPlayerID() != tileOwner)
{
this.connectedNeighbours[0] = 1;

1
binaries/data/mods/public/simulation/templates/template_structure.xml
View File

@ -159,6 +159,7 @@
<StatusEffectsReceiver/>
<TerritoryDecay>
<DecayRate>20</DecayRate>
<Territory>neutral enemy</Territory>
</TerritoryDecay>
<Visibility>
<RetainInFog>true</RetainInFog>

1
binaries/data/mods/public/simulation/templates/template_territory_pull.xml
View File

@ -24,6 +24,7 @@
</Selectable>
<TerritoryDecay>
<DecayRate>5</DecayRate>
<Territory>neutral enemy</Territory>
</TerritoryDecay>
<Visibility>
<AlwaysVisible>false</AlwaysVisible>