From ef1d1dbed87fafb0b1e5147434b18b628e7319e9 Mon Sep 17 00:00:00 2001 From: Freagarach Date: Mon, 21 Feb 2022 07:20:26 +0000 Subject: [PATCH] Make Icon non-optional. Requested by @bb in D4476. Differential revision: https://code.wildfiregames.com/D4484 Reviewed by: @bb This was SVN commit r26458. --- .../mods/public/simulation/components/Identity.js | 8 +++----- .../templates/skirmish/units/default_cavalry.xml | 1 + .../skirmish/units/default_infantry_melee_b.xml | 1 + .../skirmish/units/default_infantry_ranged_b.xml | 1 + .../skirmish/units/default_ship_trireme.xml | 1 + .../templates/skirmish/units/default_siege_ram.xml | 1 + .../units/default_support_female_citizen.xml | 1 + .../skirmish/units/special_starting_unit.xml | 1 + .../simulation/templates/special/players/athen.xml | 2 +- .../simulation/templates/special/players/brit.xml | 2 +- .../simulation/templates/special/players/cart.xml | 2 +- .../simulation/templates/special/players/gaia.xml | 12 ++++++++++++ .../simulation/templates/special/players/gaul.xml | 2 +- .../simulation/templates/special/players/han.xml | 2 +- .../simulation/templates/special/players/iber.xml | 2 +- .../simulation/templates/special/players/kush.xml | 2 +- .../simulation/templates/special/players/mace.xml | 2 +- .../simulation/templates/special/players/maur.xml | 2 +- .../simulation/templates/special/players/pers.xml | 2 +- .../simulation/templates/special/players/ptol.xml | 2 +- .../simulation/templates/special/players/rome.xml | 2 +- .../simulation/templates/special/players/sele.xml | 2 +- .../simulation/templates/special/players/spart.xml | 2 +- .../{special/player.xml => template_player.xml} | 0 24 files changed, 36 insertions(+), 19 deletions(-) rename binaries/data/mods/public/simulation/templates/{special/player.xml => template_player.xml} (100%) diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js index 4de768c3f2..bcf9d6e130 100644 --- a/binaries/data/mods/public/simulation/components/Identity.js +++ b/binaries/data/mods/public/simulation/components/Identity.js @@ -72,11 +72,9 @@ Identity.prototype.Schema = "" + "" + "" + - "" + - "" + - "" + - "" + - "" + + "" + + "" + + "" + "" + "" + "" + diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml index b4fadcf064..05e2c5b562 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml @@ -2,6 +2,7 @@ skirm + units/athen_cavalry_javelinist.png diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml index 2bb116887d..7076e9fea3 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml @@ -2,6 +2,7 @@ skirm + units/athen_infantry_spearman.png diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml index 2b213bc414..04a6c09c7f 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml @@ -2,6 +2,7 @@ skirm + units/athen_infantry_slinger.png diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml index f456ec9949..9b15528c4b 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml @@ -2,6 +2,7 @@ skirm + units/athen_ship_trireme.png units/{civ}/ship_trireme diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml index a667576084..0b9e8812e5 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml @@ -6,6 +6,7 @@ skirm + units/spart_siege_ram.png units/{civ}/siege_ram diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml index 1ebaafde80..3d48b60b90 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml @@ -2,6 +2,7 @@ skirm + units/hele_support_female_citizen.png units/{civ}/support_female_citizen diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml index 208680997d..55622daa90 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml @@ -6,6 +6,7 @@ skirm + units/maur_support_elephant.png diff --git a/binaries/data/mods/public/simulation/templates/special/players/athen.xml b/binaries/data/mods/public/simulation/templates/special/players/athen.xml index 6ced6d8054..dd725d207e 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/athen.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/athen.xml @@ -1,5 +1,5 @@ - + teambonuses/athen_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/brit.xml b/binaries/data/mods/public/simulation/templates/special/players/brit.xml index df6e4a7ba9..578cde97fe 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/brit.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/brit.xml @@ -1,5 +1,5 @@ - + teambonuses/brit_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/cart.xml b/binaries/data/mods/public/simulation/templates/special/players/cart.xml index ab737103b7..cc292853f2 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/cart.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/cart.xml @@ -1,5 +1,5 @@ - + teambonuses/cart_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/gaia.xml b/binaries/data/mods/public/simulation/templates/special/players/gaia.xml index e8f2df41ea..80bb127fc5 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/gaia.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/gaia.xml @@ -3,6 +3,7 @@ gaia Gaia + emblems/emblem_gaia.png true @@ -24,10 +25,21 @@ + special/formations/null + special/formations/box + special/formations/column_closed + special/formations/line_closed + special/formations/column_open + special/formations/line_open + special/formations/flank + special/formations/battle_line + special/formations/skirmish + special/formations/wedge special/formations/phalanx special/formations/syntagma special/formations/testudo special/formations/anti_cavalry + special/formations/scatter diff --git a/binaries/data/mods/public/simulation/templates/special/players/gaul.xml b/binaries/data/mods/public/simulation/templates/special/players/gaul.xml index eaeb45de0f..f6330ab858 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/gaul.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/gaul.xml @@ -1,5 +1,5 @@ - + teambonuses/gaul_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/han.xml b/binaries/data/mods/public/simulation/templates/special/players/han.xml index 1a106ba1da..7b15ae821f 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/han.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/han.xml @@ -1,5 +1,5 @@ - + teambonuses/han_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/iber.xml b/binaries/data/mods/public/simulation/templates/special/players/iber.xml index e4a95c0e5b..03e452b20f 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/iber.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/iber.xml @@ -1,5 +1,5 @@ - + teambonuses/iber_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/kush.xml b/binaries/data/mods/public/simulation/templates/special/players/kush.xml index 8609940dea..5c44664bee 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/kush.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/kush.xml @@ -1,5 +1,5 @@ - + teambonuses/kush_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/mace.xml b/binaries/data/mods/public/simulation/templates/special/players/mace.xml index d599adb7db..dead611e2b 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/mace.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/mace.xml @@ -1,5 +1,5 @@ - + teambonuses/mace_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/maur.xml b/binaries/data/mods/public/simulation/templates/special/players/maur.xml index cec1f86f7d..735e99c35e 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/maur.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/maur.xml @@ -1,5 +1,5 @@ - + teambonuses/maur_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/pers.xml b/binaries/data/mods/public/simulation/templates/special/players/pers.xml index 95808debeb..c2487b38d2 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/pers.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/pers.xml @@ -1,5 +1,5 @@ - + teambonuses/pers_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/ptol.xml b/binaries/data/mods/public/simulation/templates/special/players/ptol.xml index 6729b241c6..d153a54ca7 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/ptol.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/ptol.xml @@ -1,5 +1,5 @@ - + teambonuses/ptol_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/rome.xml b/binaries/data/mods/public/simulation/templates/special/players/rome.xml index 7a7ad03e32..c346992e41 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/rome.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/rome.xml @@ -1,5 +1,5 @@ - + teambonuses/rome_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/sele.xml b/binaries/data/mods/public/simulation/templates/special/players/sele.xml index 18f2fac0e5..fee3d6bafb 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/sele.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/sele.xml @@ -1,5 +1,5 @@ - + teambonuses/sele_player_teambonus diff --git a/binaries/data/mods/public/simulation/templates/special/players/spart.xml b/binaries/data/mods/public/simulation/templates/special/players/spart.xml index 8222b3a5f9..ff7029b5e9 100644 --- a/binaries/data/mods/public/simulation/templates/special/players/spart.xml +++ b/binaries/data/mods/public/simulation/templates/special/players/spart.xml @@ -1,5 +1,5 @@ - + teambonuses/spart_player_teambonus spart diff --git a/binaries/data/mods/public/simulation/templates/special/player.xml b/binaries/data/mods/public/simulation/templates/template_player.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/special/player.xml rename to binaries/data/mods/public/simulation/templates/template_player.xml