From 5a423da77a2323dcaaa2f2c9f5c746c16bd2f35b Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sat, 22 Jul 2023 12:51:20 -0400 Subject: [PATCH 01/22] fix: added aot definition --- common/country_definitions/00_countries.txt | 123 ++++++++++++++------ 1 file changed, 89 insertions(+), 34 deletions(-) diff --git a/common/country_definitions/00_countries.txt b/common/country_definitions/00_countries.txt index 5be629f1a..9f103185a 100644 --- a/common/country_definitions/00_countries.txt +++ b/common/country_definitions/00_countries.txt @@ -294,7 +294,15 @@ KUK = { country_type = recognized tier = empire capital = STATE_CENTRAL_HUNGARY - cultures = { hungarian romanian croat bulgarian slovene albanian serb } + cultures = { + hungarian + romanian + croat + bulgarian + slovene + albanian + serb + } } DEN = { @@ -4994,14 +5002,21 @@ EAU = { capital = STATE_TANGANYIKA } -PTG = { - color = { 255 244 100 } - +PTG = { + color = { + 255 + 244 + 100 + } country_type = recognized - tier = hegemony - - cultures = { north_andean andean south_andean platinean patagonian } + cultures = { + north_andean + andean + south_andean + platinean + patagonian + } capital = STATE_CUNDINAMARCA } @@ -6458,57 +6473,97 @@ BRL = { capital = STATE_BRANDENBURG } -PNS = { # Polynesia - color = { 244 140 30 } - +PNS = { + # Polynesia + color = { + 244 + 140 + 30 + } country_type = unrecognized - tier = empire - - cultures = { hawaiian maori melanesian polynesian micronesian } + cultures = { + hawaiian + maori + melanesian + polynesian + micronesian + } capital = STATE_HAWAIIAN_ISLANDS } SGF = { - color = { 176 18 7} - + color = { + 176 + 18 + 7 + } country_type = recognized - tier = kingdom - - cultures = { south_german north_german } + cultures = { + south_german + north_german + } capital = STATE_BAVARIA } CAU = { - color = { 200 100 55 } - + color = { + 200 + 100 + 55 + } country_type = recognized - tier = empire - - cultures = { azerbaijani armenian georgian } + cultures = { + azerbaijani + armenian + georgian + } capital = STATE_GREATER_CAUCASUS } PLC = { - color = { 219 31 62 } - + color = { + 219 + 31 + 62 + } country_type = recognized - tier = kingdom - - cultures = { lithuanian estonian latvian } + cultures = { + lithuanian + estonian + latvian + } capital = STATE_LATVIA } GCO = { - color = { 255 244 100 } - + color = { + 255 + 244 + 100 + } country_type = recognized - tier = empire - - cultures = { north_andean } + cultures = { + north_andean + } capital = STATE_CUNDINAMARCA -} \ No newline at end of file +} + +AOT = { + # Aotearoa + color = { + 47 + 140 + 191 + } + country_type = unrecognized + tier = kingdom + cultures = { + maori + } + capital = STATE_NORTH_ISLAND +} From 3bb7db173f064b2a5b45c3a4e8f9728f84cd5bf4 Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sat, 22 Jul 2023 12:51:30 -0400 Subject: [PATCH 02/22] fix: removed invalid states --- .../00_formable_countries.txt | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/common/country_formation/00_formable_countries.txt b/common/country_formation/00_formable_countries.txt index 1d6a7e966..6d37aea75 100644 --- a/common/country_formation/00_formable_countries.txt +++ b/common/country_formation/00_formable_countries.txt @@ -46,26 +46,7 @@ IRE = { } FRA = { - states = { - STATE_ILE_DE_FRANCE - STATE_PROVENCE - STATE_NORMANDY - STATE_LANGUEDOC - STATE_RHONE - STATE_FRENCH_LOW_COUNTRIES - STATE_PICARDY - STATE_ALSACE_LORRAINE - STATE_POITOU - STATE_GUYENNE - STATE_AUVERGNE_LIMOUSIN - STATE_BRITTANY - STATE_BURGUNDY - STATE_CHAMPAGNE - STATE_FRANCHE_COMTE - STATE_LORRAINE - STATE_AQUITAINE - STATE_ORLEANS - } + use_culture_states = yes required_states_fraction = 0.75 ai_will_do = { always = yes @@ -138,21 +119,6 @@ PLC = { } } -PRU = { - states = { - STATE_BRANDENBURG - STATE_POMERANIA - STATE_WEST_PRUSSIA - STATE_EAST_PRUSSIA - STATE_SILESIA - STATE_POSEN - } - required_states_fraction = 0.8 - ai_will_do = { - always = yes - } -} - ETH = { use_culture_states = yes required_states_fraction = 0.5 From ee84cc23b2ca28d676a1990a7b248ace441f9fbe Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sat, 22 Jul 2023 13:12:24 -0400 Subject: [PATCH 03/22] fix: new indonesian leader --- common/history/characters/ids - indonesia.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/history/characters/ids - indonesia.txt b/common/history/characters/ids - indonesia.txt index e7a58b010..3f9571497 100644 --- a/common/history/characters/ids - indonesia.txt +++ b/common/history/characters/ids - indonesia.txt @@ -1,13 +1,13 @@ CHARACTERS = { c:IDS = { create_character = { - first_name = "Hubertus" - last_name = "van_Mook" # Hubertus van Mook - culture = cu:dutch + first_name = "Blank_Name" + last_name = "Sukarno" + culture = cu:javan ruler = yes ig_leader = yes - birth_date = 1894.5.30 - interest_group = ig:ig_securocrats + birth_date = 1901.6.6 + interest_group = ig:ig_elites ideology = ideology_moderate traits = { } From 241bc5bbd715154c2a2105913eb6374be42468f0 Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sat, 22 Jul 2023 13:12:38 -0400 Subject: [PATCH 04/22] fix: removed outdated tags --- .../country_formation/00_formable_countries.txt | 10 ---------- common/flag_definitions/00_flag_definitions.txt | 8 -------- common/government_types/04_theocracies.txt | 17 ----------------- 3 files changed, 35 deletions(-) diff --git a/common/country_formation/00_formable_countries.txt b/common/country_formation/00_formable_countries.txt index 6d37aea75..a84dabd20 100644 --- a/common/country_formation/00_formable_countries.txt +++ b/common/country_formation/00_formable_countries.txt @@ -264,16 +264,6 @@ GCO = { } } -ZIM = { - states = { - STATE_ZAMBEZI - } - required_states_fraction = 0.75 - ai_will_do = { - always = yes - } -} - BLH = { states = { STATE_BALUCHISTAN diff --git a/common/flag_definitions/00_flag_definitions.txt b/common/flag_definitions/00_flag_definitions.txt index e478ee9c9..cefccdacc 100644 --- a/common/flag_definitions/00_flag_definitions.txt +++ b/common/flag_definitions/00_flag_definitions.txt @@ -6972,14 +6972,6 @@ YUG = { # Yugoslavia } } -ZIM = { # Zimbabwe - flag_definition = { - coa = ZIM - subject_canton = ZIM - priority = 1 - } -} - PNS = { # Polynesia flag_definition = { coa = PNS diff --git a/common/government_types/04_theocracies.txt b/common/government_types/04_theocracies.txt index edea34f47..0904b3b43 100644 --- a/common/government_types/04_theocracies.txt +++ b/common/government_types/04_theocracies.txt @@ -12,23 +12,6 @@ } } -gov_heavenly_kingdom_theocracy = { - transfer_of_power = hereditary - male_ruler = "RULER_TITLE_HEAVENLY_KING" - female_ruler = "" # Empty on purpose - male_heir = "RULER_TITLE_JUNIOR_HEAVENLY_KING" - female_heir = "" # Empty on purpose - possible = { - has_law = law_type:law_theocratic - country_has_state_religion = rel:protestant - exists = c:TPG - c:TPG = ROOT - } - on_government_type_change = { - change_to_dictatorial = yes - } -} - gov_papacy = { transfer_of_power = dictatorial male_ruler = "RULER_POPE" From 101637a3dcd7b2178de37982f76008ed961bcf0a Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sat, 22 Jul 2023 13:12:51 -0400 Subject: [PATCH 05/22] fix: removed invalid customs union --- common/history/diplomacy/00_customs_union.txt | 4 ---- localization/english/names_l_english.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/history/diplomacy/00_customs_union.txt b/common/history/diplomacy/00_customs_union.txt index 69439da76..ad3c85f8f 100644 --- a/common/history/diplomacy/00_customs_union.txt +++ b/common/history/diplomacy/00_customs_union.txt @@ -188,10 +188,6 @@ } } c:NET = { - create_diplomatic_pact = { - country = c:IDS - type = customs_union - } create_diplomatic_pact = { country = c:WPP type = customs_union diff --git a/localization/english/names_l_english.yml b/localization/english/names_l_english.yml index 6496b2ac4..ac5738cd2 100644 --- a/localization/english/names_l_english.yml +++ b/localization/english/names_l_english.yml @@ -2065,6 +2065,7 @@ Blanco: "Blanco" Bland: "Bland" Blank: "Blank" + Blank_Name: "" Blargnies: "Blargnies" Blas: "Blas" Blaskov: "Blaskov" @@ -8795,6 +8796,7 @@ Kyriakos: "Kyriakos" Kyriakoulis: "Kyriakoulis" Kyung-jae: "Kyung-jae" + Koesno: "Koesno" La_anui: "La'anui" La_Mappaseling: "La Mappaseling" La_Mar: "La Mar" @@ -14512,6 +14514,7 @@ Sujana: "Sujana" Suk: "Suk" Suka: "Suka" + Sukarno: "Sukarno" Sukenori: "Sukenori" Sukeyuki: "Sukeyuki" Sukha: "Sukha" From a71e3fe99ec5b6e4e18eb37d0f425f34ef5f2df8 Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sat, 22 Jul 2023 13:12:59 -0400 Subject: [PATCH 06/22] fix: default events --- events/CWP_events/decolonization_events.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/events/CWP_events/decolonization_events.txt b/events/CWP_events/decolonization_events.txt index 794266493..85b0a0e73 100644 --- a/events/CWP_events/decolonization_events.txt +++ b/events/CWP_events/decolonization_events.txt @@ -487,6 +487,7 @@ decolonization.501 = { option = { # We need a king! name = decolonization.501.a + default_option = yes trigger = { overlord = { has_law = law_type:law_hereditary @@ -565,6 +566,7 @@ decolonization.502 = { option = { # Cede Eritrea name = decolonization.502.a + default_option = yes trigger = { exists = c:ETH c:ETH = { @@ -645,6 +647,7 @@ decolonization.503 = { option = { # Cede West Sahara to Morocco name = decolonization.503.a + default_option = yes trigger = { exists = c:MOR c:MOR = { @@ -742,6 +745,7 @@ decolonization.504 = { option = { # Cede Al Rif name = decolonization.504.a + default_option = yes trigger = { exists = c:MOR c:MOR = { @@ -920,6 +924,7 @@ decolonization.506 = { option = { # Make Phillipines Independent name = decolonization.506.a + default_option = yes c:PHI = { make_independent = yes } @@ -1011,6 +1016,7 @@ decolonization.507 = { option = { # Make Japan Independent name = decolonization.507.a + default_option = yes c:JAP = { make_independent = yes } @@ -1089,6 +1095,7 @@ decolonization.508 = { option = { # We need a king! name = decolonization.508.a + default_option = yes trigger = { overlord = { has_law = law_type:law_hereditary From 1b71d2bec5fb3bf2855bbe265e14f757210ff9d1 Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sat, 22 Jul 2023 13:14:48 -0400 Subject: [PATCH 07/22] fix: unused trade routes --- common/history/trade_routes/00_trade_routes.txt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/common/history/trade_routes/00_trade_routes.txt b/common/history/trade_routes/00_trade_routes.txt index 9348eb955..0a9d4024d 100644 --- a/common/history/trade_routes/00_trade_routes.txt +++ b/common/history/trade_routes/00_trade_routes.txt @@ -61,12 +61,6 @@ direction = import target = c:NET.market } - create_trade_route = { - goods = phosphorus - level = 3 - direction = import - target = c:NET.market - } } # Czechoslovakia c:CZH = { @@ -274,12 +268,6 @@ direction = import target = c:GBR.market } - create_trade_route = { - goods = bauxite - level = 14 - direction = import - target = c:NET.market - } create_trade_route = { goods = bauxite level = 13 From e804d736e75fafdb2a65cf045e084c419055da81 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 13:23:44 +0200 Subject: [PATCH 08/22] fix: skill issue in trade center building (wasn't showing trade value) --- gui/building_details_panel.gui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/building_details_panel.gui b/gui/building_details_panel.gui index e50d337f5..9bdbd5bb0 100644 --- a/gui/building_details_panel.gui +++ b/gui/building_details_panel.gui @@ -1370,7 +1370,7 @@ types building_panels text = "[concept_trade_revenue]" } blockoverride "text_right" { - raw_text = "#variable [Country.MakeScope.Var('cwp_currency').GetFlagName][Building.GetTradeRouteRevenue|K]#!" + raw_text = "#variable [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] [Building.GetTradeRouteRevenue|K]#!" } } From 52935722041417f22adfb2190f925ad078fc23c4 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 15:32:13 +0200 Subject: [PATCH 09/22] fix: ' is unsupported character - PDX must fix GetRawTextTooltipTag --- localization/english/replace/interfaces_l_english.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localization/english/replace/interfaces_l_english.yml b/localization/english/replace/interfaces_l_english.yml index aa9e37548..9cb984dc4 100644 --- a/localization/english/replace/interfaces_l_english.yml +++ b/localization/english/replace/interfaces_l_english.yml @@ -272,10 +272,10 @@ BUILDING_BUDGET: "Budget: #BOLD [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] [Building.GetLastIncome|1]#!" TOOLTIP_BUILDING_TAXES_TOOLTIP: "#header Weekly Taxes#!\nTotal: [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] [Building.GetTaxationRevenue|D+=]\n$TOOLTIP_DELIMITER$\n[Building.GetTaxationRevenueTooltip]\n\n[concept_taxes_desc]" INCOME_TAX: "[concept_budget_income_taxes]: #tooltippable #tooltip:[GetRawTextTooltipTag('$INCOME_TAX_BREAKDOWN$')] #variable [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] $VAL|D+$#!#!#!" - INCOME_TAX_BREAKDOWN: "#header Income taxes#!\nTotal: [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] $VAL|D+=$\n$TOOLTIP_DELIMITER$\nTax Rates:\n$BREAKDOWN$" + INCOME_TAX_BREAKDOWN: "#header Income taxes#!\nTotal: $VAL|D+=$\n$TOOLTIP_DELIMITER$\nTax Rates:\n$BREAKDOWN$" INCOME_TAX_ENTRY: "$ENTRY_TYPE$: [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] $VAL|vD$\n$BREAKDOWN$" POLL_TAX: "[concept_budget_poll_taxes]: #tooltippable #tooltip:[GetRawTextTooltipTag('$POLL_TAX_BREAKDOWN$')] #variable [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] $VAL|D+$#!#!#!" - POLL_TAX_BREAKDOWN: "#header Poll taxes#!\nTotal: [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] $VAL|D+=$\n$TOOLTIP_DELIMITER$\nTax Rates:\n$BREAKDOWN$" + POLL_TAX_BREAKDOWN: "#header Poll taxes#!\nTotal: $VAL|D+=$\n$TOOLTIP_DELIMITER$\nTax Rates:\n$BREAKDOWN$" POLL_TAX_ENTRY: "$ENTRY_TYPE$: [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] $VAL|vD$\n$BREAKDOWN$" DIVIDENDS_TAX: "[concept_budget_dividends_taxes]: [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] $VAL|D+$" EARNINGS_BREAKDOWN: "#header Earnings#!\nValue: [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] [Building.GetEarnings|vD=]\n$TOOLTIP_DELIMITER$\nRevenue: #BOLD #V [GetPlayer.MakeScope.Var('cwp_currency').GetFlagName] [Building.GetLastRevenue|D+=]#!#![Building.GetLastMaterialExpensesDesc][Building.GetLastSlaveUpkeepDesc]" From 19a9b4daeefda4b4cb1c52ccf62084a51d2910d7 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 17:13:41 +0200 Subject: [PATCH 10/22] fix: maximum cash reserves bonus is capped to 100%, as higher may destabilize SoL and monetary situation. --- common/production_methods/06_urban_center.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/production_methods/06_urban_center.txt b/common/production_methods/06_urban_center.txt index 82de27cf6..1070f869e 100644 --- a/common/production_methods/06_urban_center.txt +++ b/common/production_methods/06_urban_center.txt @@ -1275,8 +1275,8 @@ pm_limited_commercial_banking = { } } state_modifiers = { - workforce_scaled = { - building_cash_reserves_mult = 0.003 + unscaled = { + building_cash_reserves_mult = 0.15 } } } @@ -1299,8 +1299,8 @@ pm_commercial_banking = { } } state_modifiers = { - workforce_scaled = { - building_cash_reserves_mult = 0.006 + unscaled = { + building_cash_reserves_mult = 0.4 } } } @@ -1323,8 +1323,8 @@ pm_full_commercial_banking = { } } state_modifiers = { - workforce_scaled = { - building_cash_reserves_mult = 0.01 + unscaled = { + building_cash_reserves_mult = 0.65 } } } From 5fc8e96245859af647840bcdfe3dabfa5b5a8489 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:41:03 +0200 Subject: [PATCH 11/22] fix: JE loc issues --- .../english/CWP/CWP_decolonization_je_l_english.yml | 8 +++----- .../english/CWP/india/CWP_india_content_l_english.yml | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index 79db897e9..323dcb9ec 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -9,7 +9,8 @@ je_decolonization_desc_net_wwii: "WWII has put onwership of our colonial possesions in jeopardy." je_decolonization_desc_generic: "The Future of Our Empire is at Stake" - je_decoloniaztion_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects." + je_decolonization_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects." + je_decolonization_goal: "Decolonization is complete" je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." je_decolonization_timeout_tooltip: "The future of our empire will be determined by our imperial unity." @@ -18,11 +19,8 @@ abandon_empire_button: "Abandon Empire" abandon_empire_button_desc: "Abandoning our empire will grant independence to all colonial subjects." - imperial_conference_button: "Imperial Conference" + imperial_conference_button: "Imperial Conference" imperial_conference_button_desc: "An Imperial Conference will be called to discuss the future of our empire." - - je_decolonization_reason: "Each month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" - DECOLONIZATION_PROGRESS_DESC: "Imperial Unity" IMPERIAL_UNITY_BANKRUPTCY_DESC: "Bankruptcy" diff --git a/localization/english/CWP/india/CWP_india_content_l_english.yml b/localization/english/CWP/india/CWP_india_content_l_english.yml index ee9c9e358..d9d526e63 100644 --- a/localization/english/CWP/india/CWP_india_content_l_english.yml +++ b/localization/english/CWP/india/CWP_india_content_l_english.yml @@ -9,6 +9,7 @@ indian_partition_progress_desc: "National Unity" indian_partition_reason: "The Crown Jewel of the British Empire, the Raj, has been promised her freedom. The coming months will determine the nature of the partition and the relationship between the newly free Indian state and her former Suzerain. High National Unity will cause more princely states to join India, once formed. At levels below 100, Pakistan may also form from the non-Hindi states of the former Raj. At low levels of national unity, some princely states will remain independent after the partition. \n\nThe relationship between Great Britain and India during the partition will determine what ties they will have after independence, if any at all." indian_partition_complete_tooltip: "National Unity 100/100 or Journal times out." + indian_partition_goal: "Has managed Indian partitions" ### Events ### # British Reaction to Indian Partition From 7d9b2a503c07adfcd0c024d4a5b7341c273d45a9 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:50:40 +0200 Subject: [PATCH 12/22] chore: voodoo --- localization/english/CWP/CWP_decolonization_je_l_english.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index 323dcb9ec..e4542d7f0 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -9,7 +9,7 @@ je_decolonization_desc_net_wwii: "WWII has put onwership of our colonial possesions in jeopardy." je_decolonization_desc_generic: "The Future of Our Empire is at Stake" - je_decolonization_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects." + je_decoloniaztion_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects." je_decolonization_goal: "Decolonization is complete" je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." @@ -21,6 +21,9 @@ abandon_empire_button_desc: "Abandoning our empire will grant independence to all colonial subjects." imperial_conference_button: "Imperial Conference" imperial_conference_button_desc: "An Imperial Conference will be called to discuss the future of our empire." + + je_decolonization_reason: "Each month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" + DECOLONIZATION_PROGRESS_DESC: "Imperial Unity" IMPERIAL_UNITY_BANKRUPTCY_DESC: "Bankruptcy" From 9e3448643a2026c781e4c96af2b04788f04ebf68 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 23:09:15 +0200 Subject: [PATCH 13/22] chore: other way around - if goal is unused, then progress desc can't be used --- common/journal_entries/CWP_decolonization.txt | 2 +- common/journal_entries/CWP_indian_partition.txt | 2 +- localization/english/CWP/CWP_decolonization_je_l_english.yml | 3 --- localization/english/CWP/india/CWP_india_content_l_english.yml | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/common/journal_entries/CWP_decolonization.txt b/common/journal_entries/CWP_decolonization.txt index 18508861e..f60b685bd 100644 --- a/common/journal_entries/CWP_decolonization.txt +++ b/common/journal_entries/CWP_decolonization.txt @@ -384,7 +384,7 @@ # value can be a localization key or first_valid + triggered_desc script # To use in loc or UI: [JournalEntry.GetProgressDesc] # If this is not specified, GetProgressDesc will instead return loc from key _progress - progress_desc = DECOLONIZATION_PROGRESS_DESC + #progress_desc = DECOLONIZATION_PROGRESS_DESC # tutorial lesson explaining HOW to complete the Journal Entry #how_tutorial = how_tutorial_lesson_key # tutorial lesson explaining the WHY around the Journal Entry diff --git a/common/journal_entries/CWP_indian_partition.txt b/common/journal_entries/CWP_indian_partition.txt index abe6eb4d9..5435b502b 100644 --- a/common/journal_entries/CWP_indian_partition.txt +++ b/common/journal_entries/CWP_indian_partition.txt @@ -234,7 +234,7 @@ # value can be a localization key or first_valid + triggered_desc script # To use in loc or UI: [JournalEntry.GetProgressDesc] # If this is not specified, GetProgressDesc will instead return loc from key _progress - progress_desc = indian_partition_progress_desc + #progress_desc = indian_partition_progress_desc # tutorial lesson explaining HOW to complete the Journal Entry #how_tutorial = how_tutorial_lesson_key diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index e4542d7f0..9d327a987 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -10,7 +10,6 @@ je_decolonization_desc_generic: "The Future of Our Empire is at Stake" je_decoloniaztion_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects." - je_decolonization_goal: "Decolonization is complete" je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." je_decolonization_timeout_tooltip: "The future of our empire will be determined by our imperial unity." @@ -24,8 +23,6 @@ je_decolonization_reason: "Each month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" - DECOLONIZATION_PROGRESS_DESC: "Imperial Unity" - IMPERIAL_UNITY_BANKRUPTCY_DESC: "Bankruptcy" IMPERIAL_UNITY_SUBJECT_WARS_DESC: "Wars against our subjects" IMPERIAL_UNITY_REVOLUTIONARY_SUBJECTS_DESC: "Revolutions in our subjects" diff --git a/localization/english/CWP/india/CWP_india_content_l_english.yml b/localization/english/CWP/india/CWP_india_content_l_english.yml index d9d526e63..cbadccf29 100644 --- a/localization/english/CWP/india/CWP_india_content_l_english.yml +++ b/localization/english/CWP/india/CWP_india_content_l_english.yml @@ -6,10 +6,8 @@ indian_partition: "The Partition of India" indian_partition_progress_desc_hnd: "The Raj will soon dissolve, and the fate of India will be decided by our unity" indian_partition_progress_desc_gbr: "Our relationship with India is at a crossroads" - indian_partition_progress_desc: "National Unity" indian_partition_reason: "The Crown Jewel of the British Empire, the Raj, has been promised her freedom. The coming months will determine the nature of the partition and the relationship between the newly free Indian state and her former Suzerain. High National Unity will cause more princely states to join India, once formed. At levels below 100, Pakistan may also form from the non-Hindi states of the former Raj. At low levels of national unity, some princely states will remain independent after the partition. \n\nThe relationship between Great Britain and India during the partition will determine what ties they will have after independence, if any at all." indian_partition_complete_tooltip: "National Unity 100/100 or Journal times out." - indian_partition_goal: "Has managed Indian partitions" ### Events ### # British Reaction to Indian Partition From dfd861d0699d051079d4e540f82f74404decd2a4 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 23:31:49 +0200 Subject: [PATCH 14/22] chore: unfuck voodoo --- localization/english/CWP/CWP_decolonization_je_l_english.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index 9d327a987..cf816a1cc 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -9,7 +9,7 @@ je_decolonization_desc_net_wwii: "WWII has put onwership of our colonial possesions in jeopardy." je_decolonization_desc_generic: "The Future of Our Empire is at Stake" - je_decoloniaztion_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects." + je_decolonization_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects. \n\n Each month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." je_decolonization_timeout_tooltip: "The future of our empire will be determined by our imperial unity." @@ -21,8 +21,6 @@ imperial_conference_button: "Imperial Conference" imperial_conference_button_desc: "An Imperial Conference will be called to discuss the future of our empire." - je_decolonization_reason: "Each month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" - IMPERIAL_UNITY_BANKRUPTCY_DESC: "Bankruptcy" IMPERIAL_UNITY_SUBJECT_WARS_DESC: "Wars against our subjects" IMPERIAL_UNITY_REVOLUTIONARY_SUBJECTS_DESC: "Revolutions in our subjects" From 2f971d5dc73715db806bb2ae7be6913b0440a379 Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sun, 23 Jul 2023 17:32:16 -0400 Subject: [PATCH 15/22] fix: just merge them bruh --- localization/english/CWP/CWP_decolonization_je_l_english.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index e4542d7f0..c136558d1 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -9,7 +9,7 @@ je_decolonization_desc_net_wwii: "WWII has put onwership of our colonial possesions in jeopardy." je_decolonization_desc_generic: "The Future of Our Empire is at Stake" - je_decoloniaztion_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all. \n\n Pressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects." + je_decolonization_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all.\n\nPressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects.\n\nEach month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" je_decolonization_goal: "Decolonization is complete" je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." @@ -22,8 +22,6 @@ imperial_conference_button: "Imperial Conference" imperial_conference_button_desc: "An Imperial Conference will be called to discuss the future of our empire." - je_decolonization_reason: "Each month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" - DECOLONIZATION_PROGRESS_DESC: "Imperial Unity" IMPERIAL_UNITY_BANKRUPTCY_DESC: "Bankruptcy" From 12f279e58575c4fb35c53bc2a050d705390eb498 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Sun, 23 Jul 2023 23:34:51 +0200 Subject: [PATCH 16/22] chore: lol --- localization/english/CWP/CWP_decolonization_je_l_english.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index 49c5d9254..cded97e08 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -10,7 +10,6 @@ je_decolonization_desc_generic: "The Future of Our Empire is at Stake" je_decolonization_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all.\n\nPressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects.\n\nEach month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" - je_decolonization_goal: "Decolonization is complete" je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." je_decolonization_timeout_tooltip: "The future of our empire will be determined by our imperial unity." From b50fffd3e23013f75f1db48b2f7427bbe6ba840c Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sun, 23 Jul 2023 17:57:06 -0400 Subject: [PATCH 17/22] fix: progress desc --- common/journal_entries/CWP_decolonization.txt | 2 +- localization/english/CWP/CWP_decolonization_je_l_english.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/journal_entries/CWP_decolonization.txt b/common/journal_entries/CWP_decolonization.txt index f60b685bd..18508861e 100644 --- a/common/journal_entries/CWP_decolonization.txt +++ b/common/journal_entries/CWP_decolonization.txt @@ -384,7 +384,7 @@ # value can be a localization key or first_valid + triggered_desc script # To use in loc or UI: [JournalEntry.GetProgressDesc] # If this is not specified, GetProgressDesc will instead return loc from key _progress - #progress_desc = DECOLONIZATION_PROGRESS_DESC + progress_desc = DECOLONIZATION_PROGRESS_DESC # tutorial lesson explaining HOW to complete the Journal Entry #how_tutorial = how_tutorial_lesson_key # tutorial lesson explaining the WHY around the Journal Entry diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index 49c5d9254..266441e77 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -10,7 +10,7 @@ je_decolonization_desc_generic: "The Future of Our Empire is at Stake" je_decolonization_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all.\n\nPressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects.\n\nEach month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" - je_decolonization_goal: "Decolonization is complete" + je_decolonization_goal: "The unity of our empire." je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." je_decolonization_timeout_tooltip: "The future of our empire will be determined by our imperial unity." @@ -22,6 +22,8 @@ imperial_conference_button: "Imperial Conference" imperial_conference_button_desc: "An Imperial Conference will be called to discuss the future of our empire." + DECOLONIZATION_PROGRESS_DESC: "Imperial Unity" + IMPERIAL_UNITY_BANKRUPTCY_DESC: "Bankruptcy" IMPERIAL_UNITY_SUBJECT_WARS_DESC: "Wars against our subjects" IMPERIAL_UNITY_REVOLUTIONARY_SUBJECTS_DESC: "Revolutions in our subjects" From e85da0297e63fdc7a3aa82d3bcc47465c5a4ee08 Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sun, 23 Jul 2023 18:05:35 -0400 Subject: [PATCH 18/22] fix: status desc --- common/journal_entries/CWP_decolonization.txt | 45 +------------------ .../journal_entries/CWP_indian_partition.txt | 44 +++++------------- 2 files changed, 12 insertions(+), 77 deletions(-) diff --git a/common/journal_entries/CWP_decolonization.txt b/common/journal_entries/CWP_decolonization.txt index 18508861e..d7bfb9be7 100644 --- a/common/journal_entries/CWP_decolonization.txt +++ b/common/journal_entries/CWP_decolonization.txt @@ -219,48 +219,7 @@ # dynamically updated text, which describes the current status of the Journal Entry # To use in loc or UI: [JournalEntry.GetStatusDesc] # If this is not specified, GetStatusDesc will instead return loc from key _status - status_desc = { - first_valid = { - triggered_desc = { - desc = je_decolonization_desc_gbr_wwii - trigger = { - c:GBR ?= this - game_date < 1956.1.1 - } - } - triggered_desc = { - desc = je_decolonization_desc_fra_wwii - trigger = { - c:FRA ?= this - game_date < 1956.1.1 - } - } - triggered_desc = { - desc = je_decolonization_desc_por_wwii - trigger = { - c:POR ?= this - game_date < 1956.1.1 - } - } - triggered_desc = { - desc = je_decolonization_desc_bel_wwii - trigger = { - c:BEL ?= this - game_date < 1956.1.1 - } - } - triggered_desc = { - desc = je_decolonization_desc_net_wwii - trigger = { - c:NET ?= this - game_date < 1956.1.1 - } - } - triggered_desc = { - desc = je_decolonization_desc_generic - } - } - } + status_desc = DECOLONIZATION_PROGRESS_DESC # the number of days before this journal entry forcibly transitions, can be used to transition silently or into another event, framed either as success, failure, or neutral; if left blank or set to zero, will not time out timeout = 7300 # effect which is executed when journal entry is timed out @@ -384,7 +343,7 @@ # value can be a localization key or first_valid + triggered_desc script # To use in loc or UI: [JournalEntry.GetProgressDesc] # If this is not specified, GetProgressDesc will instead return loc from key _progress - progress_desc = DECOLONIZATION_PROGRESS_DESC + #progress_desc = DECOLONIZATION_PROGRESS_DESC # tutorial lesson explaining HOW to complete the Journal Entry #how_tutorial = how_tutorial_lesson_key # tutorial lesson explaining the WHY around the Journal Entry diff --git a/common/journal_entries/CWP_indian_partition.txt b/common/journal_entries/CWP_indian_partition.txt index 5435b502b..0bdb4ee3d 100644 --- a/common/journal_entries/CWP_indian_partition.txt +++ b/common/journal_entries/CWP_indian_partition.txt @@ -2,21 +2,16 @@ # root = the owner of the Journal Entry (country scope) # scope:journal_entry = this Journal Entry (journalentry scope) # scope:target = target value, with which this Journal Entry was added using `add_journal_entry` effect - # optional image that shows in the journal entry widget near the description, default = NDefines::GUI::JOURNAL_ENTRY_ICON_DEFAULT (set in /defines/00_interfaces.txt) icon = "gfx/interface/icons/event_icons/event_industry.dds" - # optional trigger which determines if a journal entry can be shown, default = no # is ignored when JE is added through `add_journal_entry` effect #is_shown_when_inactive = {} - # one or more scripted buttons. See common/scripted_buttons/_scripted_buttons.info for more info #scripted_button = scripted_button_key - # optional trigger - when both this and is_shown_when_inactive is true, the JE is Activated, default = yes # is ignored when JE is added through `add_journal_entry` effect #possible = {} - # effect which happens when a journal entry is activated by having its `is_shown_when_inactive` and `possible` triggers become true or when JE is added through `add_journal_entry` effect immediate = { if = { @@ -31,7 +26,6 @@ } } } - # completion trigger, use is_goal_complete = yes in here if you're testing a tracked goal metric; if left blank, cannot be completed complete = { custom_tooltip = { @@ -39,7 +33,6 @@ text = indian_partition_complete_tooltip } } - # effect which is executed when 'complete' trigger becomes true on_complete = { trigger_event = { @@ -60,17 +53,15 @@ min = -50 } } - } + } } } - # failure trigger, should spawn event explaining what happens when triggered, framed as a failure; if left blank, cannot fail fail = { c:HND = { is_subject = no } } - # effect which is executed when 'fail' trigger becomes true on_fail = { hidden_effect = { @@ -91,7 +82,6 @@ days = 0 } } - # optional invalidation trigger, should not notify player when it triggers, just clean up and silently disappear due to journal entry no longer being valid; if left blank, cannot be invalidated invalid = { OR = { @@ -104,18 +94,16 @@ } } } - # effect which is executed when 'invalid' trigger becomes true on_invalid = { } - # dynamically updated text, which describes the current status of the Journal Entry # To use in loc or UI: [JournalEntry.GetStatusDesc] # If this is not specified, GetStatusDesc will instead return loc from key _status status_desc = { first_valid = { triggered_desc = { - desc = indian_partition_progress_desc_hnd + desc = indian_partition_progress_desc trigger = { c:HND ?= this } @@ -128,10 +116,8 @@ } } } - # the number of days before this journal entry forcibly transitions, can be used to transition silently or into another event, framed either as success, failure, or neutral; if left blank or set to zero, will not time out timeout = 540 - # effect which is executed when journal entry is timed out on_timeout = { hidden_effect = { @@ -157,18 +143,22 @@ min = 0 } } - } + } } trigger_event = { id = indian_partition.1 days = 0 } } - # on_action which is triggered every first day of the week on_weekly_pulse = { random_events = { - delay = {days = { 0 3 } } + delay = { + days = { + 0 + 3 + } + } 1000 = 0 # HND Events 100 = indian_partition.102 @@ -185,63 +175,49 @@ 100 = indian_partition.204 } } - # on_action which is triggered every first day of the month on_monthly_pulse = { events = { indian_partition.101 } } - # on_action which is triggered every first day of the year on_yearly_pulse = { effect = { } } - # a script value computing the goal completion metric current_value = { value = global_var:indian_national_unity } - # when the journal entry is activated current_value and goal_add_value are evaluated and added together to determine the goal value goal_add_value = { value = 100 } - # the highest weighted active journal entry appears in the goal tracker on the main screen weight = 200 - # yes/no, determines if this journal entry should be transfered if the player switches country through a revolution or by releasing a subject. Note that external dependencies such as country variables etc are not automatically inherited transferable = yes - # yes/no, determines if this journal entry is allowed to be inherited by a victorious revolution. Revolutions also get all variables from the defeated parent country, so most JEs *should* be inherited in this way # NOTE: transferable = yes will always mean that revolution inheritance is blocked as these JEs should stay with the player at all times can_revolution_inherit = yes - # optional trigger, progress text is shown if this is defined and true is_progressing = { } - # yes/no, if yes, a progress bar is shown progressbar = yes - # yes/no, if yes, the Journal Entry can return to an inactive state if its possible trigger reverts to false # if no or unspecified, an activated Journal Entry cannot return to being inactive even if it is no longer considered possible can_deactivate = no - # dynamically updated text, which is shown over the progress bar of the Journal Entry # value can be a localization key or first_valid + triggered_desc script # To use in loc or UI: [JournalEntry.GetProgressDesc] # If this is not specified, GetProgressDesc will instead return loc from key _progress - #progress_desc = indian_partition_progress_desc - + #progress_desc = # tutorial lesson explaining HOW to complete the Journal Entry #how_tutorial = how_tutorial_lesson_key - # tutorial lesson explaining the WHY around the Journal Entry #why_tutorial = why_tutorial_lesson_key - # whether a Journal Entry should be pinned in its outliner by default. Defaults to 'no' should_be_pinned_by_default = yes } From 02b7d8ca86a1682941633b15d5662f15dfa8b39b Mon Sep 17 00:00:00 2001 From: JackEPepper <100242026+JackEPepper@users.noreply.github.com> Date: Sun, 23 Jul 2023 18:05:50 -0400 Subject: [PATCH 19/22] chore: formatting --- .../CWP_german_reunification.txt | 201 ++++++++++++------ .../CWP_newfoundland_referendum.txt | 104 ++++----- .../CWP/CWP_decolonization_je_l_english.yml | 1 - .../CWP/india/CWP_india_content_l_english.yml | 4 +- 4 files changed, 177 insertions(+), 133 deletions(-) diff --git a/common/journal_entries/CWP_german_reunification.txt b/common/journal_entries/CWP_german_reunification.txt index 8b595ea1a..7802c1cae 100644 --- a/common/journal_entries/CWP_german_reunification.txt +++ b/common/journal_entries/CWP_german_reunification.txt @@ -2,27 +2,22 @@ # root = the owner of the Journal Entry (country scope) # scope:journal_entry = this Journal Entry (journalentry scope) # scope:target = target value, with which this Journal Entry was added using `add_journal_entry` effect - # optional image that shows in the journal entry widget near the description, default = NDefines::GUI::JOURNAL_ENTRY_ICON_DEFAULT (set in /defines/00_interfaces.txt) icon = "gfx/interface/icons/event_icons/event_industry.dds" - # optional trigger which determines if a journal entry can be shown, default = no # is ignored when JE is added through `add_journal_entry` effect is_shown_when_inactive = { } - # one or more scripted buttons. See common/scripted_buttons/_scripted_buttons.info for more info #scripted_button = scripted_button_key - # optional trigger - when both this and is_shown_when_inactive is true, the JE is Activated, default = yes # is ignored when JE is added through `add_journal_entry` effect possible = { } - # effect which happens when a journal entry is activated by having its `is_shown_when_inactive` and `possible` triggers become true or when JE is added through `add_journal_entry` effect immediate = { trigger_event = { - id = west_german_unification.999 # setup leader and unifier + id = west_german_unification.999 # setup leader and unifier days = 1 } if = { @@ -30,22 +25,27 @@ OR = { AND = { exists = c:FOZ - c:FOZ = { is_player = yes} + c:FOZ = { + is_player = yes + } } AND = { exists = c:BOZ - c:BOZ = { is_player = yes} + c:BOZ = { + is_player = yes + } } AND = { exists = c:AOZ - c:AOZ = { is_player = yes} + c:AOZ = { + is_player = yes + } } } } set_global_variable = german_player } } - # completion trigger, use is_goal_complete = yes in here if you're testing a tracked goal metric; if left blank, cannot be completed complete = { hidden_trigger = { @@ -58,11 +58,10 @@ has_global_variable = german_reunification_voting } } - # effect which is executed when 'complete' trigger becomes true on_complete = { trigger_event = { - id = west_german_unification.4 # Unified Germany + id = west_german_unification.4 # Unified Germany days = 1 } hidden_effect = { @@ -78,8 +77,8 @@ } c:BOZ = { trigger_event = { - id = west_german_unification.3 # Unified Germany - days = 0 + id = west_german_unification.3 # Unified Germany + days = 0 } } } @@ -89,8 +88,8 @@ } c:AOZ = { trigger_event = { - id = west_german_unification.3 # Unified Germany - days = 0 + id = west_german_unification.3 # Unified Germany + days = 0 } } } @@ -100,23 +99,20 @@ } c:FOZ = { trigger_event = { - id = west_german_unification.3 # Unified Germany - days = 0 - } + id = west_german_unification.3 # Unified Germany + days = 0 } } } } } - + } # failure trigger, should spawn event explaining what happens when triggered, framed as a failure; if left blank, cannot fail fail = { } - # effect which is executed when 'fail' trigger becomes true on_fail = { } - # optional invalidation trigger, should not notify player when it triggers, just clean up and silently disappear due to journal entry no longer being valid; if left blank, cannot be invalidated invalid = { NOR = { @@ -126,12 +122,9 @@ exists = c:GER } } - # effect which is executed when 'invalid' trigger becomes true on_invalid = { - } - # dynamically updated text, which describes the current status of the Journal Entry # To use in loc or UI: [JournalEntry.GetStatusDesc] # If this is not specified, GetStatusDesc will instead return loc from key _status @@ -178,15 +171,11 @@ } } } - # the number of days before this journal entry forcibly transitions, can be used to transition silently or into another event, framed either as success, failure, or neutral; if left blank or set to zero, will not time out timeout = 4380 - # effect which is executed when journal entry is timed out on_timeout = { - } - # on_action which is triggered every first day of the week on_weekly_pulse = { effect = { @@ -195,15 +184,21 @@ has_global_variable = USA_voted_german_reunification has_global_variable = GBR_voted_german_reunification has_global_variable = FRA_voted_german_reunification - NOT = { has_global_variable = german_reunification_voting_finished } + NOT = { + has_global_variable = german_reunification_voting_finished + } } set_global_variable = german_reunification_voting_finished } if = { limit = { has_global_variable = german_reunification_neutrality_complete - NOT = { has_global_variable = german_reunification_neutral_germany } - NOT = { has_global_variable = german_reunification_east_and_west_complete } + NOT = { + has_global_variable = german_reunification_neutral_germany + } + NOT = { + has_global_variable = german_reunification_east_and_west_complete + } } set_global_variable = german_reunification_east_and_west_complete } @@ -214,7 +209,9 @@ has_global_variable = GBR_voted_german_reunification has_global_variable = USA_voted_german_reunification has_global_variable = FRA_voted_german_reunification - NOT = { has_global_variable = german_reunification_independence_complete } + NOT = { + has_global_variable = german_reunification_independence_complete + } } set_global_variable = german_reunification_independence_complete } @@ -223,13 +220,16 @@ 50 = 0 # Flavortown } - } - # on_action which is triggered every first day of the month on_monthly_pulse = { events = { - delay = { days = { 0 7 } } + delay = { + days = { + 0 + 7 + } + } west_german_unification.101 west_german_unification.102 west_german_unification.103 @@ -238,7 +238,12 @@ #saarland.2 Moved to on_actions since it takes place after the end of JE } random_events = { - delay = { days = { 0 7 } } + delay = { + days = { + 0 + 7 + } + } 200 = 0 100 = west_german_unification.6 100 = west_german_unification.1 @@ -255,7 +260,9 @@ } } c:AOZ = { - trigger_event = { id = west_german_unification.2 } + trigger_event = { + id = west_german_unification.2 + } } } if = { @@ -266,7 +273,9 @@ } } c:BOZ = { - trigger_event = { id = west_german_unification.2 } + trigger_event = { + id = west_german_unification.2 + } } } if = { @@ -277,7 +286,9 @@ } } c:FOZ = { - trigger_event = { id = west_german_unification.2 } + trigger_event = { + id = west_german_unification.2 + } } } if = { @@ -299,73 +310,123 @@ } } } - - - # on_action which is triggered every first day of the year on_yearly_pulse = { events = { - delay = { days = { 0 365 } } - west_german_unification.10 # Operation Paperclip + delay = { + days = { + 0 + 365 + } + } + west_german_unification.10 # Operation Paperclip } effect = { } } - # a script value computing the goal completion metric current_value = { - if = { limit = { has_global_variable = german_reunification_austrian_question} add = 1 } - if = { limit = { has_global_variable = german_reunification_denazification } add = 1 } - if = { limit = { has_global_variable = USA_consents_germany } add = 1 } - if = { limit = { has_global_variable = GBR_consents_germany } add = 1 } - if = { limit = { has_global_variable = FRA_consents_germany } add = 1 } - if = { limit = { has_global_variable = USA_refuses_germany } add = 1 } - if = { limit = { has_global_variable = GBR_refuses_germany } add = 1 } - if = { limit = { has_global_variable = FRA_refuses_germany } add = 1 } - if = { limit = { has_global_variable = german_reunification_combined_zones_complete } add = 1 } - if = { limit = { has_global_variable = german_reunification_neutrality_complete } add = 1 } - if = { limit = { has_global_variable = german_reunification_east_and_west_complete } add = 1} - if = { limit = { has_global_variable = german_reunification_independence_complete } add = 1 } + if = { + limit = { + has_global_variable = german_reunification_austrian_question + } + add = 1 + } + if = { + limit = { + has_global_variable = german_reunification_denazification + } + add = 1 + } + if = { + limit = { + has_global_variable = USA_consents_germany + } + add = 1 + } + if = { + limit = { + has_global_variable = GBR_consents_germany + } + add = 1 + } + if = { + limit = { + has_global_variable = FRA_consents_germany + } + add = 1 + } + if = { + limit = { + has_global_variable = USA_refuses_germany + } + add = 1 + } + if = { + limit = { + has_global_variable = GBR_refuses_germany + } + add = 1 + } + if = { + limit = { + has_global_variable = FRA_refuses_germany + } + add = 1 + } + if = { + limit = { + has_global_variable = german_reunification_combined_zones_complete + } + add = 1 + } + if = { + limit = { + has_global_variable = german_reunification_neutrality_complete + } + add = 1 + } + if = { + limit = { + has_global_variable = german_reunification_east_and_west_complete + } + add = 1 + } + if = { + limit = { + has_global_variable = german_reunification_independence_complete + } + add = 1 + } } - # when the journal entry is activated current_value and goal_add_value are evaluated and added together to determine the goal value goal_add_value = { add = 9 } - # the highest weighted active journal entry appears in the goal tracker on the main screen weight = 200 - # yes/no, determines if this journal entry should be transfered if the player switches country through a revolution or by releasing a subject. Note that external dependencies such as country variables etc are not automatically inherited transferable = no - # yes/no, determines if this journal entry is allowed to be inherited by a victorious revolution. Revolutions also get all variables from the defeated parent country, so most JEs *should* be inherited in this way # NOTE: transferable = yes will always mean that revolution inheritance is blocked as these JEs should stay with the player at all times can_revolution_inherit = no - # optional trigger, progress text is shown if this is defined and true is_progressing = { } - # yes/no, if yes, a progress bar is shown progressbar = yes - # yes/no, if yes, the Journal Entry can return to an inactive state if its possible trigger reverts to false # if no or unspecified, an activated Journal Entry cannot return to being inactive even if it is no longer considered possible can_deactivate = no - # dynamically updated text, which is shown over the progress bar of the Journal Entry # value can be a localization key or first_valid + triggered_desc script # To use in loc or UI: [JournalEntry.GetProgressDesc] # If this is not specified, GetProgressDesc will instead return loc from key _progress #progress_desc = 0 - # tutorial lesson explaining HOW to complete the Journal Entry #how_tutorial = how_german_unification - # tutorial lesson explaining the WHY around the Journal Entry #why_tutorial = why_german_unification - # whether a Journal Entry should be pinned in its outliner by default. Defaults to 'no' - should_be_pinned_by_default = yes + should_be_pinned_by_default = no } diff --git a/common/journal_entries/CWP_newfoundland_referendum.txt b/common/journal_entries/CWP_newfoundland_referendum.txt index e3f649e0a..db833648e 100644 --- a/common/journal_entries/CWP_newfoundland_referendum.txt +++ b/common/journal_entries/CWP_newfoundland_referendum.txt @@ -2,31 +2,25 @@ # root = the owner of the Journal Entry (country scope) # scope:journal_entry = this Journal Entry (journalentry scope) # scope:target = target value, with which this Journal Entry was added using `add_journal_entry` effect - # optional image that shows in the journal entry widget near the description, default = NDefines::GUI::JOURNAL_ENTRY_ICON_DEFAULT (set in /defines/00_interfaces.txt) icon = "gfx/interface/icons/event_icons/event_industry.dds" - # optional trigger which determines if a journal entry can be shown, default = no # is ignored when JE is added through `add_journal_entry` effect is_shown_when_inactive = { } - # one or more scripted buttons. See common/scripted_buttons/_scripted_buttons.info for more info #scripted_button = scripted_button_key - # optional trigger - when both this and is_shown_when_inactive is true, the JE is Activated, default = yes # is ignored when JE is added through `add_journal_entry` effect possible = { } - # effect which happens when a journal entry is activated by having its `is_shown_when_inactive` and `possible` triggers become true or when JE is added through `add_journal_entry` effect immediate = { trigger_event = { - id = newfoundland_referendum.999 # setup leader and unifier + id = newfoundland_referendum.999 # setup leader and unifier days = 1 } } - # completion trigger, use is_goal_complete = yes if you're testing a tracked goal metric # if left blank, cannot be completed complete = { @@ -34,7 +28,6 @@ has_global_variable = newfoundland_referendum_done } } - # effect which is executed when 'complete' trigger becomes true on_complete = { hidden_effect = { @@ -126,17 +119,16 @@ days = 75 } } - } + } } - # failure trigger # should spawn event explaining what happens when triggered, framed as a failure; # if left blank, cannot fail - fail = {} - + fail = { + } # effect which is executed when 'fail' trigger becomes true - on_fail = {} - + on_fail = { + } # optional invalidation trigger # should not notify player when it triggers # just clean up and silently disappear due to journal entry no longer being valid; @@ -165,10 +157,9 @@ } } } - # effect which is executed when 'invalid' trigger becomes true - on_invalid = {} - + on_invalid = { + } # dynamically updated text, which describes the current status of the Journal Entry # To use in loc or UI: [JournalEntry.GetStatusDesc] # If this is not specified, GetStatusDesc will instead return loc from key _status @@ -333,7 +324,9 @@ desc = newfoundland_referendum_desc_19 trigger = { this = c:NEW - NOT = { has_global_variable = independence_decision_canada } + NOT = { + has_global_variable = independence_decision_canada + } has_global_variable = independence_decision_uk } } @@ -342,7 +335,9 @@ trigger = { this = c:NEW has_global_variable = independence_decision_canada - NOT = { has_global_variable = independence_decision_uk } + NOT = { + has_global_variable = independence_decision_uk + } } } triggered_desc = { @@ -467,7 +462,9 @@ has_global_variable = ottawa_delegation_only has_global_variable = london_and_ottawa_delegation } - NOT = { has_global_variable = london_delegation_only } + NOT = { + has_global_variable = london_delegation_only + } } } triggered_desc = { @@ -478,7 +475,9 @@ has_global_variable = london_delegation_only has_global_variable = london_and_ottawa_delegation } - NOT = { has_global_variable = ottawa_delegation_only } + NOT = { + has_global_variable = ottawa_delegation_only + } } } triggered_desc = { @@ -537,44 +536,42 @@ } } } - # the number of days before this journal entry forcibly transitions, can be used to transition silently or into another event, framed either as success, failure, or neutral; if left blank or set to zero, will not time out timeout = 1825 - # effect which is executed when journal entry is timed out - on_timeout = {} - + on_timeout = { + } # on_action which is triggered every first day of the week on_weekly_pulse = { - } - # on_action which is triggered every first day of the month on_monthly_pulse = { events = { - delay = { days = { 0 7 } } - newfoundland_referendum.1 # Calling for a Newfoundland National Convention - newfoundland_referendum.2 # Newfoundland chooses where to send delegates: London only? Ottawa only? Both? - newfoundland_referendum.3 # London Delegation - newfoundland_referendum.4 # Ottawa Delegation - newfoundland_referendum.51 # UK decides on whether Newfoundland should have the option of Independence - newfoundland_referendum.52 # Canada decides on whether Newfoundland should have the option of Independence - newfoundland_referendum.998 # Determine which first referendum gets chosen: With or without an independence option - newfoundland_referendum.6 # First referendum with independence option - newfoundland_referendum.7 # First referendum without independence option - newfoundland_referendum.8 # Second referendum - newfoundland_referendum.9 # Newfoundland becomes a British Dominion - newfoundland_referendum.10 # Newfoundland confederates with Canada - newfoundland_referendum.11 # Newfoundland remains a British Dependent Territory - newfoundland_referendum.12 # Newfoundland becomes independent + delay = { + days = { + 0 + 7 + } + } + newfoundland_referendum.1 # Calling for a Newfoundland National Convention + newfoundland_referendum.2 # Newfoundland chooses where to send delegates: London only? Ottawa only? Both? + newfoundland_referendum.3 # London Delegation + newfoundland_referendum.4 # Ottawa Delegation + newfoundland_referendum.51 # UK decides on whether Newfoundland should have the option of Independence + newfoundland_referendum.52 # Canada decides on whether Newfoundland should have the option of Independence + newfoundland_referendum.998 # Determine which first referendum gets chosen: With or without an independence option + newfoundland_referendum.6 # First referendum with independence option + newfoundland_referendum.7 # First referendum without independence option + newfoundland_referendum.8 # Second referendum + newfoundland_referendum.9 # Newfoundland becomes a British Dominion + newfoundland_referendum.10 # Newfoundland confederates with Canada + newfoundland_referendum.11 # Newfoundland remains a British Dependent Territory + newfoundland_referendum.12 # Newfoundland becomes independent } } - # on_action which is triggered every first day of the year on_yearly_pulse = { - } - # a script value computing the goal completion metric current_value = { if = { @@ -646,45 +643,32 @@ add = 1 } } - # when the journal entry is activated current_value and goal_add_value are evaluated and added together to determine the goal value goal_add_value = { add = 7 } - # the highest weighted active journal entry appears in the goal tracker on the main screen weight = 200 - # yes/no, determines if this journal entry should be transfered if the player switches country through a revolution or by releasing a subject. Note that external dependencies such as country variables etc are not automatically inherited transferable = no - # yes/no, determines if this journal entry is allowed to be inherited by a victorious revolution. Revolutions also get all variables from the defeated parent country, so most JEs *should* be inherited in this way # NOTE: transferable = yes will always mean that revolution inheritance is blocked as these JEs should stay with the player at all times can_revolution_inherit = no - # optional trigger, progress text is shown if this is defined and true is_progressing = { } - # yes/no, if yes, a progress bar is shown progressbar = yes - # yes/no, if yes, the Journal Entry can return to an inactive state if its possible trigger reverts to false # if no or unspecified, an activated Journal Entry cannot return to being inactive even if it is no longer considered possible can_deactivate = no - # dynamically updated text, which is shown over the progress bar of the Journal Entry # value can be a localization key or first_valid + triggered_desc script # To use in loc or UI: [JournalEntry.GetProgressDesc] # If this is not specified, GetProgressDesc will instead return loc from key _progress #progress_desc = 0 - # tutorial lesson explaining HOW to complete the Journal Entry - - # tutorial lesson explaining the WHY around the Journal Entry - - # whether a Journal Entry should be pinned in its outliner by default. Defaults to 'no' - should_be_pinned_by_default = yes -} \ No newline at end of file + should_be_pinned_by_default = no +} diff --git a/localization/english/CWP/CWP_decolonization_je_l_english.yml b/localization/english/CWP/CWP_decolonization_je_l_english.yml index 266441e77..fabb63204 100644 --- a/localization/english/CWP/CWP_decolonization_je_l_english.yml +++ b/localization/english/CWP/CWP_decolonization_je_l_english.yml @@ -10,7 +10,6 @@ je_decolonization_desc_generic: "The Future of Our Empire is at Stake" je_decolonization_reason: "Our empire is in a precarious position. Everybody, including our colonial subjects, are questioning our ability to maintain our empire. We must ensure stability within our empire, or we may lose it all.\n\nPressure from domestic anti-colonial politicians, from superpowers abroad, our subjects themselves, and a myriad of other factors will determine our Imperial Unity. Keeping unity high will allow us to keep our empire, but lower values will worsen our situation, possibly landing us at war with our subjects.\n\nEach month Imperial Unity will change by #bold [Country.MakeScope.ScriptValue('imperial_unity_growth')|+0d]#! due to: \n\n #bold [Country.MakeScope.GetScriptValueDesc('imperial_unity_growth')|-0d]#!" - je_decolonization_goal: "The unity of our empire." je_decolonization_complete_tooltip: "The future of our empire will be determined by our imperial unity." je_decolonization_timeout_tooltip: "The future of our empire will be determined by our imperial unity." diff --git a/localization/english/CWP/india/CWP_india_content_l_english.yml b/localization/english/CWP/india/CWP_india_content_l_english.yml index cbadccf29..35dcec63e 100644 --- a/localization/english/CWP/india/CWP_india_content_l_english.yml +++ b/localization/english/CWP/india/CWP_india_content_l_english.yml @@ -4,10 +4,10 @@ ### Journal Entries ### indian_partition: "The Partition of India" - indian_partition_progress_desc_hnd: "The Raj will soon dissolve, and the fate of India will be decided by our unity" - indian_partition_progress_desc_gbr: "Our relationship with India is at a crossroads" indian_partition_reason: "The Crown Jewel of the British Empire, the Raj, has been promised her freedom. The coming months will determine the nature of the partition and the relationship between the newly free Indian state and her former Suzerain. High National Unity will cause more princely states to join India, once formed. At levels below 100, Pakistan may also form from the non-Hindi states of the former Raj. At low levels of national unity, some princely states will remain independent after the partition. \n\nThe relationship between Great Britain and India during the partition will determine what ties they will have after independence, if any at all." indian_partition_complete_tooltip: "National Unity 100/100 or Journal times out." + indian_partition_progress_desc: "National Unity" + indian_partition_progress_desc_gbr: "Indian National Unity" ### Events ### # British Reaction to Indian Partition From 68dbb2855228bdeb7e80e698043988597cbb1f34 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Tue, 25 Jul 2023 20:14:20 +0200 Subject: [PATCH 20/22] fix: one ownership missing from trade center --- common/production_method_groups/11_private_infrastructure.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/common/production_method_groups/11_private_infrastructure.txt b/common/production_method_groups/11_private_infrastructure.txt index a44016a3d..7866eb9fd 100644 --- a/common/production_method_groups/11_private_infrastructure.txt +++ b/common/production_method_groups/11_private_infrastructure.txt @@ -55,6 +55,7 @@ pmg_ownership_building_trade_center = { ai_selection = most_productive production_methods = { pm_trade_center_privately_owned + pm_trade_center_publicly_traded pm_trade_center_government_run pm_trade_center_worker_cooperatives } From cf12d361627e210807ed5719d437d271eadec9ee Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Tue, 25 Jul 2023 20:40:44 +0200 Subject: [PATCH 21/22] chore: loc --- localization/english/CWP/CWP_production_methods_l_english.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/localization/english/CWP/CWP_production_methods_l_english.yml b/localization/english/CWP/CWP_production_methods_l_english.yml index 6619a2678..757843d03 100644 --- a/localization/english/CWP/CWP_production_methods_l_english.yml +++ b/localization/english/CWP/CWP_production_methods_l_english.yml @@ -1115,6 +1115,7 @@ pm_skyscraper_financial_district: "Financial District" pm_trade_center_state_run_cooperative: "State Run Cooperatives" pm_trade_center_worker_cooperatives: "Worker Cooperatives" + pm_trade_center_publicly_traded: "Publicly Traded" pm_privately_owned_skyscraper: "Privately Owned" pm_publicly_traded_skyscraper: "Publicly Traded" pm_government_run_skyscraper: "Government Run" From 688ce5f4633544c951b83a8a0bb475850a2b92c6 Mon Sep 17 00:00:00 2001 From: raxo2222 <54320715+raxo2222@users.noreply.github.com> Date: Tue, 25 Jul 2023 21:43:01 +0200 Subject: [PATCH 22/22] fix: qualification't --- common/pop_types/cwp_creatives.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/common/pop_types/cwp_creatives.txt b/common/pop_types/cwp_creatives.txt index 039a64eda..0339fbd19 100644 --- a/common/pop_types/cwp_creatives.txt +++ b/common/pop_types/cwp_creatives.txt @@ -43,6 +43,7 @@ desc = QUALIFICATIONS_LITERACY_FACTOR } add = { + value = wealth subtract = 5 min = 0 desc = QUALIFICATIONS_WEALTH_FACTOR