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

Make foundations not ConquestCritical

Browse source 
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.
This commit is contained in:
wraitii 2021-01-15 10:02:31 +00:00
parent ce9e965afd
commit 171afdc7a6
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binaries/data/mods/public/maps/scripts/Conquest.js
View file

@ -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).")
});
}

2
binaries/data/mods/public/simulation/components/Identity.js
View file

@ -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>" +

12
binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
View file

@ -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>