From 171afdc7a693b1bfd2e436c3cf4dd49efd200fc2 Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Fri, 15 Jan 2021 10:02:31 +0000
Subject: [PATCH] Make foundations not ConquestCritical

Foundations were originally made conquest critical in 722578fdcd.
However, it remains rather frustrating that a player can evade defeat by
placing an unbuilt, uncommitted foundation. While allies can revive a
player with only a foundation, that cannot happen in 1v1, where it is
simply undue frustration, and the inconvenience seems greater than the
feature.
This thus removes them again from the conquest critical list.

Patch By: nephele
Differential Revision: https://code.wildfiregames.com/D2674
This was SVN commit r24624.
---
 binaries/data/mods/public/maps/scripts/Conquest.js   |  2 +-
 .../mods/public/simulation/components/Identity.js    |  2 +-
 .../templates/special/filter/foundation.xml          | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/binaries/data/mods/public/maps/scripts/Conquest.js b/binaries/data/mods/public/maps/scripts/Conquest.js
index 11b74db1c8..5fcef13a48 100644
--- a/binaries/data/mods/public/maps/scripts/Conquest.js
+++ b/binaries/data/mods/public/maps/scripts/Conquest.js
@@ -1,7 +1,7 @@
 {
 	let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
 	cmpTrigger.ConquestAddVictoryCondition({
-		"classFilter": "ConquestCritical",
+		"classFilter": "ConquestCritical+!Foundation",
 		"defeatReason": markForTranslation("%(player)s has been defeated (lost all critical units and structures).")
 	});
 }
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index c47dfdc9bd..a5931c3b0b 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -57,7 +57,7 @@ Identity.prototype.Schema =
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, CitizenSoldier, CivCentre, CivSpecific, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, GarrisonFortress, Human, IndianElephant, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, CitizenSoldier, CivCentre, CivSpecific, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, Foundation, GarrisonFortress, Human, IndianElephant, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
diff --git a/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml b/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
index d3bb75b454..28c1d7e65e 100644
--- a/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
+++ b/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
@@ -7,15 +7,17 @@
   <Decay merge=""/>
   <Fogging merge=""/>
   <Footprint merge=""/>
-  <!-- Add the Foundation component, to deal with the construction process -->
+  <!-- Add the Foundation component, to deal with the construction process. -->
   <Foundation replace=""/>
   <Health>
     <Initial>1</Initial>
   </Health>
-  <Identity merge=""/>
+  <Identity merge="">
+    <Classes datatype="tokens">Foundation</Classes>
+  </Identity>
   <Market merge=""/>
   <Minimap merge=""/>
-  <!-- Foundations shouldn't initially block unit movement -->
+  <!-- Foundations shouldn't initially block unit movement. -->
   <Obstruction merge="">
     <DisableBlockMovement>true</DisableBlockMovement>
     <DisableBlockPathfinding>true</DisableBlockPathfinding>
@@ -35,12 +37,12 @@
   <StatusBars merge=""/>
   <Visibility merge=""/>
   <!-- Foundations should be visible themselves in fog-of-war if their base template is,
-       but shouldn't have any vision range -->
+       but shouldn't have any vision range. -->
   <Vision merge="">
     <Range>0</Range>
     <RevealShore>false</RevealShore>
   </Vision>
-  <!-- Switch the actor to foundation mode -->
+  <!-- Switch the actor to foundation mode. -->
   <VisualActor>
     <Foundation/>
   </VisualActor>