diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/embassy_italiote.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/embassy_italic.xml similarity index 81% rename from binaries/data/mods/public/art/actors/structures/carthaginians/embassy_italiote.xml rename to binaries/data/mods/public/art/actors/structures/carthaginians/embassy_italic.xml index dc6df406b3..c51a91e7d9 100644 --- a/binaries/data/mods/public/art/actors/structures/carthaginians/embassy_italiote.xml +++ b/binaries/data/mods/public/art/actors/structures/carthaginians/embassy_italic.xml @@ -1,30 +1,30 @@ - - - - - - structural/kart_embassy_italiote.dae - - - - - - - - - - - - - - - - - - - - - - - player_trans_ao_parallax_spec.xml - + + + + + + structural/kart_embassy_italic.dae + + + + + + + + + + + + + + + + + + + + + + + player_trans_ao_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/meshes/structural/kart_embassy_italic.dae b/binaries/data/mods/public/art/meshes/structural/kart_embassy_italic.dae new file mode 100644 index 0000000000..acca94366e --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/kart_embassy_italic.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29aae694bc045352c8a48f738d459974c04ddfbfd55be92760356f5075333036 +size 199217 diff --git a/binaries/data/mods/public/art/meshes/structural/kart_embassy_italiote.dae b/binaries/data/mods/public/art/meshes/structural/kart_embassy_italiote.dae deleted file mode 100644 index 7914d2c428..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/kart_embassy_italiote.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:210fd683b8d4b7cc0f75829b47621e64ae06724fe72fd61ba547bd6a528684af -size 199216 diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/kart_embassy_italiote.png b/binaries/data/mods/public/art/textures/skins/structural/ao/kart_embassy_italic.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/kart_embassy_italiote.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/kart_embassy_italic.png diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/structures/celtic_embassy.png b/binaries/data/mods/public/art/textures/ui/session/portraits/structures/embassy_celtic.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/session/portraits/structures/celtic_embassy.png rename to binaries/data/mods/public/art/textures/ui/session/portraits/structures/embassy_celtic.png diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/structures/iberian_embassy.png b/binaries/data/mods/public/art/textures/ui/session/portraits/structures/embassy_iberian.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/session/portraits/structures/iberian_embassy.png rename to binaries/data/mods/public/art/textures/ui/session/portraits/structures/embassy_iberian.png diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/structures/italian_embassy.png b/binaries/data/mods/public/art/textures/ui/session/portraits/structures/embassy_italic.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/session/portraits/structures/italian_embassy.png rename to binaries/data/mods/public/art/textures/ui/session/portraits/structures/embassy_italic.png diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml index b3ff38473f..ca8d101c51 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87a237d6f62a85ba72914d10634371d6acf719264c0b52da7af58b87fbfd29e3 -size 175583 +oid sha256:5395854469ab07b460f6c71afa74b6d680ebd9144c646d32e6f4761d79dafd92 +size 175581 diff --git a/binaries/data/mods/public/simulation/ai/petra/config.js b/binaries/data/mods/public/simulation/ai/petra/config.js index 6771a9e7f1..6e498e036a 100644 --- a/binaries/data/mods/public/simulation/ai/petra/config.js +++ b/binaries/data/mods/public/simulation/ai/petra/config.js @@ -66,7 +66,7 @@ PETRA.Config = function(difficulty, behavior) "cart": [ "structures/{civ}_embassy_celtic", "structures/{civ}_embassy_iberian", - "structures/{civ}_embassy_italiote" + "structures/{civ}_embassy_italic" ], "gaul": [ "structures/{civ}_tavern" diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js index 3fc1ad7cce..057a7c4694 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 = "" + "" + "" + - "" + + "" + "" + "tokens" + "" + diff --git a/binaries/data/mods/public/simulation/data/civs/cart.json b/binaries/data/mods/public/simulation/data/civs/cart.json index 4f4ae4b832..570096df5b 100644 --- a/binaries/data/mods/public/simulation/data/civs/cart.json +++ b/binaries/data/mods/public/simulation/data/civs/cart.json @@ -79,8 +79,8 @@ "Class": "", "Emblem": "", "History": "The structure is based upon the center island of the inner harbour constructed to house the war fleet of the Carthaginian navy at Carthage.", - "Requirements": "", "Phase": "", + "Requirements": "", "Special": "Construct the powerful warships of the Carthaginian navy." }, { @@ -90,25 +90,25 @@ "History": "The Celts supplied fierce warrior mercenaries for Carthaginian armies.", "Requirements": "", "Phase": "", - "Special": "Hire Celtic mercenaries." - }, - { - "Name": "Italiote Embassy", - "Class": "", - "Emblem": "", - "History": "When Hannibal invaded Italy and defeated the Romans in a series of battles, many of the Italian peoples subject to Rome, including the Italian Greeks and powerful Samnites, revolted and joined the Carthaginian cause.", - "Requirements": "", - "Phase": "", - "Special": "Hire Italian mercenaries." + "Special": "Train Celtic Mercenaries." }, { "Name": "Iberian Embassy", "Class": "", "Emblem": "", "History": "The Iberians were known as fierce mercenaries, loyal to their paymasters.", - "Requirements": "", "Phase": "", - "Special": "Hire Iberian mercenaries." + "Requirements": "", + "Special": "Train Iberian Mercenaries." + }, + { + "Name": "Italiote Embassy", + "Class": "", + "Emblem": "", + "History": "When Hannibal invaded Italy and defeated the Romans in a series of battles, many of the Italian peoples subject to Rome, including the Italian Greeks and powerful Samnites, revolted and joined the Carthaginian cause.", + "Phase": "", + "Requirements": "", + "Special": "Train Italic Mercenaries." } ], "WallSets": [ diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml index 0fb9bf83a5..eca9dd41d2 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml @@ -16,8 +16,8 @@ cart Embassy - Hire mercenaries. - structures/italian_embassy.png + Train Mercenaries and research Mercenary technologies. + structures/embassy_italic.png 80 diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml index 856efa4b19..a674169053 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml @@ -15,8 +15,8 @@ cart Celtic Embassy - Hire Celtic mercenaries. Research improvements for these mercenaries. - structures/celtic_embassy.png + Train Celtic Mercenaries and research Mercenary technologies. + structures/embassy_celtic.png 40 diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml index 8408c237ee..e156da584d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml @@ -8,8 +8,8 @@ cart Iberian Embassy - Hire Iberian mercenaries. Research improvements for these mercenaries. - structures/iberian_embassy.png + Train Iberian Mercenaries and research Mercenary technologies. + structures/embassy_iberian.png 40 diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italic.xml similarity index 72% rename from binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml rename to binaries/data/mods/public/simulation/templates/structures/cart_embassy_italic.xml index 195627baaa..932b841cf3 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italic.xml @@ -14,9 +14,9 @@ cart - Italian Embassy - Hire Italian mercenaries. Research improvements for these mercenaries. - structures/italian_embassy.png + Italic Embassy + Train Italic Mercenaries and research Mercenary technologies. + structures/embassy_italic.png 40 @@ -31,6 +31,6 @@ - structures/carthaginians/embassy_italiote.xml + structures/carthaginians/embassy_italic.xml 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 0b3fcb2ecc..1f2505baf8 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml @@ -21,9 +21,9 @@ Tavern Taberna Recruit Naked Fanatics. - structures/celtic_embassy.png - phase_town -Village Town + structures/embassy_celtic.png + phase_town 20 diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml index 37a52b8a57..23a3604796 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml @@ -8,13 +8,12 @@ cart - Italian - Mercenary Italic Cavalry + Ḥayyāl Romaḥ Raḫūv + units/cart_cavalry_spearman_ital_b + Mercenary units/cart_cavalry_spearman.png phase_town - units/cart_cavalry_spearman_ital_b - Ḥayyāl Romaḥ Raḫūv units/cart_cavalry_spearman_ital_a diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml index 294bce4cc9..e45630aaf8 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml @@ -8,13 +8,12 @@ cart - Celt - Mercenary Gallic Mercenary Cavalry + Ḥayyāl Ḥerev Raḫūv + units/cart_cavalry_swordsman_gaul_b + Mercenary units/cart_cavalry_swordsman_2.png phase_town - units/cart_cavalry_swordsman_gaul_b - Ḥayyāl Ḥerev Raḫūv units/cart_cavalry_swordsman_gaul_a diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml index 5283040e49..f6643b9678 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml @@ -8,13 +8,12 @@ cart - Iberian - Mercenary Iberian Heavy Cavalry + Ḥayyāl Ḥerev Raḫūv + units/cart_cavalry_swordsman_iber_b + Mercenary units/cart_cavalry_swordsman.png phase_town - units/cart_cavalry_swordsman_iber_b - Ḥayyāl Ḥerev Raḫūv units/cart_cavalry_swordsman_iber_a diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml index a81450afee..0db5030790 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml @@ -5,7 +5,7 @@ structures/cart_super_dock structures/cart_embassy_celtic structures/cart_embassy_iberian - structures/cart_embassy_italiote + structures/cart_embassy_italic diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml index 0dde5047a1..95019d7d1e 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml @@ -5,7 +5,7 @@ structures/{civ}_super_dock structures/{civ}_embassy_celtic structures/{civ}_embassy_iberian - structures/{civ}_embassy_italiote + structures/{civ}_embassy_italic @@ -16,13 +16,12 @@ cart - Iberian - Mercenary Iberian Mercenary Skirmisher + Sǝḫīr Kidōn + units/cart_infantry_javelinist_iber_b + Mercenary units/cart_infantry_javelinist.png phase_town - units/cart_infantry_javelinist_iber_b - Sǝḫīr Kidōn units/cart_infantry_javelinist_iber_a diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml index 59b33437b2..154d2f3466 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml @@ -5,7 +5,7 @@ structures/{civ}_super_dock structures/{civ}_embassy_celtic structures/{civ}_embassy_iberian - structures/{civ}_embassy_italiote + structures/{civ}_embassy_italic @@ -16,13 +16,12 @@ cart - Iberian - Mercenary Balearic Slinger + Qallāʿ Ibušimi + units/cart_infantry_slinger_iber_b + Mercenary units/cart_infantry_slinger.png phase_town - units/cart_infantry_slinger_iber_b - Qallāʿ Ibušimi units/cart_infantry_slinger_iber_a diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml index 8341a71f9d..7d819bb249 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml @@ -5,7 +5,7 @@ structures/cart_super_dock structures/cart_embassy_celtic structures/cart_embassy_iberian - structures/cart_embassy_italiote + structures/cart_embassy_italic diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml index 833ce3472b..42928bc71c 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml @@ -5,7 +5,7 @@ structures/{civ}_super_dock structures/{civ}_embassy_celtic structures/{civ}_embassy_iberian - structures/{civ}_embassy_italiote + structures/{civ}_embassy_italic @@ -16,13 +16,12 @@ cart - Celt - Mercenary Gallic Mercenary Swordsman + Seḫīr Ḥerev + units/cart_infantry_swordsman_gaul_b + Mercenary units/cart_infantry_swordsman.png phase_town - units/cart_infantry_swordsman_gaul_b - Seḫīr Ḥerev units/cart_infantry_swordsman_gaul_a diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml index 8eb26b7ee4..09657c57dd 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml @@ -5,7 +5,7 @@ structures/{civ}_super_dock structures/{civ}_embassy_celtic structures/{civ}_embassy_iberian - structures/{civ}_embassy_italiote + structures/{civ}_embassy_italic @@ -16,13 +16,12 @@ cart - Italian - Mercenary Samnite Swordsman + Seḫīr Romaḥ + units/cart_infantry_swordsman_ital_b + Mercenary units/cart_infantry_swordsman.png phase_town - units/cart_infantry_swordsman_ital_b - Seḫīr Romaḥ units/cart_infantry_swordsman_ital_a diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml index 53df781926..069109300e 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml @@ -14,11 +14,10 @@ ptol - Celt - Mercenary - units/ptol_infantry_swordsman_merc_b Gallic Mercenary Swordsman Gallikós Mistophorós + units/ptol_infantry_swordsman_merc_b + Mercenary units/cart_infantry_swordsman.png phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml index 3e3c95c7ef..24ed8c33cb 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml @@ -3,9 +3,9 @@ rome latin - units/rome_cavalry_javelinist_b - Italian Allied Cavalry + Allied Cavalry Eques Socius + units/rome_cavalry_javelinist_b units/rome_cavalry_javelinist.png phase_town