Index: ps/trunk/binaries/data/mods/public/simulation/components/TerritoryDecay.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/TerritoryDecay.js	(revision 25457)
+++ ps/trunk/binaries/data/mods/public/simulation/components/TerritoryDecay.js	(revision 25458)
@@ -1,156 +1,171 @@
 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()
 {
 	this.decaying = false;
 	this.connectedNeighbours = new Array(Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers()).fill(0);
 	this.territoryOwnership = !isFinite(+this.template.DecayRate);
 };
 
 TerritoryDecay.prototype.IsConnected = function()
 {
 	this.connectedNeighbours.fill(0);
 
 	var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
 	if (!cmpPosition || !cmpPosition.IsInWorld())
 		return false;
 
 	var cmpPlayer = QueryOwnerInterface(this.entity);
 	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;
 		return false;
 	}
 
 	this.connectedNeighbours = cmpTerritoryManager.GetNeighbours(pos.x, pos.y, true);
 
 	let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
 	for (var i = 1; i < numPlayers; ++i)
 		if (this.connectedNeighbours[i] > 0 && cmpPlayer.IsMutualAlly(i))
 		{
 			// don't decay if connected to a connected ally; disable blinking
 			cmpTerritoryManager.SetTerritoryBlinking(pos.x, pos.y, false);
 			return true;
 		}
 
 	cmpTerritoryManager.SetTerritoryBlinking(pos.x, pos.y, true);
 	return false;
 };
 
 TerritoryDecay.prototype.IsDecaying = function()
 {
 	return this.decaying;
 };
 
 TerritoryDecay.prototype.GetDecayRate = function()
 {
 	return ApplyValueModificationsToEntity(
 		"TerritoryDecay/DecayRate",
 		+this.template.DecayRate,
 		this.entity);
 };
 
 /**
  * Get the number of connected bordering tiles to this region
  * Only valid when this.IsDecaying()
  */
 TerritoryDecay.prototype.GetConnectedNeighbours = function()
 {
 	return this.connectedNeighbours;
 };
 
 TerritoryDecay.prototype.UpdateDecayState = function()
 {
 	let decaying = !this.IsConnected() && this.GetDecayRate() > 0;
 	if (decaying === this.decaying)
 		return;
 	this.decaying = decaying;
 	Engine.PostMessage(this.entity, MT_TerritoryDecayChanged, { "entity": this.entity, "to": decaying, "rate": this.GetDecayRate() });
 };
 
 TerritoryDecay.prototype.UpdateOwner = function()
 {
 	let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
 	let cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
 	if (!cmpOwnership || !cmpPosition || !cmpPosition.IsInWorld())
 		return;
 	let cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager);
 	let pos = cmpPosition.GetPosition2D();
 	let tileOwner = cmpTerritoryManager.GetOwner(pos.x, pos.y);
 	if (tileOwner != cmpOwnership.GetOwner())
 		cmpOwnership.SetOwner(tileOwner);
 };
 
 TerritoryDecay.prototype.OnTerritoriesChanged = function(msg)
 {
 	if (this.territoryOwnership)
 		this.UpdateOwner();
 	else
 		this.UpdateDecayState();
 };
 
 TerritoryDecay.prototype.OnTerritoryPositionChanged = function(msg)
 {
 	if (this.territoryOwnership)
 		this.UpdateOwner();
 	else
 		this.UpdateDecayState();
 };
 
 TerritoryDecay.prototype.OnDiplomacyChanged = function(msg)
 {
 	// Can change the connectedness of certain areas
 	if (!this.territoryOwnership)
 		this.UpdateDecayState();
 };
 
 TerritoryDecay.prototype.OnOwnershipChanged = function(msg)
 {
 	// Update the list of TerritoryDecay components in the manager
 	if (msg.from == INVALID_PLAYER || msg.to == INVALID_PLAYER)
 	{
 		let cmpTerritoryDecayManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryDecayManager);
 		if (msg.from == INVALID_PLAYER)
 			cmpTerritoryDecayManager.Add(this.entity);
 		else
 			cmpTerritoryDecayManager.Remove(this.entity);
 	}
 
 	// if it influences the territory, wait until we get a TerritoriesChanged message
 	if (!this.territoryOwnership && !Engine.QueryInterface(this.entity, IID_TerritoryInfluence))
 		this.UpdateDecayState();
 };
 
 TerritoryDecay.prototype.HasTerritoryOwnership = function()
 {
 	return this.territoryOwnership;
 };
 
 Engine.RegisterComponentType(IID_TerritoryDecay, "TerritoryDecay", TerritoryDecay);
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml	(revision 25457)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml	(revision 25458)
@@ -1,181 +1,182 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AIProxy/>
   <BuildRestrictions>
     <PlacementType>land</PlacementType>
     <Territory>own</Territory>
     <Category>Structure</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>500</CapturePoints>
     <RegenRate>0.5</RegenRate>
     <GarrisonRegenRate>5.0</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <Population>0</Population>
     <BuildTime>10</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Decay>
     <Active>false</Active>
     <SinkingAnim>false</SinkingAnim>
     <DelayTime>0.0</DelayTime>
     <SinkRate>3.0</SinkRate>
     <SinkAccel>9.8</SinkAccel>
   </Decay>
   <Fogging/>
   <Guard/>
   <Health>
     <DamageVariants>
       <lightdamage>0.85</lightdamage>
       <mediumdamage>0.65</mediumdamage>
       <heavydamage>0.35</heavydamage>
     </DamageVariants>
     <DeathType>corpse</DeathType>
     <RegenRate>0</RegenRate>
     <IdleRegenRate>0</IdleRegenRate>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Structure</GenericName>
     <Classes datatype="tokens">Structure</Classes>
     <Undeletable>false</Undeletable>
   </Identity>
   <Loot>
     <food>0</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
     <xp>0</xp>
   </Loot>
   <Looter/>
   <Minimap>
     <Type>structure</Type>
   </Minimap>
   <Obstruction>
     <Active>true</Active>
     <BlockMovement>true</BlockMovement>
     <BlockPathfinding>true</BlockPathfinding>
     <BlockFoundation>true</BlockFoundation>
     <BlockConstruction>false</BlockConstruction>
     <DisableBlockMovement>false</DisableBlockMovement>
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <OverlayRenderer/>
   <Ownership/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0</FloatDepth>
     <TurnRate>6</TurnRate>
   </Position>
   <ProductionQueue>
     <BatchTimeModifier>1.0</BatchTimeModifier>
     <TechCostMultiplier>
       <food>1.0</food>
       <wood>1.0</wood>
       <stone>1.0</stone>
       <metal>1.0</metal>
       <time>1.0</time>
     </TechCostMultiplier>
   </ProductionQueue>
   <RallyPoint/>
   <RallyPointRenderer>
     <MarkerTemplate>special/rallypoint</MarkerTemplate>
     <LineTexture>art/textures/misc/rallypoint_line.png</LineTexture>
     <LineTextureMask>art/textures/misc/rallypoint_line_mask.png</LineTextureMask>
     <LineThickness>0.25</LineThickness>
     <LineDashColor r="158" g="11" b="15"/>
     <LineStartCap>square</LineStartCap>
     <LineEndCap>round</LineEndCap>
     <LinePassabilityClass>default</LinePassabilityClass>
   </RallyPointRenderer>
   <RangeOverlayManager/>
   <RangeOverlayRenderer/>
   <Repairable>
     <RepairTimeRatio>2.0</RepairTimeRatio>
   </Repairable>
   <Resistance>
     <Entity>
       <ApplyStatus>
         <Poisoned>
           <Duration>0.0</Duration>
           <BlockChance>1</BlockChance>
         </Poisoned>
       </ApplyStatus>
       <Damage>
         <Hack>1</Hack>
         <Pierce>10</Pierce>
         <Crush>1</Crush>
       </Damage>
     </Entity>
     <Foundation>
       <ApplyStatus>
         <Poisoned>
           <Duration>0.0</Duration>
           <BlockChance>1</BlockChance>
         </Poisoned>
       </ApplyStatus>
       <Damage>
         <Hack>1</Hack>
         <Pierce>10</Pierce>
         <Crush>1</Crush>
       </Damage>
     </Foundation>
   </Resistance>
   <Selectable>
     <Overlay>
       <Outline>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.4</LineThickness>
       </Outline>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
       <constructed>interface/complete/building/complete_universal.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
       <attacked>interface/alarm/alarm_attackplayer.xml</attacked>
       <attacked_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_gaia>
       <attacked_capture>interface/alarm/alarm_attackplayer.xml</attacked_capture>
       <attacked_capture_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_capture_gaia>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <StatusEffectsReceiver/>
   <TerritoryDecay>
     <DecayRate>20</DecayRate>
+    <Territory>neutral enemy</Territory>
   </TerritoryDecay>
   <Visibility>
     <RetainInFog>true</RetainInFog>
     <AlwaysVisible>false</AlwaysVisible>
     <Corpse>false</Corpse>
     <Preview>false</Preview>
   </Visibility>
   <Vision>
     <Range>4</Range>
   </Vision>
   <VisionSharing>
     <Bribable>false</Bribable>
   </VisionSharing>
   <VisualActor>
     <ConstructionPreview/>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>true</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_territory_pull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_territory_pull.xml	(revision 25457)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_territory_pull.xml	(revision 25458)
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <Capturable>
     <CapturePoints>5</CapturePoints>
     <RegenRate>0</RegenRate>
     <GarrisonRegenRate>0</GarrisonRegenRate>
   </Capturable>
   <Ownership/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0</FloatDepth>
     <TurnRate>6</TurnRate>
   </Position>
   <Selectable>
     <EditorOnly/>
     <Overlay>
       <Texture>
         <MainTexture>128x128/octagram.png</MainTexture>
         <MainTextureMask>128x128/octagram_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <TerritoryDecay>
     <DecayRate>5</DecayRate>
+    <Territory>neutral enemy</Territory>
   </TerritoryDecay>
   <Visibility>
     <AlwaysVisible>false</AlwaysVisible>
     <Corpse>false</Corpse>
     <Preview>false</Preview>
     <RetainInFog>false</RetainInFog>
   </Visibility>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>true</SilhouetteOccluder>
     <Actor>props/special/common/waypoint_flag.xml</Actor>
     <VisibleInAtlasOnly>true</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>