From aedd649cd00e568aaaba1d51ae5c6519372af45e Mon Sep 17 00:00:00 2001 From: Andrettin <6322423+Andrettin@users.noreply.github.com> Date: Fri, 15 Jul 2022 08:00:49 +0200 Subject: [PATCH] Added Suebi level 2 and 3 infantry units, the Veteran Kregar and the Truhtin --- data/buttons/abilities/abilities.txt | 1 + data/buttons/ability_learning.txt | 3 + .../units/suebi_experience_upgrades.txt | 25 ++++ data/characters/suebi/ariovistus.txt | 2 +- data/unit_types/units/suebi/chieftain.txt | 79 +++++++++++++ .../units/suebi/veteran_swordsman.txt | 79 +++++++++++++ .../factions/suebi_faction_upgrades.txt | 12 +- readme.txt | 2 + scripts/buttons.lua | 2 +- scripts/civilizations/dwarf/buttons.lua | 108 +++++++++--------- scripts/civilizations/frankish/buttons.lua | 8 +- scripts/civilizations/germanic/buttons.lua | 4 +- scripts/civilizations/germanic/upgrade.lua | 4 +- scripts/civilizations/gnome/buttons.lua | 12 +- scripts/civilizations/goblin/buttons.lua | 8 +- scripts/civilizations/goth/buttons.lua | 4 +- scripts/civilizations/kobold/buttons.lua | 4 +- scripts/civilizations/latin/buttons.lua | 4 +- scripts/civilizations/norse/buttons.lua | 4 +- scripts/civilizations/suebi/characters.lua | 10 +- scripts/civilizations/suebi/upgrade.lua | 12 +- .../civilizations/suebi/upgrade_faction.lua | 10 +- scripts/civilizations/teuton/buttons.lua | 25 ++-- scripts/civilizations/teuton/upgrade.lua | 12 +- scripts/ui.lua | 4 +- scripts/upgrade_deities.lua | 4 +- scripts/upgrade_military_doctrines.lua | 4 +- 27 files changed, 328 insertions(+), 118 deletions(-) create mode 100644 data/buttons/units/suebi_experience_upgrades.txt create mode 100644 data/unit_types/units/suebi/chieftain.txt create mode 100644 data/unit_types/units/suebi/veteran_swordsman.txt diff --git a/data/buttons/abilities/abilities.txt b/data/buttons/abilities/abilities.txt index 93ba9a0dbc..9ddcd2c45f 100644 --- a/data/buttons/abilities/abilities.txt +++ b/data/buttons/abilities/abilities.txt @@ -122,6 +122,7 @@ cast_puncture = { unit_goblin_warlord unit_latin_centurion unit_norse_heroic_swordsman + unit_suebi_chieftain unit_teuton_heroic_swordsman unit_teuton_spearman unit_western_footman diff --git a/data/buttons/ability_learning.txt b/data/buttons/ability_learning.txt index da8cb7bd84..6e7b65265e 100644 --- a/data/buttons/ability_learning.txt +++ b/data/buttons/ability_learning.txt @@ -62,6 +62,7 @@ learn_sword_mastery_bronze = { unit_kobold_champion unit_latin_centurion unit_norse_heroic_swordsman + unit_suebi_chieftain unit_teuton_heroic_swordsman unit_teuton_knight_lord unit_western_footman @@ -95,6 +96,7 @@ learn_sword_mastery = { unit_kobold_champion unit_latin_centurion unit_norse_heroic_swordsman + unit_suebi_chieftain unit_teuton_heroic_swordsman unit_teuton_knight_lord unit_western_footman @@ -349,6 +351,7 @@ learn_puncture = { unit_goblin_warlord unit_latin_centurion unit_norse_heroic_swordsman + unit_suebi_chieftain unit_teuton_heroic_swordsman unit_teuton_spearman unit_western_footman diff --git a/data/buttons/units/suebi_experience_upgrades.txt b/data/buttons/units/suebi_experience_upgrades.txt new file mode 100644 index 0000000000..42b49b525e --- /dev/null +++ b/data/buttons/units/suebi_experience_upgrades.txt @@ -0,0 +1,25 @@ +upgrade_to_suebi_veteran_swordsman = { + pos = 1 + level = choose_individual_upgrade_level + action = experience_upgrade_to + value = unit_suebi_veteran_swordsman + key = k + hint = "Upgrade to Veteran ~!Kregar" + popup = popup_unit + unit_types = { + unit_suebi_swordsman + } +} + +upgrade_to_suebi_chieftain = { + pos = 1 + level = choose_individual_upgrade_level + action = experience_upgrade_to + value = unit_suebi_chieftain + key = t + hint = "Upgrade to ~!Truhtin" + popup = popup_unit + unit_types = { + unit_suebi_veteran_swordsman + } +} diff --git a/data/characters/suebi/ariovistus.txt b/data/characters/suebi/ariovistus.txt index c63fe3f8cb..abc73712e3 100644 --- a/data/characters/suebi/ariovistus.txt +++ b/data/characters/suebi/ariovistus.txt @@ -1,6 +1,6 @@ ariovistus = { name = "Ariovistus" - unit_type = unit_teuton_heroic_swordsman #chieftain + unit_type = unit_suebi_chieftain #chieftain civilization = suebi default_faction = suebia gender = male diff --git a/data/unit_types/units/suebi/chieftain.txt b/data/unit_types/units/suebi/chieftain.txt new file mode 100644 index 0000000000..14a42f74b8 --- /dev/null +++ b/data/unit_types/units/suebi/chieftain.txt @@ -0,0 +1,79 @@ +unit_suebi_chieftain = { + name = "Truhtin" + parent = unit_template_heroic_infantry + civilization = suebi + description = "Suebi chieftains are renowned for their fearlessness in battle." + background = "\"Truhtîn\" is an Old High German word for \"lord\" or \"warlord\"." + image_file = "units/suebi/swordsman.png" + frame_size = { 72 72 } + animation_set = animations_melee_unit + icon = suebi_chieftain + corpse_type = unit_human_dead_body + armor = 0 #-2 armor + basic_damage = 14 #+2 damage + accuracy = 12 #+2 accuracy + day_sight_range_bonus = 1 + night_sight_range_bonus = -1 + points = 110 #+10 points + weapon_classes = { + sword + thrusting_sword + } + hack_damage = true + ai_drops = { + unit_short_sword + unit_broad_sword + unit_spatha + unit_wooden_shield + unit_bronze_shield + unit_iron_shield + unit_kite_shield + unit_boots + unit_carrots + unit_cheese + unit_meat + unit_potion_of_healing + } + default_equipment = { + weapon = unit_short_sword + shield = unit_wooden_shield + boots = unit_boots + } + variations = { + blond_hair = { + name = "Blond Hair" + tags = { blond_hair } + conditions = { + not = { + upgrade = upgrade_teuton_iron_shield + equipment = unit_heater_shield + equipment = unit_iron_shield + equipment = unit_kite_shield + equipment = unit_thrymgjol_shield + } + } + } + blond_hair_with_shield = { + image_file = "units/suebi/swordsman_with_shield.png" + tags = { blond_hair } + conditions = { + or = { + upgrade = upgrade_teuton_iron_shield + equipment = unit_heater_shield + equipment = unit_iron_shield + equipment = unit_kite_shield + equipment = unit_thrymgjol_shield + } + } + } + } + sounds = { + selected = basic_teuton_voices_selected_group + acknowledge = basic_teuton_voices_acknowledge + ready = basic_teuton_voices_ready + help = basic_teuton_voices_help + dead = basic_human_voices_dead + hit = sword_attack + miss = attack_miss + } +} diff --git a/data/unit_types/units/suebi/veteran_swordsman.txt b/data/unit_types/units/suebi/veteran_swordsman.txt new file mode 100644 index 0000000000..a5c7f4bd61 --- /dev/null +++ b/data/unit_types/units/suebi/veteran_swordsman.txt @@ -0,0 +1,79 @@ +unit_suebi_veteran_swordsman = { + name = "Veteran Kregar" + parent = unit_template_veteran_infantry + civilization = suebi + description = "These high-ranking swordsmen have honed their combat skills to a greater degree than many of their counterparts." + background = "\"Krêg\" is the Old High German word for \"tenacity\", and possibly \"war\"." + image_file = "units/suebi/swordsman.png" + frame_size = { 72 72 } + animation_set = animations_melee_unit + icon = suebi_veteran_swordsman + corpse_type = unit_human_dead_body + armor = 0 #-2 armor + basic_damage = 12 #+2 damage + accuracy = 12 #+2 accuracy + day_sight_range_bonus = 1 + night_sight_range_bonus = -1 + points = 85 #+10 points + weapon_classes = { + sword + thrusting_sword + } + hack_damage = true + ai_drops = { + unit_short_sword + unit_broad_sword + unit_spatha + unit_wooden_shield + unit_bronze_shield + unit_iron_shield + unit_kite_shield + unit_boots + unit_carrots + unit_cheese + unit_meat + unit_potion_of_healing + } + default_equipment = { + weapon = unit_short_sword + shield = unit_wooden_shield + boots = unit_boots + } + variations = { + blond_hair = { + name = "Blond Hair" + tags = { blond_hair } + conditions = { + not = { + upgrade = upgrade_teuton_iron_shield + equipment = unit_heater_shield + equipment = unit_iron_shield + equipment = unit_kite_shield + equipment = unit_thrymgjol_shield + } + } + } + blond_hair_with_shield = { + image_file = "units/suebi/swordsman_with_shield.png" + tags = { blond_hair } + conditions = { + or = { + upgrade = upgrade_teuton_iron_shield + equipment = unit_heater_shield + equipment = unit_iron_shield + equipment = unit_kite_shield + equipment = unit_thrymgjol_shield + } + } + } + } + sounds = { + selected = basic_teuton_voices_selected_group + acknowledge = basic_teuton_voices_acknowledge + ready = basic_teuton_voices_ready + help = basic_teuton_voices_help + dead = basic_human_voices_dead + hit = sword_attack + miss = attack_miss + } +} diff --git a/data/upgrades/factions/suebi_faction_upgrades.txt b/data/upgrades/factions/suebi_faction_upgrades.txt index 47e08ed8a0..7426b67653 100644 --- a/data/upgrades/factions/suebi_faction_upgrades.txt +++ b/data/upgrades/factions/suebi_faction_upgrades.txt @@ -31,8 +31,8 @@ upgrade_faction_marcomannia = { points = 10 unit_types = { unit_suebi_swordsman - unit_teuton_veteran_swordsman - unit_teuton_heroic_swordsman + unit_suebi_veteran_swordsman + unit_suebi_chieftain } } } @@ -46,8 +46,8 @@ upgrade_faction_semnonia = { points = 10 unit_types = { unit_suebi_swordsman - unit_teuton_veteran_swordsman - unit_teuton_heroic_swordsman + unit_suebi_veteran_swordsman + unit_suebi_chieftain } } } @@ -60,8 +60,8 @@ upgrade_faction_suebia = { points = 10 unit_types = { unit_suebi_swordsman - unit_teuton_veteran_swordsman - unit_teuton_heroic_swordsman + unit_suebi_veteran_swordsman + unit_suebi_chieftain } } } diff --git a/readme.txt b/readme.txt index 61ed2d07ab..14475d5f72 100644 --- a/readme.txt +++ b/readme.txt @@ -82,6 +82,8 @@ https://github.com/Andrettin/Wyrmsun * Units - Increased the charge bonus of Gothic cavalry from 7% to 10%. +- Made it so the Suebi Kregar uses a single-layer image once again (with two variations, one with the Suebi shield and one without), both for the sake of memory efficiency, and because the layered version had some minor graphical issues. +- Added Suebi level 2 and 3 infantry units, the Veteran Kregar and the Truhtin. * Upgrades - Added Lipizzaner Horse upgrade (icon by Jinn) for the Teutonic civilization (researchable at the Stables). This upgrade increases cavalry HP. diff --git a/scripts/buttons.lua b/scripts/buttons.lua index 7fd19e4b38..20c20bf414 100644 --- a/scripts/buttons.lua +++ b/scripts/buttons.lua @@ -180,7 +180,7 @@ DefineButton( { Pos = 10, Level = "choose-individual-upgrade-level", Icon = "ico "unit-latin-centurion", "unit-latin-javelineer", "unit-norse-heroic-swordsman", "unit-orc-spearthrower", --- "unit-teuton-heroic-swordsman", "unit-frank-heroic-swordsman", +-- "unit-teuton-heroic-swordsman", "unit_suebi_chieftain", "unit-frank-heroic-swordsman", -- "unit-teuton-spearman", "unit-frank-spearman", -- "unit-teuton-archer", "unit-teuton-gunpowder-infantry", diff --git a/scripts/civilizations/dwarf/buttons.lua b/scripts/civilizations/dwarf/buttons.lua index 18778a696a..4046ec7fb0 100644 --- a/scripts/civilizations/dwarf/buttons.lua +++ b/scripts/civilizations/dwarf/buttons.lua @@ -302,349 +302,349 @@ DefineButton( { Pos = 13, Level = "choose-individual-upgrade-level", Icon = "ico -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-skilled-miner", - Action = "experience-upgrade-to", Value = "unit-dwarven-skilled-miner", + Action = "experience_upgrade_to", Value = "unit-dwarven-skilled-miner", Key = "u", Hint = "~!Upgrade to Skilled Miner", Popup = "popup_unit", ForUnit = {"unit_dwarven_miner"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-expert-miner", - Action = "experience-upgrade-to", Value = "unit-dwarven-expert-miner", + Action = "experience_upgrade_to", Value = "unit-dwarven-expert-miner", Key = "u", Hint = "~!Upgrade to Expert Miner", Popup = "popup_unit", ForUnit = {"unit-dwarven-skilled-miner"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-brising-skilled-miner", - Action = "experience-upgrade-to", Value = "unit-brising-skilled-miner", + Action = "experience_upgrade_to", Value = "unit-brising-skilled-miner", Key = "u", Hint = "~!Upgrade to Skilled Miner", Popup = "popup_unit", ForUnit = {"unit_brising_miner"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-brising-expert-miner", - Action = "experience-upgrade-to", Value = "unit-brising-expert-miner", + Action = "experience_upgrade_to", Value = "unit-brising-expert-miner", Key = "u", Hint = "~!Upgrade to Expert Miner", Popup = "popup_unit", ForUnit = {"unit-brising-skilled-miner"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-runesmith", - Action = "experience-upgrade-to", Value = "unit-dwarven-runesmith", + Action = "experience_upgrade_to", Value = "unit-dwarven-runesmith", Key = "r", Hint = "Upgrade to ~!Runesmith", Popup = "popup_unit", ForUnit = {"unit_dwarven_miner", "unit_brising_miner"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-runemaster", - Action = "experience-upgrade-to", Value = "unit-dwarven-runemaster", + Action = "experience_upgrade_to", Value = "unit-dwarven-runemaster", Key = "r", Hint = "Upgrade to ~!Runemaster", Popup = "popup_unit", ForUnit = {"unit-dwarven-runesmith"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-arcanister", - Action = "experience-upgrade-to", Value = "unit-dwarven-arcanister", + Action = "experience_upgrade_to", Value = "unit-dwarven-arcanister", Key = "a", Hint = "Upgrade to ~!Arcanister", Popup = "popup_unit", ForUnit = {"unit-dwarven-runemaster"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-steelclad", - Action = "experience-upgrade-to", Value = "unit-dwarven-steelclad", + Action = "experience_upgrade_to", Value = "unit-dwarven-steelclad", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "0"}, Key = "u", Hint = "~!Upgrade to Steelclad", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-steelclad-gray-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-steelclad", + Action = "experience_upgrade_to", Value = "unit-dwarven-steelclad", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "1"}, Key = "u", Hint = "~!Upgrade to Steelclad", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-steelclad", - Action = "experience-upgrade-to", Value = "unit-dwarven-steelclad", + Action = "experience_upgrade_to", Value = "unit-dwarven-steelclad", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "2"}, Key = "u", Hint = "~!Upgrade to Steelclad", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-steelclad-blond-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-steelclad", + Action = "experience_upgrade_to", Value = "unit-dwarven-steelclad", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "3"}, Key = "u", Hint = "~!Upgrade to Steelclad", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-steelclad-black-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-steelclad", + Action = "experience_upgrade_to", Value = "unit-dwarven-steelclad", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "4"}, Key = "u", Hint = "~!Upgrade to Steelclad", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-steelclad-brown-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-steelclad", + Action = "experience_upgrade_to", Value = "unit-dwarven-steelclad", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "5"}, Key = "u", Hint = "~!Upgrade to Steelclad", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-surghan-mercenary-steelclad", - Action = "experience-upgrade-to", Value = "unit-surghan-mercenary-steelclad", + Action = "experience_upgrade_to", Value = "unit-surghan-mercenary-steelclad", Key = "u", Hint = "~!Upgrade to Steelclad", Popup = "popup_unit", ForUnit = {"unit-surghan-mercenary-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "0"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "6"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-gray-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "1"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-gray-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "7"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "2"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "8"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-blond-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "3"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-blond-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "9"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-black-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "4"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-black-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "10"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-brown-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "5"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-thane-brown-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-thane", + Action = "experience_upgrade_to", Value = "unit-dwarven-thane", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "11"}, Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-dwarven-steelclad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-surghan-mercenary-thane", - Action = "experience-upgrade-to", Value = "unit-surghan-mercenary-thane", + Action = "experience_upgrade_to", Value = "unit-surghan-mercenary-thane", Key = "u", Hint = "~!Upgrade to Stonelord", Popup = "popup_unit", ForUnit = {"unit-surghan-mercenary-steelclad"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-rider", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-rider", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-rider", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "0"}, Key = "y", Hint = "Upgrade to ~!Yale Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter", "unit-surghan-mercenary-axefighter"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-rider-gray-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-rider", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-rider", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "1"}, Key = "y", Hint = "Upgrade to ~!Yale Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-rider-orange-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-rider", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-rider", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "2"}, Key = "y", Hint = "Upgrade to ~!Yale Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-rider-blond-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-rider", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-rider", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "3"}, Key = "y", Hint = "Upgrade to ~!Yale Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-rider-black-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-rider", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-rider", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "4"}, Key = "y", Hint = "Upgrade to ~!Yale Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-rider-brown-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-rider", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-rider", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "5"}, Key = "y", Hint = "Upgrade to ~!Yale Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "0"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "1"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-black-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "2"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-black-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "3"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-blond-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "4"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-brown-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "5"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-brown-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "6"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-gray-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "7"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-orange-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "8"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-dwarven-yale-lord-orange-hair", - Action = "experience-upgrade-to", Value = "unit-dwarven-yale-lord", + Action = "experience_upgrade_to", Value = "unit-dwarven-yale-lord", Allowed = "check-unit-variable", AllowArg = {"Variation", "Value", "==", "9"}, Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-dwarven-yale-rider"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-joruvellir-yale-rider", + Action = "experience_upgrade_to", Value = "unit-joruvellir-yale-rider", Key = "y", Hint = "Upgrade to ~!Yale Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-axefighter"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-joruvellir-yale-lord", + Action = "experience_upgrade_to", Value = "unit-joruvellir-yale-lord", Key = "y", Hint = "Upgrade to ~!Yale Lord", Popup = "popup_unit", ForUnit = {"unit-joruvellir-yale-rider"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-dwarven-stalwart", + Action = "experience_upgrade_to", Value = "unit-dwarven-stalwart", Key = "u", Hint = "~!Upgrade to Stalwart", Popup = "popup_unit", ForUnit = {"unit-dwarven-guard"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-dwarven-sentinel", + Action = "experience_upgrade_to", Value = "unit-dwarven-sentinel", Key = "u", Hint = "~!Upgrade to Sentinel", Popup = "popup_unit", ForUnit = {"unit-dwarven-stalwart"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-dwarven-pathfinder", + Action = "experience_upgrade_to", Value = "unit-dwarven-pathfinder", Key = "u", Hint = "~!Upgrade to Pathfinder", Popup = "popup_unit", ForUnit = {"unit-dwarven-scout"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-joruvellir-pathfinder", + Action = "experience_upgrade_to", Value = "unit-joruvellir-pathfinder", Key = "u", Hint = "~!Upgrade to Pathfinder", Popup = "popup_unit", ForUnit = {"unit-joruvellir-scout"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-dwarven-explorer", + Action = "experience_upgrade_to", Value = "unit-dwarven-explorer", Key = "u", Hint = "~!Upgrade to Explorer", Popup = "popup_unit", ForUnit = {"unit-dwarven-pathfinder"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-joruvellir-explorer", + Action = "experience_upgrade_to", Value = "unit-joruvellir-explorer", Key = "u", Hint = "~!Upgrade to Explorer", Popup = "popup_unit", ForUnit = {"unit-joruvellir-pathfinder"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit_dwarven_gryphon_rider", + Action = "experience_upgrade_to", Value = "unit_dwarven_gryphon_rider", Key = "g", Hint = "Upgrade to ~!Gryphon Rider", Popup = "popup_unit", ForUnit = {"unit-dwarven-pathfinder", "unit-joruvellir-pathfinder"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-dwarven-annalist", + Action = "experience_upgrade_to", Value = "unit-dwarven-annalist", Key = "u", Hint = "~!Upgrade to Annalist", Popup = "popup_unit", ForUnit = {"unit-dwarven-witness"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-dwarven-loremaster", + Action = "experience_upgrade_to", Value = "unit-dwarven-loremaster", Key = "u", Hint = "~!Upgrade to Loremaster", Popup = "popup_unit", ForUnit = {"unit-dwarven-annalist"} } ) diff --git a/scripts/civilizations/frankish/buttons.lua b/scripts/civilizations/frankish/buttons.lua index ad74969ff0..fffc5d2c34 100644 --- a/scripts/civilizations/frankish/buttons.lua +++ b/scripts/civilizations/frankish/buttons.lua @@ -38,25 +38,25 @@ DefineButton( { Pos = 2, Icon = "icon-frankish-spatha", -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-frank-veteran-swordsman", + Action = "experience_upgrade_to", Value = "unit-frank-veteran-swordsman", Key = "a", Hint = "Upgrade to ~!Adal", Popup = "popup_unit", ForUnit = {"unit-frank-swordsman"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-frank-heroic-swordsman", + Action = "experience_upgrade_to", Value = "unit-frank-heroic-swordsman", Key = "d", Hint = "Upgrade to ~!Truhtin", Popup = "popup_unit", ForUnit = {"unit-frank-veteran-swordsman"} } ) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-frank-horseman", + Action = "experience_upgrade_to", Value = "unit-frank-horseman", Key = "r", Hint = "Upgrade to ~!Ritar", Popup = "popup_unit", ForUnit = {"unit-frank-swordsman"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-frank-knight-lord", + Action = "experience_upgrade_to", Value = "unit-frank-knight-lord", Key = "h", Hint = "Upgrade to ~!Heriro", Popup = "popup_unit", ForUnit = {"unit-frank-horseman"} } ) diff --git a/scripts/civilizations/germanic/buttons.lua b/scripts/civilizations/germanic/buttons.lua index 3b759e2b12..775be9da2e 100644 --- a/scripts/civilizations/germanic/buttons.lua +++ b/scripts/civilizations/germanic/buttons.lua @@ -168,13 +168,13 @@ DefineButton( { Pos = 14, Level = "choose-individual-upgrade-level", Icon = "ico -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-germanic-veteran-warrior", + Action = "experience_upgrade_to", Value = "unit-germanic-veteran-warrior", Key = "k", Hint = "Upgrade to ~!Kuni", Popup = "popup_unit", ForUnit = {"unit-germanic-warrior"} }) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-germanic-chieftain", + Action = "experience_upgrade_to", Value = "unit-germanic-chieftain", Key = "d", Hint = "Upgrade to ~!Druhtana", Popup = "popup_unit", ForUnit = {"unit-germanic-veteran-warrior"} }) diff --git a/scripts/civilizations/germanic/upgrade.lua b/scripts/civilizations/germanic/upgrade.lua index 01f5bad0e4..4ff85d96eb 100644 --- a/scripts/civilizations/germanic/upgrade.lua +++ b/scripts/civilizations/germanic/upgrade.lua @@ -67,7 +67,7 @@ DefineModifier("upgrade-germanic-broad-sword", {"apply-to", "unit-germanic-spearman"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-frank-swordsman"}, {"apply-to", "unit-frank-veteran-swordsman"}, {"apply-to", "unit-frank-heroic-swordsman"}, {"apply-to", "unit-teuton-ritter"}, {"apply-to", "unit-teuton-knight-lord"}, {"apply-to", "unit-frank-horseman"}, {"apply-to", "unit-frank-knight-lord"}, @@ -89,7 +89,7 @@ DefineModifier("upgrade-germanic-bronze-shield", {"apply-to", "unit-germanic-spearman"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-frank-swordsman"}, {"apply-to", "unit-frank-veteran-swordsman"}, {"apply-to", "unit-frank-heroic-swordsman"}, {"apply-to", "unit-teuton-spearman"}, {"apply-to", "unit-frank-spearman"}, {"apply-to", "unit-teuton-ritter"}, {"apply-to", "unit-teuton-knight-lord"}, diff --git a/scripts/civilizations/gnome/buttons.lua b/scripts/civilizations/gnome/buttons.lua index 62035ff182..1ee074cf9e 100644 --- a/scripts/civilizations/gnome/buttons.lua +++ b/scripts/civilizations/gnome/buttons.lua @@ -36,37 +36,37 @@ DefineButton( { Pos = 1, -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-gnomish-duelist", - Action = "experience-upgrade-to", Value = "unit-gnomish-duelist", + Action = "experience_upgrade_to", Value = "unit-gnomish-duelist", Key = "u", Hint = "~!Upgrade to Duelist", Popup = "popup_unit", ForUnit = {"unit-gnomish-recruit"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-gnomish-master-at-arms", - Action = "experience-upgrade-to", Value = "unit-gnomish-master-at-arms", + Action = "experience_upgrade_to", Value = "unit-gnomish-master-at-arms", Key = "u", Hint = "~!Upgrade to Master at Arms", Popup = "popup_unit", ForUnit = {"unit-gnomish-duelist"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-gnomish-duelist", - Action = "experience-upgrade-to", Value = "unit-deep-gnomish-duelist", + Action = "experience_upgrade_to", Value = "unit-deep-gnomish-duelist", Key = "u", Hint = "~!Upgrade to Duelist", Popup = "popup_unit", ForUnit = {"unit-deep-gnomish-recruit"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-gnomish-master-at-arms", - Action = "experience-upgrade-to", Value = "unit-deep-gnomish-master-at-arms", + Action = "experience_upgrade_to", Value = "unit-deep-gnomish-master-at-arms", Key = "u", Hint = "~!Upgrade to Master at Arms", Popup = "popup_unit", ForUnit = {"unit-deep-gnomish-duelist"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "derro_executioner", - Action = "experience-upgrade-to", Value = "unit-derro-executioner", + Action = "experience_upgrade_to", Value = "unit-derro-executioner", Key = "u", Hint = "~!Upgrade to Executioner", Popup = "popup_unit", ForUnit = {"unit-derro-thug"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "derro_shadowguard", - Action = "experience-upgrade-to", Value = "unit-derro-shadowguard", + Action = "experience_upgrade_to", Value = "unit-derro-shadowguard", Key = "u", Hint = "~!Upgrade to Shadowguard", Popup = "popup_unit", ForUnit = {"unit-derro-executioner"} } ) diff --git a/scripts/civilizations/goblin/buttons.lua b/scripts/civilizations/goblin/buttons.lua index 1136e9e863..b2dbe4528e 100644 --- a/scripts/civilizations/goblin/buttons.lua +++ b/scripts/civilizations/goblin/buttons.lua @@ -178,25 +178,25 @@ DefineButton( { Pos = 2, Icon = "icon-goblin-catapult-tower", } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-goblin-barbarian", - Action = "experience-upgrade-to", Value = "unit-goblin-barbarian", + Action = "experience_upgrade_to", Value = "unit-goblin-barbarian", Key = "u", Hint = "~!Upgrade to Barbarian", Popup = "popup_unit", ForUnit = {"unit-goblin-swordsman"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-goblin-warlord", - Action = "experience-upgrade-to", Value = "unit-goblin-warlord", + Action = "experience_upgrade_to", Value = "unit-goblin-warlord", Key = "u", Hint = "~!Upgrade to Warlord", Popup = "popup_unit", ForUnit = {"unit-goblin-barbarian"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-goblin-headhunter", - Action = "experience-upgrade-to", Value = "unit-goblin-headhunter", + Action = "experience_upgrade_to", Value = "unit-goblin-headhunter", Key = "u", Hint = "~!Upgrade to Headhunter", Popup = "popup_unit", ForUnit = {"unit-goblin-archer"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-goblin-shadowstalker", - Action = "experience-upgrade-to", Value = "unit-goblin-shadowstalker", + Action = "experience_upgrade_to", Value = "unit-goblin-shadowstalker", Key = "u", Hint = "~!Upgrade to Shadowstalker", Popup = "popup_unit", ForUnit = {"unit-goblin-headhunter"} } ) diff --git a/scripts/civilizations/goth/buttons.lua b/scripts/civilizations/goth/buttons.lua index 7ff0b5163a..c98082d2a1 100644 --- a/scripts/civilizations/goth/buttons.lua +++ b/scripts/civilizations/goth/buttons.lua @@ -28,13 +28,13 @@ -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-gothic-horse-rider", + Action = "experience_upgrade_to", Value = "unit-gothic-horse-rider", Key = "r", Hint = "Upgrade to Horse ~!Rider", Popup = "popup_unit", ForUnit = {"unit-teuton-swordsman"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-gothic-horse-lord", + Action = "experience_upgrade_to", Value = "unit-gothic-horse-lord", Key = "u", Hint = "~!Upgrade to Horse Lord", Popup = "popup_unit", ForUnit = {"unit-gothic-horse-rider"} } ) diff --git a/scripts/civilizations/kobold/buttons.lua b/scripts/civilizations/kobold/buttons.lua index 384cc0a080..b39a13b008 100644 --- a/scripts/civilizations/kobold/buttons.lua +++ b/scripts/civilizations/kobold/buttons.lua @@ -28,13 +28,13 @@ -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-kobold-slasher", - Action = "experience-upgrade-to", Value = "unit-kobold-slasher", + Action = "experience_upgrade_to", Value = "unit-kobold-slasher", Key = "u", Hint = "~!Upgrade to Slasher", Popup = "popup_unit", ForUnit = {"unit-kobold-footpad"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-kobold-champion", - Action = "experience-upgrade-to", Value = "unit-kobold-champion", + Action = "experience_upgrade_to", Value = "unit-kobold-champion", Key = "u", Hint = "~!Upgrade to Champion", Popup = "popup_unit", ForUnit = {"unit-kobold-slasher"} } ) diff --git a/scripts/civilizations/latin/buttons.lua b/scripts/civilizations/latin/buttons.lua index c898b919a8..42a7be44ad 100644 --- a/scripts/civilizations/latin/buttons.lua +++ b/scripts/civilizations/latin/buttons.lua @@ -28,13 +28,13 @@ -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-latin-veteran-legionary", + Action = "experience_upgrade_to", Value = "unit-latin-veteran-legionary", Key = "l", Hint = "Upgrade to Veteran ~!Legionary", Popup = "popup_unit", ForUnit = {"unit-latin-legionary"} }) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-latin-centurion", + Action = "experience_upgrade_to", Value = "unit-latin-centurion", Key = "c", Hint = "Upgrade to ~!Centurion", Popup = "popup_unit", ForUnit = {"unit-latin-veteran-legionary"} }) diff --git a/scripts/civilizations/norse/buttons.lua b/scripts/civilizations/norse/buttons.lua index 3c943a1a93..99c5d02a94 100644 --- a/scripts/civilizations/norse/buttons.lua +++ b/scripts/civilizations/norse/buttons.lua @@ -112,13 +112,13 @@ DefineButton( { Pos = 15, Level = "choose-individual-upgrade-level", Icon = "ico -- Upgrades --------------------------------------------------------- DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-norse-veteran-swordsman", + Action = "experience_upgrade_to", Value = "unit-norse-veteran-swordsman", Key = "w", Hint = "Upgrade to Veteran S~!wordsman", Popup = "popup_unit", ForUnit = {"unit-norse-swordsman", "unit-slavic-swordsman"} }) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-norse-heroic-swordsman", + Action = "experience_upgrade_to", Value = "unit-norse-heroic-swordsman", Key = "h", Hint = "Upgrade to ~!Hersir", Popup = "popup_unit", ForUnit = {"unit-norse-veteran-swordsman"} }) diff --git a/scripts/civilizations/suebi/characters.lua b/scripts/civilizations/suebi/characters.lua index 5186903bc0..3328ef5189 100644 --- a/scripts/civilizations/suebi/characters.lua +++ b/scripts/civilizations/suebi/characters.lua @@ -28,7 +28,7 @@ DefineCharacter("marbod", { Name = "Marbod", Gender = "male", - Type = "unit-teuton-heroic-swordsman", -- chieftain/king + Type = "unit_suebi_chieftain", -- chieftain/king Civilization = "suebi", Faction = "marcomannia", Trait = "upgrade-keen", @@ -52,7 +52,7 @@ DefineCharacter("marbod", { DefineCharacter("catualda", { -- Marcomannic noble who was exiled by Marbod, and later returned with an army behind him and deposed Marbod Name = "Catualda", Gender = "male", - Type = "unit-teuton-veteran-swordsman", -- noble + Type = "unit_suebi_veteran_swordsman", -- noble Civilization = "suebi", Faction = "marcomannia", Deities = {"odin", "tyr"}, @@ -70,7 +70,7 @@ DefineCharacter("catualda", { -- Marcomannic noble who was exiled by Marbod, and DefineCharacter("ballomar", { -- Source: "Ancient Warfare VII.6", 2013, pp. 29-32. Name = "Ballomar", Gender = "male", - Type = "unit-teuton-heroic-swordsman", -- chieftain + Type = "unit_suebi_chieftain", -- chieftain Civilization = "suebi", Faction = "marcomannia", Trait = "upgrade-intelligent", @@ -88,7 +88,7 @@ DefineCharacter("ballomar", { -- Source: "Ancient Warfare VII.6", 2013, pp. 29-3 DefineCharacter("hermeric", { -- Suebic chieftain who sacked central Galicia Name = "Hermeric", Gender = "male", - Type = "unit-teuton-heroic-swordsman", -- chieftain + Type = "unit_suebi_chieftain", -- chieftain Civilization = "suebi", Faction = "suebia", Deities = {"christian-god"}, @@ -103,7 +103,7 @@ DefineCharacter("hermeric", { -- Suebic chieftain who sacked central Galicia DefineCharacter("rechilas", { -- Suebic chieftain who defeated a Roman army led by Andevotus near the Singilis river in 438 AD Name = "Rechilas", Gender = "male", - Type = "unit-teuton-heroic-swordsman", -- chieftain + Type = "unit_suebi_chieftain", -- chieftain Civilization = "suebi", Faction = "galicia", Deities = {"christian-god"}, diff --git a/scripts/civilizations/suebi/upgrade.lua b/scripts/civilizations/suebi/upgrade.lua index 07dbf31bd1..4ceba72640 100644 --- a/scripts/civilizations/suebi/upgrade.lua +++ b/scripts/civilizations/suebi/upgrade.lua @@ -70,11 +70,19 @@ DefineModifier("upgrade-suebi-civilization", ) DefineModifier("upgrade-suebi-civilization", - {"apply-to", "unit-germanic-veteran-warrior"}, {"convert-to", "unit-teuton-veteran-swordsman"} + {"apply-to", "unit-germanic-veteran-warrior"}, {"convert-to", "unit_suebi_veteran_swordsman"} ) DefineModifier("upgrade-suebi-civilization", - {"apply-to", "unit-germanic-chieftain"}, {"convert-to", "unit-teuton-heroic-swordsman"} + {"apply-to", "unit-teuton-veteran-swordsman"}, {"convert-to", "unit_suebi_veteran_swordsman"} +) + +DefineModifier("upgrade-suebi-civilization", + {"apply-to", "unit-germanic-chieftain"}, {"convert-to", "unit_suebi_chieftain"} +) + +DefineModifier("upgrade-suebi-civilization", + {"apply-to", "unit-teuton-heroic-swordsman"}, {"convert-to", "unit_suebi_chieftain"} ) DefineModifier("upgrade-suebi-civilization", diff --git a/scripts/civilizations/suebi/upgrade_faction.lua b/scripts/civilizations/suebi/upgrade_faction.lua index f7eef99a80..7742c3eb08 100644 --- a/scripts/civilizations/suebi/upgrade_faction.lua +++ b/scripts/civilizations/suebi/upgrade_faction.lua @@ -28,30 +28,30 @@ DefineModifier("upgrade-faction-alamanni-tribe", {"HitPoints", 10}, {"Points", 10}, - {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"} + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"} ) DefineModifier("upgrade-faction-buri-tribe", {"Speed", 1}, {"Points", 10}, - {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"} + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"} ) DefineModifier("upgrade-faction-hermunduri-tribe", {"HitPoints", 5}, {"BasicDamage", 1}, {"Points", 10}, - {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"} + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"} ) DefineModifier("upgrade-faction-quadi-tribe", {"Armor", 2}, {"Points", 10}, - {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"} + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"} ) DefineModifier("upgrade-faction-galicia", {"BasicDamage", 2}, {"Points", 10}, - {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"} + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"} ) diff --git a/scripts/civilizations/teuton/buttons.lua b/scripts/civilizations/teuton/buttons.lua index db1362762f..8783d47b25 100644 --- a/scripts/civilizations/teuton/buttons.lua +++ b/scripts/civilizations/teuton/buttons.lua @@ -215,7 +215,8 @@ DefineButton( { Pos = 9, Level = "choose-individual-upgrade-level", Icon = "icon ForUnit = { "unit_teuton_worker", "unit-norse-swordsman", "unit-norse-veteran-swordsman", "unit-norse-heroic-swordsman", - "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", "unit_suebi_swordsman", + "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", + "unit_suebi_swordsman", "unit_suebi_veteran_swordsman", "unit_suebi_chieftain", "unit-frank-swordsman", "unit-frank-veteran-swordsman", "unit-frank-heroic-swordsman", "unit-latin-legionary", "unit-latin-veteran-legionary", "unit-latin-centurion", "unit-latin-javelineer", "unit-slavic-swordsman", @@ -235,7 +236,8 @@ DefineButton( { Pos = 10, Level = "choose-individual-upgrade-level", Icon = "ico Description = "Choose Wodan as your hero's major deity. +2 Damage for Archers, enables Far Sight spell for Gudjans. Incompatible with the Christianity religion or with the Thunor major deity.", ForUnit = { "unit_teuton_worker", - "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", "unit_suebi_swordsman", + "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", + "unit_suebi_swordsman", "unit_suebi_veteran_swordsman", "unit_suebi_chieftain", "unit-frank-swordsman", "unit-frank-veteran-swordsman", "unit-frank-heroic-swordsman", "unit-teuton-spearman", "unit-frank-spearman", "unit-teuton-archer", @@ -253,7 +255,8 @@ DefineButton( { Pos = 11, Level = "choose-individual-upgrade-level", Icon = "ico Description = "Choose Thunor as your hero's major deity. +2 Damage for sword infantry, enables Shocking Grasp spell for Gudjans. Incompatible with the Christianity religion or with the Wodan major deity.", ForUnit = { "unit_teuton_worker", - "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", "unit_suebi_swordsman", + "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", + "unit_suebi_swordsman", "unit_suebi_veteran_swordsman", "unit_suebi_chieftain", "unit-frank-swordsman", "unit-frank-veteran-swordsman", "unit-frank-heroic-swordsman", "unit-teuton-spearman", "unit-frank-spearman", "unit-teuton-archer", @@ -272,7 +275,8 @@ DefineButton( { Pos = 12, Level = "choose-individual-upgrade-level", Icon = "ico Description = "Choose Ziu as a minor deity for your hero. +2 Damage for sword infantry and enables Inspire spell for Gudjans. Incompatible with the Hella minor deity.", ForUnit = { "unit_teuton_worker", - "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", "unit_suebi_swordsman", + "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", + "unit_suebi_swordsman", "unit_suebi_veteran_swordsman", "unit_suebi_chieftain", "unit-frank-swordsman", "unit-frank-veteran-swordsman", "unit-frank-heroic-swordsman", "unit-teuton-spearman", "unit-frank-spearman", "unit-teuton-archer", @@ -301,7 +305,8 @@ DefineButton( { Pos = 14, Level = "choose-individual-upgrade-level", Icon = "ico Description = "Choose Hella as a minor deity for your hero. +20 Mana and enables Wither spell for Gudjans. Incompatible with the Ziu minor deity.", ForUnit = { "unit_teuton_worker", - "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", "unit_suebi_swordsman", + "unit-teuton-swordsman", "unit-teuton-veteran-swordsman", "unit-teuton-heroic-swordsman", + "unit_suebi_swordsman", "unit_suebi_veteran_swordsman", "unit_suebi_chieftain", "unit-frank-swordsman", "unit-frank-veteran-swordsman", "unit-frank-heroic-swordsman", "unit-teuton-spearman", "unit-frank-spearman", "unit-teuton-archer", @@ -340,25 +345,25 @@ DefineButton( { Pos = 2, Icon = "icon-teuton-catapult-tower", } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-teuton-veteran-swordsman", + Action = "experience_upgrade_to", Value = "unit-teuton-veteran-swordsman", Key = "w", Hint = "Upgrade to Veteran S~!wordsman", Popup = "popup_unit", - ForUnit = {"unit-teuton-swordsman", "unit_suebi_swordsman"} + ForUnit = {"unit-teuton-swordsman"} }) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-teuton-heroic-swordsman", + Action = "experience_upgrade_to", Value = "unit-teuton-heroic-swordsman", Key = "w", Hint = "Upgrade to ~!Warlord", Popup = "popup_unit", ForUnit = {"unit-teuton-veteran-swordsman"} }) DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-teuton-ritter", - Action = "experience-upgrade-to", Value = "unit-teuton-ritter", + Action = "experience_upgrade_to", Value = "unit-teuton-ritter", Key = "k", Hint = "Upgrade to ~!Knight", Popup = "popup_unit", ForUnit = {"unit-teuton-swordsman", "unit_suebi_swordsman", "unit-norse-swordsman", "unit-latin-legionary", "unit-slavic-swordsman"} } ) DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", - Action = "experience-upgrade-to", Value = "unit-teuton-knight-lord", + Action = "experience_upgrade_to", Value = "unit-teuton-knight-lord", Key = "k", Hint = "Upgrade to ~!Knight Lord", Popup = "popup_unit", ForUnit = {"unit-teuton-ritter"} } ) diff --git a/scripts/civilizations/teuton/upgrade.lua b/scripts/civilizations/teuton/upgrade.lua index 6a71d24664..0f5ec83678 100644 --- a/scripts/civilizations/teuton/upgrade.lua +++ b/scripts/civilizations/teuton/upgrade.lua @@ -88,7 +88,7 @@ DefineModifier("upgrade-teuton-spatha", {"BasicDamage", 2}, {"Points", 10}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-ritter"}, {"apply-to", "unit-teuton-knight-lord"}, {"apply-to", "unit-gothic-horse-rider"}, {"apply-to", "unit-gothic-horse-lord"}, @@ -106,7 +106,7 @@ DefineModifier("upgrade-teuton-iron-shield", {"Armor", 2}, {"Points", 10}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-frank-swordsman"}, {"apply-to", "unit-frank-veteran-swordsman"}, {"apply-to", "unit-frank-heroic-swordsman"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-spearman"}, {"apply-to", "unit-frank-spearman"}, @@ -225,10 +225,18 @@ DefineModifier("upgrade_teutonic_civilization", {"apply-to", "unit-germanic-veteran-warrior"}, {"convert-to", "unit-teuton-veteran-swordsman"} ) +DefineModifier("upgrade_teutonic_civilization", + {"apply-to", "unit_suebi_veteran_swordsman"}, {"convert-to", "unit-teuton-veteran-swordsman"} +) + DefineModifier("upgrade_teutonic_civilization", {"apply-to", "unit-germanic-chieftain"}, {"convert-to", "unit-teuton-heroic-swordsman"} ) +DefineModifier("upgrade_teutonic_civilization", + {"apply-to", "unit_suebi_chieftain"}, {"convert-to", "unit-teuton-heroic-swordsman"} +) + DefineModifier("upgrade_teutonic_civilization", {"apply-to", "unit-germanic-spearman"}, {"convert-to", "unit-teuton-spearman"} ) diff --git a/scripts/ui.lua b/scripts/ui.lua index d38ed08642..29c9081c12 100644 --- a/scripts/ui.lua +++ b/scripts/ui.lua @@ -1192,10 +1192,10 @@ if not (ui_loaded_first_time) then { Condition = {ExperienceRequirementsString = "only"}, HighlightColor = "yellow", More = {"Text", {Text = Concat(_("Requirements: "), TypeExperienceRequirementsString("Type")), MaxWidth = math.max(256, Video.Width / 5), Font = PopupDescriptionFont}} }, - { Margin = {1, 1}, Condition = {ButtonAction = "experience-upgrade-to"}, + { Margin = {1, 1}, Condition = {ButtonAction = "experience_upgrade_to"}, More = {"Line", {Width = 0, Height = 1, Color = PopupBorderColor}} }, - { Condition = {ButtonAction = "experience-upgrade-to"}, HighlightColor = "yellow", + { Condition = {ButtonAction = "experience_upgrade_to"}, HighlightColor = "yellow", More = {"Text", {Text = _("Requires 1 Level Up Point"), MaxWidth = Video.Width / 5, Font = PopupDescriptionFont}} }, { Condition = {Opponent = "false", Neutral = "false"}, Margin = {1, 1}, diff --git a/scripts/upgrade_deities.lua b/scripts/upgrade_deities.lua index fd1d86ad58..2b258be4f9 100644 --- a/scripts/upgrade_deities.lua +++ b/scripts/upgrade_deities.lua @@ -174,7 +174,7 @@ DefineModifier("upgrade-deity-thor", {"apply-to", "unit-germanic-warrior"}, {"apply-to", "unit-germanic-veteran-warrior"}, {"apply-to", "unit-germanic-chieftain"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-frank-swordsman"}, {"apply-to", "unit-frank-veteran-swordsman"}, {"apply-to", "unit-frank-heroic-swordsman"}, {"apply-to", "unit-dwarven-scout"}, {"apply-to", "unit-dwarven-pathfinder"}, {"apply-to", "unit-dwarven-explorer"}, {"apply-to", "unit-joruvellir-scout"}, {"apply-to", "unit-joruvellir-pathfinder"}, {"apply-to", "unit-joruvellir-explorer"} @@ -215,7 +215,7 @@ DefineModifier("upgrade-deity-tyr", {"apply-to", "unit-germanic-warrior"}, {"apply-to", "unit-germanic-veteran-warrior"}, {"apply-to", "unit-germanic-chieftain"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-frank-swordsman"}, {"apply-to", "unit-frank-veteran-swordsman"}, {"apply-to", "unit-frank-heroic-swordsman"}, {"apply-to", "unit-dwarven-axefighter"}, {"apply-to", "unit-dwarven-steelclad"}, {"apply-to", "unit-dwarven-thane"}, {"apply-to", "unit-surghan-mercenary-axefighter"}, {"apply-to", "unit-surghan-mercenary-steelclad"}, {"apply-to", "unit-surghan-mercenary-thane"} diff --git a/scripts/upgrade_military_doctrines.lua b/scripts/upgrade_military_doctrines.lua index c446817708..0ff32c8fa9 100644 --- a/scripts/upgrade_military_doctrines.lua +++ b/scripts/upgrade_military_doctrines.lua @@ -51,7 +51,7 @@ DefineModifier("upgrade-shield-wall", {"apply-to", "unit-germanic-spearman"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-frank-swordsman"}, {"apply-to", "unit-frank-veteran-swordsman"}, {"apply-to", "unit-frank-heroic-swordsman"}, {"apply-to", "unit-teuton-spearman"}, {"apply-to", "unit-frank-spearman"}, {"apply-to", "unit-latin-legionary"}, {"apply-to", "unit-latin-veteran-legionary"}, {"apply-to", "unit-latin-centurion"}, @@ -78,7 +78,7 @@ DefineModifier("upgrade-svinfylking", {"apply-to", "unit-germanic-spearman"}, {"apply-to", "unit-norse-swordsman"}, {"apply-to", "unit-norse-veteran-swordsman"}, {"apply-to", "unit-norse-heroic-swordsman"}, {"apply-to", "unit-teuton-swordsman"}, {"apply-to", "unit-teuton-veteran-swordsman"}, {"apply-to", "unit-teuton-heroic-swordsman"}, - {"apply-to", "unit_suebi_swordsman"}, + {"apply-to", "unit_suebi_swordsman"}, {"apply-to", "unit_suebi_veteran_swordsman"}, {"apply-to", "unit_suebi_chieftain"}, {"apply-to", "unit-frank-swordsman"}, {"apply-to", "unit-frank-veteran-swordsman"}, {"apply-to", "unit-frank-heroic-swordsman"}, {"apply-to", "unit-teuton-spearman"}, {"apply-to", "unit-frank-spearman"}, {"apply-to", "unit-latin-legionary"}, {"apply-to", "unit-latin-veteran-legionary"}, {"apply-to", "unit-latin-centurion"},