From 19bbaa5430e710674d5d581a26da8d8162154929 Mon Sep 17 00:00:00 2001 From: rogerburks <17787203+rogerburks@users.noreply.github.com> Date: Thu, 27 Jan 2022 12:24:47 -0500 Subject: [PATCH] Prevents core removal for existing tags in most cases References #70 and #73. In many cases, the cores of tags that start uncivilized are removed by decisions and events that are meant to simulate historical change from uncivlized areas to colonies to post-colonial areas. However, if cores are considered to be claims, this should not occur while the tag still exists. This is different from a situation where tags give up cores in treaties, when this fix should not be applied. Additionally, I have allowed core removal in cases where the tag no longer exists, so that the simulation occurs as intended. I have ignored removal of ENG cores in the New World, since those should happen always through ENG giving up cores voluntarily. In other cases, especially within Europe, it seemed like a bad idea to change anything. In the course of making changes, I removed `cleanup_colonial_cores`, since that decision should not exist if things function as intended. I changed `organize_ghana` and `reorganize_ghana` to require a tag to own the in-game capital of Ashanti, since core removals were not working while Ashanti and other tags with claims on Ghana existed. This seemed justifiable to me since otherwise only a single coastal province was required to organize all of Ghana. I removed a few apparently arbitrary Malay core changes in `97122`, `Anglo-Siamese Treaty of 1909`, because it did not make sense to switch around and not remove the claims of tags that do not exist. I additionally made some changes to add Malaysia cores properly to its provinces. The initial set of changes succeeded with only a few noticed bugs. These and matters requiring investigation are listed and discussed [in this post](https://github.com/moretrim/ccHFM/issues/70#issuecomment-1023876986). Found an overlooked core removal of potentially existing Kurdish tags. Acadia core removal now removes the cores on Maritime Union territory as well. Louisiana core removal now covers the possibility of USA core removal. --- ccHFM/decisions/BEL.txt | 91 +- ccHFM/decisions/BoerWar.txt | 27 +- ccHFM/decisions/CAN.txt | 55 +- ccHFM/decisions/CleanUp.txt | 598 ---- ccHFM/decisions/Colonial Portugal.txt | 23 +- ccHFM/decisions/ENG.txt | 332 +-- ccHFM/decisions/East Indies.txt | 609 ++++- ccHFM/decisions/FlavourMod_Africa.txt | 1 - ccHFM/decisions/FlavourMod_FRA_Colonial.txt | 40 +- ccHFM/decisions/FlavourMod_RUS.txt | 39 +- ccHFM/decisions/FlavourMod_USA.txt | 27 +- ccHFM/decisions/Germany.txt | 13 +- ccHFM/decisions/Italy.txt | 401 ++- ccHFM/decisions/NationalUnification.txt | 45 +- ccHFM/decisions/New Colonies.txt | 2400 ++++++++++++++--- .../decisions/Peru-Bolivia Confederation.txt | 26 +- ccHFM/decisions/UncivFlavor.txt | 91 +- ccHFM/events/BoerWar.txt | 63 +- ccHFM/events/CANFlavor.txt | 87 +- ccHFM/events/Congo.txt | 1023 ++++++- ccHFM/events/East Indies.txt | 495 +++- ccHFM/events/Ethiopia.txt | 39 +- .../events/FlavourMod_ColonialReconquest.txt | 72 +- ccHFM/events/Malaysia.txt | 1 - ccHFM/events/New Colonies.txt | 90 + ccHFM/events/Ottoman Empire.txt | 78 +- ccHFM/events/RGOChangeEvents.txt | 1 + ccHFM/events/Scramble for Africa.txt | 50 +- 28 files changed, 5351 insertions(+), 1466 deletions(-) diff --git a/ccHFM/decisions/BEL.txt b/ccHFM/decisions/BEL.txt index 2febec00..9b0c2dcd 100644 --- a/ccHFM/decisions/BEL.txt +++ b/ccHFM/decisions/BEL.txt @@ -507,13 +507,90 @@ political_decisions = { 1998 = { change_province_name = "Ango" life_rating = 25 } 1988 = { change_province_name = "Kolwezi" life_rating = 25 } any_owned = { limit = { OR = { province_id = 1990 province_id = 1986 } } life_rating = 25 } - CNG = { all_core = { remove_core = KON } } - CNG = { all_core = { remove_core = KUB } } - CNG = { all_core = { remove_core = KZB } } - CNG = { all_core = { remove_core = LBA } } - CNG = { all_core = { remove_core = LUN } } - CNG = { all_core = { remove_core = AZA } } - CNG = { all_core = { remove_core = MNG } } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } } ai_will_do = { factor = 1 } diff --git a/ccHFM/decisions/BoerWar.txt b/ccHFM/decisions/BoerWar.txt index b3867dac..4a332c44 100644 --- a/ccHFM/decisions/BoerWar.txt +++ b/ccHFM/decisions/BoerWar.txt @@ -353,10 +353,29 @@ political_decisions = { add_accepted_culture = boer set_country_flag = post_colonial_country } - any_owned = { - limit = { region = TRN_2108 } - remove_core = MAT - remove_core = GAZ + any_country = { + limit = { + tag = MAT + exists = no + } + all_core = { + limit = { + is_core = SAF + } + remove_core = MAT + } + } + any_country = { + limit = { + tag = GAZ + exists = no + } + all_core = { + limit = { + is_core = SAF + } + remove_core = GAZ + } } any_pop = { limit = { location = { is_core = SAF } } diff --git a/ccHFM/decisions/CAN.txt b/ccHFM/decisions/CAN.txt index 8cf571d1..d2cb99d1 100644 --- a/ccHFM/decisions/CAN.txt +++ b/ccHFM/decisions/CAN.txt @@ -47,17 +47,21 @@ political_decisions = { capital = 65 small_arms = 50 regular_clothes = 50 - CAN_60 = { - add_core = QUE - remove_core = RPL - } - 2625 = { - add_core = QUE - remove_core = RPL - } - 76 = { - add_core = QUE - remove_core = RPL + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + OR = { + province_id = 60 + province_id = 2625 + province_id = 76 + } + } + remove_core = RPL + } } 58 = { state_scope = { change_region_name = "Québec" } } } @@ -112,8 +116,21 @@ political_decisions = { CAN_13 = { add_core = COL add_core = CAN - remove_core = RPL - } + } + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + OR = { + province_id = 13 + } + } + remove_core = RPL + } + } #Remove RPL & USA Cores, if owned RPL = { any_owned = { @@ -140,6 +157,18 @@ political_decisions = { } all_core = { remove_core = ENG } } + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + is_core = COL + } + remove_core = RPL + } + } } ai_will_do = { factor = 1 diff --git a/ccHFM/decisions/CleanUp.txt b/ccHFM/decisions/CleanUp.txt index 8add4063..82337d15 100644 --- a/ccHFM/decisions/CleanUp.txt +++ b/ccHFM/decisions/CleanUp.txt @@ -1729,602 +1729,4 @@ political_decisions = { } ai_will_do = { factor = 1 } } - - cleanup_colonial_cores = { - picture = map_nigeria - potential = { - ai = yes - any_neighbor_country = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - any_owned_province = { - OR = { - #Nigeria - AND = { - is_core = NGR - OR = { - is_core = SOK - is_core = DND - is_core = TOU - is_core = OYO - is_core = BEN - is_core = ARO - is_core = CLA - is_core = WRI - is_core = KBO - } - } - #Ivory Coast - AND = { - is_core = IVC - OR = { - is_core = KNG - is_core = ASH - is_core = MOS - } - } - #Guinea - AND = { - is_core = GNE - OR = { - is_core = JAL - is_core = GBU - } - } - #Senegal - AND = { - is_core = SNG - OR = { - is_core = TOO - is_core = WOL - is_core = SEG - is_core = TOU - } - } - #Zaire/Congo - AND = { - is_core = CNG - OR = { - is_core = LUN - is_core = LOA - is_core = AZA - is_core = KZB - is_core = KON - } - } - #Niger - AND = { - is_core = NIG - OR = { - is_core = DND - is_core = TOU - is_core = MAS - is_core = DAM - is_core = KBO - } - } - - #Mali - AND = { - is_core = MLI - OR = { - is_core = TOU - is_core = SEG - is_core = MAS - is_core = MOS - is_core = DND - is_core = BKF - } - } - - #Gambia - AND = { - is_core = GMB - OR = { - is_core = TOO - is_core = WOL - is_core = SEG - is_core = TOU - } - } - - #Angola - AND = { - is_core = ANG - is_core = KON - } - - #Mozambique - AND = { - is_core = MOZ - OR = { - is_core = GAZ - is_core = AGC - is_core = ZUL - is_core = SHO - } - } - - #Sudan - AND = { - is_core = SUD - OR = { - is_core = EGY - is_core = SHK - is_core = DAR - is_core = AZA - } - } - - #Ghana - AND = { - is_core = GHN - OR = { - is_core = MOS - is_core = ASH - } - } - - #Burkina-Faso - AND = { - is_core = BKF - OR = { - is_core = SEG - is_core = TOU - is_core = MAS - is_core = MOS - is_core = KNG - } - } - - #Dahomey/Benin - AND = { - is_core = DAH - OR = { - is_core = TOU - is_core = MAS - } - } - - #Faroe Islands - AND = { - NOT = { exists = FRO } - is_core = FRO - OR = { - is_colonial = no - year = 1880 - } - } - - } - } - } - } - - allow = { - } - - effect = { - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = NGR - OR = { - is_core = SOK - is_core = DND - is_core = TOU - is_core = OYO - is_core = BEN - is_core = ARO - is_core = CLA - is_core = WRI - is_core = KBO - } - } - remove_core = SOK - remove_core = DND - remove_core = TOU - remove_core = OYO - remove_core = BEN - remove_core = ARO - remove_core = CLA - remove_core = WRI - remove_core = KBO - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = IVC - OR = { - is_core = KNG - is_core = ASH - is_core = MOS - } - } - remove_core = KNG - remove_core = ASH - remove_core = MOS - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = GNE - OR = { - is_core = JAL - is_core = GBU - } - } - remove_core = JAL - remove_core = GBU - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = SNG - OR = { - is_core = TOO - is_core = WOL - is_core = SEG - is_core = TOU - } - } - remove_core = TOO - remove_core = WOL - remove_core = SEG - remove_core = TOU - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = NIG - OR = { - is_core = DND - is_core = TOU - is_core = MAS - is_core = DAM - is_core = KBO - } - } - remove_core = DND - remove_core = TOU - remove_core = MAS - remove_core = DAM - remove_core = KBO - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = CNG - OR = { - is_core = LUN - is_core = LOA - is_core = AZA - is_core = KZB - is_core = KON - } - } - remove_core = LUN - remove_core = LOA - remove_core = AZA - remove_core = KZB - remove_core = KON - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = MLI - OR = { - is_core = TOU - is_core = SEG - is_core = MAS - is_core = MOS - is_core = DND - is_core = BKF - } - } - remove_core = TOU - remove_core = SEG - remove_core = MAS - remove_core = MOS - remove_core = DND - remove_core = BKF - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = GMB - OR = { - is_core = TOO - is_core = WOL - is_core = SEG - is_core = TOU - } - } - remove_core = TOO - remove_core = WOL - remove_core = SEG - remove_core = TOU - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = ANG - is_core = KON - } - remove_core = KON - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = MOZ - OR = { - is_core = GAZ - is_core = AGC - is_core = ZUL - is_core = SHO - } - } - remove_core = GAZ - remove_core = AGC - remove_core = ZUL - remove_core = SHO - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = SUD - OR = { - is_core = EGY - is_core = SHK - is_core = DAR - is_core = AZA - } - } - remove_core = EGY - remove_core = SHK - remove_core = DAR - remove_core = AZA - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = GHN - OR = { - is_core = MOS - is_core = ASH - } - } - remove_core = MOS - remove_core = ASH - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = BKF - OR = { - is_core = SEG - is_core = TOU - is_core = MAS - is_core = MOS - is_core = KNG - } - } - remove_core = SEG - remove_core = TOU - remove_core = MAS - remove_core = MOS - remove_core = KNG - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - is_core = DAH - OR = { - is_core = TOU - is_core = MAS - } - } - remove_core = TOU - remove_core = MAS - } - } - - any_neighbor_country = { - limit = { - civilized = yes - NOT = { - capital_scope = { continent = africa } - capital_scope = { continent = west_africa } - capital_scope = { continent = central_africa } - capital_scope = { continent = east_africa } - capital_scope = { continent = south_west_africa } - } - } - any_owned = { - limit = { - NOT = { exists = FRO } - is_core = FRO - OR = { - is_colonial = no - year = 1880 - } - } - remove_core = FRO - } - } - - } - } } diff --git a/ccHFM/decisions/Colonial Portugal.txt b/ccHFM/decisions/Colonial Portugal.txt index 03b1b757..c4cd5a0c 100644 --- a/ccHFM/decisions/Colonial Portugal.txt +++ b/ccHFM/decisions/Colonial Portugal.txt @@ -328,10 +328,31 @@ political_decisions = { any_owned = { limit = { OR = { state_id = 1999 state_id = 2003 state_id = 2006 province_id = 2000 } } add_core = ANG + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = ANG + } remove_core = KON + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = ANG + } remove_core = LUN + } } - random_owned = { limit = { owner = { primary_culture = portuguese owns = 2003 } } 2003 = { change_province_name = "Lobito" } } random_owned = { limit = { owner = { primary_culture = portuguese owns = 2005 } } 2005 = { change_province_name = "New Lisbon" } } random_owned = { limit = { owner = { primary_culture = portuguese owns = 2008 } } 2008 = { change_province_name = "Namakunde" } } diff --git a/ccHFM/decisions/ENG.txt b/ccHFM/decisions/ENG.txt index 5ab0f8ce..355ede2d 100644 --- a/ccHFM/decisions/ENG.txt +++ b/ccHFM/decisions/ENG.txt @@ -306,7 +306,18 @@ political_decisions = { duration = 1825 } } - RHO = { all_core = { remove_core = MAT } } + any_country = { + limit = { + tag = MAT + exists = no + } + all_core = { + limit = { + is_core = RHO + } + remove_core = MAT + } + } set_country_flag = ian_would_be_proud } } @@ -516,123 +527,6 @@ political_decisions = { } } - aden_protectorate = { - picture = aden_protectorate - potential = { - NOT = { is_culture_group = arab } - OR = { - any_owned_province = { is_core = LHJ } - any_owned_province = { is_core = FDL } - any_owned_province = { is_core = KTH } - any_owned_province = { is_core = MHR } - is_sphere_leader_of = LHJ - is_sphere_leader_of = FDL - is_sphere_leader_of = KTH - is_sphere_leader_of = MHR - } - NOT = { has_global_flag = created_aden_protectorate } - } - - allow = { - war = no - OR = { - LHJ = { exists = no } - owns = 1412 - } - 1173 = { - OR = { - owned_by = THIS - owner = { in_sphere = THIS } - owner = { vassal_of = THIS } - KTH = { exists = no } - } - } - 1175 = { - OR = { - owned_by = THIS - owner = { in_sphere = THIS } - owner = { vassal_of = THIS } - MHR = { exists = no } - } - } - 1176 = { - OR = { - owned_by = THIS - owner = { in_sphere = THIS } - owner = { vassal_of = THIS } - FDL = { exists = no } - } - } - 1177 = { - OR = { - owned_by = THIS - owner = { in_sphere = THIS } - owner = { vassal_of = THIS } - MHR = { exists = no } - } - } - YEM = { exists = no } - } - - effect = { - set_global_flag = created_aden_protectorate - badboy = -3 - prestige = 10 - any_country = { - limit = { - OR = { - in_sphere = THIS - vassal_of = THIS - } - exists = yes - OR = { - tag = KTH - tag = LHJ - tag = FDL - tag = MHR - } - ai = yes - } - annex_to = THIS - } - LHJ = { all_core = { add_core = YEM remove_core = LHJ } } - FDL = { all_core = { add_core = YEM remove_core = FDL } } - KTH = { all_core = { add_core = YEM remove_core = KTH } } - MHR = { all_core = { add_core = YEM remove_core = MHR } } - 1412 = { remove_core = NYE } - any_owned = { limit = { is_core = YEM } secede_province = YEM } - create_vassal = YEM - diplomatic_influence = { who = YEM value = 400 } - relation = { who = YEM value = 400 } - YEM = { - capital = 1176 - money = 10000 - research_points = 6000 - government = absolute_monarchy - 1412 = { secede_province = THIS } - tech_school = unciv_tech_school - } - random_owned = { - limit = { owner = { primary_culture = british } } - YEM = { - government = colonial_company - military_reform = yes_foreign_weapons - military_reform = yes_foreign_officers - military_reform = yes_foreign_naval_officers - military_reform = yes_foreign_artillery - } - } - random_owned = { limit = { exists = NEJ } owner = { diplomatic_influence = { who = NEJ value = 25 } } } - random_owned = { limit = { exists = HAL } owner = { diplomatic_influence = { who = HAL value = 25 } } } - random_owned = { limit = { exists = BHR } owner = { diplomatic_influence = { who = BHR value = 25 } } } - random_owned = { limit = { exists = QAT } owner = { diplomatic_influence = { who = QAT value = 25 } } } - random_owned = { limit = { exists = ABU } owner = { diplomatic_influence = { who = ABU value = 25 } } } - random_owned = { limit = { exists = KWT } owner = { diplomatic_influence = { who = KWT value = 25 } } } - } - - ai_will_do = { factor = 1 } - } - gold_coast_treaty = { picture = treaty_signing potential = { @@ -1015,116 +909,6 @@ political_decisions = { ai_will_do = { factor = 1 } } - unite_north_yemen_existing = { - picture = aden_protectorate - potential = { - OR = { - NOT = { 1178 = { is_core = YEM } } - NOT = { 1179 = { is_core = YEM } } - NOT = { 1180 = { is_core = YEM } } - } - NOT = { tag = NYE } - NYE = { exists = yes } - OR = { - tag = YEM - YEM = { - exists = yes - OR = { - vassal_of = THIS - in_sphere = THIS - } - } - } - } - - allow = { - nationalism_n_imperialism = 1 - war = no - NYE = { - war = no - OR = { - vassal_of = THIS - in_sphere = THIS - all_core = { - OR = { - owned_by = THIS - owner = { in_sphere = THIS } - owner = { vassal_of = THIS } - } - } - } - } - OR = { - tag = YEM - YEM = { - OR = { - vassal_of = THIS - in_sphere = THIS - } - } - } - } - - effect = { - prestige = 5 - NYE = { all_core = { add_core = YEM } } - YEM = { inherit = NYE capital = 1178 } - } - ai_will_do = { factor = 1 } - } - - unite_yemeni_colonies = { - picture = aden_protectorate - potential = { - has_global_flag = created_aden_protectorate - OR = { - NOT = { 1178 = { is_core = YEM } } - NOT = { 1179 = { is_core = YEM } } - NOT = { 1180 = { is_core = YEM } } - } - OR = { - any_owned_province = { is_core = YEM } - any_owned_province = { is_core = NYE } - NYE = { in_sphere = THIS } - NYE = { vassal_of = THIS } - } - YEM = { exists = no } - } - - allow = { - nationalism_n_imperialism = 1 - war = no - YEM = { war = no all_core = { owned_by = THIS } } - NYE = { - war = no - all_core = { - OR = { - owned_by = THIS - owner = { in_sphere = THIS } - owner = { vassal_of = THIS } - } - } - } - } - - effect = { - prestige = 5 - NYE = { tech_school = unciv_tech_school all_core = { add_core = YEM } } - 1178 = { secede_province = THIS } - 1179 = { secede_province = THIS } - 1180 = { secede_province = THIS } - YEM = { tech_school = unciv_tech_school capital = 1178 } - - random_owned = { limit = { exists = NEJ } owner = { diplomatic_influence = { who = NEJ value = 50 } } } - random_owned = { limit = { exists = HAL } owner = { diplomatic_influence = { who = HAL value = 50 } } } - random_owned = { limit = { exists = BHR } owner = { diplomatic_influence = { who = BHR value = 50 } } } - random_owned = { limit = { exists = QAT } owner = { diplomatic_influence = { who = QAT value = 50 } } } - random_owned = { limit = { exists = ABU } owner = { diplomatic_influence = { who = ABU value = 50 } } } - random_owned = { limit = { exists = KWT } owner = { diplomatic_influence = { who = KWT value = 50 } } } - } - - ai_will_do = { factor = 1 } - } anglo_persian_oil_company = { picture = map_arabia @@ -1205,10 +989,51 @@ political_decisions = { set_country_flag = integrated_johore JOH = { civilized = no tech_school = unciv_tech_school } inherit = JOH - any_owned = { limit = { NOT = { OR = { province_id = 1386 province_id = 1384 province_id = 1385 } } } remove_core = JOH } - 1388 = { remove_core = JOH add_core = PRK } - 1389 = { remove_core = JOH add_core = PRK } - 1391 = { remove_core = JOH add_core = PHG } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + OR = { + province_id = 1388 + province_id = 1389 + } + } + remove_core = JOH + add_core = PRK + } + } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + province_id = 1391 + } + remove_core = JOH + add_core = PHG + } + } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + NOT = { + province_id = 1384 + province_id = 1385 + province_id = 1386 + } + } + remove_core = JOH + } + } random_owned = { limit = { exists = PRK } owner = { diplomatic_influence = { who = PRK value = 15 } } } random_owned = { limit = { exists = SWK } owner = { diplomatic_influence = { who = SWK value = 15 } } } @@ -1250,7 +1075,18 @@ political_decisions = { set_country_flag = integrated_pahang PHG = { civilized = no tech_school = unciv_tech_school } PHG = { all_core = { add_province_modifier = { name = nationalist_agitation duration = 730 } } } - PHG = { all_core = { remove_core = JOH } } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + is_core = PHG + } + remove_core = JOH + } + } inherit = PHG badboy = 1 @@ -1294,7 +1130,18 @@ political_decisions = { set_country_flag = integrated_selangor SLG = { civilized = no tech_school = unciv_tech_school } inherit = SLG - SLG = { all_core = { remove_core = JOH } } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + is_core = SLG + } + remove_core = JOH + } + } badboy = 1 random_owned = { limit = { exists = JOH } owner = { diplomatic_influence = { who = JOH value = 15 } } } @@ -1337,7 +1184,18 @@ political_decisions = { set_country_flag = integrated_perak PRK = { civilized = no tech_school = unciv_tech_school } inherit = PRK - PRK = { all_core = { remove_core = JOH } } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + is_core = PRK + } + remove_core = JOH + } + } badboy = 1 random_owned = { limit = { exists = JOH } owner = { diplomatic_influence = { who = JOH value = 15 } } } @@ -1495,11 +1353,11 @@ political_decisions = { } random_owned = { limit = { province_id = 1412 } - 1412 = { secede_province = YEM add_core = YEM remove_core = THIS remove_core = LHJ } + 1412 = { secede_province = YEM add_core = YEM remove_core = THIS } } random_country = { limit = { owns = 1412 NOT = { num_of_cities = 2 } } - 1412 = { add_core = YEM remove_core = THIS remove_core = LHJ } + 1412 = { add_core = YEM remove_core = THIS } annex_to = YEM } diff --git a/ccHFM/decisions/East Indies.txt b/ccHFM/decisions/East Indies.txt index bb36cfaf..503366bf 100644 --- a/ccHFM/decisions/East Indies.txt +++ b/ccHFM/decisions/East Indies.txt @@ -198,21 +198,162 @@ political_decisions = { } country_event = 95255 } - any_owned = { - limit = { is_core = INO NOT = { province_id = 1446 } } + any_country = { #1446 and 2647 do not need any of this, since their (TMR) cores are not removed at all + limit = { + tag = JAV + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = JAV - remove_core = DJA - remove_core = SAK - remove_core = ATJ - remove_core = BAL + } + } + any_country = { + limit = { + tag = DJA + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = DJA + } + } + any_country = { + limit = { + tag = SAK + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SAK + } + } + any_country = { + limit = { + tag = ATJ + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = ATJ + } + } + any_country = { + limit = { + tag = BAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BAL + } + } + any_country = { + limit = { + tag = SLW + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = SLW + } + } + any_country = { + limit = { + tag = MAL + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = MAL + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = LAN + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = KTI + } + } + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = SUL + } + } + any_country = { + limit = { + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = INO + } remove_core = BRU } + } + any_country = { + limit = { + tag = PPG + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = PPG + } + } } ai_will_do = { @@ -318,19 +459,137 @@ political_decisions = { } country_event = 95255 } - any_owned = { - limit = { is_core = MLY NOT = { province_id = 1393 } } - remove_core = SWK - remove_core = SUL - remove_core = BRU - remove_core = KTI - remove_core = JOH - remove_core = PRK - remove_core = SLG - remove_core = PHG - remove_core = SIA - remove_core = KLM - remove_core = LAN + any_country = { + limit = { + tag = SWK + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SWK + } + } + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SUL + } + } + any_country = { + limit = { + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = BRU + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = KTI + } + } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = JOH + } + } + any_country = { + limit = { + tag = PRK + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = PRK + } + } + any_country = { + limit = { + tag = SLG + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SLG + } + } + any_country = { + limit = { + tag = PHG + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = PHG + } + } + any_country = { + limit = { + tag = SIA + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SIA + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = LAN + } } } @@ -464,6 +723,10 @@ political_decisions = { effect = { set_global_flag = malaya_formed prestige = 20 + random_owned = { + limit = { province_id = 1384 } + remove_core = JOH + } random_country = { limit = { tag = JOH @@ -518,30 +781,6 @@ political_decisions = { secede_province = THIS } } - JOH = { - all_core = { - add_core = MLY - remove_core = JOH - } - } - SLG = { - all_core = { - add_core = MLY - remove_core = SLG - } - } - PHG = { - all_core = { - add_core = MLY - remove_core = PHG - } - } - PRK = { - all_core = { - add_core = MLY - remove_core = PRK - } - } any_country = { limit = { OR = { @@ -581,6 +820,7 @@ political_decisions = { is_core = PHG is_core = PRK is_core = SLG + is_core = JOH } } add_core = MLY @@ -598,22 +838,187 @@ political_decisions = { } MLY = { tech_school = unciv_tech_school } SGP = { tech_school = unciv_tech_school } - any_owned = { - limit = { is_core = MLY NOT = { province_id = 1393 } } - remove_core = SWK - remove_core = SUL - remove_core = BRU - remove_core = KTI - remove_core = KLM - remove_core = LAN - remove_core = SAK - remove_core = ATJ - remove_core = DJA - remove_core = PHG - remove_core = PRK - remove_core = SLG - } random_owned = { limit = { province_id = 2576 } add_core = MLY } + any_country = { + limit = { + tag = SWK + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SWK + } + } + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SUL + } + } + any_country = { + limit = { + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = BRU + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = KTI + } + } + any_country = { + limit = { + tag = PRK + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = PRK + } + } + any_country = { + limit = { + tag = SLG + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SLG + } + } + any_country = { + limit = { + tag = PHG + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = PHG + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = LAN + } + } + any_country = { + limit = { + tag = ATJ + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = ATJ + } + } + any_country = { + limit = { + tag = DJA + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = DJA + } + } + any_country = { + limit = { + tag = JOH + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = JOH + } + } + any_country = { + limit = { + tag = SLG + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = SLG + } + } + any_country = { + limit = { + tag = PHG + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = PHG + } + } + any_country = { + limit = { + tag = PRK + exists = no + } + all_core = { + limit = { + is_core = MLY + } + remove_core = PRK + } + } } ai_will_do = { @@ -1141,18 +1546,51 @@ political_decisions = { LUA = { all_core = { add_core = LXA + } + } + any_country = { + limit = { + tag = LUA + exists = no + } + all_core = { + limit = { + is_core = LXA + } remove_core = LUA } } WIA = { all_core = { add_core = LXA + } + } + any_country = { + limit = { + tag = WIA + exists = no + } + all_core = { + limit = { + is_core = LXA + } remove_core = WIA } } CHK = { all_core = { add_core = LXA + } + } + any_country = { + limit = { + tag = CHK + exists = no + } + all_core = { + limit = { + is_core = LXA + } remove_core = CHK } } @@ -1167,9 +1605,20 @@ political_decisions = { set_country_flag = Luangprabang government = democracy political_reform = landed_voting - all_core = { remove_core = SIA } tech_school = unciv_tech_school } + any_country = { + limit = { + tag = SIA + exists = no + } + all_core = { + limit = { + is_core = LXA + } + remove_core = SIA + } + } } ai_will_do = { factor = 1 } } @@ -1267,14 +1716,44 @@ political_decisions = { effect = { set_country_flag = laos_formed - any_owned = { - limit = { OR = { is_core = LUA is_core = CHK is_core = WIA } } - remove_core = LUA - remove_core = CHK - remove_core = WIA - } LUA_1356 = { add_core = LXA } random_owned = { limit = { owner = { ai = no } } owner = { 1358 = { add_core = LXA } 1359 = { add_core = LXA } } } + any_country = { + limit = { + tag = LUA + exists = no + } + all_core = { + limit = { + is_core = LXA + } + remove_core = LUA + } + } + any_country = { + limit = { + tag = CHK + exists = no + } + all_core = { + limit = { + is_core = LXA + } + remove_core = CHK + } + } + any_country = { + limit = { + tag = WIA + exists = no + } + all_core = { + limit = { + is_core = LXA + } + remove_core = WIA + } + } prestige = 10 change_tag = LXA any_country = { diff --git a/ccHFM/decisions/FlavourMod_Africa.txt b/ccHFM/decisions/FlavourMod_Africa.txt index 09c651ab..8c27b53f 100644 --- a/ccHFM/decisions/FlavourMod_Africa.txt +++ b/ccHFM/decisions/FlavourMod_Africa.txt @@ -1120,7 +1120,6 @@ political_decisions = { ai = yes exists = yes } - KNG = { all_core = { remove_core = KNG } } war = { target = THIS attacker_goal = { casus_belli = humiliate } diff --git a/ccHFM/decisions/FlavourMod_FRA_Colonial.txt b/ccHFM/decisions/FlavourMod_FRA_Colonial.txt index 7d606268..918a8e42 100644 --- a/ccHFM/decisions/FlavourMod_FRA_Colonial.txt +++ b/ccHFM/decisions/FlavourMod_FRA_Colonial.txt @@ -94,10 +94,21 @@ political_decisions = { all_core = { remove_core = THIS remove_core = CAN - remove_core = RPL remove_core = NEW } } + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + is_core = QUE + } + remove_core = RPL + } + } USA = { remove_accepted_culture = cajun } remove_accepted_culture = cajun } @@ -358,8 +369,31 @@ political_decisions = { ###Effects for Treaty of Paris - This will end the French Goals in North America### random_owned = { limit = { owner = { has_country_flag = quebec_and_acadia_only } } - USA = { all_core = { remove_core = ACA } } #Removes Acadian Cores from the US - ULA = { all_core = { remove_core = ULA } } + #Removes Acadian Cores from the US + any_country = { + limit = { + tag = ACA + exists = no + } + all_core = { + limit = { + is_core = USA + } + remove_core = ACA + } + } + any_country = { + limit = { + tag = ULA + exists = no + } + all_core = { + limit = { + is_core = USA + } + remove_core = ULA + } + } owner = { badboy = -5 } #Reduces your infamy for dropping the rest of your claims 46 = { state_scope = { change_region_name = "Southern Ontario" } } QUE = { all_core = { remove_core = ENG remove_core = THIS remove_core = RPL remove_core = CAN remove_core = NEW } } diff --git a/ccHFM/decisions/FlavourMod_RUS.txt b/ccHFM/decisions/FlavourMod_RUS.txt index bcd8d5f1..57c65ebf 100644 --- a/ccHFM/decisions/FlavourMod_RUS.txt +++ b/ccHFM/decisions/FlavourMod_RUS.txt @@ -172,7 +172,18 @@ political_decisions = { } effect = { set_country_flag = abolish_volga_region - VLG = { all_core = { remove_core = VLG } } + any_country = { + limit = { + tag = VLG + exists = no + } + all_core = { + limit = { + is_core = RUS + } + remove_core = VLG + } + } war_exhaustion = -5 } @@ -582,7 +593,18 @@ political_decisions = { all_core = { add_core = RUS } annex_to = RUS } - SVA = { all_core = { remove_core = SVA } } + any_country = { + limit = { + tag = SVA + exists = no + } + all_core = { + limit = { + is_core = RUS + } + remove_core = SVA + } + } } ai_will_do = { factor = 1 } } @@ -643,7 +665,18 @@ political_decisions = { all_core = { add_core = RUS } annex_to = RUS } - MIG = { all_core = { remove_core = MIG } } + any_country = { + limit = { + tag = MIG + exists = no + } + all_core = { + limit = { + is_core = RUS + } + remove_core = MIG + } + } } ai_will_do = { factor = 1 } } diff --git a/ccHFM/decisions/FlavourMod_USA.txt b/ccHFM/decisions/FlavourMod_USA.txt index 3b0d2565..3ee106eb 100644 --- a/ccHFM/decisions/FlavourMod_USA.txt +++ b/ccHFM/decisions/FlavourMod_USA.txt @@ -194,8 +194,31 @@ political_decisions = { } inherit = ULA inherit = ACA - ULA = { all_core = { remove_core = ULA } } - ACA = { all_core = { add_core = USA remove_core = ACA } } + any_country = { + limit = { + tag = ULA + exists = no + } + all_core = { + limit = { + is_core = USA + } + remove_core = ULA + } + } + any_country = { + limit = { + tag = ACA + exists = no + } + all_core = { + limit = { + is_core = USA + } + add_core = USA + remove_core = ACA + } + } } ai_will_do = { factor = 1 } diff --git a/ccHFM/decisions/Germany.txt b/ccHFM/decisions/Germany.txt index 3fcd668c..4f69bc8b 100644 --- a/ccHFM/decisions/Germany.txt +++ b/ccHFM/decisions/Germany.txt @@ -445,9 +445,20 @@ political_decisions = { 533 = { add_core = THIS # Heligoland is my last territorial demand! add_core = ENG - remove_core = HGL change_province_name = "Helgoland" } + any_country = { + limit = { + tag = HGL + exists = no + } + all_core = { + limit = { + is_core = ENG + } + remove_core = HGL + } + } set_country_flag = has_questioned_heligoland } } diff --git a/ccHFM/decisions/Italy.txt b/ccHFM/decisions/Italy.txt index 96f5ec08..805b4bf8 100644 --- a/ccHFM/decisions/Italy.txt +++ b/ccHFM/decisions/Italy.txt @@ -574,21 +574,186 @@ political_decisions = { } } add_core = ITA - remove_core = SAR - remove_core = SVY - remove_core = SRD - remove_core = SIC - remove_core = MOD - remove_core = TUS - remove_core = LUC - remove_core = PAR - remove_core = PAP - remove_core = VEN - remove_core = LOM - remove_core = RMG - remove_core = SYC - remove_core = TST - remove_core = GEN + } + any_country = { + limit = { + tag = SAR + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SAR + } + } + any_country = { + limit = { + tag = SVY + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SVY + } + } + any_country = { + limit = { + tag = SRD + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SRD + } + } + any_country = { + limit = { + tag = SIC + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SIC + } + } + any_country = { + limit = { + tag = MOD + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = MOD + } + } + any_country = { + limit = { + tag = TUS + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = TUS + } + } + any_country = { + limit = { + tag = LUC + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = LUC + } + } + any_country = { + limit = { + tag = PAR + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = PAR + } + } + any_country = { + limit = { + tag = PAP + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = PAP + } + } + any_country = { + limit = { + tag = VEN + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = VEN + } + } + any_country = { + limit = { + tag = LOM + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = LOM + } + } + any_country = { + limit = { + tag = RMG + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = RMG + } + } + any_country = { + limit = { + tag = SYC + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SYC + } + } + any_country = { + limit = { + tag = TST + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = TST + } + } + any_country = { + limit = { + tag = GEN + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = GEN + } } } @@ -765,7 +930,7 @@ political_decisions = { owner = { set_global_flag = italian_claimed_south_tirol - AUS_734 = { add_core = ITA remove_core = TST } + AUS_734 = { add_core = ITA } AUS_736 = { add_core = ITA } } } @@ -1288,6 +1453,17 @@ political_decisions = { SRD = { all_core = { any_pop = { consciousness = 3 militancy = -9 } + } + } + any_country = { + limit = { + tag = SRD + exists = no + } + all_core = { + limit = { + is_core = SAR + } remove_core = SRD } } @@ -1562,19 +1738,186 @@ political_decisions = { } } add_core = ITA - remove_core = SAR - remove_core = SVY - remove_core = SRD - remove_core = SIC - remove_core = MOD - remove_core = TUS - remove_core = LUC - remove_core = PAR - remove_core = PAP - remove_core = VEN - remove_core = LOM - remove_core = RMG - remove_core = SYC + } + any_country = { + limit = { + tag = SAR + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SAR + } + } + any_country = { + limit = { + tag = SVY + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SVY + } + } + any_country = { + limit = { + tag = SRD + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SRD + } + } + any_country = { + limit = { + tag = SIC + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SIC + } + } + any_country = { + limit = { + tag = MOD + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = MOD + } + } + any_country = { + limit = { + tag = TUS + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = TUS + } + } + any_country = { + limit = { + tag = LUC + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = LUC + } + } + any_country = { + limit = { + tag = PAR + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = PAR + } + } + any_country = { + limit = { + tag = PAP + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = PAP + } + } + any_country = { + limit = { + tag = VEN + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = VEN + } + } + any_country = { + limit = { + tag = LOM + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = LOM + } + } + any_country = { + limit = { + tag = RMG + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = RMG + } + } + any_country = { + limit = { + tag = SYC + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SYC + } + } + any_country = { + limit = { + tag = TST + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = TST + } + } + any_country = { + limit = { + tag = GEN + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = GEN + } } } ai_will_do = { diff --git a/ccHFM/decisions/NationalUnification.txt b/ccHFM/decisions/NationalUnification.txt index 1f502e05..04951846 100644 --- a/ccHFM/decisions/NationalUnification.txt +++ b/ccHFM/decisions/NationalUnification.txt @@ -1002,9 +1002,42 @@ political_decisions = { random_owned = { limit = { owner = { accepted_culture = french } } owner = { remove_accepted_culture = french } } random_owned = { limit = { owner = { accepted_culture = south_german } } owner = { remove_accepted_culture = south_german } } random_owned = { limit = { owner = { accepted_culture = british } } owner = { remove_accepted_culture = british } } - any_owned = { limit = { is_core = SYC } remove_core = SYC } - any_owned = { limit = { is_core = SRD } remove_core = SRD } - any_owned = { limit = { is_core = RMG } remove_core = RMG } + any_country = { + limit = { + tag = SYC + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SYC + } + } + any_country = { + limit = { + tag = SRD + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = SRD + } + } + any_country = { + limit = { + tag = RMG + exists = no + } + all_core = { + limit = { + is_core = ITA + } + remove_core = RMG + } + } any_country = { limit = { is_culture_group = italian @@ -1537,12 +1570,6 @@ political_decisions = { FDL = { all_core = { add_core = YEM } } KTH = { all_core = { add_core = YEM } } MHR = { all_core = { add_core = YEM } } - any_owned = { - remove_core = LHJ - remove_core = FDL - remove_core = KTH - remove_core = MHR - } change_tag = YEM } diff --git a/ccHFM/decisions/New Colonies.txt b/ccHFM/decisions/New Colonies.txt index 29042c67..c569a23c 100644 --- a/ccHFM/decisions/New Colonies.txt +++ b/ccHFM/decisions/New Colonies.txt @@ -395,19 +395,126 @@ political_decisions = { SOK_1937 = { add_core = NGR } FRA_1927 = { add_core = NGR } SOK_1945 = { add_core = NGR } - - any_owned = { - limit = { is_core = NGR } - remove_core = NIG - remove_core = SOK - remove_core = DND - remove_core = TOU - remove_core = OYO - remove_core = BEN - remove_core = ARO - remove_core = CLA - remove_core = WRI - remove_core = KBO + + any_country = { + limit = { + tag = NIG + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = NIG + } + } + any_country = { + limit = { + tag = SOK + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = SOK + } + } + any_country = { + limit = { + tag = DND + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = DND + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = OYO + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = OYO + } + } + any_country = { + limit = { + tag = BEN + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = BEN + } + } + any_country = { + limit = { + tag = ARO + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = ARO + } + } + any_country = { + limit = { + tag = CLA + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = CLA + } + } + any_country = { + limit = { + tag = WRI + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = WRI + } + } + any_country = { + limit = { + tag = KBO + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = KBO + } } SOK_1934 = { add_core = ARO } @@ -557,15 +664,126 @@ political_decisions = { } } add_core = NGR - remove_core = SOK - remove_core = DND - remove_core = TOU - remove_core = OYO - remove_core = BEN - remove_core = ARO - remove_core = CLA - remove_core = WRI - remove_core = KBO + } + any_country = { + limit = { + tag = NIG + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = NIG + } + } + any_country = { + limit = { + tag = SOK + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = SOK + } + } + any_country = { + limit = { + tag = DND + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = DND + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = OYO + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = OYO + } + } + any_country = { + limit = { + tag = BEN + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = BEN + } + } + any_country = { + limit = { + tag = ARO + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = ARO + } + } + any_country = { + limit = { + tag = CLA + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = CLA + } + } + any_country = { + limit = { + tag = WRI + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = WRI + } + } + any_country = { + limit = { + tag = KBO + exists = no + } + all_core = { + limit = { + is_core = NGR + } + remove_core = KBO + } } NGR = { primary_culture = THIS @@ -871,11 +1089,41 @@ political_decisions = { 1892 = { change_province_name = "Abidjan" } FRA_1892 = { add_core = IVC } FRA_1893 = { add_core = IVC } - any_owned = { - limit = { is_core = IVC } - remove_core = KNG - remove_core = ASH - remove_core = MOS + any_country = { + limit = { + tag = KNG + exists = no + } + all_core = { + limit = { + is_core = IVC + } + remove_core = KNG + } + } + any_country = { + limit = { + tag = ASH + exists = no + } + all_core = { + limit = { + is_core = IVC + } + remove_core = ASH + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = IVC + } + remove_core = MOS + } } random_owned = { limit = { owner = { primary_culture = french } } IVC = { government = colonial_company } } IVC = { @@ -971,9 +1219,42 @@ political_decisions = { } } add_core = IVC - remove_core = KNG - remove_core = ASH - remove_core = MOS + } + any_country = { + limit = { + tag = KNG + exists = no + } + all_core = { + limit = { + is_core = IVC + } + remove_core = KNG + } + } + any_country = { + limit = { + tag = ASH + exists = no + } + all_core = { + limit = { + is_core = IVC + } + remove_core = ASH + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = IVC + } + remove_core = MOS + } } IVC = { primary_culture = THIS @@ -1221,10 +1502,29 @@ political_decisions = { country_event = 199042 1879 = { change_province_name = "Conakry" } FRA_1883 = { add_core = GNE } - any_owned = { - limit = { is_core = GNE } - remove_core = JAL - remove_core = GBU + any_country = { + limit = { + tag = JAL + exists = no + } + all_core = { + limit = { + is_core = GNE + } + remove_core = JAL + } + } + any_country = { + limit = { + tag = GBU + exists = no + } + all_core = { + limit = { + is_core = GNE + } + remove_core = GBU + } } GNE = { primary_culture = THIS @@ -1314,8 +1614,30 @@ political_decisions = { any_owned = { limit = { region = FRA_1883 } add_core = GNE - remove_core = JAL - remove_core = GBU + } + any_country = { + limit = { + tag = JAL + exists = no + } + all_core = { + limit = { + is_core = GNE + } + remove_core = JAL + } + } + any_country = { + limit = { + tag = GBU + exists = no + } + all_core = { + limit = { + is_core = GNE + } + remove_core = GBU + } } GNE = { @@ -1414,14 +1736,55 @@ political_decisions = { 1788 = { trade_goods = cotton } FRA_1783 = { add_core = SNG } FRA_1788 = { add_core = SNG } - any_owned = { - limit = { is_core = SNG } - remove_core = TOO - remove_core = WOL - remove_core = SEG - remove_core = TOU + any_country = { + limit = { + tag = TOO + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = TOO + } } - SNG = { + any_country = { + limit = { + tag = WOL + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = WOL + } + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = SEG + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = TOU + } + } + SNG = { primary_culture = THIS add_accepted_culture = wolof tech_school = unciv_tech_school @@ -1478,10 +1841,54 @@ political_decisions = { } } add_core = SNG - remove_core = TOO - remove_core = WOL - remove_core = SEG - remove_core = TOU + } + any_country = { + limit = { + tag = TOO + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = TOO + } + } + any_country = { + limit = { + tag = WOL + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = WOL + } + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = SEG + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = SNG + } + remove_core = TOU + } } SNG = { primary_culture = THIS } @@ -1533,13 +1940,65 @@ political_decisions = { FRA_1813 = { add_core = NIG } FRA_1808 = { add_core = NIG } - any_owned = { - limit = { is_core = NIG } - remove_core = DND - remove_core = TOU - remove_core = MAS - remove_core = DAM - remove_core = KBO + any_country = { + limit = { + tag = DND + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = DND + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = DAM + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = DAM + } + } + any_country = { + limit = { + tag = KBO + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = KBO + } } NIG = { primary_culture = THIS @@ -1597,13 +2056,67 @@ political_decisions = { } } add_core = NIG - remove_core = DND - remove_core = TOU - remove_core = MAS - remove_core = DAM - remove_core = KBO } - + any_country = { + limit = { + tag = DND + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = DND + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = DAM + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = DAM + } + } + any_country = { + limit = { + tag = KBO + exists = no + } + all_core = { + limit = { + is_core = NIG + } + remove_core = KBO + } + } NIG = { primary_culture = THIS @@ -2096,7 +2609,18 @@ political_decisions = { clr_country_flag = shinto_country clr_country_flag = sikh_country clr_country_flag = animist_country - all_core = { remove_core = EQG } + } + any_country = { + limit = { + tag = EQG + exists = no + } + all_core = { + limit = { + is_core = GAB + } + remove_core = EQG + } } random_owned = { limit = { owner = { has_country_flag = catholic_country } } GAB = { religion = catholic set_country_flag = catholic_country } } @@ -2180,6 +2704,18 @@ political_decisions = { clr_country_flag = sikh_country clr_country_flag = animist_country } + any_country = { + limit = { + tag = EQG + exists = no + } + all_core = { + limit = { + is_core = GAB + } + remove_core = EQG + } + } random_owned = { limit = { owner = { has_country_flag = catholic_country } } GAB = { religion = catholic set_country_flag = catholic_country } } random_owned = { @@ -2261,7 +2797,18 @@ political_decisions = { any_owned = { limit = { is_core = CGO NOT = {life_rating = 12 } } life_rating = 25 } - any_owned = { limit = { is_core = CGO } remove_core = LOA } + any_country = { + limit = { + tag = LOA + exists = no + } + all_core = { + limit = { + is_core = CGO + } + remove_core = LOA + } + } CGO = { primary_culture = THIS add_accepted_culture = bakongo @@ -2359,7 +2906,18 @@ political_decisions = { } life_rating = 25 } - any_owned = { limit = { is_core = CGO } remove_core = LOA } + any_country = { + limit = { + tag = LOA + exists = no + } + all_core = { + limit = { + is_core = CGO + } + remove_core = LOA + } + } CGO = { primary_culture = THIS clr_country_flag = sunni_country @@ -2478,23 +3036,77 @@ political_decisions = { BEL_1987 = { add_core = CNG } BEL_1990 = { add_core = CNG } BEL_1996 = { add_core = CNG } - any_owned = { + any_country = { limit = { - OR = { - region = BEL_1977 - region = BEL_1984 - region = BEL_1992 - region = BEL_1987 - region = BEL_1990 - region = BEL_1996 + tag = CGO + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = CGO + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = LOA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LOA + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG } + remove_core = KON } - remove_core = CGO - remove_core = LUN - remove_core = LOA - remove_core = AZA - remove_core = KZB - remove_core = KON } any_owned = { limit = { @@ -2613,44 +3225,110 @@ political_decisions = { } } add_core = CNG - remove_core = CGO - remove_core = LUN - remove_core = LOA - remove_core = AZA - remove_core = KZB - remove_core = KON } - any_owned = { + any_country = { limit = { - OR = { - region = BEL_1977 - region = BEL_1984 - region = BEL_1992 - region = BEL_1987 - region = BEL_1990 - region = BEL_1996 + tag = CGO + exists = no + } + all_core = { + limit = { + is_core = CNG } - NOT = { life_rating = 12 } + remove_core = CGO } - life_rating = 25 } - CNG = { - primary_culture = THIS - clr_country_flag = sunni_country - clr_country_flag = shiite_country - clr_country_flag = ibadi_country - clr_country_flag = catholic_country - clr_country_flag = protestant_country - clr_country_flag = mormon_country - clr_country_flag = orthodox_country - clr_country_flag = coptic_country - clr_country_flag = jewish_country - clr_country_flag = yazidi_country - clr_country_flag = mahayana_country - clr_country_flag = gelugpa_country - clr_country_flag = theravada_country - clr_country_flag = hindu_country - clr_country_flag = shinto_country + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = LOA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LOA + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } + any_owned = { + limit = { + OR = { + region = BEL_1977 + region = BEL_1984 + region = BEL_1992 + region = BEL_1987 + region = BEL_1990 + region = BEL_1996 + } + NOT = { life_rating = 12 } + } + life_rating = 25 + } + CNG = { + primary_culture = THIS + clr_country_flag = sunni_country + clr_country_flag = shiite_country + clr_country_flag = ibadi_country + clr_country_flag = catholic_country + clr_country_flag = protestant_country + clr_country_flag = mormon_country + clr_country_flag = orthodox_country + clr_country_flag = coptic_country + clr_country_flag = jewish_country + clr_country_flag = yazidi_country + clr_country_flag = mahayana_country + clr_country_flag = gelugpa_country + clr_country_flag = theravada_country + clr_country_flag = hindu_country + clr_country_flag = shinto_country clr_country_flag = sikh_country clr_country_flag = animist_country } @@ -2731,10 +3409,29 @@ political_decisions = { ENG_2014 = { add_core = ZAM } ENG_2016 = { add_core = ZAM } - any_owned = { - limit = { is_core = ZAM } - remove_core = KZB - remove_core = LUN + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = ZAM + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = ZAM + } + remove_core = LUN + } } any_owned = { limit = { @@ -2849,8 +3546,30 @@ political_decisions = { } } add_core = ZAM - remove_core = KZB - remove_core = LUN + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = ZAM + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = ZAM + } + remove_core = LUN + } } random_owned = { limit = { province_id = 2015 owner = { primary_culture = british } } @@ -2955,9 +3674,17 @@ political_decisions = { ENG_2026 = { add_core = KNY } ENG_2024 = { add_core = KNY } - any_owned = { - limit = { is_core = KNY } - remove_core = ZAN + any_country = { + limit = { + tag = ZAN + exists = no + } + all_core = { + limit = { + is_core = KNY + } + remove_core = ZAN + } } any_owned = { @@ -3069,7 +3796,18 @@ political_decisions = { } } add_core = KNY - remove_core = ZAN + } + any_country = { + limit = { + tag = ZAN + exists = no + } + all_core = { + limit = { + is_core = KNY + } + remove_core = ZAN + } } any_owned = { limit = { @@ -3175,13 +3913,18 @@ political_decisions = { ENG_2044 = { add_core = TNZ } ENG_2039 = { add_core = TNZ } - any_owned = { + any_country = { limit = { - is_core = TNZ - # Zanzibar - NOT = { province_id = 2048 } + tag = ZAN + exists = no + } + all_core = { + limit = { + is_core = TNZ + NOT = { province_id = 2048 } + } + remove_core = ZAN } - remove_core = ZAN } any_owned = { @@ -3299,6 +4042,19 @@ political_decisions = { } add_core = TNZ } + any_country = { + limit = { + tag = ZAN + exists = no + } + all_core = { + limit = { + is_core = TNZ + NOT = { province_id = 2048 } + } + remove_core = ZAN + } + } any_owned = { limit = { OR = { @@ -3406,14 +4162,77 @@ political_decisions = { FRA_1801 = { add_core = MLI } FRA_1798 = { add_core = MLI } - any_owned = { - limit = { is_core = MLI } - remove_core = TOU - remove_core = SEG - remove_core = MAS - remove_core = MOS - remove_core = DND - remove_core = BKF + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = SEG + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = MOS + } + } + any_country = { + limit = { + tag = DND + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = DND + } + } + any_country = { + limit = { + tag = BKF + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = BKF + } } MLI = { @@ -3517,12 +4336,78 @@ political_decisions = { } } add_core = MLI - remove_core = TOU - remove_core = SEG - remove_core = MAS - remove_core = MOS - remove_core = DND - remove_core = BKF + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = SEG + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = MOS + } + } + any_country = { + limit = { + tag = DND + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = DND + } + } + any_country = { + limit = { + tag = BKF + exists = no + } + all_core = { + limit = { + is_core = MLI + } + remove_core = BKF + } } MLI = { @@ -3609,8 +4494,30 @@ political_decisions = { } } add_core = LBY - remove_core = TRI - remove_core = CYR + } + any_country = { + limit = { + tag = TRI + exists = no + } + all_core = { + limit = { + is_core = LBY + } + remove_core = TRI + } + } + any_country = { + limit = { + tag = CYR + exists = no + } + all_core = { + limit = { + is_core = LBY + } + remove_core = CYR + } } LBY = { tech_school = unciv_tech_school } @@ -3649,11 +4556,33 @@ political_decisions = { } } add_core = LBY - remove_core = TRI - remove_core = CYR } - LBY = { tech_school = unciv_tech_school } - } + any_country = { + limit = { + tag = TRI + exists = no + } + all_core = { + limit = { + is_core = LBY + } + remove_core = TRI + } + } + any_country = { + limit = { + tag = CYR + exists = no + } + all_core = { + limit = { + is_core = LBY + } + remove_core = CYR + } + } + LBY = { tech_school = unciv_tech_school } + } } organize_CAR = { @@ -3692,9 +4621,20 @@ political_decisions = { any_owned = { limit = { region = FRA_1965 } add_core = CAR - remove_core = AZA #remove_core = DAR } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CAR + } + remove_core = AZA + } + } any_owned = { limit = { region = FRA_1965 @@ -3793,9 +4733,20 @@ political_decisions = { region = FRA_1965 } add_core = CAR - remove_core = AZA #remove_core = DAR } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CAR + } + remove_core = AZA + } + } any_owned = { limit = { region = FRA_1965 @@ -3881,14 +4832,24 @@ political_decisions = { 2067 = { add_core = MLW - remove_core = KZB life_rating = 25 } 2066 = { add_core = MLW - remove_core = KZB life_rating = 25 } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = MLW + } + remove_core = KZB + } + } MLW = { primary_culture = THIS add_accepted_culture = chewa @@ -4059,12 +5020,65 @@ political_decisions = { 1785 = { add_core = GMB } - any_owned = { - limit = { is_core = GMB } - remove_core = TOO - remove_core = WOL - remove_core = SEG - remove_core = TOU + any_country = { + limit = { + tag = TOO + exists = no + } + all_core = { + limit = { + is_core = GMB + } + remove_core = TOO + } + } + any_country = { + limit = { + tag = WOL + exists = no + } + all_core = { + limit = { + is_core = GMB + } + remove_core = WOL + } + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = GMB + } + remove_core = SEG + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = GMB + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = GBU + exists = no + } + all_core = { + limit = { + is_core = GMB + } + remove_core = GBU + } } GMB = { @@ -4268,9 +5282,17 @@ political_decisions = { POR_2006 = { add_core = ANG } POR_1999 = { add_core = ANG } - any_owned = { - limit = { is_core = ANG } - remove_core = KON + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = ANG + } + remove_core = KON + } } random_owned = { @@ -4473,11 +5495,51 @@ political_decisions = { POR_2054 = { add_core = MOZ } POR_2049 = { add_core = MOZ } - MOZ = { + any_country = { + limit = { + tag = GAZ + exists = no + } all_core = { + limit = { + is_core = MOZ + } remove_core = GAZ + } + } + any_country = { + limit = { + tag = AGC + exists = no + } + all_core = { + limit = { + is_core = MOZ + } remove_core = AGC + } + } + any_country = { + limit = { + tag = ZUL + exists = no + } + all_core = { + limit = { + is_core = MOZ + } remove_core = ZUL + } + } + any_country = { + limit = { + tag = SHO + exists = no + } + all_core = { + limit = { + is_core = MOZ + } remove_core = SHO } } @@ -4611,10 +5673,54 @@ political_decisions = { } } add_core = MOZ - remove_core = GAZ - remove_core = AGC - remove_core = ZUL - remove_core = SHO + } + any_country = { + limit = { + tag = GAZ + exists = no + } + all_core = { + limit = { + is_core = MOZ + } + remove_core = GAZ + } + } + any_country = { + limit = { + tag = AGC + exists = no + } + all_core = { + limit = { + is_core = MOZ + } + remove_core = AGC + } + } + any_country = { + limit = { + tag = ZUL + exists = no + } + all_core = { + limit = { + is_core = MOZ + } + remove_core = ZUL + } + } + any_country = { + limit = { + tag = SHO + exists = no + } + all_core = { + limit = { + is_core = MOZ + } + remove_core = SHO + } } MOZ = { primary_culture = THIS @@ -4940,9 +6046,20 @@ political_decisions = { clr_country_flag = shinto_country clr_country_flag = sikh_country clr_country_flag = animist_country - all_core = { remove_core = MAT } any_pop = { limit = { has_pop_religion = animist } literacy = -0.99 } } + any_country = { + limit = { + tag = MAT + exists = no + } + all_core = { + limit = { + is_core = TSW + } + remove_core = MAT + } + } random_owned = { limit = { owner = { has_country_flag = catholic_country } } TSW = { religion = catholic set_country_flag = catholic_country } } random_owned = { @@ -5006,10 +6123,19 @@ political_decisions = { set_country_flag = botswana_master country_event = 199059 - any_owned = { - limit = { is_core = TSW } - remove_core = MAT + any_country = { + limit = { + tag = MAT + exists = no + } + all_core = { + limit = { + is_core = TSW + } + remove_core = MAT + } } + TSW = { primary_culture = THIS clr_country_flag = sunni_country @@ -5170,6 +6296,54 @@ political_decisions = { political_reform = landed_voting tech_school = unciv_tech_school } + any_country = { + limit = { + tag = EGY + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = EGY + } + } + any_country = { + limit = { + tag = SHK + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = SHK + } + } + any_country = { + limit = { + tag = DAR + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = DAR + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = AZA + } + } } } @@ -5248,6 +6422,7 @@ political_decisions = { war = no machine_guns = 1 market_regulations = 1 + 1911 = { owned_by = THIS } OR = { ASH_1909 = { owned_by = THIS } FRA_1907 = { owned_by = THIS } @@ -5262,10 +6437,44 @@ political_decisions = { ASH = { all_core = { add_core = GHN + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = GHN + } remove_core = MOS + } + } + any_country = { + limit = { + tag = ASH + exists = no + } + all_core = { + limit = { + is_core = GHN + } remove_core = ASH } } + any_country = { + limit = { + tag = KNG + exists = no + } + all_core = { + limit = { + is_core = GHN + } + remove_core = KNG + } + } GHN = { set_country_flag = post_colonial_country @@ -5355,21 +6564,54 @@ political_decisions = { set_country_flag = ghana_master country_event = 199061 - any_owned = { - limit = { is_core = GHN } - remove_core = MOS + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = GHN + } + remove_core = MOS + } } - GHN = { - primary_culture = THIS - clr_country_flag = sunni_country - clr_country_flag = shiite_country - clr_country_flag = ibadi_country - clr_country_flag = catholic_country - clr_country_flag = protestant_country - clr_country_flag = mormon_country - clr_country_flag = orthodox_country - clr_country_flag = coptic_country - clr_country_flag = jewish_country + any_country = { + limit = { + tag = ASH + exists = no + } + all_core = { + limit = { + is_core = GHN + } + remove_core = ASH + } + } + any_country = { + limit = { + tag = KNG + exists = no + } + all_core = { + limit = { + is_core = GHN + } + remove_core = KNG + } + } + + GHN = { + primary_culture = THIS + clr_country_flag = sunni_country + clr_country_flag = shiite_country + clr_country_flag = ibadi_country + clr_country_flag = catholic_country + clr_country_flag = protestant_country + clr_country_flag = mormon_country + clr_country_flag = orthodox_country + clr_country_flag = coptic_country + clr_country_flag = jewish_country clr_country_flag = yazidi_country clr_country_flag = mahayana_country clr_country_flag = gelugpa_country @@ -5438,11 +6680,66 @@ political_decisions = { random_owned = { limit = { owner = { primary_culture = french } } 1901 = { change_province_name = "Ouagadougou" } } FRA_1901 = { add_core = BKF - remove_core = SEG - remove_core = TOU - remove_core = MAS - remove_core = MOS - remove_core = KNG + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = SEG + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = MOS + } + } + any_country = { + limit = { + tag = KNG + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = KNG + } } BKF = { @@ -5535,11 +6832,66 @@ political_decisions = { any_owned = { limit = { is_core = BKF } - remove_core = SEG - remove_core = TOU - remove_core = MAS - remove_core = MOS - remove_core = KNG + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = SEG + } + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = MOS + } + } + any_country = { + limit = { + tag = KNG + exists = no + } + all_core = { + limit = { + is_core = BKF + } + remove_core = KNG + } } BKF = { primary_culture = THIS @@ -5666,8 +7018,54 @@ political_decisions = { FRA_1919 = { add_core = DAH - remove_core = TOU - remove_core = MAS + } + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = MOS + } + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = SEG + } } 1919 = { change_province_name = Porto-Novo } DAH = { @@ -5759,12 +7157,53 @@ political_decisions = { set_country_flag = dahomey_master country_event = 199063 - any_owned = { - limit = { is_core = DAH } - remove_core = SEG - remove_core = TOU - remove_core = MAS - remove_core = MOS + any_country = { + limit = { + tag = TOU + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = TOU + } + } + any_country = { + limit = { + tag = MAS + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = MAS + } + } + any_country = { + limit = { + tag = MOS + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = MOS + } + } + any_country = { + limit = { + tag = SEG + exists = no + } + all_core = { + limit = { + is_core = DAH + } + remove_core = SEG + } } DAH = { primary_culture = THIS @@ -5792,94 +7231,231 @@ political_decisions = { limit = { owner = { has_country_flag = protestant_country } } DAH = { religion = protestant set_country_flag = protestant_country } } - random_owned = { limit = { owner = { has_country_flag = orthodox_country } } DAH = { religion = orthodox set_country_flag = orthodox_country } } - random_owned = { limit = { owner = { has_country_flag = mormon_country } } DAH = { religion = mormon set_country_flag = mormon_country } } - random_owned = { limit = { owner = { has_country_flag = coptic_country } } DAH = { religion = coptic set_country_flag = coptic_country } } - random_owned = { limit = { owner = { has_country_flag = sunni_country } } DAH = { religion = sunni set_country_flag = sunni_country } } - random_owned = { limit = { owner = { has_country_flag = shiite_country } } DAH = { religion = shiite set_country_flag = shiite_country } } - random_owned = { limit = { owner = { has_country_flag = shinto_country } } DAH = { religion = shinto set_country_flag = shinto_country } } - random_owned = { limit = { owner = { has_country_flag = mahayana_country } } DAH = { religion = mahayana set_country_flag = mahayana_country } } - random_owned = { limit = { owner = { has_country_flag = gelugpa_country } } DAH = { religion = gelugpa set_country_flag = gelugpa_country } } - random_owned = { limit = { owner = { has_country_flag = theravada_country } } DAH = { religion = theravada set_country_flag = theravada_country } } - random_owned = { limit = { owner = { has_country_flag = hindu_country } } DAH = { religion = hindu set_country_flag = hindu_country } } - random_owned = { limit = { owner = { has_country_flag = sikh_country } } DAH = { religion = sikh set_country_flag = sikh_country } } - random_owned = { limit = { owner = { has_country_flag = jewish_country } } DAH = { religion = jewish set_country_flag = jewish_country } } - random_owned = { limit = { owner = { has_country_flag = ibadi_country } } DAH = { religion = ibadi set_country_flag = ibadi_country } } - random_owned = { limit = { owner = { has_country_flag = yazidi_country } } DAH = { religion = yazidi set_country_flag = yazidi_country } } - } - } - - organize_indonesia = { - picture = map_east_indies - potential = { - OR = { - has_country_flag = organize_colony_decisions - ai = yes + random_owned = { limit = { owner = { has_country_flag = orthodox_country } } DAH = { religion = orthodox set_country_flag = orthodox_country } } + random_owned = { limit = { owner = { has_country_flag = mormon_country } } DAH = { religion = mormon set_country_flag = mormon_country } } + random_owned = { limit = { owner = { has_country_flag = coptic_country } } DAH = { religion = coptic set_country_flag = coptic_country } } + random_owned = { limit = { owner = { has_country_flag = sunni_country } } DAH = { religion = sunni set_country_flag = sunni_country } } + random_owned = { limit = { owner = { has_country_flag = shiite_country } } DAH = { religion = shiite set_country_flag = shiite_country } } + random_owned = { limit = { owner = { has_country_flag = shinto_country } } DAH = { religion = shinto set_country_flag = shinto_country } } + random_owned = { limit = { owner = { has_country_flag = mahayana_country } } DAH = { religion = mahayana set_country_flag = mahayana_country } } + random_owned = { limit = { owner = { has_country_flag = gelugpa_country } } DAH = { religion = gelugpa set_country_flag = gelugpa_country } } + random_owned = { limit = { owner = { has_country_flag = theravada_country } } DAH = { religion = theravada set_country_flag = theravada_country } } + random_owned = { limit = { owner = { has_country_flag = hindu_country } } DAH = { religion = hindu set_country_flag = hindu_country } } + random_owned = { limit = { owner = { has_country_flag = sikh_country } } DAH = { religion = sikh set_country_flag = sikh_country } } + random_owned = { limit = { owner = { has_country_flag = jewish_country } } DAH = { religion = jewish set_country_flag = jewish_country } } + random_owned = { limit = { owner = { has_country_flag = ibadi_country } } DAH = { religion = ibadi set_country_flag = ibadi_country } } + random_owned = { limit = { owner = { has_country_flag = yazidi_country } } DAH = { religion = yazidi set_country_flag = yazidi_country } } + } + } + + organize_indonesia = { + picture = map_east_indies + potential = { + OR = { + has_country_flag = organize_colony_decisions + ai = yes + } + civilized = yes + NOT = { + exists = INO + has_global_flag = indonesia_organized + has_global_flag = indonesia_formed + is_culture_group = southeast_asian + } + nationalism_n_imperialism = 1 + owns = 1413 + } + + allow = { + war = no + machine_guns = 1 + market_regulations = 1 + owns = 1413 + } + + effect = { + set_global_flag = indonesia_organized + prestige = 5 + set_country_flag = indonesia_master + country_event = 199064 + + any_owned = { + limit = { + OR = { + region = NET_1413 #Western Java + region = NET_1418 #Eastern Java + region = NET_1398 #Sumatra + region = NET_1401 #Siak + region = ATJ_1405 #Aceh + region = BAL_1438 #Sunda Islands + region = NET_1423 #East Borneo + region = NET_1426 #South Borneo + region = NET_1447 #Moluccas + region = NET_1451 #Western New Guinea + region = AST_2528 #Southern New Guina + region = GER_2530 #Northern New Guinea + region = BRU_1396 #Sabah + region = BRU_1394 #West Borneo + } + } + add_core = INO + } + + any_country = { #1446 and 2647 do not need any of this, since their (TMR) cores are not removed at all + limit = { + tag = JAV + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = JAV + } + } + any_country = { + limit = { + tag = DJA + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = DJA + } + } + any_country = { + limit = { + tag = SAK + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SAK + } + } + any_country = { + limit = { + tag = ATJ + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = ATJ + } + } + any_country = { + limit = { + tag = BAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BAL + } + } + any_country = { + limit = { + tag = SLW + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SLW + } + } + any_country = { + limit = { + tag = MAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = MAL + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = LAN + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KTI + } } - civilized = yes - NOT = { - exists = INO - has_global_flag = indonesia_organized - has_global_flag = indonesia_formed - is_culture_group = southeast_asian + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SUL + } } - nationalism_n_imperialism = 1 - owns = 1413 - } - - allow = { - war = no - machine_guns = 1 - market_regulations = 1 - owns = 1413 - } - - effect = { - set_global_flag = indonesia_organized - prestige = 5 - set_country_flag = indonesia_master - country_event = 199064 - - any_owned = { + any_country = { limit = { - OR = { - region = NET_1413 #Western Java - region = NET_1418 #Eastern Java - region = NET_1398 #Sumatra - region = NET_1401 #Siak - region = ATJ_1405 #Aceh - region = BAL_1438 #Sunda Islands - region = NET_1423 #East Borneo - region = NET_1426 #South Borneo - region = NET_1447 #Moluccas - region = NET_1451 #Western New Guinea - region = AST_2528 #Southern New Guina - region = GER_2530 #Northern New Guinea - region = BRU_1396 #Sabah - region = BRU_1394 #West Borneo + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = INO } + remove_core = BRU } - add_core = INO } - - any_owned = { + any_country = { limit = { - is_core = INO - NOT = { province_id = 1446 province_id = 2647 } + tag = PPG + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = PPG } - remove_core = JAV - remove_core = DJA - remove_core = SAK - remove_core = ATJ - remove_core = BAL - remove_core = SLW - remove_core = MAL - remove_core = KLM - remove_core = LAN - remove_core = KTI - remove_core = SUL - remove_core = BRU - remove_core = PPG } INO = { @@ -5928,24 +7504,161 @@ political_decisions = { set_country_flag = indonesia_master country_event = 199064 - any_owned = { + any_country = { #1446 and 2647 do not need any of this, since their (TMR) cores are not removed at all + limit = { + tag = JAV + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = JAV + } + } + any_country = { + limit = { + tag = DJA + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = DJA + } + } + any_country = { + limit = { + tag = SAK + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SAK + } + } + any_country = { + limit = { + tag = ATJ + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = ATJ + } + } + any_country = { + limit = { + tag = BAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BAL + } + } + any_country = { + limit = { + tag = SLW + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SLW + } + } + any_country = { + limit = { + tag = MAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = MAL + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = LAN + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KTI + } + } + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SUL + } + } + any_country = { + limit = { + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BRU + } + } + any_country = { limit = { - is_core = INO - NOT = { province_id = 1446 province_id = 2647 } + tag = PPG + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = PPG } - remove_core = JAV - remove_core = DJA - remove_core = SAK - remove_core = ATJ - remove_core = BAL - remove_core = SLW - remove_core = MAL - remove_core = KLM - remove_core = LAN - remove_core = KTI - remove_core = SUL - remove_core = BRU - remove_core = PPG } } } @@ -6015,6 +7728,54 @@ political_decisions = { tech_school = unciv_tech_school nationalvalue = nv_tradition } + any_country = { + limit = { + tag = HBY + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = HBY + } + } + any_country = { + limit = { + tag = GEL + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = GEL + } + } + any_country = { + limit = { + tag = MAJ + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = MAJ + } + } + any_country = { + limit = { + tag = WRL + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = WRL + } + } } } @@ -6145,10 +7906,29 @@ political_decisions = { clr_country_flag = sikh_country clr_country_flag = animist_country } - any_owned = { - limit = { is_core = TMR } - remove_core = BAL - remove_core = MAL + any_country = { + limit = { + tag = BAL + exists = no + } + all_core = { + limit = { + is_core = TMR + } + remove_core = BAL + } + } + any_country = { + limit = { + tag = MAL + exists = no + } + all_core = { + limit = { + is_core = TMR + } + remove_core = MAL + } } random_owned = { limit = { owner = { has_country_flag = catholic_country } } TMR = { religion = catholic set_country_flag = catholic_country } } random_owned = { @@ -6601,8 +8381,15 @@ political_decisions = { country_event = 199065 FRA_1878 = { add_core = GBU } - GBU = { + any_country = { + limit = { + tag = JAL + exists = no + } all_core = { + limit = { + is_core = GBU + } remove_core = JAL } } @@ -6950,7 +8737,18 @@ political_decisions = { set_country_flag = zimbabwe_master country_event = 199067 - ZBW = { all_core = { remove_core = MAT } } + any_country = { + limit = { + tag = MAT + exists = no + } + all_core = { + limit = { + is_core = ZBW + } + remove_core = MAT + } + } ZBW = { set_country_flag = post_colonial_country primary_culture = THIS diff --git a/ccHFM/decisions/Peru-Bolivia Confederation.txt b/ccHFM/decisions/Peru-Bolivia Confederation.txt index 22657172..4fb67cff 100644 --- a/ccHFM/decisions/Peru-Bolivia Confederation.txt +++ b/ccHFM/decisions/Peru-Bolivia Confederation.txt @@ -253,7 +253,18 @@ political_decisions = { limit = { owner = { NOT = { has_country_flag = end_of_the_confederation } } } PEU = { all_core = { add_core = PBC } } SPU = { all_core = { add_core = PBC } } - SPU = { all_core = { remove_core = SPU } } + } + any_country = { + limit = { + tag = SPU + exists = no + } + all_core = { + limit = { + is_core = PBC + } + remove_core = SPU + } } BOL = { all_core = { add_core = PBC } } } @@ -496,7 +507,18 @@ political_decisions = { } effect = { - any_owned = { remove_core = SPU } + any_country = { + limit = { + tag = SPU + exists = no + } + all_core = { + limit = { + is_core = PEU + } + remove_core = SPU + } + } } ai_will_do = { diff --git a/ccHFM/decisions/UncivFlavor.txt b/ccHFM/decisions/UncivFlavor.txt index 91c52c1e..74ce95d6 100644 --- a/ccHFM/decisions/UncivFlavor.txt +++ b/ccHFM/decisions/UncivFlavor.txt @@ -284,9 +284,42 @@ political_decisions = { life_rating = 5 } capital = 1859 - GON = { all_core = { remove_core = GON } } - SHW = { all_core = { remove_core = SHW } } - TIG = { all_core = { remove_core = TIG } } + any_country = { + limit = { + tag = GON + exists = no + } + all_core = { + limit = { + is_core = ETH + } + remove_core = GON + } + } + any_country = { + limit = { + tag = SHW + exists = no + } + all_core = { + limit = { + is_core = ETH + } + remove_core = SHW + } + } + any_country = { + limit = { + tag = TIG + exists = no + } + all_core = { + limit = { + is_core = ETH + } + remove_core = TIG + } + } ENG_1848 = { add_core = TIG } } @@ -352,10 +385,54 @@ political_decisions = { set_global_flag = somalia_united prestige = 5 all_core = { add_core = SOM } - HBY = { all_core = { remove_core = HBY } } - GEL = { all_core = { remove_core = GEL } } - MAJ = { all_core = { remove_core = MAJ } } - WRL = { all_core = { remove_core = WRL } } + any_country = { + limit = { + tag = HBY + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = HBY + } + } + any_country = { + limit = { + tag = GEL + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = GEL + } + } + any_country = { + limit = { + tag = MAJ + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = MAJ + } + } + any_country = { + limit = { + tag = WRL + exists = no + } + all_core = { + limit = { + is_core = SOM + } + remove_core = WRL + } + } 1875 = { add_core = SOM } 1864 = { add_core = SOM } 1866 = { add_core = SOM } diff --git a/ccHFM/events/BoerWar.txt b/ccHFM/events/BoerWar.txt index b518df80..e95927cd 100644 --- a/ccHFM/events/BoerWar.txt +++ b/ccHFM/events/BoerWar.txt @@ -618,7 +618,6 @@ country_event = { } 2102 = { secede_province = THIS - remove_core = MAT add_core = ORA add_core = SAF change_province_name = "Winburg" @@ -713,12 +712,23 @@ country_event = { } 2102 = { secede_province = THIS - remove_core = MAT add_core = ORA add_core = SAF change_province_name = "Winburg" state_scope = { change_region_name = "Vrystaat" } } + any_country = { + limit = { + tag = MAT + exists = no + } + all_core = { + limit = { + province_id = 2102 + } + remove_core = MAT + } + } 2103 = { change_province_name = "Philippolis" secede_province = THIS @@ -875,7 +885,6 @@ country_event = { 2105 = { secede_province = THIS - remove_core = BSH add_core = TRN add_core = SAF change_province_name = "Pretoria" @@ -884,10 +893,24 @@ country_event = { 2106 = { change_province_name = "Witwatersrand" secede_province = THIS - remove_core = BSH add_core = TRN add_core = SAF } + any_country = { + limit = { + tag = BSH + exists = no + } + all_core = { + limit = { + OR = { + province_id = 2105 + province_id = 2106 + } + } + remove_core = BSH + } + } 2107 = { change_province_name = "Klerksdorp" secede_province = THIS @@ -908,10 +931,23 @@ country_event = { 2110 = { #change_province_name = "Hoedspruit" #secede_province = THIS - remove_core = GAZ add_core = TRN add_core = SAF } + any_country = { + limit = { + tag = GAZ + exists = no + } + all_core = { + limit = { + OR = { + province_id = 2110 + } + } + remove_core = BSH + } + } 3273 = { change_province_name = "Hoedspruit" secede_province = THIS @@ -1020,7 +1056,6 @@ country_event = { 2105 = { secede_province = THIS - remove_core = BSH add_core = TRN add_core = SAF change_province_name = "Pretoria" @@ -1029,10 +1064,24 @@ country_event = { 2106 = { change_province_name = "Witwatersrand" secede_province = THIS - remove_core = BSH add_core = TRN add_core = SAF } + any_country = { + limit = { + tag = BSH + exists = no + } + all_core = { + limit = { + OR = { + province_id = 2105 + province_id = 2106 + } + } + remove_core = BSH + } + } 2107 = { change_province_name = "Klerksdorp" secede_province = THIS diff --git a/ccHFM/events/CANFlavor.txt b/ccHFM/events/CANFlavor.txt index d74a307a..607bc7a9 100644 --- a/ccHFM/events/CANFlavor.txt +++ b/ccHFM/events/CANFlavor.txt @@ -117,7 +117,20 @@ country_event = { prestige = -10 CAN_58 = { add_core = CAN - remove_core = RPL + } + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + OR = { + province_id = 58 + } + } + remove_core = RPL + } } any_pop = { limit = { @@ -594,7 +607,20 @@ country_event = { } CAN_60 = { add_core = QUE - remove_core = RPL + } + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + OR = { + province_id = 60 + } + } + remove_core = RPL + } } QUE = { all_core = { @@ -725,7 +751,20 @@ country_event = { } CAN_60 = { add_core = QUE - remove_core = RPL + } + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + OR = { + province_id = 60 + } + } + remove_core = RPL + } } QUE = { all_core = { @@ -1438,15 +1477,6 @@ country_event = { RPL = { all_core = { remove_core = RPL } } - random_country = { - limit = { - tag = RPL - exists = yes - vassal_of = FROM - } - all_core = { remove_core = RPL } - annex_to = CAN - } random_country = { limit = { tag = RPL @@ -1480,6 +1510,26 @@ country_event = { secede_province = CAN } } + random_country = { + limit = { + tag = RPL + vassal_of = FROM + ai = no + } + all_core = { remove_core = RPL } + change_tag = CAN + } + random_country = { + limit = { + tag = RPL + vassal_of = FROM + ai = yes + } + all_core = { remove_core = RPL } + } + CAN = { + inherit = RPL + } ai_chance = { factor = 100 } @@ -2118,8 +2168,17 @@ country_event = { option = { name = "EVT44303OPTA" set_country_flag = metis_pacification - MTC = { - all_core = { remove_core = MTC } + any_country = { + limit = { + tag = MTC + exists = no + } + all_core = { + limit = { + is_core = CAN + } + remove_core = MTC + } } any_pop = { ideology = { diff --git a/ccHFM/events/Congo.txt b/ccHFM/events/Congo.txt index a07b2de4..66e96864 100644 --- a/ccHFM/events/Congo.txt +++ b/ccHFM/events/Congo.txt @@ -275,14 +275,91 @@ country_event = { government = hms_government political_reform = non_secret_ballots political_reform = universal_weighted_voting - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } any_owned = { limit = { is_core = KON } add_province_modifier = { name = nationalist_agitation duration = 1095 } @@ -314,14 +391,91 @@ country_event = { government = hms_government political_reform = non_secret_ballots political_reform = universal_weighted_voting - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } clr_country_flag = historical_congo clr_country_flag = congo_master any_country = { clr_country_flag = yes_to_congo clr_country_flag = historical_congo clr_country_flag = congo_master } @@ -347,14 +501,91 @@ country_event = { government = hms_government political_reform = non_secret_ballots political_reform = universal_weighted_voting - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } clr_country_flag = historical_congo clr_country_flag = congo_master any_country = { clr_country_flag = yes_to_congo clr_country_flag = historical_congo clr_country_flag = congo_master } @@ -377,14 +608,91 @@ country_event = { government = hms_government political_reform = non_secret_ballots political_reform = universal_weighted_voting - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } clr_country_flag = historical_congo clr_country_flag = congo_master any_country = { clr_country_flag = yes_to_congo clr_country_flag = historical_congo clr_country_flag = congo_master } @@ -626,14 +934,91 @@ country_event = { political_reform = non_secret_ballots political_reform = universal_weighted_voting political_reform = no_slavery - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } inherit = CNG ai_chance = { factor = 0.5 @@ -664,14 +1049,91 @@ country_event = { political_reform = non_secret_ballots political_reform = universal_weighted_voting political_reform = no_slavery - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } inherit = CNG ai_chance = { factor = 0.5 @@ -720,14 +1182,91 @@ country_event = { political_reform = non_secret_ballots political_reform = universal_weighted_voting political_reform = no_slavery - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } inherit = CNG } } @@ -770,14 +1309,91 @@ country_event = { political_reform = universal_weighted_voting political_reform = no_slavery add_country_modifier = { name = philantropic_work duration = 1825 } - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } } } @@ -813,14 +1429,91 @@ country_event = { any_country = { clr_country_flag = yes_to_congo clr_country_flag = historical_congo clr_country_flag = congo_master } CNG = { political_reform = no_slavery - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } inherit = CNG ai_chance = { factor = 0.9 } } @@ -833,14 +1526,91 @@ country_event = { any_country = { clr_country_flag = yes_to_congo clr_country_flag = historical_congo clr_country_flag = congo_master } CNG = { political_reform = no_slavery - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } random_owned = { limit = { owner = { government = proletarian_dictatorship } } CNG = { government = proletarian_dictatorship political_reform = no_slavery } @@ -860,14 +1630,91 @@ country_event = { any_country = { clr_country_flag = yes_to_congo clr_country_flag = historical_congo clr_country_flag = congo_master } CNG = { political_reform = no_slavery - all_core = { remove_core = KUB } - all_core = { remove_core = AZA } - all_core = { remove_core = KZB } - all_core = { remove_core = LBA } - all_core = { remove_core = LUN } - all_core = { remove_core = MNG } - } - random_country = { limit = { tag = KON ai = yes } all_core = { remove_core = KON } } + } + any_country = { + limit = { + tag = KUB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KUB + } + } + any_country = { + limit = { + tag = AZA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = AZA + } + } + any_country = { + limit = { + tag = KZB + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KZB + } + } + any_country = { + limit = { + tag = LBA + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LBA + } + } + any_country = { + limit = { + tag = LUN + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = LUN + } + } + any_country = { + limit = { + tag = MNG + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = MNG + } + } + any_country = { + limit = { + tag = KON + exists = no + } + all_core = { + limit = { + is_core = CNG + } + remove_core = KON + } + } release_vassal = CNG random_owned = { limit = { owner = { government = proletarian_dictatorship } } diff --git a/ccHFM/events/East Indies.txt b/ccHFM/events/East Indies.txt index 990573d1..a19ce896 100644 --- a/ccHFM/events/East Indies.txt +++ b/ccHFM/events/East Indies.txt @@ -1,6 +1,6 @@ ##################################################### # # -# East Indies Events # +# East Indies Events # # # ##################################################### @@ -604,23 +604,150 @@ province_event = { } } INO = { add_accepted_culture = malay } - state_scope = { - any_owned = { - limit = { is_core = INO NOT = { province_id = 1446 } } - remove_core = JAV - remove_core = DJA - remove_core = SAK - remove_core = ATJ - remove_core = BAL - remove_core = SLW - remove_core = MAL - remove_core = KLM - remove_core = LAN - remove_core = KTI - remove_core = SUL - remove_core = BRU + any_country = { #1446 and 2647 do not need any of this, since their (TMR) cores are not removed at all + limit = { + tag = JAV + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = JAV + } + } + any_country = { + limit = { + tag = DJA + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = DJA + } + } + any_country = { + limit = { + tag = SAK + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SAK + } + } + any_country = { + limit = { + tag = ATJ + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = ATJ + } + } + any_country = { + limit = { + tag = BAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BAL + } + } + any_country = { + limit = { + tag = SLW + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SLW + } + } + any_country = { + limit = { + tag = MAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = MAL + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = LAN + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KTI + } + } + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SUL + } + } + any_country = { + limit = { + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BRU + } } - } } } @@ -679,23 +806,150 @@ province_event = { } } INO = { add_accepted_culture = moluccan } - state_scope = { - any_owned = { - limit = { is_core = INO NOT = { province_id = 1446 } } - remove_core = JAV - remove_core = DJA - remove_core = SAK - remove_core = ATJ - remove_core = BAL - remove_core = SLW - remove_core = MAL - remove_core = KLM - remove_core = LAN - remove_core = KTI - remove_core = SUL - remove_core = BRU + any_country = { #1446 and 2647 do not need any of this, since their (TMR) cores are not removed at all + limit = { + tag = JAV + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = JAV + } + } + any_country = { + limit = { + tag = DJA + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = DJA + } + } + any_country = { + limit = { + tag = SAK + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SAK + } + } + any_country = { + limit = { + tag = ATJ + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = ATJ + } + } + any_country = { + limit = { + tag = BAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BAL + } + } + any_country = { + limit = { + tag = SLW + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SLW + } + } + any_country = { + limit = { + tag = MAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = MAL + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = LAN + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KTI + } + } + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SUL + } + } + any_country = { + limit = { + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BRU + } } - } } } @@ -754,23 +1008,150 @@ province_event = { } } INO = { add_accepted_culture = melanesian } - state_scope = { - any_owned = { - limit = { is_core = INO NOT = { province_id = 1446 } } - remove_core = JAV - remove_core = DJA - remove_core = SAK - remove_core = ATJ - remove_core = BAL - remove_core = SLW - remove_core = MAL - remove_core = KLM - remove_core = LAN - remove_core = KTI - remove_core = SUL - remove_core = BRU + any_country = { #1446 and 2647 do not need any of this, since their (TMR) cores are not removed at all + limit = { + tag = JAV + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = JAV + } + } + any_country = { + limit = { + tag = DJA + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = DJA + } + } + any_country = { + limit = { + tag = SAK + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SAK + } + } + any_country = { + limit = { + tag = ATJ + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = ATJ + } + } + any_country = { + limit = { + tag = BAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BAL + } + } + any_country = { + limit = { + tag = SLW + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SLW + } + } + any_country = { + limit = { + tag = MAL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = MAL + } + } + any_country = { + limit = { + tag = KLM + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KLM + } + } + any_country = { + limit = { + tag = LAN + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = LAN + } + } + any_country = { + limit = { + tag = KTI + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = KTI + } + } + any_country = { + limit = { + tag = SUL + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = SUL + } + } + any_country = { + limit = { + tag = BRU + exists = no + } + all_core = { + limit = { + is_core = INO + } + remove_core = BRU + } } - } } } @@ -934,9 +1315,9 @@ country_event = { owner = { NOT = { has_global_flag = malaya_formed } } } owner = { - 1389 = { secede_province = FROM remove_core = THIS remove_core = JOH add_core = PRK } - 1388 = { remove_core = THIS remove_core = JOH add_core = PRK } - 1391 = { secede_province = FROM remove_core = THIS remove_core = JOH add_core = PHG } + 1389 = { secede_province = FROM remove_core = THIS } + 1388 = { remove_core = THIS } + 1391 = { secede_province = FROM remove_core = THIS } 1390 = { remove_core = THIS } 2575 = { remove_core = THIS } } @@ -947,9 +1328,9 @@ country_event = { owner = { has_global_flag = malaya_formed } } owner = { - 1389 = { secede_province = FROM remove_core = THIS remove_core = JOH add_core = MLY } - 1388 = { remove_core = THIS remove_core = JOH add_core = MLY } - 1391 = { secede_province = FROM remove_core = THIS remove_core = JOH add_core = MLY } + 1389 = { secede_province = FROM remove_core = THIS add_core = MLY } + 1388 = { remove_core = THIS add_core = MLY } + 1391 = { secede_province = FROM remove_core = THIS add_core = MLY } 1390 = { remove_core = THIS } 2575 = { remove_core = THIS } } @@ -1064,7 +1445,7 @@ country_event = { option = { name = "EVT971204OPTA" prestige = -5 - 1408 = { secede_province = NET remove_core = ATJ } - 1411 = { secede_province = NET remove_core = ATJ } + 1408 = { secede_province = NET } + 1411 = { secede_province = NET } } } diff --git a/ccHFM/events/Ethiopia.txt b/ccHFM/events/Ethiopia.txt index 49bf7675..8f3e3cdd 100644 --- a/ccHFM/events/Ethiopia.txt +++ b/ccHFM/events/Ethiopia.txt @@ -128,10 +128,43 @@ country_event = { capital = 1853 1853 = { change_province_name = "Magdala" } change_tag = ETH - GON = { all_core = { remove_core = GON } } - SHW = { all_core = { remove_core = SHW } } - TIG = { all_core = { remove_core = TIG } } ENG_1848 = { add_core = TIG } + any_country = { + limit = { + tag = GON + exists = no + } + all_core = { + limit = { + is_core = ETH + } + remove_core = GON + } + } + any_country = { + limit = { + tag = SHW + exists = no + } + all_core = { + limit = { + is_core = ETH + } + remove_core = SHW + } + } + any_country = { + limit = { + tag = TIG + exists = no + } + all_core = { + limit = { + is_core = ETH + } + remove_core = TIG + } + } any_pop = { limit = { OR = { is_primary_culture = yes is_accepted_culture = yes } } militancy = -4 } } } diff --git a/ccHFM/events/FlavourMod_ColonialReconquest.txt b/ccHFM/events/FlavourMod_ColonialReconquest.txt index cdc846a8..5d3af041 100644 --- a/ccHFM/events/FlavourMod_ColonialReconquest.txt +++ b/ccHFM/events/FlavourMod_ColonialReconquest.txt @@ -76,8 +76,37 @@ country_event = { BOR = { remove_accepted_culture = french_canadian remove_accepted_culture = cajun } badboy = -2 NEN = { remove_accepted_culture = french_canadian } - ULA = { all_core = { remove_core = ULA } } - ACA = { all_core = { remove_core = ACA } } + any_country = { + limit = { + tag = ULA + exists = no + } + all_core = { + limit = { + OR = { + is_core = USA + is_core = CSA + } + } + remove_core = ULA + } + } + any_country = { + limit = { + tag = ACA + exists = no + } + all_core = { + limit = { + OR = { + is_core = USA + is_core = MRU + is_core = CAN + } + } + remove_core = ACA + } + } ai_chance = { factor = 1 } } @@ -177,8 +206,30 @@ country_event = { set_country_flag = no_french_america FRA = { remove_accepted_culture = french_canadian remove_accepted_culture = cajun } BOR = { remove_accepted_culture = french_canadian remove_accepted_culture = cajun } - ACA = { all_core = { remove_core = ACA } } - ULA = { all_core = { remove_core = ULA } } + any_country = { + limit = { + tag = ULA + exists = no + } + all_core = { + limit = { + is_core = USA + } + remove_core = ULA + } + } + any_country = { + limit = { + tag = ACA + exists = no + } + all_core = { + limit = { + is_core = USA + } + remove_core = ACA + } + } } } @@ -221,10 +272,21 @@ country_event = { all_core = { remove_core = THIS remove_core = CAN - remove_core = RPL remove_core = NEW } } + any_country = { + limit = { + tag = RPL + exists = no + } + all_core = { + limit = { + is_core = QUE + } + remove_core = RPL + } + } any_pop = { limit = { diff --git a/ccHFM/events/Malaysia.txt b/ccHFM/events/Malaysia.txt index c430b637..66c46514 100644 --- a/ccHFM/events/Malaysia.txt +++ b/ccHFM/events/Malaysia.txt @@ -91,7 +91,6 @@ country_event = { name = "EVT956581OPTA" sphere_owner = { diplomatic_influence = { who = THIS value = -400 } country_event = 956582 } any_country = { release_vassal = THIS } - PRK = { all_core = { remove_core = JOH } } 2575 = { any_pop = { limit = { has_pop_culture = yue } reduce_pop = 1.5 } } any_greater_power = { diplomatic_influence = { who = THIS value = -200 } } ai_chance = { factor = 100 } diff --git a/ccHFM/events/New Colonies.txt b/ccHFM/events/New Colonies.txt index 230d0ea2..6525e907 100644 --- a/ccHFM/events/New Colonies.txt +++ b/ccHFM/events/New Colonies.txt @@ -285,6 +285,12 @@ province_event = { is_culture_group = THIS } } + DAH = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -449,6 +455,12 @@ province_event = { NOT = { is_core = IVC } + ASH = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -503,6 +515,12 @@ province_event = { NOT = { is_core = IVC } + ASH = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -685,6 +703,12 @@ province_event = { is_culture_group = THIS } } + ASH = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -1544,6 +1568,18 @@ province_event = { is_culture_group = THIS } } + TRI = { + OR = { + exists = no + is_vassal = yes + } + } + CYR = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -1613,6 +1649,12 @@ province_event = { is_culture_group = THIS } } + GAB = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -2999,6 +3041,12 @@ province_event = { NOT = { is_core = KNY } + ZAN = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -3162,6 +3210,12 @@ province_event = { NOT = { is_core = TNZ } + ZAN = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -3217,6 +3271,12 @@ province_event = { NOT = { is_core = TNZ } + ZAN = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -3625,6 +3685,18 @@ province_event = { NOT = { is_core = LBY } + TRI = { + OR = { + exists = no + is_vassal = yes + } + } + CYR = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -3934,6 +4006,12 @@ province_event = { has_global_flag = zanzibar_organized } } + ZAN = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -3994,6 +4072,12 @@ province_event = { vassal_of = THIS } } + MOR = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { @@ -4053,6 +4137,12 @@ province_event = { NOT = { is_core = MOR } + TRZ = { + OR = { + exists = no + is_vassal = yes + } + } } mean_time_to_happen = { diff --git a/ccHFM/events/Ottoman Empire.txt b/ccHFM/events/Ottoman Empire.txt index 36826e47..b3bbe01f 100644 --- a/ccHFM/events/Ottoman Empire.txt +++ b/ccHFM/events/Ottoman Empire.txt @@ -2247,12 +2247,78 @@ country_event = { any_owned = { limit = { OR = { is_core = RDL is_core = MKN } } secede_province = PER } - BTL = { all_core = { remove_core = BTL } } - BDN = { all_core = { remove_core = BDN } } - BHT = { all_core = { remove_core = BHT } } - BNB = { all_core = { remove_core = BNB } } - SRN = { all_core = { remove_core = SRN } } - RDL = { all_core = { remove_core = RDL } } + any_country = { + limit = { + tag = BTL + exists = no + } + all_core = { + limit = { + is_core = KDS + } + remove_core = BTL + } + } + any_country = { + limit = { + tag = BDN + exists = no + } + all_core = { + limit = { + is_core = KDS + } + remove_core = BDN + } + } + any_country = { + limit = { + tag = BHT + exists = no + } + all_core = { + limit = { + is_core = KDS + } + remove_core = BHT + } + } + any_country = { + limit = { + tag = BNB + exists = no + } + all_core = { + limit = { + is_core = KDS + } + remove_core = BNB + } + } + any_country = { + limit = { + tag = SRN + exists = no + } + all_core = { + limit = { + is_core = KDS + } + remove_core = SRN + } + } + any_country = { + limit = { + tag = RDL + exists = no + } + all_core = { + limit = { + is_core = KDS + } + remove_core = RDL + } + } MKN = { all_core = { remove_core = MKN } } } } diff --git a/ccHFM/events/RGOChangeEvents.txt b/ccHFM/events/RGOChangeEvents.txt index 798ccfb3..31353cd4 100644 --- a/ccHFM/events/RGOChangeEvents.txt +++ b/ccHFM/events/RGOChangeEvents.txt @@ -2536,6 +2536,7 @@ country_event = { 1936 = { trade_goods = coffee } #Nsukka 1945 = { trade_goods = tobacco } #Kano + ai_chance = { factor = 70 } } #Oil Production #Sources: COAL PRODUCTION AND UTILIZATION TRENDS IN NIGERIA by Olayinka I. Ogunsola diff --git a/ccHFM/events/Scramble for Africa.txt b/ccHFM/events/Scramble for Africa.txt index e9265f6a..0d78a139 100644 --- a/ccHFM/events/Scramble for Africa.txt +++ b/ccHFM/events/Scramble for Africa.txt @@ -980,7 +980,30 @@ country_event = { } money = 50000 } - SUD = { all_core = { remove_core = DAR remove_core = SHK } } + any_country = { + limit = { + tag = DAR + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = DAR + } + } + any_country = { + limit = { + tag = SHK + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = SHK + } + } inherit = SUD relation = { who = EGY value = 100 } } @@ -1000,7 +1023,30 @@ country_event = { relation = { who = FROM value = -400 } diplomatic_influence = { who = FROM value = -400 } FROM = { any_owned = { limit = { OR = { is_core = SUD is_core = ETH } } secede_province = SUD } } - SUD = { all_core = { remove_core = DAR remove_core = SHK } } + any_country = { + limit = { + tag = DAR + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = DAR + } + } + any_country = { + limit = { + tag = SHK + exists = no + } + all_core = { + limit = { + is_core = SUD + } + remove_core = SHK + } + } SUD = { civilized = no government = theocracy