diff --git a/binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json b/binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json index 27d59a1555..29590cab3e 100644 --- a/binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json +++ b/binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json @@ -6,7 +6,7 @@ "requirementsTooltip": "Unlocked in City Phase.", "icon": "shields_generic_silver.png", "researchTime": 40, - "tooltip": "Upgrade Shield Bearer Champion Infantry to Silver Shields, with greater attack, health, and armor.", + "tooltip": "Upgrade Shield Bearer Champion Infantry to Silver Shields, with greater health and armor.", "modifications": [{"value": "Promotion/RequiredXp", "replace": 0}], "affects": ["Champion Infantry"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json index ffa8f776f5..02f2626724 100644 --- a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json +++ b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json @@ -7,11 +7,11 @@ "rome": "Regio Cohors" }, "description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.", - "cost": {"food": 0, "wood": 0, "stone": 0, "metal": 500}, + "cost": {"food": 0, "wood": 0, "stone": 0, "metal": 1000}, "requirements": {"tech": "phase_city"}, "requirementsTooltip": "Unlocked in City Phase.", "icon": "helmet_corinthian_crest.png", - "researchTime": 40, + "researchTime": 90, "tooltip": "Unlock the ability to train Champions at the barracks.", "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml index 415d89856d..242fca5c1b 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml @@ -1,18 +1,18 @@ - 8 - 6 + 7 + 5 20 1 - 15 + 40 - 200 + 250 0 0 - 75 + 100 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml index 1638305e79..6de8c069c9 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml @@ -1,8 +1,8 @@ - 9 - 8 + 1 + 2 @@ -21,7 +21,6 @@ - 16 100 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml index 519d194aab..43e6c15a30 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml @@ -1,8 +1,8 @@ - 9 - 7 + 1 + 2 @@ -23,10 +23,9 @@ - 16 75 - 100 + 125 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml index 4f9b8e547c..315ecbd1dc 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml @@ -1,17 +1,17 @@ - 6 - 6 + 5 + 5 20 - 13 + 30 - 100 + 125 0 0 - 50 + 75 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml index 3fa8fd1647..79359f163b 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml @@ -1,8 +1,8 @@ - 15 - 15 + 8 + 8 20 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml index ce4857f77c..1be255eed0 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml @@ -1,8 +1,8 @@ - 10 - 10 + 3 + 3 @@ -52,7 +52,7 @@ 11.5 - 15.0 + 23.0 600.0 5.0 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml index d3a0620f52..31f0cccc2f 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml @@ -1,8 +1,8 @@ - 10 - 10 + 2 + 2 @@ -23,7 +23,7 @@ 75 - 75 + 100 diff --git a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml index f607df19ef..df3a916e67 100644 --- a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml +++ b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml @@ -8,7 +8,6 @@ The Athenian employed Scythian archers as city police and auxillary troops. units/athen_champion_ranged.png - units/athenians/champion_unit_ranged.xml 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 91bbb0174c..5641bccebb 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 @@ -1,13 +1,14 @@ - 2 - 4 + -3 + -3 + 0.5 0 - 80 + 2 @@ -17,6 +18,14 @@ A fanatic Celtic warrior, devoted to war and his Celtic liege lord. These bloodthirsty young men roamed Gaul in search of battle. units/celt_fanatic.png + + 1.5 + + 1.5 + 600.0 + 5.0 + + units/celts/fanatic.xml diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml index 5a82259b6f..8b9791440c 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml @@ -4,14 +4,8 @@ 5 15 - 48 - - - 100 - - iber Leial Zalduneria diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml index b43ef44885..e39c2fe755 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml @@ -5,14 +5,14 @@ greek Macedonian Shield Bearer Hypaspistḗs - The Hypaspistai, or "shield bearers", were the flower of the Macedonian infantry. They were the most battle hardened veterans within the army and followed Philip II and Alexander the Great into over a dozen full scale engagements. These heavily armed and opulently armored units acted as an intermediary between the phalanx and the cavalry arm, many times charging headlong with Alexander into a breech in the enemy lines. Sometimes they fought as slow pikemen, like the Pezhetairoi with 6 meter "sarissas", and other times they fought as Hoplites with large aspides and 2.5 meter-long spears, or "dorata". In later times they became known as the Argyraspidai, or "Silver Shields" when Alexander bestowed upon them armor and shields plated in pure silver, and played a decisive role in the early Diadochoi Wars of Alexander's "Successors." + The Hypaspistai, or "shield bearers", were the flower of the Macedonian infantry. They were the most battle hardened veterans within the army and followed Philip II and Alexander the Great into over a dozen full scale engagements. These heavily armed and opulently armored units acted as an intermediary between the phalanx and the cavalry arm, many times charging headlong with Alexander into a breech in the enemy lines. Sometimes they fought as slow pikemen, like the Pezhetairoi with 6 meter "sarissas", and other times they fought as Hoplites with large aspides and 2.5 meter-long spears, or "dorata". In later times they became known as the Argyraspidai, or "Silver Shields" when Alexander bestowed upon them armor and shields plated in pure silver, and played a decisive role in the early Diadochoi Wars of Alexander's "Successors." units/macedonian_hypaspist.png units/mace_champion_infantry_a phase_city units/mace_champion_infantry_e - 9999 + 2000 units/macedonians/mace_champion_hypaspist.xml diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml index 89f2b55a10..f42671a87e 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml @@ -1,7 +1,11 @@ + + 1 + 1 + - 220 + 1.1 Hypaspistḗs Argyraspídi diff --git a/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml index 9ce7790333..869815e36f 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml @@ -1,5 +1,11 @@ + + + 0 + 2 + + mace greek @@ -7,7 +13,7 @@ Thōrakitēs Thōrakitai were soldiers similar to Thyreophóroi. The literal translation of the term is curassiers, which suggests that they may have worn a short Celtic mail shirt or possibly a thorax. Thorakitai were used in armies of the Hellenistic Period in a variety of tactical situations. They were a type of armored but mobile infantry who did not require a rigid formation to be effective in combat. From their name we can deduce that most wore armor and helmet. They bore a thureos (or thyreos), an oblong shield, and were armed with sword, javelins and spear, which were used according to their tactical use. It seems that the thorakitai were heavily armored thureophoroi, able to bear spears and do battle in a phalanx as well as irregularly attack the enemy in situations when such an action was required for tactical reasons, like to exploit or challenge rough terrain. Thorakitai are mentioned in the army of the Achaian League and in the army of the Seleucids. The Seleucid Thorakitai were used in the storming of the Elburz Range in 210 BC under Antiochus III. They were used with the lighter troops to climb the cliffs and fight hand to hand with the enemy who might have not been dislodged by the lighter troops in the assault. There is a tomb illustration from Sidon showing what could well be a thorakites. The fragmentary inscription indicates that he was an Anatolian. units/mace_thorakites.png - phase_town + phase_city units/macedonians/thorakites.xml diff --git a/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml index 03c2dab04e..12400724df 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml @@ -1,9 +1,11 @@ - - 3 - 6 - + + + 0 + 2 + + mace greek @@ -11,14 +13,8 @@ Thyreophóros Thyreophóroi were a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a link between the heavier pikemen and the cavalry wings. units/mace_thureophoros.png - phase_village + phase_city - - 11 - - 17.6 - - units/macedonians/thureophoros.xml 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 c714197ca4..cf4b19b2e2 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 @@ -13,13 +13,6 @@ units/maur_champion_chariot.png Deals Trample Damage. - - 200 - 0 - 20 - 0 - 20 - 5.0 diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml index ceb68fdd0b..d5a8a4017c 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml @@ -1,8 +1,8 @@ - 6 - 6 + -4 + -4 diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thrace_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/merc_thrace_swordsman.xml index 3a709230dd..3f1c19aa51 100644 --- a/binaries/data/mods/public/simulation/templates/units/merc_thrace_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/merc_thrace_swordsman.xml @@ -1,21 +1,5 @@ - - 6 - 5 - 5 - - - - 16.5 - - - 32.0 - - - - 120 - merc Thracian Mercenary Swordsman @@ -26,7 +10,6 @@ Mercenary phase_town - 0.5 diff --git a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml index 2c6ba0d191..79c4248279 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml @@ -12,12 +12,6 @@ units/rome_legionnaire_imperial 150 - - 9 - - 18.0 - - units/romans/champion_unit_3.xml 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 9bfe587a1c..6fdb8bcc3c 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 @@ -14,13 +14,6 @@ units/pers_cavalry_archer.png successors/unlock_traditional_army - - 200 - 0 - 20 - 0 - 20 - 5.0 diff --git a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml index e4a9870748..db73964845 100644 --- a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml +++ b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml @@ -7,9 +7,6 @@ -structures/{civ}_wallset_stone - - 8 - spart greek diff --git a/binaries/data/mods/public/simulation/templates/units/theb_champion_spearman.xml b/binaries/data/mods/public/simulation/templates/units/theb_champion_spearman.xml index 4f2d93dcb6..d6ffba0255 100644 --- a/binaries/data/mods/public/simulation/templates/units/theb_champion_spearman.xml +++ b/binaries/data/mods/public/simulation/templates/units/theb_champion_spearman.xml @@ -8,9 +8,6 @@ The Sacred Band of Thebes was a troop of picked soldiers, consisting of 150 pederastic male couples which formed the elite force of the Theban army in the 4th century BC. It is said to have been organised by the Theban commander Gorgidas in 378 BC and to have played a crucial role in the Battle of Leuctra. units/thebes_sacred_band_hoplitai.png - - 66 - units/hellenes/champion_sacred_band.xml diff --git a/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml b/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml index b6a3ca3b84..d60eafb4e8 100644 --- a/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml +++ b/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml @@ -8,9 +8,6 @@ Champion Spearman. units/thebes_sacred_band_hoplitai.png - - 66 - units/hellenes/champion_sacred_band.xml diff --git a/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml b/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml index 27b735e959..c2a3503d2b 100644 --- a/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml +++ b/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml @@ -8,9 +8,6 @@ The Thespians were among the 700 or so soldiers to stay behind and hold the pass at Thermopylae to delay the Persians long enough for the rest of the Greek army to withdraw. This heroic deed made the Thespians "friends forever" to the Spartans. units/thespian_melanochitones.png - - 66 - units/hellenes/thespian.xml diff --git a/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml index 7e1a6c7be4..c1bddd7198 100644 --- a/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml +++ b/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml @@ -1,17 +1,10 @@ - - - 24.5 - - - 50.0 - - + 0.5 0 - 125 + 3 @@ -22,17 +15,8 @@ Thracian tribesmen who wield the fiercesome rhomphaia polearm weapon in combat. They were ubiquitous mercenary swordsmen throughout Hellenistic times, sometimes even serving in two opposing armies. Mercenary units/sele_infantry_swordsman.png - phase_city + phase_town - - 9.5 - - 18.0 - - - - 88 - units/hellenes/thracian_blackcloak.xml