From 86b327e8bebc34face8724ea3a3657640b1a298b Mon Sep 17 00:00:00 2001 From: rogerburks <17787203+rogerburks@users.noreply.github.com> Date: Wed, 2 Jun 2021 20:12:43 -0400 Subject: [PATCH] UK can no longer steal provinces or, delete cores of existing tags, using the `rhodesia_charter` decision The decision `rhodesia_charter` awards Rhodesian and Malawi provinces to the UK even when other countries own them https://github.com/moretrim/ccHFM/blob/e0ee2ed03ffa2458f2d42c1409e7e7bba49dcd7a/ccHFM/decisions/ENG.txt#L291-L300 The following pair of screenshots were taken on the same game day. Before the decision: ![image](https://user-images.githubusercontent.com/17787203/120563622-eac5d100-c3bd-11eb-843a-08fbe0f3cc2b.png) After the decision: ![image](https://user-images.githubusercontent.com/17787203/120563646-f74a2980-c3bd-11eb-8b34-11b50d909dcd.png) Potentially, this decision should check if the provinces are empty or not, and if they are part of a colonial race, although truly I do not exactly see why this decision should `secede_province` at all. The UK will normally outrace all other tags at obtaining these provinces, but if it cannot, then the game should reflect that. For this reason, I suggest that the best solution is to simply remove all of the `secede_province` statements. Additionally, the decision removes Matabele cores from provinces that are awarded Rhodesia cores, even if Matabele still exists. Given all of this, my proposed fix looks like this, with unowned provinces unmodified except for retaining any core addition. This is because provinces need not be owned for claims on them to occur. The UK can no longer take owned provinces away, and Matabele keeps its cores if it exists. The code that I used is experimental from my perspective, but it worked in tests with and without Matabele existing: ![image](https://user-images.githubusercontent.com/17787203/120567073-b6561300-c3c5-11eb-8b29-f6dc7846dfaf.png) --- ccHFM/decisions/ENG.txt | 55 +++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/ccHFM/decisions/ENG.txt b/ccHFM/decisions/ENG.txt index 3fb3355b..de9b891f 100644 --- a/ccHFM/decisions/ENG.txt +++ b/ccHFM/decisions/ENG.txt @@ -265,39 +265,31 @@ political_decisions = { effect = { prestige = 10 ENG_2068 = { add_core = RHO } - 2068 = { - change_province_name = "Salisbury" - any_pop = { limit = { type = soldiers culture = british } pop_type = farmers } - state_scope = { - change_region_name = "Southern Rhodesia" - any_owned = { - add_core = RHO + ENG_2071 = { add_core = RHO } + ENG_2014 = { add_core = RHO } + ENG_2016 = { add_core = RHO } + any_owned = { + 2068 = { + change_province_name = "Salisbury" + any_pop = { limit = { type = soldiers culture = british } pop_type = farmers } + state_scope = { + change_region_name = "Southern Rhodesia" + any_owned = { + add_core = RHO + } + any_pop = { limit = { type = farmers culture = british } reduce_pop = 2 } } - any_pop = { limit = { type = farmers culture = british } reduce_pop = 2 } } - } - 2073 = { - change_province_name = "Fort Victoria" - any_pop = { limit = { type = farmers culture = british } reduce_pop = 2 } - state_scope = { - change_region_name = "Southern Rhodesia" - any_owned = { add_core = RHO } + 2073 = { + change_province_name = "Fort Victoria" + any_pop = { limit = { type = farmers culture = british } reduce_pop = 2 } + state_scope = { + change_region_name = "Southern Rhodesia" + any_owned = { add_core = RHO } + } } + 2072 = { change_province_name = "Wankie" } } - 2072 = { change_province_name = "Wankie" } - ENG_2071 = { add_core = RHO } - ENG_2014 = { add_core = RHO } - ENG_2016 = { add_core = RHO } - 2015 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2013 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2014 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2012 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 790 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2017 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2016 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2018 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2067 = { secede_province = THIS any_pop = { literacy = -0.99 } } - 2066 = { secede_province = THIS any_pop = { literacy = -0.99 } } any_owned = { limit = { is_core = RHO } add_province_modifier = { name = colonial_exploitation @@ -308,7 +300,10 @@ political_decisions = { duration = 1825 } } - RHO = { all_core = { remove_core = MAT } } + any_owned { + limit = { MAT = { exists = no } } + RHO = { all_core = { remove_core = MAT } } + } set_country_flag = ian_would_be_proud } }