diff --git a/EU4ToVic3/Data_Files/blankMod/output/common/parties/agrarian_party.txt b/EU4ToVic3/Data_Files/blankMod/output/common/parties/agrarian_party.txt index c164ca411..45fae0e0c 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/common/parties/agrarian_party.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/common/parties/agrarian_party.txt @@ -273,6 +273,7 @@ agrarian_party = { limit = { OR = { has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern has_ideology = ideology:ideology_particularist } owner = { @@ -382,6 +383,7 @@ agrarian_party = { } OR = { has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern has_ideology = ideology:ideology_anti_slavery has_ideology = ideology:ideology_laissez_faire has_ideology = ideology:ideology_particularist diff --git a/EU4ToVic3/Data_Files/blankMod/output/common/parties/conservative_party.txt b/EU4ToVic3/Data_Files/blankMod/output/common/parties/conservative_party.txt index 4ba9d0fa0..418989d50 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/common/parties/conservative_party.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/common/parties/conservative_party.txt @@ -451,7 +451,7 @@ conservative_party = { limit = { leader = { OR = { - is_feminist_character = yes ### Converter + has_ideology = ideology:ideology_feminist has_ideology = ideology:ideology_pacifist has_ideology = ideology:ideology_reformer has_ideology = ideology:ideology_humanitarian diff --git a/EU4ToVic3/Data_Files/blankMod/output/common/parties/free_trade_party.txt b/EU4ToVic3/Data_Files/blankMod/output/common/parties/free_trade_party.txt index 70e9e12f3..275b3fa9b 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/common/parties/free_trade_party.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/common/parties/free_trade_party.txt @@ -165,6 +165,7 @@ free_trade_party = { desc = "usa_two_party_system" } } + if = { # capitalists like capitalism limit = { OR = { diff --git a/EU4ToVic3/Data_Files/blankMod/output/common/parties/liberal_party.txt b/EU4ToVic3/Data_Files/blankMod/output/common/parties/liberal_party.txt index dd6eca8d6..078734d36 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/common/parties/liberal_party.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/common/parties/liberal_party.txt @@ -338,6 +338,7 @@ liberal_party = { limit = { OR = { has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern has_ideology = ideology:ideology_laissez_faire } } @@ -444,7 +445,9 @@ liberal_party = { is_feminist_character = yes ### Converter } has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern } owner = { has_law = law_type:law_no_womens_rights @@ -466,6 +469,7 @@ liberal_party = { } } has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern } owner = { OR = { @@ -484,11 +488,11 @@ liberal_party = { limit = { OR = { has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern leader = { has_ideology = ideology:ideology_humanitarian - } - leader = { has_ideology = ideology:ideology_humanitarian_royalist } } @@ -505,6 +509,7 @@ liberal_party = { limit = { OR = { has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern has_ideology = ideology:ideology_particularist } owner = { @@ -605,6 +610,7 @@ liberal_party = { } OR = { has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern has_ideology = ideology:ideology_anti_slavery has_ideology = ideology:ideology_laissez_faire has_ideology = ideology:ideology_particularist @@ -629,7 +635,6 @@ liberal_party = { desc = "from_modernizer" } } - # Special weights for ACW if = { limit = { diff --git a/EU4ToVic3/Data_Files/blankMod/output/common/parties/radical_party.txt b/EU4ToVic3/Data_Files/blankMod/output/common/parties/radical_party.txt index 99deb92cf..9da476156 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/common/parties/radical_party.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/common/parties/radical_party.txt @@ -355,7 +355,10 @@ radical_party = { owner = { any_interest_group = { is_powerful = yes - has_ideology = ideology:ideology_liberal + OR = { + has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern + } } } } @@ -367,7 +370,10 @@ radical_party = { if = { # weak liberals will fall in line behind strong radicals limit = { is_powerful = no - has_ideology = ideology:ideology_liberal + OR = { + has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern + } owner = { any_interest_group = { is_powerful = yes @@ -526,6 +532,7 @@ radical_party = { OR = { has_ideology = ideology:ideology_liberal has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern leader = { has_ideology = ideology:ideology_humanitarian } @@ -543,6 +550,7 @@ radical_party = { limit = { OR = { has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern leader = { OR = { has_ideology = ideology:ideology_humanitarian @@ -589,6 +597,7 @@ radical_party = { } OR = { has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern has_ideology = ideology:ideology_anti_slavery has_ideology = ideology:ideology_laissez_faire has_ideology = ideology:ideology_particularist diff --git a/EU4ToVic3/Data_Files/blankMod/output/common/parties/social_democrats_party.txt b/EU4ToVic3/Data_Files/blankMod/output/common/parties/social_democrats_party.txt index 637db2151..71cbaf613 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/common/parties/social_democrats_party.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/common/parties/social_democrats_party.txt @@ -337,7 +337,10 @@ social_democrat_party = { if = { limit = { is_powerful = no + OR = { has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern + } owner = { any_interest_group = { is_powerful = yes @@ -406,12 +409,14 @@ social_democrat_party = { limit = { OR = { has_ideology = ideology:ideology_liberal + has_ideology = ideology:ideology_liberal_modern has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern leader = { - has_ideology = ideology:ideology_humanitarian - } - leader = { - has_ideology = ideology:ideology_humanitarian_royalist + OR = { + has_ideology = ideology:ideology_humanitarian + has_ideology = ideology:ideology_humanitarian_royalist + } } } owner = { @@ -577,6 +582,7 @@ social_democrat_party = { } OR = { has_ideology = ideology:ideology_egalitarian + has_ideology = ideology:ideology_egalitarian_modern has_ideology = ideology:ideology_anti_slavery has_ideology = ideology:ideology_laissez_faire has_ideology = ideology:ideology_particularist diff --git a/EU4ToVic3/Data_Files/blankMod/output/events/agitators_events/paris_commune_pulse_events.txt b/EU4ToVic3/Data_Files/blankMod/output/events/agitators_events/paris_commune_pulse_events.txt index f868c4399..211678cc2 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/events/agitators_events/paris_commune_pulse_events.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/events/agitators_events/paris_commune_pulse_events.txt @@ -307,6 +307,7 @@ paris_commune_pulse_events.2 = { OR = { has_ideology = ideology:ideology_moderate has_ideology = ideology:ideology_humanitarian + has_ideology = ideology:ideology_humanitarian_royalist has_ideology = ideology:ideology_reformer } } @@ -324,6 +325,7 @@ paris_commune_pulse_events.2 = { OR = { has_ideology = ideology:ideology_moderate has_ideology = ideology:ideology_humanitarian + has_ideology = ideology:ideology_humanitarian_royalist has_ideology = ideology:ideology_reformer } } @@ -1240,6 +1242,12 @@ paris_commune_pulse_events.6 = { } } activate_law = law_type:law_state_atheism + capital = { + convert_population = { + target = rel:atheist + value = 0.1 + } + } } if = { limit = { @@ -1499,20 +1507,28 @@ paris_commune_pulse_events.8 = { random_list = { 60 = { custom_tooltip = paris_commune_pulse_events.8.tt_1 + custom_tooltip = { + text = commune_progress_subtract_5 + change_global_variable = { + name = paris_commune_progress_var + add = -5 + } + } scope:cannon_seizing_general_scope = { add_modifier = { name = first_blood_modifier months = short_modifier_time } } + post_notification = paris_commune_event_8_a1 } 40 = { custom_tooltip = paris_commune_pulse_events.8.tt_2 custom_tooltip = { - text = commune_progress_subtract_10 + text = commune_progress_add_10 change_global_variable = { name = paris_commune_progress_var - add = -10 + add = 10 } } scope:cannon_seizing_general_scope = { @@ -1542,16 +1558,17 @@ paris_commune_pulse_events.8 = { } } } + post_notification = paris_commune_event_8_a2 } } } option = { # There are too few men to seize them. name = paris_commune_pulse_events.8.b custom_tooltip = { - text = commune_progress_subtract_5 + text = commune_progress_add_5 change_global_variable = { name = paris_commune_progress_var - add = -5 + add = 5 } } c:PRC = { @@ -1583,10 +1600,10 @@ paris_commune_pulse_events.8 = { has_technology_researched = breech_loading_artillery } custom_tooltip = { - text = commune_progress_add_5 + text = commune_progress_subtract_5 change_global_variable = { name = paris_commune_progress_var - add = 5 + add = -5 } } c:PRC = { diff --git a/EU4ToVic3/Data_Files/blankMod/output/events/commander_events.txt b/EU4ToVic3/Data_Files/blankMod/output/events/commander_events.txt index 5f74f5930..593bb052c 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/events/commander_events.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/events/commander_events.txt @@ -268,7 +268,7 @@ commander_events.5 = { name = commander_events.5.a default_option = yes add_technology_progress = { - progress = 4500 + progress = 4150 technology = handcranked_machine_gun } } diff --git a/EU4ToVic3/Data_Files/blankMod/output/events/communism.txt b/EU4ToVic3/Data_Files/blankMod/output/events/communism.txt index 731b74885..1c25600f5 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/events/communism.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/events/communism.txt @@ -25,14 +25,9 @@ communism.1 = { immediate = { random_interest_group = { limit = { - is_in_government = yes - ig_clout > 0.15 - leader = { - OR = { - has_ideology = ideology:ideology_communist - has_ideology = ideology:ideology_vanguardist - has_ideology = ideology:ideology_anarchist - } + law_stance = { + law = law_type:law_council_republic + value > neutral } } set_variable = communist_ig_var @@ -57,7 +52,14 @@ communism.1 = { NOT = { has_law = law_type:law_old_age_pension } } activate_law = law_type:law_wage_subsidies - custom_tooltip = communist_unions.tt + if = { + limit = { + any_interest_group = { + has_variable = communist_ig_var + } + } + custom_tooltip = communist_unions.tt + } } option = { # ban slavery name = communism.1.b @@ -65,7 +67,14 @@ communism.1 = { NOT = { has_law = law_type:law_slavery_banned } } activate_law = law_type:law_slavery_banned - custom_tooltip = communist_unions.tt + if = { + limit = { + any_interest_group = { + has_variable = communist_ig_var + } + } + custom_tooltip = communist_unions.tt + } } option = { # Regulatory bodies name = communism.1.c @@ -74,12 +83,26 @@ communism.1 = { NOT = { has_law = law_type:law_worker_protections } } activate_law = law_type:law_regulatory_bodies - custom_tooltip = communist_unions.tt + if = { + limit = { + any_interest_group = { + has_variable = communist_ig_var + } + } + custom_tooltip = communist_unions.tt + } } option = { name = communism.1.d default_option = yes - custom_tooltip = communist_unions.tt + if = { + limit = { + any_interest_group = { + has_variable = communist_ig_var + } + } + custom_tooltip = communist_unions.tt + } every_interest_group = { limit = { leader = { @@ -95,6 +118,10 @@ communism.1 = { months = normal_modifier_time } } + add_loyalists = { + value = medium_radicals + strata = rich + } } } @@ -740,7 +767,7 @@ communism.9 = { any_scope_pop = { pop_is_discriminated = no standard_of_living > 15 - workplace = { + workplace ?= { OR = { has_active_production_method = pm_worker_cooperative_building_food_industry has_active_production_method = pm_worker_cooperative_building_textile_mills @@ -779,7 +806,7 @@ communism.9 = { any_scope_pop = { pop_is_discriminated = no standard_of_living > 15 - workplace = { + workplace ?= { OR = { has_active_production_method = pm_worker_cooperative_building_food_industry has_active_production_method = pm_worker_cooperative_building_textile_mills @@ -812,7 +839,7 @@ communism.9 = { limit = { pop_is_discriminated = no standard_of_living > 15 - workplace = { + workplace ?= { OR = { has_active_production_method = pm_worker_cooperative_building_food_industry has_active_production_method = pm_worker_cooperative_building_textile_mills @@ -868,3 +895,124 @@ communism.9 = { } } } + +# Startup event 1 +communism.10 = { + type = country_event + placement = root + title = communism.10.t + desc = communism.10.d + flavor = communism.10.f + + duration = 3 + + event_image = { + video = "europenorthamerica_political_extremism" + } + + on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" + + icon = "gfx/interface/icons/event_icons/event_election.dds" + + trigger = { + # triggered by communsim JE 1 + } + + immediate = { + set_variable = { name = communism_je_1_var value = 25 } + } + + option = { + name = communism.10.a + default_option = yes + capital = { + add_radicals_in_state = { + value = medium_radicals + pop_type = laborers + } + } + } + option = { + name = communism.10.b + trigger = { + any_interest_group = { + is_in_government = yes + OR = { + has_ideology = ideology:ideology_socialist + leader = { + has_socialist_ideology = yes + } + } + } + } + capital = { + add_radicals_in_state = { + value = small_radicals + pop_type = laborers + } + } + custom_tooltip = { + text = communism_var_tick_05_tt + set_variable = { name = communism_progress_var_add value = 0.5 } + } + } +} + +# Completion Event +communism.11 = { + type = country_event + placement = root + title = communism.11.t + desc = communism.11.d + flavor = communism.11.f + + duration = 3 + + event_image = { + video = "votp_realist_household" + } + + on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" + + icon = "gfx/interface/icons/event_icons/event_election.dds" + + trigger = { + # triggered by communism JE 1 + } + + immediate = { + + } + + option = { + name = communism.11.a + default_option = yes + add_modifier = { + name = modifier_defeated_initial_socialist_movement + months = normal_modifier_time + } + add_loyalists = { + value = small_radicals + strata = rich + } + add_loyalists = { + value = small_radicals + strata = middle + } + } + option = { + name = communism.11.b + add_modifier = { + name = modifier_defeated_initial_socialist_movement_worries + months = normal_modifier_time + } + add_loyalists = { + value = medium_radicals + strata = rich + } + add_loyalists = { + value = medium_radicals + strata = middle + } + } +} \ No newline at end of file diff --git a/EU4ToVic3/Data_Files/blankMod/output/events/german_unification.txt b/EU4ToVic3/Data_Files/blankMod/output/events/german_unification.txt index 45863b65c..c6fbfb3f0 100644 --- a/EU4ToVic3/Data_Files/blankMod/output/events/german_unification.txt +++ b/EU4ToVic3/Data_Files/blankMod/output/events/german_unification.txt @@ -53,6 +53,9 @@ german_unification.1 = { country_has_primary_culture = cu:south_german } } + NOT = { + THIS = ROOT + } } if = { @@ -66,7 +69,7 @@ german_unification.1 = { is_supporting_unification_candidate = { who = root country_formation = GER } } } - root = { annex = prev } + root = { annex_with_incorporation = prev } } else = { trigger_event = { id = german_unification.2 days = 0 popup = yes } @@ -180,7 +183,7 @@ german_unification.2 = { is_subject_of = scope:german_unification_candidate } } - scope:german_unification_candidate = { annex = root } + scope:german_unification_candidate = { annex_with_incorporation = root } ai_chance = { base = 9 }