real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Properly use tokens for all Tech requirements.

Browse Source 
Better than faking the fix with a flaw in the inheritance.
Refs. d771e775d9 and 83b786dcf5.

Differential revision: https://code.wildfiregames.com/D4924
Comments by: @Stan
Refs. #6724

This was SVN commit r27530.
This commit is contained in:
Freagarach 2023-02-06 11:50:42 +00:00
parent 642a20e9a8
commit 9a134b88f7
30 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml
View File

@ -26,7 +26,7 @@
<VisibleClasses datatype="tokens">Gymnasium -City Town</VisibleClasses>
<Icon>structures/gymnasium.png</Icon>
<Requirements>
<Techs>phase_town</Techs>
<Techs datatype="tokens">-phase_city phase_town</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml
View File

@ -26,7 +26,7 @@
<VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
<Icon>structures/apartment.png</Icon>
<Requirements>
<Techs>phase_town</Techs>
<Techs datatype="tokens">-phase_village phase_town</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml
View File

@ -5,7 +5,7 @@
<SpecificName>Low Wall</SpecificName>
<Icon>structures/palisade_wall.png</Icon>
<Requirements>
<Techs datatype="tokens">phase_village</Techs>
<Techs datatype="tokens">-phase_town phase_village</Techs>
</Requirements>
</Identity>
<WallSet>

2
binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml
View File

@ -22,7 +22,7 @@
<VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
<Icon>structures/embassy_celtic.png</Icon>
<Requirements>
<Techs datatype="tokens">phase_town</Techs>
<Techs datatype="tokens">-phase_village phase_town</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/structures/han/academy.xml
View File

@ -31,7 +31,7 @@
<VisibleClasses datatype="tokens">-Village City Academy</VisibleClasses>
<Icon>structures/embassy_italic.png</Icon>
<Requirements>
<Techs>phase_city</Techs>
<Techs datatype="tokens">-phase_village phase_city</Techs>
</Requirements>
</Identity>
<Obstruction>

2
binaries/data/mods/public/simulation/templates/structures/han/wallset_palisade.xml
View File

@ -7,7 +7,7 @@
<VisibleClasses datatype="tokens">-Wall Palisade</VisibleClasses>
<Icon>structures/palisade_wall.png</Icon>
<Requirements>
<Techs>phase_village</Techs>
<Techs datatype="tokens">-phase_town phase_village</Techs>
</Requirements>
</Identity>
<WallSet>

2
binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml
View File

@ -31,7 +31,7 @@
<VisibleClasses datatype="tokens">-Town City TempleOfAmun</VisibleClasses>
<Icon>structures/temple_epic.png</Icon>
<Requirements>
<Techs>phase_city</Techs>
<Techs datatype="tokens">-phase_town phase_city</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml
View File

@ -6,7 +6,7 @@
<Classes datatype="tokens">CivSpecific</Classes>
<VisibleClasses datatype="tokens">-City Town</VisibleClasses>
<Requirements>
<Techs>phase_town</Techs>
<Techs datatype="tokens">-phase_city phase_town</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml
View File

@ -19,7 +19,7 @@
<Civ>maur</Civ>
<SpecificName>Udarka</SpecificName>
<Requirements>
<Techs>phase_city</Techs>
<Techs datatype="tokens">-phase_town phase_city</Techs>
</Requirements>
</Identity>
<Loot>

3
binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
View File

@ -28,10 +28,11 @@
<GenericName>Egyptian Mercenary Camp</GenericName>
<SpecificName>Stratopedeia Misthophorōn</SpecificName>
<Classes datatype="tokens">MercenaryCamp</Classes>
<VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
<Tooltip>Capture this structure to train mercenaries from Hellenistic Egypt.</Tooltip>
<Icon>structures/military_settlement.png</Icon>
<Requirements>
<Techs>phase_town</Techs>
<Techs datatype="tokens">-phase_village phase_town</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml
View File

@ -30,7 +30,7 @@
</Classes>
<Icon>structures/yakhchal.png</Icon>
<Requirements>
<Techs>phase_village</Techs>
<Techs datatype="tokens">-phase_city phase_village</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/structures/ptol/mercenary_camp.xml
View File

@ -30,7 +30,7 @@
<Tooltip>Cheap Barracks-like structure that is buildable in neutral territory, but casts no territory influence. Train Mercenaries.</Tooltip>
<Icon>structures/mercenary_camp.png</Icon>
<Requirements>
<Techs>phase_town</Techs>
<Techs datatype="tokens">-phase_village phase_town</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/structures/rome/temple_mars.xml
View File

@ -13,7 +13,7 @@
<SpecificName>Aedēs Mārtiālis</SpecificName>
<VisibleClasses datatype="tokens">-Town City TempleOfMars</VisibleClasses>
<Requirements>
<Techs>phase_city</Techs>
<Techs datatype="tokens">-phase_town phase_city</Techs>
</Requirements>
</Identity>
<Obstruction>

2
binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml
View File

@ -9,7 +9,7 @@
<VisibleClasses datatype="tokens">SiegeWall</VisibleClasses>
<Icon>structures/siege_wall.png</Icon>
<Requirements>
<Techs>phase_city</Techs>
<Techs datatype="tokens">-phase_town phase_city</Techs>
</Requirements>
</Identity>
<WallSet>

2
binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
View File

@ -6,7 +6,7 @@
<VisibleClasses datatype="tokens">-Wall Palisade</VisibleClasses>
<Icon>structures/palisade_wall.png</Icon>
<Requirements>
<Techs>phase_village</Techs>
<Techs datatype="tokens">-phase_town phase_village</Techs>
</Requirements>
</Identity>
<WallSet>

2
binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
View File

@ -5,7 +5,7 @@
<SpecificName>Epibátēs Athēnaîos</SpecificName>
<Icon>units/athen/champion_marine.png</Icon>
<Requirements>
<Techs>iphicratean_reforms</Techs>
<Techs datatype="tokens">-phase_city iphicratean_reforms</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml
View File

@ -12,7 +12,7 @@
<VisibleClasses datatype="tokens">Chariot</VisibleClasses>
<Icon>units/brit/champion_chariot.png</Icon>
<Requirements>
<Techs>unlock_champion_chariots</Techs>
<Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml
View File

@ -6,7 +6,7 @@
<SpecificName>Argos</SpecificName>
<Icon>units/brit/champion_infantry.png</Icon>
<Requirements>
<Techs>unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml
View File

@ -13,7 +13,7 @@
<SpecificName>Bariogaisatos</SpecificName>
<Icon>units/gaul/champion_fanatic.png</Icon>
<Requirements>
<Techs datatype="tokens">phase_town</Techs>
<Techs datatype="tokens">-phase_city phase_town</Techs>
</Requirements>
</Identity>
<Loot>

2
binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml
View File

@ -5,7 +5,7 @@
<SpecificName>Soliduros</SpecificName>
<Icon>units/gaul/champion_infantry.png</Icon>
<Requirements>
<Techs>unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml
View File

@ -10,7 +10,7 @@
<SpecificName>Leial Ezpatari</SpecificName>
<Icon>units/iber/champion_infantry.png</Icon>
<Requirements>
<Techs datatype="tokens">unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml
View File

@ -7,7 +7,7 @@
<SpecificName>Hry pdty</SpecificName>
<Icon>units/kush/champion_archer.png</Icon>
<Requirements>
<Techs>unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml
View File

@ -8,7 +8,7 @@
<SelectionGroupName>units/mace/champion_infantry_spearman</SelectionGroupName>
<Icon>units/mace/hypaspist.png</Icon>
<Requirements>
<Techs datatype="tokens">unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<Promotion>

2
binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml
View File

@ -12,7 +12,7 @@
<SpecificName>Rhomphaiaphoros</SpecificName>
<Icon>units/thrac/champion_infantry_swordsman.png</Icon>
<Requirements>
<Techs>unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml
View File

@ -12,7 +12,7 @@
<VisibleClasses datatype="tokens">Chariot</VisibleClasses>
<Icon>units/maur/champion_chariot.png</Icon>
<Requirements>
<Techs>unlock_champion_chariots</Techs>
<Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml
View File

@ -7,7 +7,7 @@
<SelectionGroupName>units/maur/champion_infantry</SelectionGroupName>
<Icon>units/maur/champion_maceman.png</Icon>
<Requirements>
<Techs>unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
View File

@ -12,7 +12,7 @@
<VisibleClasses datatype="tokens">Chariot</VisibleClasses>
<Icon>units/pers/chariot_archer.png</Icon>
<Requirements>
<Techs>unlock_champion_chariots</Techs>
<Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml
View File

@ -7,7 +7,7 @@
<SpecificName>Phalangitès Agema</SpecificName>
<Icon>units/ptol/champion_infantry.png</Icon>
<Requirements>
<Techs>unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml
View File

@ -14,7 +14,7 @@
<SelectionGroupName>units/rome/champion_infantry_swordsman</SelectionGroupName>
<Icon>units/rome/champion_infantry.png</Icon>
<Requirements>
<Techs>unlock_champion_infantry</Techs>
<Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
</Requirements>
</Identity>
<VisualActor>

2
binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
View File

@ -12,7 +12,7 @@
<VisibleClasses datatype="tokens">Chariot</VisibleClasses>
<Icon>units/sele/champion_chariot.png</Icon>
<Requirements>
<Techs>unlock_champion_chariots</Techs>
<Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
</Requirements>
</Identity>
<VisualActor>