diff --git a/CHANGELOG.md b/CHANGELOG.md index 0587a28..f3f69e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,4 +27,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.0.1] Minor Fix - 18.07.2020 - Now Followers of Nagash have to control the Black Pyramid of Nagash to achieve a Short Victory -- Fixed a bug where Clan Mors had to destroy Clan Mors to achieve a victory \ No newline at end of file +- Fixed a bug where Clan Mors had to destroy Clan Mors to achieve a victory + +## [2.1.0] Major Update - 25.07.2020 + +- The number of special buildings required by The Blessed Dread to achieve a Short Victory has been reduced to 1 +- The number of special buildings required by The Blessed Dread to achieve a Long Victory has been reduced to 3 +- Controlling Western Badlands is not longer required by Knights of Caledor +- Building the White Tower of Hoeth landmark is no longer required by the Order of Loremasters to achieve a Short Victory +- Building the Black Citadel of Anlec is no longer required by Nagarythe to achieve a Short Victory +- Razing or looting Tor Yvresse, White Tower of Hoeth and Lothern is now required by Broken Axe to achieve a Short Victory +- Destroying Crooked Moon, Broken Nose and Skullsmasherz is no longer required by Grimgor's 'Ardboyz to achieve a Short Victory +- Destroying Naggarond and Cult of Please is no longer required by Eataine to achieve a Short Victory +- Razing or sacking Naggarond is now required by Eataine to achieve a Short Victory +- Getting Slann mages to level 20 is no longer required by Hexoatl +- Building the Great Halls of Nagashizzar is no longer required by Bonerattlaz +- Redone of Cult of Pleasure + - Building the Sanctum of Quintex is now required to achieve a victory + - Building 4 Court of the Dark Prince is now required to achieve a Short Victory + - Building 7 Court of the Dark Prince is now required to achieve a Long Victory + - Getting 1 Sorceress to lvl 20 is now required to achieve a Short Victory + - Getting 3 Sorceress to lvl 20 is now required to achieve a Long Victory + - Controlling Black Arks objectives have been removed +- Redone of The Bloody Handz + - Razing or looting Sartosa is not required to achieve a victory + - Razing or looting Copher, Fyrus and Al Haikk is no longer required to achive a Short Victory + - Having at least 80% Untained in Southern Badlands and Western Badlands is now required to achieve a Short Victory + - Having at least 80% Untained in Easter Badlands, Southern Badlands and Western Badlands is now required to achieve a Short Victory +- Redone of Vor Carstein's Long Victory conditions + - Destroying World Walkers and Wintertooth is no longer required + - Destroying Clan Moulder and Couronne is now required + - Controlling Southern Oblast and Fort Soll is now required +- Redone of The Golden Order + - Destroying Clan Spittel is now required to achieve a victory + - Destroying The Bloody Handz is no longer required to achieve a Short Victory + - Controlling Fort Soll, Black Mountains, Eastern Border Princes and Western Border Princes is now required to achieve a Long Victory +- Fixed bugs / Minor changes + - Renamed some Naggarond objective descriptions as they where wrong + - Now Bretonnia and Wood Elves are going to have Short/Ultimate victories instead of Short/Long + - Fixed a bug where Hexoatl had to control 14 provinces instead of 2 to achieve a Short Victory + - Solved a bug where Bonerattlaz long victory conditions remained vanilla + - Solved a bug where Durthu's and Orion's victory conditions where switched + - Fixed a bug where Tlaqua had to build Basic Military instead of Ripperdactyl Hatcheries to achieve a victory + - Solved a bug where Tlaqua has to build Star Chambers to achieve a Long Victory + - Fixed a bug where Cult of Sotek long victory conditions remained vanilla + - Solved a bug where Itza long victory conditions remained vanilla + - Fixed a bug where Beastmen final battle never happened + - Solved a bug where some unit requirements numbers where weird and different from the docs diff --git a/dist/vco2_main.pack b/dist/vco2_main.pack index 0408fbf..e7965ae 100644 Binary files a/dist/vco2_main.pack and b/dist/vco2_main.pack differ diff --git a/docs/factions/bretonnia/README.md b/docs/factions/bretonnia/README.md index a1c342b..98c4bde 100644 --- a/docs/factions/bretonnia/README.md +++ b/docs/factions/bretonnia/README.md @@ -8,7 +8,7 @@ * Bastonne, Borderlaux, Carcasone, Couronne, Forest of Arden, Lyonese, Parravon * Destroy factions: * Mousillon, The Barrow Legion, World Walkers, Wintertooth, Vanaheimlings -* **Long Victory Conditions**: +* **Ultimate Victory Conditions**: * Attain 2000 Chivalry * Conquer provinces: * Bastonne, Borderlaux, Carcasone, Couronne, Forest of Arden, Lyonese, Parravon @@ -24,7 +24,7 @@ * Attain 2000 Chivalry * Destroy factions: * Pirates of Sartosa, The Awakened, The Dreadfleet, The Drowned, All Pirate Rogue Armies -* **Long Victory Conditions**: +* **Ultimate Victory Conditions**: * Attain 2000 Chivalry * Destroy factions: * Pirates of Sartosa, The Awakened, The Dreadfleet, The Drowned, The Blessed Dread, All Pirate Rogue Armies @@ -39,7 +39,7 @@ * Get a level 20 damsel * Destroy factions: - Clan Skryre, Clan Spittel, Skullmasherz, Crooked Moon, Mousillon, The Barrow Legion -* **Long Victory Conditions**: +* **Ultimate Victory Conditions**: * Attain 2000 Chivalry * Get 3 level 20 damsels * Destroy factions: @@ -51,7 +51,7 @@ ### Chevaliers de Lyonesse -* **Long Victory Conditions**: +* **Ultimate Victory Conditions**: * Attain 2000 Chivalry * Destroy factions: * Dune Kingdoms, Followers of Nagash, Khemri, Numas, Rakaph Dynasty, The Sentinels, Necrarch Brotherhood diff --git a/docs/factions/dark-elves/README.md b/docs/factions/dark-elves/README.md index 2588848..38ac425 100644 --- a/docs/factions/dark-elves/README.md +++ b/docs/factions/dark-elves/README.md @@ -31,16 +31,19 @@ * **Short Victory Conditions**: * Destroy factions: * Nagarythe, Exiles of Nehek, Clan Rictus - * Own 3 Black Arks + * Build the Sanctum of Quintex + * Build 4 Courts of the Dark Prince + * Get 1 Sorceress to lvl 20 * Capture 10,000 battle captives * **Long Victory Conditions**: * Conquer, ally with or assimilate all provinces of Ulthuan: * Eataine, Yvresse, Saphery, Cothique, Avelorn, Chrace, Nagarythe, Ellyrion, Tiranoc, Caledor, Eagle Gate, Griffon Gate, Unicorn Gate, Phoenix Gate - * Construct the Dark Convent of Sorcery - * Own 5 Black Arks + * Build the Dark Convent of Sorcery and the Sanctum of Quintex + * Build 7 Courts of the Dark Prince * Destroy factions: * Averlorn, Nagarythe, Exiles of Nehek, Clan Rictus, Hexoatl, The Drowned, Eataine, Har Ganeth + * Get 3 Sorceress to lvl 20 * Capture 25000 battle captives ### The Blessed Dread @@ -48,7 +51,7 @@ * **Short Victory Conditions**: * Destroy factions: * Vampire Coast, Order of Loremasters, Clan Pestilenes - * Construct 2 of the following special buildings: + * Construct 1 of the following special buildings: * Fiery Pits of Sacrifice, Slave Traders' Palaces, The Black Tower of Malekith, Vandalised Court of the Everqueen, The Maelstrom (Raging), Sanctum of Quintex, Shrine of Widowmaker * Capture 20000 battle captives @@ -57,7 +60,7 @@ * **Long Victory Conditions**: * Destroy factions: * Vampire Coast, Order of Loremasters, Clan Pestilenes, Eataine, Avelorn, Noctilus, Nagarythe - * Construct 5 of the following special buildings: + * Construct 3 of the following special buildings: * Fiery Pits of Sacrifice, Slave Traders' Palaces, The Black Tower of Malekith, Vandalised Court of the Everqueen, The Maelstrom (Raging), Sanctum of Quintex, Shrine of Widowmaker * Capture 40000 battle captives diff --git a/docs/factions/empire/README.md b/docs/factions/empire/README.md index 95b1cf3..f544798 100644 --- a/docs/factions/empire/README.md +++ b/docs/factions/empire/README.md @@ -23,15 +23,15 @@ * Control Solland and Fort Soll * Reconquer Sylvannia * Destroy factions - * Black Venom, Crooked Moon, The Bloody Handz, Clan Skyre, Pirates of Sartosa + * Black Venom, Crooked Moon, Clan Skyre, Clan Spittel, Pirates of Sartosa * Build the Nuln Gunnery School * **Long Victory Conditions**: * Conquer, ally with or assimilate all provinces of the Empire - * Control Fort Soll + * Control Fort Soll, Black Mountains, Eastern Border Princes and Western Border Princes * Reconquer Sylvannia * Destroy factions - * Black Venom, Broken Nose, Crooked Moon, Greenskins, The Bloody Handz, Clan Kreepus, Clan Skyre, Pirates of - Sartosa, Sylvannia, Von Carstein + * Black Venom, Broken Nose, Crooked Moon, Greenskins, The Bloody Handz, Clan Kreepus, Clan Skyre, Clan Spittel, + Pirates of Sartosa, Sylvannia, Von Carstein * Build the Nuln Gunnery School * Defeat the Chaos Invasion * Defeat Archaon diff --git a/docs/factions/greenskins/README.md b/docs/factions/greenskins/README.md index 11307c7..82d2584 100644 --- a/docs/factions/greenskins/README.md +++ b/docs/factions/greenskins/README.md @@ -4,8 +4,8 @@ * **Short Victory Conditions**: * Conquer or assimilate all of the Greenskin tribes - * Black Venom, Bloody Spearz, Broken Nose, Crooken Moon, Necksnappers, Orcs of The Bloody Handz, Red Eye, Red - Fangs, Scabby Eye, Skullmasherz, Teef Snatchaz, Top Knotz + * Black Venom, Bloody Spearz, Necksnappers, Orcs of The Bloody Handz, Red Eye, Red Fangs, Scabby Eye, Teef + Snatchaz, Top Knotz * Loot or sack at least 35 settlements including: * Karak Kadrin, Karaz-a-Karak * Build the Black Orc Headquarters @@ -30,7 +30,6 @@ Order, Wissenland, Kislev and Karak Kadrin * Occupy/loot/raze/sack at least 50 settlements * Control the Broken Teeth province - * Build the Great Halls of Nagashizzar * Earn 20000 from raiding * Defeat Archaon @@ -39,8 +38,10 @@ * **Short Victory Conditions**: * Control provinces: * Southern Badlands, Western Badlands + * Have at least 80% Untained in the following provinces: + * Southern Badlands, Western Badlands * Loot or at sack settlements: - * Akendorf, Al-Haikk, Copher, Fyrus, Luccini, Matorca, Miragliano, Myrmidens, Zandri, Zvorak + * Akendorf, Luccini, Matorca, Miragliano, Myrmidens, Sartosa, Zandri, Zvorak * Destroy factions: * Border Princess, Tilea, Strygos Empire * Control at least two of these regions: @@ -51,8 +52,10 @@ * **Long Victory Conditions**: * Control provinces: * Eastern Badlands, Southern Badlands, Western Badlands + * Have at least 80% Untained in the following provinces: + * Eastern Badlands, Southern Badlands, Western Badlands * Loot or at sack settlements: - * Akendorf, Al-Haikk, Copher, Fyrus, Lucini, Matorca, Miragliano, Myrmidens, Zandri, Zvorak + * Akendorf, Al-Haikk, Copher, Fyrus, Lucini, Matorca, Miragliano, Myrmidens, Sartosa, Zandri, Zvorak * Destroy factions: * Border Princess, Estalia, Tilea, Clan Skryre, Khemri, Pirates of Sartosa, Strygos Empire * Control at least four of these regions: @@ -81,6 +84,8 @@ * **Short Victory Conditions**: * Complete 3 Chapter Objectives * Have at least 100 Waaagh! + * Loot or raze settlements: + * Lothern, Tor Yvresse, Tower of Hoeth * Earn 15000 from raiding * Destroy Yvresse * Own 7 chariots diff --git a/docs/factions/high-elves/README.md b/docs/factions/high-elves/README.md index f6bd333..a5c1571 100644 --- a/docs/factions/high-elves/README.md +++ b/docs/factions/high-elves/README.md @@ -4,8 +4,7 @@ * **Short Victory Conditions**: * Conquer, ally with or assimilate all provinces of Ulthuan - * Destroy factions: - * Cult of Pleasure, Naggarond + * Raze or sack Naggarond * Construct the Sacred Flame of Asuryan and the Gates of Lothern * **Long Victory Conditions**: * Conquer, ally with or assimilate all provinces of Ulthuan @@ -19,7 +18,6 @@ * **Short Victory Conditions**: * Hold 12 settlements * Control the Saphery province - * Construct the White Tower of Hoeth * Construct a Tower of Mages * Destroy factions: * The Blessed Dread, Vampire Coast, Clan Pestilens @@ -39,7 +37,6 @@ * Nagarythe, Iron Mountains, Titan Peaks, The Road of Skulls, Doom Glades * Destroy factions * Bleak Holds, Naggarond, Clar Karond - * Construct the Black Citadel of Anlec * Own 2 Moon Dragons * **Long Victory Conditions**: * Conquer four of the following provinces @@ -68,7 +65,7 @@ * **Short Victory Conditions**: * Complete 3 Missions * Control provinces: - * Western Badlands, Gnoblar Country, Dragon Isles, The Wolf Lands, Caledor + * Gnoblar Country, Dragon Isles, The Wolf Lands, Caledor * Destroy factions * Clan Eshin, Greenskins, Hag Graef * Construct 3 of the following buildings: @@ -81,7 +78,7 @@ * Complete 5 Missions * Conquer, ally with or assimilate all provinces of Ulthuan * Control provinces: - * Western Badlands, Gnoblar Country, Dragon Isles, The Wolf Lands, Caledor + * Gnoblar Country, Dragon Isles, The Wolf Lands, Caledor * Destroy factions * Clan Eshin, Greenskins, Hag Graef, Clan Mors * Construct 8 of the following buildings: diff --git a/docs/factions/lizardmen/README.md b/docs/factions/lizardmen/README.md index d0f3e63..bfc245b 100644 --- a/docs/factions/lizardmen/README.md +++ b/docs/factions/lizardmen/README.md @@ -12,7 +12,6 @@ * Construct 3 Star Chambers * Build the Stellar Pyramids of the Southern Skies * Build 4 Temple-Nexus - * Get a level 20 Slann Mage-Priest * Own 7 Temple Guards * **Long Victory Conditions**: * Conquer, ally with or assimilate all provinces of Lustria @@ -23,7 +22,6 @@ * Construct The Chamber of Visions * Build the Stellar Pyramids of the Southern Skies * Build 7 Temple-Nexus - * Get 3 level 20 Slann Mage-Priest * Own 15 Temple Guards * Defeat the Chaos Invasion * Defeat Archaon diff --git a/docs/factions/vampire-counts/README.md b/docs/factions/vampire-counts/README.md index 86c33f5..dae9934 100644 --- a/docs/factions/vampire-counts/README.md +++ b/docs/factions/vampire-counts/README.md @@ -18,9 +18,10 @@ * Build the Altdorf Landmark and the Von Carstein Court Hall * **Long Victory Conditions**: * Conquer, ally with or assimilate all provinces of the Empire and Sylvannia - * Control Mousillon + * Control Southern Oblast and Fort Soll + * Control Mousillon * Destroy factions: - * The Empire, Sylvania, Wintertooth, World Walkers + * Clan Moulder, Couronne, The Empire, Sylvania * Build the Altdorf Landmark and the Von Carstein Court Hall * Defeat the Chaos Invasion * Defeat Archaon diff --git a/docs/factions/wood-elves/README.md b/docs/factions/wood-elves/README.md index d5fcbb5..507adf2 100644 --- a/docs/factions/wood-elves/README.md +++ b/docs/factions/wood-elves/README.md @@ -11,7 +11,7 @@ * Complete the final battle * Own at least 60 units * Own at least 7 sisters of the thorn and/or wild riders (shielded/unshielded) -* **Long Victory Conditions**: +* **Ultimate Victory Conditions**: * Control Athel Loren, the Laurelorn Forest and the Oreon's Camp * Athel Loren has to be at least 80% untained * Destroy factions: @@ -34,7 +34,7 @@ * Complete the final battle * Own at least 40 units * Own at least 10 tree units -* **Long Victory Conditions**: +* **Ultimate Victory Conditions**: * Control Athel Loren, the Laurelorn Forest and Avelorn * Athel Loren has to be at least 80% untained * Destroy factions: diff --git a/src/script/campaign/mod/vco2_main_listeners.lua b/src/script/campaign/mod/vco2_main_listeners.lua index 210820d..3693617 100644 --- a/src/script/campaign/mod/vco2_main_listeners.lua +++ b/src/script/campaign/mod/vco2_main_listeners.lua @@ -1,3 +1,22 @@ +function vco_add_beastmen_final_battle_listener() + if not cm:get_saved_value("bst_final_battle_quest") then + core:add_listener( + "Beastmen_Final_Battle", + "FactionTurnStart", + function(context) + local faction = context:faction(); + + return faction:is_human() and faction:name() == "wh_dlc03_bst_beastmen" and are_all_beastmen_final_battle_factions_dead(); + end, + function() + cm:trigger_mission("wh_dlc03_bst_beastmen", "wh_dlc03_qb_bst_the_final_battle", true); + cm:set_saved_value("bst_final_battle_quest", true); + end, + false + ); + end; +end; + function vco_check_bretonnia_chivalry(faction) local chivalry_amount = faction:total_food(); @@ -75,6 +94,23 @@ end function add_listeners() out("#### Adding Victory Conditions Overhaul Listeners ####"); if cm:is_multiplayer() == false then + out("#### Adding Beastmen Victory Conditions Overhaul Listeners ####"); + if not cm:get_saved_value("bst_final_battle_quest") then + core:add_listener( + "vco_beastmen_turn_50_start", + "FactionTurnStart", + function(context) + local faction = context:faction(); + return faction:is_human() and faction:name() == "wh_dlc03_bst_beastmen" and cm:turn_number() >= 50; + end, + function() + cm:trigger_mission("wh_dlc03_bst_beastmen", "wh_dlc03_qb_bst_the_final_battle", true); + cm:set_saved_value("bst_final_battle_quest", true); + end, + false + ); + end; + out("#### Adding Bretonnia Victory Conditions Overhaul Listeners ####"); core:add_listener( "vco_bretonnia_faction_turn_start", diff --git a/src/script/vco2_main/factions/wh2_dlc09_skv_clan_rictus/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc09_skv_clan_rictus/campaigns/main_warhammer/missions.lua index 12d0087..81b5346 100644 --- a/src/script/vco2_main/factions/wh2_dlc09_skv_clan_rictus/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc09_skv_clan_rictus/campaigns/main_warhammer/missions.lua @@ -28,7 +28,6 @@ local missions = { { type OWN_N_UNITS; total 26; - additive; unit wh2_main_skv_inf_stormvermin_0; unit wh2_main_skv_inf_stormvermin_1; unit wh2_dlc12_skv_inf_stormvermin_ror_0; @@ -81,7 +80,6 @@ local missions = { { type OWN_N_UNITS; total 39; - additive; unit wh2_main_skv_inf_stormvermin_0; unit wh2_main_skv_inf_stormvermin_1; unit wh2_dlc12_skv_inf_stormvermin_ror_0; diff --git a/src/script/vco2_main/factions/wh2_dlc09_tmb_followers_of_nagash/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc09_tmb_followers_of_nagash/campaigns/main_warhammer/missions.lua index 2e56c79..f18e566 100644 --- a/src/script/vco2_main/factions/wh2_dlc09_tmb_followers_of_nagash/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc09_tmb_followers_of_nagash/campaigns/main_warhammer/missions.lua @@ -43,7 +43,6 @@ local missions = { { type OWN_N_UNITS; total 7; - additive; unit wh2_dlc09_tmb_mon_dire_wolves; unit wh2_dlc09_tmb_mon_fell_bats; unit wh2_dlc09_tmb_inf_crypt_ghouls; @@ -105,7 +104,6 @@ local missions = { { type OWN_N_UNITS; total 15; - additive; unit wh2_dlc09_tmb_mon_dire_wolves; unit wh2_dlc09_tmb_mon_fell_bats; unit wh2_dlc09_tmb_inf_crypt_ghouls; diff --git a/src/script/vco2_main/factions/wh2_dlc09_tmb_khemri/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc09_tmb_khemri/campaigns/main_warhammer/missions.lua index dbeef2d..8d15e7f 100644 --- a/src/script/vco2_main/factions/wh2_dlc09_tmb_khemri/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc09_tmb_khemri/campaigns/main_warhammer/missions.lua @@ -35,7 +35,6 @@ local missions = { { type OWN_N_UNITS; total 3; - additive; unit wh2_dlc09_tmb_veh_khemrian_warsphinx_0; } @@ -103,7 +102,6 @@ local missions = { { type OWN_N_UNITS; total 10; - additive; unit wh2_dlc09_tmb_veh_khemrian_warsphinx_0; unit wh2_dlc09_tmb_mon_heirotitan_0; unit wh2_dlc09_tmb_mon_necrosphinx_0; diff --git a/src/script/vco2_main/factions/wh2_dlc09_tmb_lybaras/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc09_tmb_lybaras/campaigns/main_warhammer/missions.lua index 2fb93ce..9036253 100644 --- a/src/script/vco2_main/factions/wh2_dlc09_tmb_lybaras/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc09_tmb_lybaras/campaigns/main_warhammer/missions.lua @@ -38,7 +38,6 @@ local missions = { { type OWN_N_UNITS; total 7; - additive; unit wh2_dlc09_tmb_cav_necropolis_knights_0; unit wh2_dlc09_tmb_cav_necropolis_knights_1; unit wh2_dlc09_tmb_cav_necropolis_knights_ror; @@ -101,7 +100,6 @@ local missions = { { type OWN_N_UNITS; total 15; - additive; unit wh2_dlc09_tmb_cav_necropolis_knights_0; unit wh2_dlc09_tmb_cav_necropolis_knights_1; unit wh2_dlc09_tmb_cav_necropolis_knights_ror; diff --git a/src/script/vco2_main/factions/wh2_dlc11_cst_noctilus/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc11_cst_noctilus/campaigns/main_warhammer/missions.lua index 5a990aa..00775e8 100644 --- a/src/script/vco2_main/factions/wh2_dlc11_cst_noctilus/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc11_cst_noctilus/campaigns/main_warhammer/missions.lua @@ -12,7 +12,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 15000; - additive; } objective { @@ -44,7 +43,6 @@ local missions = { { type OWN_N_UNITS; total 3; - additive; unit wh2_dlc11_cst_mon_necrofex_colossus_0; } @@ -68,7 +66,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 25000; - additive; } objective { @@ -108,7 +105,6 @@ local missions = { { type OWN_N_UNITS; total 6; - additive; unit wh2_dlc11_cst_mon_necrofex_colossus_0; } diff --git a/src/script/vco2_main/factions/wh2_dlc11_cst_pirates_of_sartosa/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc11_cst_pirates_of_sartosa/campaigns/main_warhammer/missions.lua index 895bb92..5bfc370 100644 --- a/src/script/vco2_main/factions/wh2_dlc11_cst_pirates_of_sartosa/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc11_cst_pirates_of_sartosa/campaigns/main_warhammer/missions.lua @@ -12,7 +12,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 15000; - additive; } objective { @@ -74,7 +73,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 25000; - additive; } objective { diff --git a/src/script/vco2_main/factions/wh2_dlc11_cst_the_drowned/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc11_cst_the_drowned/campaigns/main_warhammer/missions.lua index 915b983..4ade50c 100644 --- a/src/script/vco2_main/factions/wh2_dlc11_cst_the_drowned/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc11_cst_the_drowned/campaigns/main_warhammer/missions.lua @@ -12,7 +12,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 15000; - additive; } objective { @@ -52,7 +51,6 @@ local missions = { { type OWN_N_UNITS; total 10; - additive; unit wh2_dlc11_cst_inf_syreens; unit wh2_dlc11_cst_mon_mournguls_0; } @@ -83,7 +81,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 25000; - additive; } objective { @@ -130,7 +127,6 @@ local missions = { { type OWN_N_UNITS; total 20; - additive; unit wh2_dlc11_cst_inf_syreens; unit wh2_dlc11_cst_mon_mournguls_0; } diff --git a/src/script/vco2_main/factions/wh2_dlc11_cst_vampire_coast/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc11_cst_vampire_coast/campaigns/main_warhammer/missions.lua index ee5cafb..5327971 100644 --- a/src/script/vco2_main/factions/wh2_dlc11_cst_vampire_coast/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc11_cst_vampire_coast/campaigns/main_warhammer/missions.lua @@ -12,7 +12,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 15000; - additive; } objective { @@ -84,7 +83,6 @@ local missions = { type HAVE_AT_LEAST_X_OF_A_POOLED_RESOURCE; pooled_resource cst_infamy; total 25000; - additive; } objective { diff --git a/src/script/vco2_main/factions/wh2_dlc11_def_the_blessed_dread/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc11_def_the_blessed_dread/campaigns/main_warhammer/missions.lua index 6b30964..508a089 100644 --- a/src/script/vco2_main/factions/wh2_dlc11_def_the_blessed_dread/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc11_def_the_blessed_dread/campaigns/main_warhammer/missions.lua @@ -21,7 +21,7 @@ local missions = { { type CONSTRUCT_N_BUILDINGS_FROM; faction wh2_dlc11_def_the_blessed_dread; - total 2; + total 1; building_level wh2_main_special_har_ganeth_temple_of_khaine_1; building_level wh2_main_special_karond_kar_slavers; building_level wh2_main_special_naggarond_witch_king_def; @@ -45,7 +45,6 @@ local missions = { { type OWN_N_UNITS; total 20; - additive; unit wh2_main_def_inf_black_ark_corsairs_0; unit wh2_main_def_inf_black_ark_corsairs_1; } @@ -83,7 +82,7 @@ local missions = { { type CONSTRUCT_N_BUILDINGS_FROM; faction wh2_dlc11_def_the_blessed_dread; - total 5; + total 3; building_level wh2_main_special_har_ganeth_temple_of_khaine_1; building_level wh2_main_special_karond_kar_slavers; building_level wh2_main_special_naggarond_witch_king_def; @@ -109,7 +108,6 @@ local missions = { { type OWN_N_UNITS; total 30; - additive; unit wh2_main_def_inf_black_ark_corsairs_0; unit wh2_main_def_inf_black_ark_corsairs_1; } diff --git a/src/script/vco2_main/factions/wh2_dlc12_lzd_cult_of_sotek/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc12_lzd_cult_of_sotek/campaigns/main_warhammer/missions.lua index fe01ed9..ed7959e 100644 --- a/src/script/vco2_main/factions/wh2_dlc12_lzd_cult_of_sotek/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc12_lzd_cult_of_sotek/campaigns/main_warhammer/missions.lua @@ -54,7 +54,6 @@ local missions = { { type OWN_N_UNITS; total 40; - additive; unit wh2_main_lzd_inf_skink_cohort_0; unit wh2_dlc12_lzd_inf_skink_red_crested_0; unit wh2_dlc12_lzd_inf_skink_red_crested_ror_0; @@ -142,7 +141,6 @@ local missions = { { type OWN_N_UNITS; total 60; - additive; unit wh2_main_lzd_inf_skink_cohort_0; unit wh2_dlc12_lzd_inf_skink_red_crested_0; unit wh2_dlc12_lzd_inf_skink_red_crested_ror_0; @@ -182,11 +180,6 @@ local missions = { { game_victory; } - - payload - { - game_victory; - } } } ]] diff --git a/src/script/vco2_main/factions/wh2_dlc13_emp_golden_order/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc13_emp_golden_order/campaigns/main_warhammer/missions.lua index 773f02b..11b4a9c 100644 --- a/src/script/vco2_main/factions/wh2_dlc13_emp_golden_order/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc13_emp_golden_order/campaigns/main_warhammer/missions.lua @@ -27,9 +27,9 @@ local missions = { type DESTROY_FACTION; faction wh_main_grn_black_venom; faction wh_main_grn_crooked_moon; - faction wh_main_grn_orcs_of_the_bloody_hand; faction wh2_main_skv_clan_skyre; + faction wh2_main_skv_clan_spittel; faction wh2_dlc11_cst_pirates_of_sartosa; confederation_valid; @@ -76,6 +76,15 @@ local missions = { province wh2_main_solland; } objective + { + type CONTROL_N_PROVINCES_INCLUDING; + total 4; + province wh2_main_fort_soll; + province wh_main_black_mountains; + province wh_main_eastern_border_princes; + province wh_main_western_border_princes; + } + objective { type CONTROL_N_PROVINCES_INCLUDING; total 2; @@ -94,6 +103,7 @@ local missions = { faction wh2_dlc15_skv_clan_kreepus; faction wh2_main_skv_clan_skyre; + faction wh2_main_skv_clan_spittel; faction wh2_dlc11_cst_pirates_of_sartosa; diff --git a/src/script/vco2_main/factions/wh2_dlc13_lzd_spirits_of_the_jungle/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc13_lzd_spirits_of_the_jungle/campaigns/main_warhammer/missions.lua index 99cea14..73370ee 100644 --- a/src/script/vco2_main/factions/wh2_dlc13_lzd_spirits_of_the_jungle/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc13_lzd_spirits_of_the_jungle/campaigns/main_warhammer/missions.lua @@ -51,7 +51,6 @@ local missions = { { type OWN_N_UNITS; total 7; - additive; unit wh2_main_lzd_mon_kroxigors; unit wh2_main_lzd_mon_kroxigors_nakai; unit wh2_main_lzd_mon_kroxigors_blessed; @@ -121,7 +120,6 @@ local missions = { { type OWN_N_UNITS; total 15; - additive; unit wh2_main_lzd_mon_kroxigors; unit wh2_main_lzd_mon_kroxigors_nakai; unit wh2_main_lzd_mon_kroxigors_blessed; diff --git a/src/script/vco2_main/factions/wh2_dlc15_grn_bonerattlaz/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc15_grn_bonerattlaz/campaigns/main_warhammer/missions.lua index cea5d20..86e56a8 100644 --- a/src/script/vco2_main/factions/wh2_dlc15_grn_bonerattlaz/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc15_grn_bonerattlaz/campaigns/main_warhammer/missions.lua @@ -73,14 +73,7 @@ local missions = { { type CONTROL_N_REGIONS_INCLUDING; total 1; - region wh2_main_the_broken_teeth; - } - objective - { - type CONSTRUCT_N_OF_A_BUILDING; - faction wh2_dlc15_grn_bonerattlaz; - total 1; - building_level wh2_dlc14_special_nagashizzar_other; + region wh2_main_the_broken_teeth_nagashizar; } objective { diff --git a/src/script/vco2_main/factions/wh2_dlc15_grn_broken_axe/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc15_grn_broken_axe/campaigns/main_warhammer/missions.lua index 1a8041e..b92986c 100644 --- a/src/script/vco2_main/factions/wh2_dlc15_grn_broken_axe/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc15_grn_broken_axe/campaigns/main_warhammer/missions.lua @@ -21,6 +21,14 @@ local missions = { total 100; } objective + { + type RAZE_OR_SACK_N_DIFFERENT_SETTLEMENTS_INCLUDING; + total 3; + region wh2_main_eataine_lothern; + region wh2_main_yvresse_tor_yvresse; + region wh2_main_saphery_tower_of_hoeth; + } + objective { type EARN_X_AMOUNT_FROM_RAIDING; total 15000; @@ -35,7 +43,6 @@ local missions = { { type OWN_N_UNITS; total 7; - additive; unit wh_main_grn_cav_goblin_wolf_chariot; unit wh_dlc06_grn_cav_teef_robbers_0; unit wh_main_grn_cav_orc_boar_chariot; @@ -74,16 +81,6 @@ local missions = { total 100; } objective - { - type EARN_X_AMOUNT_FROM_RAIDING; - total 30000; - } - objective - { - type DESTROY_FACTION; - faction wh2_main_hef_yvresse; - confederation_valid; - }objective { type RAZE_OR_SACK_N_DIFFERENT_SETTLEMENTS_INCLUDING; total 10; @@ -99,10 +96,20 @@ local missions = { region wh2_main_saphery_tower_of_hoeth; } objective + { + type EARN_X_AMOUNT_FROM_RAIDING; + total 30000; + } + objective + { + type DESTROY_FACTION; + faction wh2_main_hef_yvresse; + confederation_valid; + } + objective { type OWN_N_UNITS; total 15; - additive; unit wh_main_grn_cav_goblin_wolf_chariot; unit wh_dlc06_grn_cav_teef_robbers_0; unit wh_main_grn_cav_orc_boar_chariot; diff --git a/src/script/vco2_main/factions/wh2_dlc15_hef_imrik/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_dlc15_hef_imrik/campaigns/main_warhammer/missions.lua index ed9ad7c..e5bb18d 100644 --- a/src/script/vco2_main/factions/wh2_dlc15_hef_imrik/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_dlc15_hef_imrik/campaigns/main_warhammer/missions.lua @@ -17,8 +17,7 @@ local missions = { objective { type CONTROL_N_PROVINCES_INCLUDING; - total 5; - province wh_main_western_badlands; + total 4; province wh2_main_gnoblar_country; province wh2_main_dragon_isles; province wh2_main_the_wolf_lands; @@ -52,7 +51,6 @@ local missions = { { type OWN_N_UNITS; total 5; - additive; unit wh2_main_hef_mon_sun_dragon; unit wh2_dlc10_hef_inf_the_silverpelts_ror_0; unit wh2_main_hef_inf_phoenix_guard; @@ -90,7 +88,7 @@ local missions = { objective { type CONTROL_N_PROVINCES_INCLUDING; - total 18; + total 17; province wh2_main_eataine; province wh2_main_yvresse; province wh2_main_saphery; @@ -105,7 +103,6 @@ local missions = { province wh2_main_griffon_gate; province wh2_main_unicorn_gate; province wh2_main_phoenix_gate; - province wh_main_western_badlands; province wh2_main_gnoblar_country; province wh2_main_dragon_isles; province wh2_main_the_wolf_lands; @@ -139,7 +136,6 @@ local missions = { { type OWN_N_UNITS; total 15; - additive; unit wh2_main_hef_mon_sun_dragon; unit wh2_dlc10_hef_inf_the_silverpelts_ror_0; unit wh2_main_hef_inf_phoenix_guard; diff --git a/src/script/vco2_main/factions/wh2_main_def_cult_of_pleasure/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_def_cult_of_pleasure/campaigns/main_warhammer/missions.lua index f1a3019..b31613d 100644 --- a/src/script/vco2_main/factions/wh2_main_def_cult_of_pleasure/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_def_cult_of_pleasure/campaigns/main_warhammer/missions.lua @@ -19,9 +19,24 @@ local missions = { } objective { - type HAVE_N_AGENTS_OF_TYPE; - total 3; - agent_subtype wh2_main_def_black_ark; + type CONSTRUCT_N_BUILDINGS_INCLUDING; + faction wh2_main_def_cult_of_pleasure; + total 1; + building_level wh2_main_special_quintex_2; + } + objective + { + type CONSTRUCT_N_OF_A_BUILDING; + faction wh2_main_def_cult_of_pleasure; + total 4; + building_level wh2_main_def_pleasure_cult_5; + } + objective + { + type ACHIEVE_CHARACTER_RANK; + total 1; + total2 20; + agent wizard; } objective { @@ -66,9 +81,18 @@ local missions = { } objective { - type HAVE_N_AGENTS_OF_TYPE; - total 5; - agent_subtype wh2_main_def_black_ark; + type CONSTRUCT_N_BUILDINGS_INCLUDING; + faction wh2_main_def_cult_of_pleasure; + total 2; + building_level wh2_main_special_quintex_2; + building_level wh2_main_special_ghrond_convent_of_sorcery_2; + } + objective + { + type CONSTRUCT_N_OF_A_BUILDING; + faction wh2_main_def_cult_of_pleasure; + total 7; + building_level wh2_main_def_pleasure_cult_5; } objective { @@ -89,15 +113,15 @@ local missions = { } objective { - type CAPTURE_X_BATTLE_CAPTIVES; - total 25000; + type ACHIEVE_CHARACTER_RANK; + total 3; + total2 20; + agent wizard; } objective { - type CONSTRUCT_N_OF_A_BUILDING; - faction wh2_main_def_cult_of_pleasure; - total 1; - building_level wh2_main_special_ghrond_convent_of_sorcery_2; + type CAPTURE_X_BATTLE_CAPTIVES; + total 25000; } payload diff --git a/src/script/vco2_main/factions/wh2_main_def_hag_graef/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_def_hag_graef/campaigns/main_warhammer/missions.lua index 9b363ca..51cb3ac 100644 --- a/src/script/vco2_main/factions/wh2_main_def_hag_graef/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_def_hag_graef/campaigns/main_warhammer/missions.lua @@ -18,7 +18,6 @@ local missions = { { type CAPTURE_X_BATTLE_CAPTIVES; total 15000; - additive; } objective { @@ -38,7 +37,6 @@ local missions = { { type OWN_N_UNITS; total 15; - additive; unit wh2_main_def_inf_har_ganeth_executioners_0; unit wh2_main_def_mon_black_dragon; unit wh2_main_def_cav_cold_one_knights_1; @@ -75,7 +73,6 @@ local missions = { { type CAPTURE_X_BATTLE_CAPTIVES; total 30000; - additive; } objective { @@ -98,7 +95,6 @@ local missions = { { type OWN_N_UNITS; total 30; - additive; unit wh2_main_def_inf_har_ganeth_executioners_0; unit wh2_main_def_mon_black_dragon; unit wh2_main_def_cav_cold_one_knights_1; diff --git a/src/script/vco2_main/factions/wh2_main_def_har_ganeth/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_def_har_ganeth/campaigns/main_warhammer/missions.lua index cf18a2d..828f3a4 100644 --- a/src/script/vco2_main/factions/wh2_main_def_har_ganeth/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_def_har_ganeth/campaigns/main_warhammer/missions.lua @@ -47,7 +47,6 @@ local missions = { { type OWN_N_UNITS; total 10; - additive; unit wh2_main_def_inf_witch_elves_0; unit wh2_dlc10_def_inf_sisters_of_slaughter; unit wh2_main_def_inf_har_ganeth_executioners_0; @@ -124,7 +123,6 @@ local missions = { { type OWN_N_UNITS; total 20; - additive; unit wh2_main_def_inf_witch_elves_0; unit wh2_dlc10_def_inf_sisters_of_slaughter; unit wh2_main_def_inf_har_ganeth_executioners_0; diff --git a/src/script/vco2_main/factions/wh2_main_def_naggarond/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_def_naggarond/campaigns/main_warhammer/missions.lua index 1bfb92f..c007646 100644 --- a/src/script/vco2_main/factions/wh2_main_def_naggarond/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_def_naggarond/campaigns/main_warhammer/missions.lua @@ -11,7 +11,6 @@ local missions = { { type CONTROL_N_PROVINCES_INCLUDING; total 10; - override_text mission_text_text_wh2_main_objective_override_malekith_control; province wh2_main_ironfrost_glacier; province wh2_main_the_chill_road; province wh2_main_the_road_of_skulls; @@ -72,7 +71,6 @@ local missions = { { type CONTROL_N_PROVINCES_INCLUDING; total 10; - override_text mission_text_text_wh2_main_objective_override_malekith_control; province wh2_main_ironfrost_glacier; province wh2_main_the_chill_road; province wh2_main_the_road_of_skulls; diff --git a/src/script/vco2_main/factions/wh2_main_hef_eataine/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_hef_eataine/campaigns/main_warhammer/missions.lua index fc3d773..5c028e2 100644 --- a/src/script/vco2_main/factions/wh2_main_hef_eataine/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_hef_eataine/campaigns/main_warhammer/missions.lua @@ -29,10 +29,9 @@ local missions = { } objective { - type DESTROY_FACTION; - faction wh2_main_def_naggarond; - faction wh2_main_def_cult_of_pleasure; - confederation_valid; + type RAZE_OR_SACK_N_DIFFERENT_SETTLEMENTS_INCLUDING; + total 1; + region wh2_main_iron_mountains_naggarond; } objective { diff --git a/src/script/vco2_main/factions/wh2_main_hef_nagarythe/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_hef_nagarythe/campaigns/main_warhammer/missions.lua index 2450fd2..e9167f0 100644 --- a/src/script/vco2_main/factions/wh2_main_hef_nagarythe/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_hef_nagarythe/campaigns/main_warhammer/missions.lua @@ -26,17 +26,9 @@ local missions = { confederation_valid; } objective - { - type CONSTRUCT_N_BUILDINGS_FROM; - faction wh2_main_hef_nagarythe; - total 1; - building_level wh2_main_special_anlec_citadel_hef; - } - objective { type OWN_N_UNITS; total 2; - additive; unit wh2_main_hef_mon_moon_dragon; } @@ -86,7 +78,6 @@ local missions = { { type OWN_N_UNITS; total 3; - additive; unit wh2_main_hef_mon_moon_dragon; } diff --git a/src/script/vco2_main/factions/wh2_main_hef_order_of_loremasters/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_hef_order_of_loremasters/campaigns/main_warhammer/missions.lua index df0eefd..7d6d9b8 100644 --- a/src/script/vco2_main/factions/wh2_main_hef_order_of_loremasters/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_hef_order_of_loremasters/campaigns/main_warhammer/missions.lua @@ -29,13 +29,6 @@ local missions = { confederation_valid; } objective - { - type CONSTRUCT_N_OF_A_BUILDING; - faction wh2_main_hef_order_of_loremasters; - total 1; - building_level wh2_main_special_tower_of_hoeth_2; - } - objective { type CONSTRUCT_N_OF_A_BUILDING; faction wh2_main_hef_order_of_loremasters; diff --git a/src/script/vco2_main/factions/wh2_main_hef_yvresse/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_hef_yvresse/campaigns/main_warhammer/missions.lua index 73c58d0..422fc2c 100644 --- a/src/script/vco2_main/factions/wh2_main_hef_yvresse/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_hef_yvresse/campaigns/main_warhammer/missions.lua @@ -47,7 +47,6 @@ local missions = { { type OWN_N_UNITS; total 3; - additive; unit wh2_dlc15_hef_inf_mistwalkers_faithbearers_0; unit wh2_dlc15_hef_inf_mistwalkers_griffon_knights_0; unit wh2_dlc15_hef_inf_mistwalkers_sentinels_0; @@ -125,7 +124,6 @@ local missions = { { type OWN_N_UNITS; total 5; - additive; unit wh2_dlc15_hef_inf_mistwalkers_faithbearers_0; unit wh2_dlc15_hef_inf_mistwalkers_griffon_knights_0; unit wh2_dlc15_hef_inf_mistwalkers_sentinels_0; diff --git a/src/script/vco2_main/factions/wh2_main_lzd_hexoatl/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_lzd_hexoatl/campaigns/main_warhammer/missions.lua index ddfe1bd..6afc1ee 100644 --- a/src/script/vco2_main/factions/wh2_main_lzd_hexoatl/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_lzd_hexoatl/campaigns/main_warhammer/missions.lua @@ -10,7 +10,7 @@ local missions = { objective { type CONTROL_N_PROVINCES_INCLUDING; - total 14; + total 2; province wh2_main_isthmus_of_lustria; province wh2_main_northern_jungle_of_pahualaxa; } @@ -51,18 +51,10 @@ local missions = { total 4; building_level wh2_main_lzd_settlement_major_5; } - objective - { - type ACHIEVE_CHARACTER_RANK; - total 1; - total2 20; - agent wizard; - } objective { type OWN_N_UNITS; total 7; - additive; unit wh2_main_lzd_inf_temple_guards; unit wh2_main_lzd_inf_temple_guards_nakai; unit wh2_main_lzd_inf_temple_guards_blessed; @@ -157,18 +149,10 @@ local missions = { total 7; building_level wh2_main_lzd_settlement_major_5; } - objective - { - type ACHIEVE_CHARACTER_RANK; - total 3; - total2 20; - agent wizard; - } objective { type OWN_N_UNITS; total 15; - additive; unit wh2_main_lzd_inf_temple_guards; unit wh2_main_lzd_inf_temple_guards_nakai; unit wh2_main_lzd_inf_temple_guards_blessed; diff --git a/src/script/vco2_main/factions/wh2_main_lzd_itza/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_lzd_itza/campaigns/main_warhammer/missions.lua index 72622e8..4c1104c 100644 --- a/src/script/vco2_main/factions/wh2_main_lzd_itza/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_lzd_itza/campaigns/main_warhammer/missions.lua @@ -41,7 +41,6 @@ local missions = { { type OWN_N_UNITS; total 20; - additive; unit wh2_main_lzd_inf_saurus_spearmen_0; unit wh2_main_lzd_inf_saurus_warriors_0; unit wh2_main_lzd_inf_saurus_spearmen_1; @@ -110,7 +109,6 @@ local missions = { { type OWN_N_UNITS; total 30; - additive; unit wh2_main_lzd_inf_saurus_spearmen_0; unit wh2_main_lzd_inf_saurus_warriors_0; unit wh2_main_lzd_inf_saurus_spearmen_1; @@ -143,11 +141,6 @@ local missions = { { game_victory; } - - payload - { - game_victory; - } } } ]] diff --git a/src/script/vco2_main/factions/wh2_main_lzd_tlaqua/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_lzd_tlaqua/campaigns/main_warhammer/missions.lua index c5151ef..f576640 100644 --- a/src/script/vco2_main/factions/wh2_main_lzd_tlaqua/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_lzd_tlaqua/campaigns/main_warhammer/missions.lua @@ -34,7 +34,7 @@ local missions = { objective { type CONSTRUCT_N_OF_A_BUILDING; - faction wh2_main_lzd_tlaqua; + faction wh2_main_lzd_lizardmen; total 3; building_level wh2_dlc12_lzd_terradons_2; } @@ -42,7 +42,6 @@ local missions = { { type OWN_N_UNITS; total 7; - additive; unit wh2_dlc12_lzd_cav_ripperdactyl_riders_0; unit wh2_dlc12_lzd_cav_ripperdactyl_riders_ror_0; unit wh2_main_lzd_cav_terradon_riders_0; @@ -80,13 +79,6 @@ local missions = { province wh_main_southern_badlands; } objective - { - type CONSTRUCT_N_OF_A_BUILDING; - faction wh2_main_lzd_tlaqua; - total 5; - building_level wh2_main_lzd_slann_1; - } - objective { type DESTROY_FACTION; faction wh2_main_skv_clan_mors; @@ -104,7 +96,7 @@ local missions = { objective { type CONSTRUCT_N_OF_A_BUILDING; - faction wh2_main_lzd_tlaqua; + faction wh2_main_lzd_lizardmen; total 5; building_level wh2_dlc12_lzd_terradons_2; } @@ -112,7 +104,6 @@ local missions = { { type OWN_N_UNITS; total 15; - additive; unit wh2_dlc12_lzd_cav_ripperdactyl_riders_0; unit wh2_dlc12_lzd_cav_ripperdactyl_riders_ror_0; unit wh2_main_lzd_cav_terradon_riders_0; diff --git a/src/script/vco2_main/factions/wh2_main_skv_clan_eshin/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_skv_clan_eshin/campaigns/main_warhammer/missions.lua index 9e1f6bd..2655707 100644 --- a/src/script/vco2_main/factions/wh2_main_skv_clan_eshin/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_skv_clan_eshin/campaigns/main_warhammer/missions.lua @@ -53,7 +53,6 @@ local missions = { { type OWN_N_UNITS; total 13; - additive; unit wh2_main_skv_inf_death_runners_0; unit wh2_dlc14_skv_inf_death_runners_ror_0; unit wh2_dlc14_skv_inf_eshin_triads_0; @@ -143,7 +142,6 @@ local missions = { { type OWN_N_UNITS; total 26; - additive; unit wh2_main_skv_inf_death_runners_0; unit wh2_dlc14_skv_inf_death_runners_ror_0; unit wh2_dlc14_skv_inf_eshin_triads_0; diff --git a/src/script/vco2_main/factions/wh2_main_skv_clan_skyre/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh2_main_skv_clan_skyre/campaigns/main_warhammer/missions.lua index 984a995..082ffde 100644 --- a/src/script/vco2_main/factions/wh2_main_skv_clan_skyre/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh2_main_skv_clan_skyre/campaigns/main_warhammer/missions.lua @@ -45,7 +45,6 @@ local missions = { { type OWN_N_UNITS; total 13; - additive; unit wh2_dlc12_skv_veh_doom_flayer_0; unit wh2_dlc12_skv_veh_doom_flayer_ror_0; unit wh2_dlc12_skv_veh_doom_flayer_ror_tech_lab_0; @@ -125,7 +124,6 @@ local missions = { { type OWN_N_UNITS; total 26; - additive; unit wh2_dlc12_skv_veh_doom_flayer_0; unit wh2_dlc12_skv_veh_doom_flayer_ror_0; unit wh2_dlc12_skv_veh_doom_flayer_ror_tech_lab_0; diff --git a/src/script/vco2_main/factions/wh_dlc05_wef_argwylon/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_dlc05_wef_argwylon/campaigns/main_warhammer/missions.lua index 7474007..4d15bb5 100644 --- a/src/script/vco2_main/factions/wh_dlc05_wef_argwylon/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_dlc05_wef_argwylon/campaigns/main_warhammer/missions.lua @@ -31,12 +31,10 @@ local missions = { objective { type DESTROY_FACTION; - faction wh2_main_skv_clan_skyre; faction wh2_main_skv_clan_spittel; - faction wh_main_grn_crooked_moon; - - faction wh2_dlc11_cst_pirates_of_sartosa; + faction wh2_dlc11_vmp_the_barrow_legion; + faction wh_main_vmp_mousillon; confederation_valid; } objective @@ -54,17 +52,16 @@ local missions = { objective { type OWN_N_UNITS; - total 60; + total 40; } objective { type OWN_N_UNITS; - total 7; - additive; - unit wh_dlc05_wef_cav_sisters_thorn_0; - unit wh_dlc05_wef_cav_wild_riders_0; - unit wh_dlc05_wef_cav_wild_riders_1; - unit wh_pro04_wef_cav_wild_riders_ror_0; + total 10; + unit wh_dlc05_wef_inf_dryads_0; + unit wh_dlc05_wef_mon_treekin_0; + unit wh_dlc05_wef_mon_treeman_0; + unit wh_pro04_wef_mon_treekin_ror_0; } payload @@ -77,7 +74,7 @@ local missions = { [[ mission { - victory_type vco_victory_type_long; + victory_type vco_victory_type_ultimate; key wh_main_long_victory; issuer CLAN_ELDERS; primary_objectives_and_payload @@ -92,7 +89,7 @@ local missions = { province wh_main_wydrioth; province wh_main_yn_edri_eternos; province wh2_main_laurelorn_forest; - province wh2_main_heart_of_the_jungle; + province wh2_main_avelorn; } objective { @@ -112,8 +109,9 @@ local missions = { faction wh2_main_skv_clan_spittel; faction wh_main_grn_crooked_moon; - faction wh_main_grn_greenskins; - faction wh_main_grn_orcs_of_the_bloody_hand; + + faction wh_dlc08_nor_norsca; + faction wh_dlc08_nor_wintertooth; faction wh2_dlc11_vmp_the_barrow_legion; faction wh_main_vmp_mousillon; @@ -136,17 +134,15 @@ local missions = { objective { type OWN_N_UNITS; - total 100; + total 80; } objective { type OWN_N_UNITS; - total 10; - additive; + total 16; unit wh_dlc05_wef_cav_sisters_thorn_0; unit wh_dlc05_wef_cav_wild_riders_0; unit wh_dlc05_wef_cav_wild_riders_1; - unit wh_pro04_wef_cav_wild_riders_ror_0; } objective { diff --git a/src/script/vco2_main/factions/wh_dlc05_wef_wood_elves/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_dlc05_wef_wood_elves/campaigns/main_warhammer/missions.lua index bb637c7..925708b 100644 --- a/src/script/vco2_main/factions/wh_dlc05_wef_wood_elves/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_dlc05_wef_wood_elves/campaigns/main_warhammer/missions.lua @@ -31,10 +31,12 @@ local missions = { objective { type DESTROY_FACTION; + faction wh2_main_skv_clan_skyre; faction wh2_main_skv_clan_spittel; - faction wh2_dlc11_vmp_the_barrow_legion; - faction wh_main_vmp_mousillon; + faction wh_main_grn_crooked_moon; + + faction wh2_dlc11_cst_pirates_of_sartosa; confederation_valid; } objective @@ -52,17 +54,16 @@ local missions = { objective { type OWN_N_UNITS; - total 40; + total 60; } objective { type OWN_N_UNITS; - total 10; - additive; - unit wh_dlc05_wef_inf_dryads_0; - unit wh_dlc05_wef_mon_treekin_0; - unit wh_dlc05_wef_mon_treeman_0; - unit wh_pro04_wef_mon_treekin_ror_0; + total 7; + unit wh_dlc05_wef_cav_sisters_thorn_0; + unit wh_dlc05_wef_cav_wild_riders_0; + unit wh_dlc05_wef_cav_wild_riders_1; + unit wh_pro04_wef_cav_wild_riders_ror_0; } payload @@ -75,7 +76,7 @@ local missions = { [[ mission { - victory_type vco_victory_type_long; + victory_type vco_victory_type_ultimate; key wh_main_long_victory; issuer CLAN_ELDERS; primary_objectives_and_payload @@ -90,7 +91,7 @@ local missions = { province wh_main_wydrioth; province wh_main_yn_edri_eternos; province wh2_main_laurelorn_forest; - province wh2_main_avelorn; + province wh2_main_heart_of_the_jungle; } objective { @@ -110,9 +111,8 @@ local missions = { faction wh2_main_skv_clan_spittel; faction wh_main_grn_crooked_moon; - - faction wh_dlc08_nor_norsca; - faction wh_dlc08_nor_wintertooth; + faction wh_main_grn_greenskins; + faction wh_main_grn_orcs_of_the_bloody_hand; faction wh2_dlc11_vmp_the_barrow_legion; faction wh_main_vmp_mousillon; @@ -135,16 +135,16 @@ local missions = { objective { type OWN_N_UNITS; - total 80; + total 100; } objective { type OWN_N_UNITS; - total 16; - additive; + total 10; unit wh_dlc05_wef_cav_sisters_thorn_0; unit wh_dlc05_wef_cav_wild_riders_0; unit wh_dlc05_wef_cav_wild_riders_1; + unit wh_pro04_wef_cav_wild_riders_ror_0; } objective { diff --git a/src/script/vco2_main/factions/wh_dlc08_nor_norsca/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_dlc08_nor_norsca/campaigns/main_warhammer/missions.lua index ed67587..e514df3 100644 --- a/src/script/vco2_main/factions/wh_dlc08_nor_norsca/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_dlc08_nor_norsca/campaigns/main_warhammer/missions.lua @@ -34,7 +34,6 @@ local missions = { { type OWN_N_UNITS; total 7; - additive; unit wh_dlc08_nor_mon_skinwolves_0; unit wh_dlc08_nor_mon_skinwolves_1; unit wh_dlc08_nor_mon_war_mammoth_0; diff --git a/src/script/vco2_main/factions/wh_main_brt_bordeleaux/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_brt_bordeleaux/campaigns/main_warhammer/missions.lua index 0c7a55a..57a15df 100644 --- a/src/script/vco2_main/factions/wh_main_brt_bordeleaux/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_brt_bordeleaux/campaigns/main_warhammer/missions.lua @@ -45,7 +45,7 @@ local missions = { [[ mission { - victory_type vco_victory_type_long; + victory_type vco_victory_type_ultimate; key wh_main_long_victory; issuer CLAN_ELDERS; primary_objectives_and_payload diff --git a/src/script/vco2_main/factions/wh_main_brt_bretonnia/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_brt_bretonnia/campaigns/main_warhammer/missions.lua index 3b923cf..1d8b7f1 100644 --- a/src/script/vco2_main/factions/wh_main_brt_bretonnia/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_brt_bretonnia/campaigns/main_warhammer/missions.lua @@ -47,7 +47,7 @@ local missions = { [[ mission { - victory_type vco_victory_type_long; + victory_type vco_victory_type_ultimate; key wh_main_long_victory; issuer CLAN_ELDERS; primary_objectives_and_payload diff --git a/src/script/vco2_main/factions/wh_main_brt_carcassonne/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_brt_carcassonne/campaigns/main_warhammer/missions.lua index f1c3b9a..78f5285 100644 --- a/src/script/vco2_main/factions/wh_main_brt_carcassonne/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_brt_carcassonne/campaigns/main_warhammer/missions.lua @@ -44,7 +44,7 @@ local missions = { [[ mission { - victory_type vco_victory_type_long; + victory_type vco_victory_type_ultimate; key wh_main_long_victory; issuer CLAN_ELDERS; primary_objectives_and_payload diff --git a/src/script/vco2_main/factions/wh_main_grn_crooked_moon/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_grn_crooked_moon/campaigns/main_warhammer/missions.lua index 8ebc428..914454d 100644 --- a/src/script/vco2_main/factions/wh_main_grn_crooked_moon/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_grn_crooked_moon/campaigns/main_warhammer/missions.lua @@ -28,7 +28,6 @@ local missions = { { type OWN_N_UNITS; total 40; - additive; unit wh_main_grn_inf_goblin_spearmen; unit wh_main_grn_inf_night_goblins; unit wh_dlc06_grn_inf_da_warlords_boyz_0; @@ -102,7 +101,6 @@ local missions = { { type OWN_N_UNITS; total 80; - additive; unit wh_main_grn_inf_goblin_spearmen; unit wh_main_grn_inf_night_goblins; unit wh_dlc06_grn_inf_da_warlords_boyz_0; diff --git a/src/script/vco2_main/factions/wh_main_grn_greenskins/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_grn_greenskins/campaigns/main_warhammer/missions.lua index 1d6b411..a70c573 100644 --- a/src/script/vco2_main/factions/wh_main_grn_greenskins/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_grn_greenskins/campaigns/main_warhammer/missions.lua @@ -12,14 +12,11 @@ local missions = { type DESTROY_FACTION; faction wh_main_grn_black_venom; faction wh_main_grn_bloody_spearz; - faction wh_main_grn_broken_nose; - faction wh_main_grn_crooked_moon; faction wh_main_grn_necksnappers; faction wh_main_grn_orcs_of_the_bloody_hand; faction wh_main_grn_red_eye; faction wh_main_grn_red_fangs; faction wh_main_grn_scabby_eye; - faction wh_main_grn_skullsmasherz; faction wh_main_grn_teef_snatchaz; faction wh_main_grn_top_knotz; confederation_valid; diff --git a/src/script/vco2_main/factions/wh_main_grn_orcs_of_the_bloody_hand/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_grn_orcs_of_the_bloody_hand/campaigns/main_warhammer/missions.lua index 845c070..0ef70ce 100644 --- a/src/script/vco2_main/factions/wh_main_grn_orcs_of_the_bloody_hand/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_grn_orcs_of_the_bloody_hand/campaigns/main_warhammer/missions.lua @@ -14,18 +14,24 @@ local missions = { province wh_main_southern_badlands; province wh_main_western_badlands; } + objective + { + type AT_LEAST_X_RELIGION_IN_PROVINCES; + province wh_main_southern_badlands; + province wh_main_western_badlands; + total 80; + religion wh_main_religion_untainted; + } objective { type LOOT_OR_SACK_N_DIFFERENT_SETTLEMENTS_INCLUDING; total 10; region wh_main_eastern_border_princes_akendorf; - region wh2_main_coast_of_araby_al_haikk; - region wh2_main_coast_of_araby_copher; - region wh2_main_coast_of_araby_fyrus; region wh_main_tilea_luccini; region wh_main_eastern_border_princes_matorca; region wh_main_tilea_miragliano; region wh_main_western_border_princes_myrmidens; + region wh2_main_sartosa_sartosa; region wh2_main_land_of_the_dead_zandri; region wh_main_western_border_princes_zvorak; } @@ -62,7 +68,6 @@ local missions = { { type OWN_N_UNITS; total 20; - additive; unit wh_main_grn_inf_savage_orcs; unit wh_main_grn_inf_savage_orc_big_uns; unit wh_main_grn_inf_savage_orc_arrer_boyz; @@ -96,6 +101,15 @@ local missions = { province wh_main_southern_badlands; province wh_main_western_badlands; } + objective + { + type AT_LEAST_X_RELIGION_IN_PROVINCES; + province wh_main_eastern_badlands; + province wh_main_southern_badlands; + province wh_main_western_badlands; + total 80; + religion wh_main_religion_untainted; + } objective { type LOOT_OR_SACK_N_DIFFERENT_SETTLEMENTS_INCLUDING; @@ -108,6 +122,7 @@ local missions = { region wh_main_eastern_border_princes_matorca; region wh_main_tilea_miragliano; region wh_main_western_border_princes_myrmidens; + region wh2_main_sartosa_sartosa; region wh2_main_land_of_the_dead_zandri; region wh_main_western_border_princes_zvorak; } @@ -151,7 +166,6 @@ local missions = { { type OWN_N_UNITS; total 30; - additive; unit wh_main_grn_inf_savage_orcs; unit wh_main_grn_inf_savage_orc_big_uns; unit wh_main_grn_inf_savage_orc_arrer_boyz; diff --git a/src/script/vco2_main/factions/wh_main_vmp_schwartzhafen/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_vmp_schwartzhafen/campaigns/main_warhammer/missions.lua index 0fab3d6..ac79730 100644 --- a/src/script/vco2_main/factions/wh_main_vmp_schwartzhafen/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_vmp_schwartzhafen/campaigns/main_warhammer/missions.lua @@ -78,6 +78,13 @@ local missions = { province wh_main_western_sylvania; } objective + { + type CONTROL_N_PROVINCES_INCLUDING; + total 2; + province wh_main_southern_oblast; + province wh2_main_fort_soll; + } + objective { type CONTROL_N_REGIONS_INCLUDING; total 1; @@ -86,12 +93,13 @@ local missions = { objective { type DESTROY_FACTION; + faction wh2_main_skv_clan_moulder; + + faction wh_main_brt_bretonnia; + faction wh_main_emp_empire; faction wh_main_vmp_vampire_counts; - - faction wh_dlc08_nor_norsca; - faction wh_dlc08_nor_wintertooth; confederation_valid; } objective