From 9a134b88f743b4e1d667e4b3009da2999e0ed182 Mon Sep 17 00:00:00 2001 From: Freagarach Date: Mon, 6 Feb 2023 11:50:42 +0000 Subject: [PATCH] Properly use tokens for all Tech requirements. 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. --- .../public/simulation/templates/structures/athen/gymnasium.xml | 2 +- .../public/simulation/templates/structures/cart/apartment.xml | 2 +- .../simulation/templates/structures/cart/wallset_short.xml | 2 +- .../public/simulation/templates/structures/gaul/tavern.xml | 2 +- .../public/simulation/templates/structures/han/academy.xml | 2 +- .../simulation/templates/structures/han/wallset_palisade.xml | 2 +- .../simulation/templates/structures/kush/temple_amun.xml | 2 +- .../simulation/templates/structures/maur/elephant_stable.xml | 2 +- .../simulation/templates/structures/maur/tower_double.xml | 2 +- .../simulation/templates/structures/merc_camp_egyptian.xml | 3 ++- .../public/simulation/templates/structures/pers/ice_house.xml | 2 +- .../simulation/templates/structures/ptol/mercenary_camp.xml | 2 +- .../simulation/templates/structures/rome/temple_mars.xml | 2 +- .../simulation/templates/structures/rome/wallset_siege.xml | 2 +- .../simulation/templates/structures/wallset_palisade.xml | 2 +- .../simulation/templates/units/athen/champion_marine.xml | 2 +- .../simulation/templates/units/brit/champion_chariot.xml | 2 +- .../templates/units/brit/champion_infantry_swordsman.xml | 2 +- .../simulation/templates/units/gaul/champion_fanatic.xml | 2 +- .../templates/units/gaul/champion_infantry_swordsman.xml | 2 +- .../templates/units/iber/champion_infantry_swordsman.xml | 2 +- .../templates/units/kush/champion_infantry_archer.xml | 2 +- .../templates/units/mace/champion_infantry_spearman.xml | 2 +- .../templates/units/mace/champion_infantry_swordsman.xml | 2 +- .../simulation/templates/units/maur/champion_chariot.xml | 2 +- .../templates/units/maur/champion_infantry_maceman.xml | 2 +- .../simulation/templates/units/pers/champion_chariot.xml | 2 +- .../templates/units/ptol/champion_infantry_pikeman.xml | 2 +- .../templates/units/rome/champion_infantry_swordsman.xml | 2 +- .../simulation/templates/units/sele/champion_chariot.xml | 2 +- 30 files changed, 31 insertions(+), 30 deletions(-) diff --git a/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml b/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml index e9f0d25544..a53b017ca3 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml @@ -26,7 +26,7 @@ Gymnasium -City Town structures/gymnasium.png - phase_town + -phase_city phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml b/binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml index 41ebb2d737..e66b4538cc 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml @@ -26,7 +26,7 @@ -Village Town structures/apartment.png - phase_town + -phase_village phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml b/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml index 89b15e7e3d..1453001abd 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml @@ -5,7 +5,7 @@ Low Wall structures/palisade_wall.png - phase_village + -phase_town phase_village diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml b/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml index 85ad174d66..4aa6339d80 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml @@ -22,7 +22,7 @@ -Village Town structures/embassy_celtic.png - phase_town + -phase_village phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml index 59100a210d..81faccbc50 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml @@ -31,7 +31,7 @@ -Village City Academy structures/embassy_italic.png - phase_city + -phase_village phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/han/wallset_palisade.xml b/binaries/data/mods/public/simulation/templates/structures/han/wallset_palisade.xml index e6f875627e..2d56356f64 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/wallset_palisade.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/wallset_palisade.xml @@ -7,7 +7,7 @@ -Wall Palisade structures/palisade_wall.png - phase_village + -phase_town phase_village diff --git a/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml b/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml index ef1a24ef46..d79222e68b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml +++ b/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml @@ -31,7 +31,7 @@ -Town City TempleOfAmun structures/temple_epic.png - phase_city + -phase_town phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml b/binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml index 5152d97b91..2cf45dc9b6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml @@ -6,7 +6,7 @@ CivSpecific -City Town - phase_town + -phase_city phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml b/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml index e3dca13e1b..5936480654 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml @@ -19,7 +19,7 @@ maur Udarka - phase_city + -phase_town phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml index 88e045a564..e6152db14d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml +++ b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml @@ -28,10 +28,11 @@ Egyptian Mercenary Camp Stratopedeia Misthophorōn MercenaryCamp + -Village Town Capture this structure to train mercenaries from Hellenistic Egypt. structures/military_settlement.png - phase_town + -phase_village phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml b/binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml index 172e3645b3..af06de2360 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml @@ -30,7 +30,7 @@ structures/yakhchal.png - phase_village + -phase_city phase_village diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol/mercenary_camp.xml b/binaries/data/mods/public/simulation/templates/structures/ptol/mercenary_camp.xml index 62efdd353f..0f142313de 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol/mercenary_camp.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol/mercenary_camp.xml @@ -30,7 +30,7 @@ Cheap Barracks-like structure that is buildable in neutral territory, but casts no territory influence. Train Mercenaries. structures/mercenary_camp.png - phase_town + -phase_village phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/rome/temple_mars.xml b/binaries/data/mods/public/simulation/templates/structures/rome/temple_mars.xml index 22247fae44..125327b3b5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome/temple_mars.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome/temple_mars.xml @@ -13,7 +13,7 @@ Aedēs Mārtiālis -Town City TempleOfMars - phase_city + -phase_town phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml b/binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml index 7fdcf2bc98..1b04f9a010 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml @@ -9,7 +9,7 @@ SiegeWall structures/siege_wall.png - phase_city + -phase_town phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml b/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml index 655b65194b..b78dcf23ad 100644 --- a/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml +++ b/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml @@ -6,7 +6,7 @@ -Wall Palisade structures/palisade_wall.png - phase_village + -phase_town phase_village diff --git a/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml b/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml index 2a19ed4c4a..887e3cedcb 100644 --- a/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml +++ b/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml @@ -5,7 +5,7 @@ Epibátēs Athēnaîos units/athen/champion_marine.png - iphicratean_reforms + -phase_city iphicratean_reforms diff --git a/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml index b6a2fb0227..affae69909 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml @@ -12,7 +12,7 @@ Chariot units/brit/champion_chariot.png - unlock_champion_chariots + -unlock_champion_cavalry unlock_champion_chariots diff --git a/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml index bf39b4255f..ee836f995f 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml @@ -6,7 +6,7 @@ Argos units/brit/champion_infantry.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml b/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml index 172f2b3a65..d30c63ecea 100644 --- a/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml +++ b/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml @@ -13,7 +13,7 @@ Bariogaisatos units/gaul/champion_fanatic.png - phase_town + -phase_city phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml index 1acfba0fe5..beed2ecaf2 100644 --- a/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml @@ -5,7 +5,7 @@ Soliduros units/gaul/champion_infantry.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml index efb40614f7..12e98fbbf9 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml @@ -10,7 +10,7 @@ Leial Ezpatari units/iber/champion_infantry.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml index 23b4af7944..7c96a52031 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml @@ -7,7 +7,7 @@ Hry pdty units/kush/champion_archer.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml index 92ce09a503..5e5afed8d7 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml @@ -8,7 +8,7 @@ units/mace/champion_infantry_spearman units/mace/hypaspist.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml index 141195280e..21e64013e9 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml @@ -12,7 +12,7 @@ Rhomphaiaphoros units/thrac/champion_infantry_swordsman.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml index f331022b89..26a671f838 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml @@ -12,7 +12,7 @@ Chariot units/maur/champion_chariot.png - unlock_champion_chariots + -unlock_champion_cavalry unlock_champion_chariots diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml index 1fbf624476..bf4959e3fd 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml @@ -7,7 +7,7 @@ units/maur/champion_infantry units/maur/champion_maceman.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml index 7d4ea66fdb..a89d0fbc62 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml @@ -12,7 +12,7 @@ Chariot units/pers/chariot_archer.png - unlock_champion_chariots + -unlock_champion_cavalry unlock_champion_chariots diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml index 9abb9735e3..719325d785 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml @@ -7,7 +7,7 @@ Phalangitès Agema units/ptol/champion_infantry.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml index ddbca09117..a932be9be2 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml @@ -14,7 +14,7 @@ units/rome/champion_infantry_swordsman units/rome/champion_infantry.png - unlock_champion_infantry + -phase_city unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml index 023527bfae..06dd771e0e 100644 --- a/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml +++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml @@ -12,7 +12,7 @@ Chariot units/sele/champion_chariot.png - unlock_champion_chariots + -unlock_champion_cavalry unlock_champion_chariots