From 20b392e04aba76ca964a75c6b7a1ed2ee65d7928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Sol=C3=A9?= Date: Sun, 11 Oct 2020 12:23:47 +0200 Subject: [PATCH] Add update v2.1.1 - Controlling Northern Grey Mountains is no longer required by Karak Kadrin to achieve a Short Victory - Fixed bugs / Minor changes - Lyonesse Ultimate Victory conditions remained vanilla - Clan Rictus victory conditions were a mix of vanilla and modded - Destroying Borderleaux was missing from The Dreadfleet Short Victory conditions - Fall of Man Beastmen quest battle popped randomly and multiple times - Sad reports - It is not possible to turn instances of Sack/Raze specific locations into Occupy/Loot/Raze/Sack for non horde factions in order to prevent weird situations where you had to attack your own settlements. The key OCCUPY_LOOT_RAZE_OR_SACK_X_SETTLEMENTS_INCLUDING does not exist. --- CHANGELOG.md | 15 ++++++++- .../campaign/mod/vco2_main_listeners.lua | 31 +++++++++++-------- .../campaigns/main_warhammer/missions.lua | 4 +-- .../campaigns/main_warhammer/missions.lua | 2 ++ .../campaigns/main_warhammer/missions.lua | 1 - 5 files changed, 36 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7eb11ef..9e83650 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,7 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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 + - Razing or looting Copher, Fyrus and Al Haikk is no longer required to achieve 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 Long Victory - Redone of Vor Carstein's Long Victory conditions @@ -74,3 +74,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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 + +## [2.1.1] Minor Update - 10.11.2020 + +- Controlling Northern Grey Mountains is no longer required by Karak Kadrin to achieve a Short Victory +- Fixed bugs / Minor changes + - Lyonesse Ultimate Victory conditions remained vanilla + - Clan Rictus victory conditions were a mix of vanilla and modded + - Destroying Borderleaux was missing from The Dreadfleet Short Victory conditions + - Fall of Man Beastmen quest battle popped randomly and multiple times +- Sad reports + - It is not possible to turn instances of Sack/Raze specific locations into Occupy/Loot/Raze/Sack for non horde + factions in order to prevent weird situations where you had to attack your own settlements. The key + OCCUPY_LOOT_RAZE_OR_SACK_X_SETTLEMENTS_INCLUDING does not exist. diff --git a/src/script/campaign/mod/vco2_main_listeners.lua b/src/script/campaign/mod/vco2_main_listeners.lua index 3693617..bee8e64 100644 --- a/src/script/campaign/mod/vco2_main_listeners.lua +++ b/src/script/campaign/mod/vco2_main_listeners.lua @@ -95,21 +95,26 @@ 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:set_saved_value("vco_bst_final_battle_quest", false); + 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() + -- Duplicated because I do not exactly know how this work: + -- - Key bst_final_battle_quest is vanilla and should be false by default + -- - Key vco_bst_final_battle_quest is custom, but I do not know if value is correctly saved + if not (cm:get_saved_value("bst_final_battle_quest") and cm:get_saved_value("vco_bst_final_battle_quest")) then 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; + cm:set_saved_value("vco_bst_final_battle_quest", true); + end + end, + false + ); out("#### Adding Bretonnia Victory Conditions Overhaul Listeners ####"); core:add_listener( 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 81b5346..c71e853 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 @@ -21,7 +21,7 @@ local missions = { type DESTROY_FACTION; faction wh2_main_lzd_hexoatl; - province wh2_main_nagarythe; + faction wh2_main_hef_nagarythe; confederation_valid; } objective @@ -66,7 +66,7 @@ local missions = { faction wh2_main_lzd_hexoatl; faction wh2_main_hef_eataine; - province wh2_main_nagarythe; + faction wh2_main_hef_nagarythe; confederation_valid; } objective 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 00775e8..2a0f45a 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 @@ -26,6 +26,8 @@ local missions = { type DESTROY_FACTION; faction wh2_dlc11_def_the_blessed_dread; + faction wh_main_brt_bordeleaux; + faction wh2_dlc11_cst_pirates_of_sartosa; faction wh2_dlc11_cst_vampire_coast; faction wh2_dlc11_cst_the_drowned; diff --git a/src/script/vco2_main/factions/wh_main_dwf_karak_kadrin/campaigns/main_warhammer/missions.lua b/src/script/vco2_main/factions/wh_main_dwf_karak_kadrin/campaigns/main_warhammer/missions.lua index c28bedb..36aeef6 100644 --- a/src/script/vco2_main/factions/wh_main_dwf_karak_kadrin/campaigns/main_warhammer/missions.lua +++ b/src/script/vco2_main/factions/wh_main_dwf_karak_kadrin/campaigns/main_warhammer/missions.lua @@ -41,7 +41,6 @@ local missions = { province wh_main_zhufbar; province wh_main_rib_peaks; province wh_main_gianthome_mountains; - province wh_main_northern_grey_mountains; } objective {