diff --git a/Anti-Trust Patch/common/on_actions/zMoG_ATP_start_cleanout.txt b/Anti-Trust Patch/common/on_actions/zMoG_ATP_start_cleanout.txt index b0bf0b2f..96ab4b95 100644 --- a/Anti-Trust Patch/common/on_actions/zMoG_ATP_start_cleanout.txt +++ b/Anti-Trust Patch/common/on_actions/zMoG_ATP_start_cleanout.txt @@ -44,7 +44,7 @@ mog_atp_start_cleanout_action = { # # owner = ROOT # # is_incorporated = yes # # any_scope_building = { -# # is_building_type = building_chemical_plants +# # is_building_type = building_chemical_plant # # level = 1 # # } # # OR = { @@ -53,9 +53,9 @@ mog_atp_start_cleanout_action = { # # region = sr:region_south_germany # # } # # } -# # remove_building = building_chemical_plants +# # remove_building = building_chemical_plant # # create_building={ -# # building="building_chemical_plants" +# # building="building_chemical_plant" # # add_ownership={ # # company={ # # type=company_IG_Farben @@ -69,4 +69,4 @@ mog_atp_start_cleanout_action = { # ## Repeat this block for x levels as needed. # #} # } -# } \ No newline at end of file +# } diff --git a/Industries Rework - Military/common/buildings/11_mog_sec_industry.txt b/Industries Rework - Military/common/buildings/11_mog_sec_industry.txt index 492a7efe..50f6e369 100644 --- a/Industries Rework - Military/common/buildings/11_mog_sec_industry.txt +++ b/Industries Rework - Military/common/buildings/11_mog_sec_industry.txt @@ -77,7 +77,7 @@ TRY_REPLACE:building_explosives_factory = { levels_per_mesh = 50 production_method_groups = { - pmg_explosives_building_chemical_plants + pmg_explosives_building_chemical_plant pmg_automation_building_explosives_factory } @@ -96,4 +96,4 @@ TRY_REPLACE:building_explosives_factory = { ownership_type = self background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_heavy_industry.dds" -} \ No newline at end of file +} diff --git a/Industries Rework - Military/common/buildings/vmog_ship_industry.txt b/Industries Rework - Military/common/buildings/vmog_ship_industry.txt index 77606e25..e132a42f 100644 --- a/Industries Rework - Military/common/buildings/vmog_ship_industry.txt +++ b/Industries Rework - Military/common/buildings/vmog_ship_industry.txt @@ -1,8 +1,8 @@ # We use the TTS named PMG with the vanilla pms in it, so that we can overwrite the building using a vanilla PMG that has the TTS name. # This file must SUPERSEDE "tts_buildings.txt" for the purposes of the military shipyards # -#building_military_shipyards = { -# building_group = bg_military_shipyards +#building_military_shipyard = { +# building_group = bg_military_industry # icon = "gfx/interface/icons/building_icons/building_naval_yards.dds" # city_type = port # @@ -32,4 +32,4 @@ # production_method_groups = { # pmg_mil_shipyards_shiftwork # } -#} \ No newline at end of file +#} diff --git a/Industries Rework - Military/common/production_method_groups/mog_mil_pmg.txt b/Industries Rework - Military/common/production_method_groups/mog_mil_pmg.txt index a3f1df14..28fbeebd 100644 --- a/Industries Rework - Military/common/production_method_groups/mog_mil_pmg.txt +++ b/Industries Rework - Military/common/production_method_groups/mog_mil_pmg.txt @@ -53,7 +53,7 @@ REPLACE_OR_CREATE:pmg_automation_building_arms_industry = { } # Ref production_methods = { pm_automation_disabled pm_rotary_valve_engine_building_arms_industry pm_assembly_lines_building_arms_industry } -# pmg_base_building_munition_plants = { # Vanilla PMG untouched +# pmg_base_building_munition_plant = { # Vanilla PMG untouched # Ref production_methods = { pm_percussion_caps pm_explosive_shells } REPLACE_OR_CREATE:pmg_munitions_explosives_demob = { # Modded PMG @@ -79,5 +79,5 @@ REPLACE_OR_CREATE:pmg_munitions_explosives_demob = { # Modded PMG } } -# pmg_automation_building_munition_plants = { # Vanilla PMG untouched -# Ref production_methods = { pm_automation_disabled pm_rotary_valve_engine_building_munition_plants pm_assembly_lines_building_munition_plants } +# pmg_automation_building_munition_plant = { # Vanilla PMG untouched +# Ref production_methods = { pm_automation_disabled pm_rotary_valve_engine_building_munition_plant pm_assembly_lines_building_munition_plant } diff --git a/Industries Rework - Military/common/production_method_groups/mog_sec_pmg.txt b/Industries Rework - Military/common/production_method_groups/mog_sec_pmg.txt index 78c3b45d..08ca731d 100644 --- a/Industries Rework - Military/common/production_method_groups/mog_sec_pmg.txt +++ b/Industries Rework - Military/common/production_method_groups/mog_sec_pmg.txt @@ -48,7 +48,7 @@ REPLACE_OR_CREATE:pmg_automation_building_motor_industry = { # Vanilla } ## Explosives Factory: -REPLACE_OR_CREATE:pmg_explosives_building_chemical_plants = { # Vanilla PMG re-specified +REPLACE_OR_CREATE:pmg_explosives_building_chemical_plant = { # Vanilla PMG re-specified texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds" production_methods = { pm_leblanc_process @@ -81,4 +81,4 @@ REPLACE_OR_CREATE:pmg_automation_building_explosives_factory = { # Modde # pm_mil_shipyards_triple_shifts # pm_mil_shipyards_triple_shifts_arc_weld # } -#} \ No newline at end of file +#} diff --git a/Industries Rework - Military/common/production_methods/amog_ships_pm.txt b/Industries Rework - Military/common/production_methods/amog_ships_pm.txt index 315ecd36..c5ebeebf 100644 --- a/Industries Rework - Military/common/production_methods/amog_ships_pm.txt +++ b/Industries Rework - Military/common/production_methods/amog_ships_pm.txt @@ -166,10 +166,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.1 +# building_military_shipyard_throughput_add = 0.1 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.02 +# building_military_shipyard_throughput_add = 0.02 # } # } #} @@ -210,10 +210,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.1 +# building_military_shipyard_throughput_add = 0.1 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.02 +# building_military_shipyard_throughput_add = 0.02 # } # } #} @@ -251,10 +251,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.1 +# building_military_shipyard_throughput_add = 0.1 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.02 +# building_military_shipyard_throughput_add = 0.02 # } # } # @@ -312,10 +312,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.2 +# building_military_shipyard_throughput_add = 0.2 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.04 +# building_military_shipyard_throughput_add = 0.04 # } # } # @@ -358,10 +358,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.2 +# building_military_shipyard_throughput_add = 0.2 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.04 +# building_military_shipyard_throughput_add = 0.04 # } # } # @@ -401,12 +401,12 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.2 +# building_military_shipyard_throughput_add = 0.2 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.04 +# building_military_shipyard_throughput_add = 0.04 # } # } # # required_input_goods = electricity -#} \ No newline at end of file +#} diff --git a/Industries Rework - Military/common/production_methods/mog_ammo_pm.txt b/Industries Rework - Military/common/production_methods/mog_ammo_pm.txt index 787d4199..5ef76fa2 100644 --- a/Industries Rework - Military/common/production_methods/mog_ammo_pm.txt +++ b/Industries Rework - Military/common/production_methods/mog_ammo_pm.txt @@ -386,7 +386,7 @@ REPLACE_OR_CREATE:pm_no_self_explosives = { } ### Automation Replacements ### -REPLACE_OR_CREATE:pm_rotary_valve_engine_building_munition_plants = { +REPLACE_OR_CREATE:pm_rotary_valve_engine_building_munition_plant = { texture = "gfx/interface/icons/production_method_icons/rotary_valve_engine.dds" state_modifiers = { @@ -410,7 +410,7 @@ REPLACE_OR_CREATE:pm_rotary_valve_engine_building_munition_plants = { } } -REPLACE_OR_CREATE:pm_assembly_lines_building_munition_plants = { +REPLACE_OR_CREATE:pm_assembly_lines_building_munition_plant = { texture = "gfx/interface/icons/production_method_icons/assembly_lines.dds" state_modifiers = { diff --git a/Industries Rework - Military/common/production_methods/vmog_tts_pm.txt b/Industries Rework - Military/common/production_methods/vmog_tts_pm.txt index 04e24cd1..72a2f5d2 100644 --- a/Industries Rework - Military/common/production_methods/vmog_tts_pm.txt +++ b/Industries Rework - Military/common/production_methods/vmog_tts_pm.txt @@ -165,10 +165,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.1 +# building_military_shipyard_throughput_add = 0.1 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.02 +# building_military_shipyard_throughput_add = 0.02 # } # } #} @@ -211,10 +211,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.1 +# building_military_shipyard_throughput_add = 0.1 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.02 +# building_military_shipyard_throughput_add = 0.02 # } # } #} @@ -256,10 +256,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.1 +# building_military_shipyard_throughput_add = 0.1 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.02 +# building_military_shipyard_throughput_add = 0.02 # } # } #} @@ -299,10 +299,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.1 +# building_military_shipyard_throughput_add = 0.1 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.02 +# building_military_shipyard_throughput_add = 0.02 # } # } #} @@ -346,10 +346,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.2 +# building_military_shipyard_throughput_add = 0.2 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.04 +# building_military_shipyard_throughput_add = 0.04 # } # } # @@ -393,10 +393,10 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.2 +# building_military_shipyard_throughput_add = 0.2 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.04 +# building_military_shipyard_throughput_add = 0.04 # } # } # @@ -438,12 +438,12 @@ # # state_modifiers = { # unscaled = { -# building_military_shipyards_throughput_add = 0.2 +# building_military_shipyard_throughput_add = 0.2 # } # level_scaled = { -# building_military_shipyards_throughput_add = 0.04 +# building_military_shipyard_throughput_add = 0.04 # } # } # # required_input_goods = electricity -#} \ No newline at end of file +#} diff --git a/Industries Rework - Ranches/common/company_types/yMoG_RPR_companies_overwrite.txt b/Industries Rework - Ranches/common/company_types/yMoG_RPR_companies_overwrite.txt index 5093f6e7..d293fbc8 100644 --- a/Industries Rework - Ranches/common/company_types/yMoG_RPR_companies_overwrite.txt +++ b/Industries Rework - Ranches/common/company_types/yMoG_RPR_companies_overwrite.txt @@ -87,7 +87,7 @@ company_somali_food_chain = { building_banana_plantation building_coffee_plantation building_tea_plantation - building_vineyard_plantation + building_vineyard } possible_prestige_goods = { diff --git a/Industries Rework - Ranches/common/production_methods/amog_rpr_subsistence.txt b/Industries Rework - Ranches/common/production_methods/amog_rpr_subsistence.txt index 21a30c1d..c406ae59 100644 --- a/Industries Rework - Ranches/common/production_methods/amog_rpr_subsistence.txt +++ b/Industries Rework - Ranches/common/production_methods/amog_rpr_subsistence.txt @@ -1,5 +1,5 @@ ### Subsistence Production -TRY_INJECT:default_building_subsistence_farms = { +TRY_INJECT:default_building_subsistence_farm = { state_modifiers = { # This is inherited from USU, and is not strictly in scope for this mod - but I've seen that it works and people should have access to this feature without USU if they want it. workforce_scaled = { state_birth_rate_mult = -0.0045 # For some reason this one gets modifiers but the other doesn't, and the goal is to cancel out when fully employed. @@ -10,7 +10,7 @@ TRY_INJECT:default_building_subsistence_farms = { } } -TRY_INJECT:default_building_subsistence_orchards = { +TRY_INJECT:default_building_subsistence_orchard = { state_modifiers = { workforce_scaled = { state_birth_rate_mult = -0.0045 @@ -21,7 +21,7 @@ TRY_INJECT:default_building_subsistence_orchards = { } } -TRY_INJECT:default_building_subsistence_pastures = { +TRY_INJECT:default_building_subsistence_pasture = { state_modifiers = { workforce_scaled = { state_birth_rate_mult = -0.0045 @@ -32,7 +32,7 @@ TRY_INJECT:default_building_subsistence_pastures = { } } -TRY_INJECT:default_building_subsistence_fishing_villages = { +TRY_INJECT:default_building_subsistence_fishing_village = { state_modifiers = { workforce_scaled = { state_birth_rate_mult = -0.0045 @@ -43,7 +43,7 @@ TRY_INJECT:default_building_subsistence_fishing_villages = { } } -TRY_INJECT:default_building_subsistence_rice_paddies = { +TRY_INJECT:default_building_subsistence_rice_farm = { state_modifiers = { workforce_scaled = { state_birth_rate_mult = -0.0045 diff --git a/Populist Legal Power/common/laws/yMoG_PLP_church_and_state.txt b/Populist Legal Power/common/laws/yMoG_PLP_church_and_state.txt index 477be72e..7c5190b2 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_church_and_state.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_church_and_state.txt @@ -9,17 +9,17 @@ REPLACE_OR_CREATE:law_state_religion = { progressiveness = -50 - is_visible = { # Turkey should only unlock this as a possibility if it abolishes the Millet System - NOT = { + is_visible = { # Turkey should only unlock this as a possibility if it abolishes the Millet System, likewise other Muslim nations + NOR = { has_law = law_type:law_millet_system + has_law = law_type:law_people_of_the_book } } - on_enact = { - recalculate_pop_ig_support = yes + on_activate = { if = { limit = { - # has_law_or_variant = law_type:law_state_atheism + #has_law_or_variant = law_type:law_state_atheism country_has_state_religion = rel:atheist } set_state_religion = root.country_definition.religion @@ -30,15 +30,7 @@ REPLACE_OR_CREATE:law_state_religion = { } remove_modifier = antireligious_policies } - } - - on_activate = { - if = { - limit = { - country_has_state_religion = rel:atheist - } - set_state_religion = root.country_definition.religion - } + recalculate_pop_ig_support = yes } modifier = { @@ -147,11 +139,10 @@ REPLACE_OR_CREATE:law_millet_system = { # Ottoman Empire c:TUR ?= this # For the Ottoman Empire and its subjects } - on_enact = { - recalculate_pop_ig_support = yes + on_activate = { if = { limit = { - # has_law_or_variant = law_type:law_state_atheism + #has_law_or_variant = law_type:law_state_atheism country_has_state_religion = rel:atheist } set_state_religion = root.country_definition.religion @@ -162,9 +153,6 @@ REPLACE_OR_CREATE:law_millet_system = { # Ottoman Empire } remove_modifier = antireligious_policies } - } - - on_activate = { if = { limit = { NOR = { @@ -175,12 +163,7 @@ REPLACE_OR_CREATE:law_millet_system = { # Ottoman Empire deactivate_law = law_type:law_millet_system activate_law = law_type:law_state_religion } - if = { - limit = { - country_has_state_religion = rel:atheist - } - set_state_religion = root.country_definition.religion - } + recalculate_pop_ig_support = yes } modifier = { @@ -269,11 +252,10 @@ REPLACE_OR_CREATE:law_people_of_the_book = { # Other Muslim states } } - on_enact = { - recalculate_pop_ig_support = yes + on_activate = { if = { limit = { - # has_law_or_variant = law_type:law_state_atheism + #has_law_or_variant = law_type:law_state_atheism country_has_state_religion = rel:atheist } set_state_religion = root.country_definition.religion @@ -284,15 +266,8 @@ REPLACE_OR_CREATE:law_people_of_the_book = { # Other Muslim states } remove_modifier = antireligious_policies } - } - - on_activate = { - if = { - limit = { - country_has_state_religion = rel:atheist - } - set_state_religion = root.country_definition.religion - } + + recalculate_pop_ig_support = yes } modifier = { @@ -383,8 +358,7 @@ REPLACE_OR_CREATE:law_freedom_of_conscience = { law_theocracy } - on_enact = { - recalculate_pop_ig_support = yes + on_activate = { if = { limit = { # has_law_or_variant = law_type:law_state_atheism @@ -398,15 +372,7 @@ REPLACE_OR_CREATE:law_freedom_of_conscience = { } remove_modifier = antireligious_policies } - } - - on_activate = { - if = { - limit = { - country_has_state_religion = rel:atheist - } - set_state_religion = root.country_definition.religion - } + recalculate_pop_ig_support = yes } modifier = { @@ -484,8 +450,7 @@ REPLACE_OR_CREATE:law_total_separation = { } } - on_enact = { - recalculate_pop_ig_support = yes + on_activate = { ## PLP - Total separation doesn't reset the state religion # if = { # limit = { @@ -499,6 +464,7 @@ REPLACE_OR_CREATE:law_total_separation = { } remove_modifier = antireligious_policies } + recalculate_pop_ig_support = yes } modifier = { @@ -545,7 +511,7 @@ REPLACE_OR_CREATE:law_state_atheism = { icon = "gfx/interface/icons/law_icons/state_atheism.dds" - progressiveness = 0 + progressiveness = 100 unlocking_technologies = { empiricism diff --git a/Populist Legal Power/common/laws/yMoG_PLP_citizenship.txt b/Populist Legal Power/common/laws/yMoG_PLP_citizenship.txt index 2a4f5e48..4451264b 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_citizenship.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_citizenship.txt @@ -19,10 +19,24 @@ REPLACE_OR_CREATE:law_subjecthood = { } } + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } + unlocking_laws = { law_monarchy law_theocracy law_chiefdom + law_colonial_administration } modifier = { @@ -123,6 +137,19 @@ REPLACE_OR_CREATE:law_ethnostate = { custom_tooltip = fervor_effects_ld_tt } } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } unlocking_technologies = { nationalism @@ -262,6 +289,19 @@ REPLACE_OR_CREATE:law_national_supremacy = { custom_tooltip = fervor_effects_ld_tt } } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } modifier = { country_authority_add = 150 @@ -405,6 +445,19 @@ REPLACE_OR_CREATE:law_racial_segregation = { } } + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } + modifier = { country_authority_add = 100 @@ -548,6 +601,19 @@ REPLACE_OR_CREATE:law_cultural_exclusion = { remove_modifier = modifier_polish_organic_statute } } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } modifier = { country_authority_add = 50 @@ -694,6 +760,19 @@ REPLACE_OR_CREATE:law_multicultural = { remove_modifier = modifier_polish_organic_statute } } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } modifier = { state_migration_pull_mult = 0.03 diff --git a/Populist Legal Power/common/laws/yMoG_PLP_colonial_affairs.txt b/Populist Legal Power/common/laws/yMoG_PLP_colonial_affairs.txt index 3990ac54..1f6f9539 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_colonial_affairs.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_colonial_affairs.txt @@ -66,7 +66,7 @@ REPLACE_OR_CREATE:law_frontier_colonization = { can_enact = { OR = { AND = { - is_country_type = colonial + country_is_colonial_or_company = yes any_decentralized_country = { is_adjacent_to_country = root } @@ -84,7 +84,7 @@ REPLACE_OR_CREATE:law_frontier_colonization = { icon = "gfx/interface/icons/law_icons/frontier_colonization.dds" - progressiveness = 25 + progressiveness = 0 unlocking_technologies = { colonization @@ -163,7 +163,7 @@ REPLACE_OR_CREATE:law_colonial_resettlement = { icon = "gfx/interface/icons/law_icons/colonial_resettlement.dds" - progressiveness = 25 + progressiveness = 0 unlocking_technologies = { colonization diff --git a/Populist Legal Power/common/laws/yMoG_PLP_distribution_of_power.txt b/Populist Legal Power/common/laws/yMoG_PLP_distribution_of_power.txt index 833c2735..20e3810e 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_distribution_of_power.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_distribution_of_power.txt @@ -36,12 +36,7 @@ activate_law = law_type:law_hereditary_bureaucrats } scripted_effect_parties_disappearence = yes - if = { - limit = { - has_modifier = missouri_compromise - } - remove_modifier = missouri_compromise - } + cleanup_voting_strength_modifiers = yes } modifier = { @@ -211,12 +206,7 @@ REPLACE_OR_CREATE:law_technocracy = { activate_law = law_type:law_appointed_bureaucrats } scripted_effect_parties_disappearence = yes - if = { - limit = { - has_modifier = missouri_compromise - } - remove_modifier = missouri_compromise - } + cleanup_voting_strength_modifiers = yes add_journal_entry = { type = je_technocracy } } @@ -340,12 +330,8 @@ REPLACE_OR_CREATE:law_oligarchy = { activate_law = law_type:law_hereditary_bureaucrats } scripted_effect_parties_disappearence = yes - if = { - limit = { - has_modifier = missouri_compromise - } - remove_modifier = missouri_compromise - } + handle_possible_absent_caciquismo_variables = yes + cleanup_voting_strength_modifiers = yes } modifier = { @@ -569,6 +555,7 @@ REPLACE_OR_CREATE:law_landed_voting = { country_clergymen_voting_power_add = 50 country_capitalists_voting_power_add = 50 country_authority_add = 100 + country_electoral_confidence_impact_mult = -0.3 state_radicals_and_loyalists_from_sol_change_mult = 0.1 state_radicals_from_political_movements_mult = 0.1 } @@ -588,10 +575,26 @@ REPLACE_OR_CREATE:law_landed_voting = { } on_activate = { + if = { + limit = { + game_date > 1836.1.1 + country_has_voting_franchise = yes + } + initialize_electoral_confidence = yes + } + random_law = { + limit = { + type = law_type:law_landed_voting + } + save_scope_as = relevant_voting_law + } + handle_possible_absent_caciquismo_variables = yes scripted_effect_parties_emergence = yes + inherit_caciquismo_effect = yes + inherit_free_elections_effect = yes if = { limit = { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy has_variable = king_in_parliament_possible NOT = { has_journal_entry = je_king_in_parliament @@ -691,6 +694,7 @@ REPLACE_OR_CREATE:law_wealth_voting = { country_voting_power_base_add = 50 country_voting_power_wealth_threshold_add = 20 country_authority_add = 100 + country_electoral_confidence_impact_mult = -0.2 state_radicals_and_loyalists_from_sol_change_mult = 0.1 state_radicals_from_political_movements_mult = -0.1 } @@ -710,10 +714,26 @@ REPLACE_OR_CREATE:law_wealth_voting = { } on_activate = { + if = { + limit = { + game_date > 1836.1.1 + country_has_voting_franchise = yes + } + initialize_electoral_confidence = yes + } + random_law = { + limit = { + type = law_type:law_wealth_voting + } + save_scope_as = relevant_voting_law + } + handle_possible_absent_caciquismo_variables = yes scripted_effect_parties_emergence = yes + inherit_caciquismo_effect = yes + inherit_free_elections_effect = yes if = { limit = { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy has_variable = king_in_parliament_possible NOT = { has_journal_entry = je_king_in_parliament @@ -807,6 +827,7 @@ REPLACE_OR_CREATE:law_census_voting = { country_voting_power_wealth_threshold_add = 10 country_voting_power_from_literacy_add = 50 country_authority_add = 50 + country_electoral_confidence_impact_mult = -0.1 state_radicals_and_loyalists_from_sol_change_mult = -0.2 state_radicals_from_political_movements_mult = -0.2 state_migration_pull_mult = 0.02 @@ -827,10 +848,26 @@ REPLACE_OR_CREATE:law_census_voting = { } on_activate = { + if = { + limit = { + game_date > 1836.1.1 + country_has_voting_franchise = yes + } + initialize_electoral_confidence = yes + } + random_law = { + limit = { + type = law_type:law_census_voting + } + save_scope_as = relevant_voting_law + } + handle_possible_absent_caciquismo_variables = yes scripted_effect_parties_emergence = yes + inherit_caciquismo_effect = yes + inherit_free_elections_effect = yes if = { limit = { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy has_variable = king_in_parliament_possible NOT = { has_journal_entry = je_king_in_parliament @@ -842,7 +879,7 @@ REPLACE_OR_CREATE:law_census_voting = { } } } - + can_impose = { country_has_voting_franchise = yes # modification of the standard trigger, only countries with a voting franchise can impose democracy on others OR = { @@ -941,10 +978,26 @@ REPLACE_OR_CREATE:law_universal_suffrage = { } on_activate = { + if = { + limit = { + game_date > 1836.1.1 + country_has_voting_franchise = yes + } + initialize_electoral_confidence = yes + } + random_law = { + limit = { + type = law_type:law_universal_suffrage + } + save_scope_as = relevant_voting_law + } + handle_possible_absent_caciquismo_variables = yes scripted_effect_parties_emergence = yes + inherit_caciquismo_effect = yes + inherit_free_elections_effect = yes if = { limit = { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy has_variable = king_in_parliament_possible NOT = { has_journal_entry = je_king_in_parliament @@ -1057,12 +1110,7 @@ REPLACE_OR_CREATE:law_anarchy = { on_activate = { scripted_effect_parties_disappearence = yes - if = { - limit = { - has_modifier = missouri_compromise - } - remove_modifier = missouri_compromise - } + cleanup_voting_strength_modifiers = yes } ai_will_do = { @@ -1133,7 +1181,7 @@ REPLACE_OR_CREATE:law_single_party_state = { icon = "gfx/interface/icons/law_icons/single_party_state.dds" - progressiveness = 0 + progressiveness = 50 can_enact = { OR = { @@ -1176,6 +1224,7 @@ REPLACE_OR_CREATE:law_single_party_state = { country_authority_add = 250 country_voting_power_base_add = 50 interest_group_in_government_attraction_mult = 0.20 + country_electoral_confidence_impact_mult = -1.0 state_radicals_and_loyalists_from_sol_change_mult = 0.7 state_radicals_from_political_movements_mult = 0.7 state_migration_pull_mult = -0.1 @@ -1183,7 +1232,6 @@ REPLACE_OR_CREATE:law_single_party_state = { on_activate = { set_only_legal_party_from_ig = ruler.interest_group - custom_tooltip = { text = sps_government_reshuffle_tt every_interest_group = { @@ -1206,7 +1254,7 @@ REPLACE_OR_CREATE:law_single_party_state = { if = { limit = { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy has_variable = king_in_parliament_possible NOT = { has_journal_entry = je_king_in_parliament @@ -1217,6 +1265,13 @@ REPLACE_OR_CREATE:law_single_party_state = { add_journal_entry = { type = je_king_in_parliament } } } + if = { + limit = { + game_date > 1836.1.1 + country_has_voting_franchise = yes + } + initialize_electoral_confidence = yes + } } on_deactivate = { diff --git a/Populist Legal Power/common/laws/yMoG_PLP_economic_system.txt b/Populist Legal Power/common/laws/yMoG_PLP_economic_system.txt index 5dbbb2b0..266d7e2c 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_economic_system.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_economic_system.txt @@ -14,6 +14,7 @@ REPLACE_OR_CREATE:law_traditionalism = { law_proportional_taxation law_graduated_taxation law_anarchy + law_factory_councils } on_activate = { @@ -35,6 +36,7 @@ REPLACE_OR_CREATE:law_traditionalism = { building_nationalization_investment_return_add = 0.1 country_leverage_resistance_mult = 0.25 state_market_access_price_impact = -0.15 + building_self_investment_chance_add = 0.25 country_disable_nationalization_without_compensation_bool = yes } @@ -58,11 +60,12 @@ REPLACE_OR_CREATE:law_interventionism = { icon = "gfx/interface/icons/law_icons/interventionism.dds" - progressiveness = 50 + progressiveness = 25 disallowing_laws = { law_serfdom law_anarchy + law_factory_councils law_women_in_the_fields } @@ -77,8 +80,8 @@ REPLACE_OR_CREATE:law_interventionism = { country_disable_nationalization_without_compensation_bool = yes country_private_construction_allocation_mult = 0.5 building_nationalization_investment_return_add = 0.5 - country_government_dividends_reinvestment_add = 0.7 - country_government_dividends_efficiency_add = 0.5 + country_government_dividends_reinvestment_add = 0.7 # 0.5 + country_government_dividends_efficiency_add = 0.5 # 0.25 country_free_charters_add = 1 } @@ -148,6 +151,7 @@ REPLACE_OR_CREATE:law_agrarianism = { disallowing_laws = { law_anarchy + law_factory_councils law_women_in_the_fields } @@ -166,7 +170,7 @@ REPLACE_OR_CREATE:law_agrarianism = { country_private_construction_allocation_mult = 0.5 building_nationalization_investment_return_add = 0.5 country_government_dividends_reinvestment_add = 0.5 - country_government_dividends_efficiency_add = 0.5 + country_government_dividends_efficiency_add = 0.5 # 0.3 country_free_charters_add = 1 state_market_access_price_impact = -0.05 @@ -242,7 +246,12 @@ REPLACE_OR_CREATE:law_industry_banned = { group = lawgroup_economic_system icon = "gfx/interface/icons/law_icons/industry_banned.dds" - progressiveness = 0 + progressiveness = -50 + + disallowing_laws = { + law_anarchy + law_factory_councils + } unlocking_technologies = { romanticism @@ -271,6 +280,13 @@ REPLACE_OR_CREATE:law_industry_banned = { } remove_building = building_steel_mill } + # PLP - Removed + #if = { + # limit = { + # has_building = building_power_plant + # } + # remove_building = building_power_plant + #} if = { limit = { has_building = building_motor_industry @@ -314,8 +330,8 @@ REPLACE_OR_CREATE:law_industry_banned = { country_production_tech_research_speed_mult = -0.25 country_production_tech_spread_mult = -0.25 building_nationalization_investment_return_add = 0.5 - country_government_dividends_reinvestment_add = 0.3 - country_government_dividends_efficiency_add = 0.5 + country_government_dividends_reinvestment_add = 0.3 # 0.25 + country_government_dividends_efficiency_add = 0.5 # 0.3 state_market_access_price_impact = -0.1 state_peasants_education_access_add = -0.10 @@ -345,7 +361,12 @@ REPLACE_OR_CREATE:law_extraction_economy = { group = lawgroup_economic_system icon = "gfx/interface/icons/law_icons/extraction_economy.dds" - progressiveness = 0 + progressiveness = -50 + + disallowing_laws = { + law_anarchy + law_factory_councils + } unlocking_technologies = { colonization @@ -456,13 +477,14 @@ REPLACE_OR_CREATE:law_laissez_faire = { icon = "gfx/interface/icons/law_icons/laissez_faire.dds" - progressiveness = 50 + progressiveness = 25 disallowing_laws = { law_serfdom law_isolationism law_anarchy law_guild_system + law_factory_councils law_women_in_the_fields } @@ -478,8 +500,8 @@ REPLACE_OR_CREATE:law_laissez_faire = { state_shopkeepers_investment_pool_efficiency_mult = 0.25 state_capitalists_investment_pool_efficiency_mult = 0.25 country_private_construction_allocation_mult = 0.75 - country_government_dividends_reinvestment_add = 0 - country_government_dividends_efficiency_add = 0.65 + country_government_dividends_reinvestment_add = 0 # 1.0 + country_government_dividends_efficiency_add = 0.65 # 0 country_free_charters_add = 2 country_disable_nationalization_bool = yes country_force_privatization_bool = yes @@ -561,13 +583,12 @@ REPLACE_OR_CREATE:law_cooperative_ownership = { state_engineers_investment_pool_contribution_add = 0.05 country_private_construction_allocation_mult = 0.35 - country_government_dividends_reinvestment_add = 0.7 - country_government_dividends_efficiency_add = 0.75 + country_government_dividends_reinvestment_add = 0.7 # 1.0 + country_government_dividends_efficiency_add = 0.75 # 0 building_company_worker_dividends_add = 0.75 country_free_charters_add = 1 building_group_bg_manufacturing_allowed_collectivization_add = 1.0 - building_group_bg_mining_allowed_collectivization_add = 1.0 building_group_bg_extraction_allowed_collectivization_add = 1.0 building_group_bg_power_allowed_collectivization_add = 1.0 building_group_bg_private_infrastructure_allowed_collectivization_add = 1.0 @@ -628,7 +649,7 @@ REPLACE_OR_CREATE:law_command_economy = { icon = "gfx/interface/icons/law_icons/command_economy.dds" - progressiveness = 100 + progressiveness = 50 disallowing_laws = { law_serfdom @@ -666,7 +687,7 @@ REPLACE_OR_CREATE:law_command_economy = { country_bureaucrats_pol_str_mult = 0.25 building_nationalization_cost_mult = -0.5 building_nationalization_radicals_mult = -0.75 - country_government_dividends_efficiency_add = 0.75 + country_government_dividends_efficiency_add = 0.75 # 0.4 country_government_dividends_reinvestment_add = 0.10 state_bureaucrats_investment_pool_contribution_add = 0.1 country_private_construction_allocation_mult = 0.1 diff --git a/Populist Legal Power/common/laws/yMoG_PLP_governance_principles.txt b/Populist Legal Power/common/laws/yMoG_PLP_governance_principles.txt index 5a3f4a19..759aede1 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_governance_principles.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_governance_principles.txt @@ -9,6 +9,15 @@ democracy } + can_enact = { + trigger_if ={ + limit = { + is_subject = no + } + NOT = { has_government_type = gov_chartered_company } + } + } + can_impose = { OR = { AND = { @@ -26,7 +35,7 @@ country_legitimacy_headofstate_add = 10 country_legitimacy_govt_total_votes_add = 10 country_legitimacy_ideological_incoherence_mult = 0.2 - country_authority_add = 50 + country_authority_add = 50 # 100 } on_activate = { @@ -64,6 +73,15 @@ deactivate_law = law_type:law_neo_absolutism activate_law = law_type:law_autocracy } + if = { + limit = { + c:POR ?= this + ruler ?= { + has_template = POR_manuel_ii_de_braganca_template + } + } + trigger_event = { id = portuguese_monarchs.3 } + } } ai_will_do = { @@ -159,6 +177,15 @@ REPLACE_OR_CREATE:law_corporate_state = { corporatism } + can_enact = { + trigger_if ={ + limit = { + is_subject = no + } + NOT = { has_government_type = gov_chartered_company } + } + } + on_activate = { if = { limit = { @@ -174,24 +201,6 @@ REPLACE_OR_CREATE:law_corporate_state = { add_ideology = ideology_republican } } - if = { - limit = { - var:corporatist_nominating_body_var ?= 1 - } - add_modifier = { name = modifier_corporate_state_trade_unions_bias } - } - if = { - limit = { - var:corporatist_nominating_body_var ?= 2 - } - add_modifier = { name = modifier_corporate_state_industrialists_bias } - } - if = { - limit = { - var:corporatist_nominating_body_var ?= 3 - } - add_modifier = { name = modifier_corporate_state_intelligentsia_bias } - } crown_land_republic_effect = yes if = { limit = { @@ -200,29 +209,21 @@ REPLACE_OR_CREATE:law_corporate_state = { deactivate_law = law_type:law_neo_absolutism activate_law = law_type:law_autocracy } - } - - on_enact = { if = { limit = { - var:corporatist_nominating_body_var ?= 1 - } - custom_tooltip = corporate_state_trade_unions_bias_tt - } - if = { - limit = { - var:corporatist_nominating_body_var ?= 2 - } - custom_tooltip = corporate_state_industrialists_bias_tt - } - if = { - limit = { - var:corporatist_nominating_body_var ?= 3 + c:POR ?= this + ruler ?= { + has_template = POR_manuel_ii_de_braganca_template + } } - custom_tooltip = corporate_state_intelligentsia_bias_tt + trigger_event = { id = portuguese_monarchs.3 } } } + on_enact = { + + } + on_deactivate = { if = { limit = { @@ -265,7 +266,6 @@ REPLACE_OR_CREATE:law_corporate_state = { country_max_companies_add = 1 country_free_charters_add = 1 building_group_bg_manufacturing_allowed_collectivization_add = -0.5 - building_group_bg_mining_allowed_collectivization_add = -0.5 building_group_bg_extraction_allowed_collectivization_add = -0.5 building_group_bg_power_allowed_collectivization_add = -0.5 building_group_bg_private_infrastructure_allowed_collectivization_add = -0.5 diff --git a/Populist Legal Power/common/laws/yMoG_PLP_internal_security.txt b/Populist Legal Power/common/laws/yMoG_PLP_internal_security.txt index bd700e0f..6471068b 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_internal_security.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_internal_security.txt @@ -19,6 +19,7 @@ REPLACE_OR_CREATE:law_guaranteed_liberties = { # state_radicals_from_sol_change_mult = -0.05 # state_loyalists_from_sol_change_mult = 0.05 state_radicals_and_loyalists_from_sol_change_mult = 0.05 + country_coup_resistance_add = 0.5 } ai_enact_weight_modifier = { #Petitions diff --git a/Populist Legal Power/common/laws/yMoG_PLP_land_reform.txt b/Populist Legal Power/common/laws/yMoG_PLP_land_reform.txt index 2fc68796..81905d00 100644 --- a/Populist Legal Power/common/laws/yMoG_PLP_land_reform.txt +++ b/Populist Legal Power/common/laws/yMoG_PLP_land_reform.txt @@ -1,49 +1,5 @@  -REPLACE_OR_CREATE:law_commercialized_agriculture = { - group = lawgroup_land_reform - - icon = "gfx/interface/icons/law_icons/commercial_agriculture.dds" - - progressiveness = 0 - - disallowing_laws = { - law_traditionalism - } - - unlocking_technologies = { - mutual_funds - } - - on_enact = { - custom_tooltip = financial_districts_buy_farms_tt - if = { - limit = { - NOR = { - has_law_or_variant = law_type:law_commercialized_agriculture - has_law_or_variant = law_type:law_homesteading - } - } - custom_tooltip = farmers_pb_ig_shift_effect_tt - } - if = { - limit = { - NOR = { - has_law_or_variant = law_type:law_commercialized_agriculture - has_law_or_variant = law_type:law_collectivized_agriculture - } - } - custom_tooltip = rural_laborers_tu_ig_shift_effect_tt - } - if = { - limit = { - has_journal_entry = je_pedro_brazil - NOT = { has_variable = landreform_pedropoint } - } - set_variable = landreform_pedropoint - remove_pedropoint_effect = yes - } - } - +TRY_INJECT:law_commercialized_agriculture = { on_activate = { add_modifier = { name = land_redistribution_modifier @@ -57,42 +13,6 @@ REPLACE_OR_CREATE:law_commercialized_agriculture = { is_decaying = yes } } - - ai_enact_weight_modifier = { #Petitions - value = 0 - - if = { - limit = { ai_has_enact_weight_modifier_journal_entries = yes } - add = 750 - } - - if = { - limit = { - has_journal_entry = je_meiji_main - has_law_or_variant = law_type:law_serfdom - } - add = 10000 # Top priority for Meiji AI is to get out of Serfdom - } - - # AI should really try to get out of Serfdom under the right circumstances - if = { - limit = { - has_law_or_variant = law_type:law_serfdom - NOT = { has_strategy = ai_strategy_reactionary_agenda } - OR = { - NOT = { has_strategy = ai_strategy_conservative_agenda } - any_political_movement = { - law_enactment_stance = { - law = law_type:law_commercialized_agriculture - value > neutral - } - political_movement_support >= 0.10 - } - } - } - add = 1000 - } - } } REPLACE_OR_CREATE:law_homesteading = { @@ -100,7 +20,7 @@ REPLACE_OR_CREATE:law_homesteading = { icon = "gfx/interface/icons/law_icons/freeholders.dds" - progressiveness = 25 + progressiveness = 50 modifier = { country_farmers_pol_str_mult = 0.25 @@ -182,6 +102,22 @@ REPLACE_OR_CREATE:law_homesteading = { } add = 1000 } + + if = { + limit = { + NOT = { + has_variable = is_carlist_spain + } + OR = { + has_journal_entry = je_portugal_regeneration_agriculture + has_journal_entry = je_spa_economic_regeneration_land_reform + } + NOT = { + has_law = law_type:law_commercialized_agriculture + } + } + add = 1000 + } } } @@ -190,7 +126,7 @@ REPLACE_OR_CREATE:law_collectivized_agriculture = { icon = "gfx/interface/icons/law_icons/collectivized_agriculture.dds" - progressiveness = 50 + progressiveness = 100 modifier = { building_group_bg_agriculture_allowed_collectivization_add = 1.0 diff --git a/Populist Legal Power/common/political_movements/yMog_PLP_country_specific_ideological_movements.txt b/Populist Legal Power/common/political_movements/yMog_PLP_country_specific_ideological_movements.txt index a5186328..c1a3a77a 100755 --- a/Populist Legal Power/common/political_movements/yMog_PLP_country_specific_ideological_movements.txt +++ b/Populist Legal Power/common/political_movements/yMog_PLP_country_specific_ideological_movements.txt @@ -287,7 +287,7 @@ if = { limit = { owner ?= { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy ruler ?= { NOT = { has_ideology = ideology:ideology_orleanist @@ -625,7 +625,7 @@ REPLACE_OR_CREATE:movement_bonapartist = { if = { limit = { owner ?= { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy ruler ?= { NOT = { has_ideology = ideology:ideology_bonapartist @@ -917,7 +917,7 @@ REPLACE_OR_CREATE:movement_legitimist = { if = { limit = { owner ?= { - has_law_or_variant = law_type:law_monarchy + has_law = law_type:law_monarchy ruler ?= { NOT = { has_ideology = ideology:ideology_legitimist @@ -951,3 +951,458 @@ REPLACE_OR_CREATE:movement_legitimist = { } } } + +REPLACE_OR_CREATE:movement_carlist = { + category = movement_category_ideological + + ideology = ideology_carlist_movement + character_ideologies = { + ideology_carlist + } + + creation_trigger = { + OR = { + country_has_primary_culture = cu:spanish + country_has_primary_culture = cu:catalan + country_has_primary_culture = cu:basque + } + NOT = { + has_variable = monarchy_stamped_out_var + } + capital = { + is_in_geographic_region = geographic_region_iberia + } + } + creation_weight = { + value = 100 + } + on_created = { + add_movement_enthusiasm_modifier = yes + } + + disband_trigger = { + OR = { + has_variable = monarchy_stamped_out_var + NOT = { + capital = { + is_in_geographic_region = geographic_region_iberia + } + } + } + } + + character_support_trigger = { + OR = { + has_ideology = ideology:ideology_carlist + has_ideology = ideology:ideology_traditionalist + has_ideology = ideology:ideology_royalist + has_ideology = ideology:ideology_integralist + has_ideology = ideology:ideology_theocrat + AND = { + law_stance = { + law = law_type:law_monarchy + value > neutral + } + law_stance = { + law = law_type:law_state_religion + value > neutral + } + } + } + } + character_support_weight = { + value = 200 + if = { + limit = { + has_ideology = ideology:ideology_carlist + } + multiply = { + value = 5 + } + } + } + + pop_support_trigger = { + NOT = { + is_pop_type = slaves + } + religion = rel:catholic + } + + pop_support_factors = { + movement_support_low_urbanization + movement_support_high_literacy + movement_support_aristocrats + movement_support_farmers + movement_support_peasants + movement_support_clergymen + movement_support_officers + } + + pop_support_weight = { + add = { + desc = "URBAN_STATE" # Increases support in rural states, decreases in urban + value = 0.5 + subtract = state.state_urbanization_rate + multiply = 10 + } + + add = { + value = 5 + desc = "POP_BASE_SUPPORT" + } + + if = { + limit = { + is_pop_type = aristocrats + } + add = { + value = 25 + desc = "POP_ARISTOCRATS" + } + } + else_if = { + limit = { + is_pop_type = farmers + } + add = { + value = 15 + desc = "POP_FARMERS" + } + } + else_if = { + limit = { + is_pop_type = peasants + } + add = { + value = 15 + desc = "POP_PEASANTS" + } + } + else_if = { + limit = { + is_pop_type = clergymen + } + add = { + value = 15 + desc = "POP_CLERGYMEN" + } + } + else_if = { + limit = { + is_pop_type = officers + } + add = { + value = 15 + desc = "POP_OFFICERS" + } + } + else_if = { + limit = { + is_pop_type = soldiers + } + add = { + value = 5 + desc = "POP_SERVICEMEN" + } + } + + if = { + limit = { # Only Catholics can support this anyway + culture = { + NOT = { + cu:spanish ?= this + } + has_discrimination_trait_group = heritage_group_european + } + } + multiply = { # Less accepted pops like Basques and Catalans tend to like this movement + desc = "POP_LOW_ACCEPTANCE" + value = 100 + subtract = pop_acceptance + divide = 25 + } + } + + if = { + limit = { + owner ?= { + OR = { + c:SPC ?= this + has_variable = is_carlist_spain + } + } + culture ?= cu:spanish + } + multiply = { # Carlists love Carlism + desc = "SPC" + value = 2 + } + } + + multiply = { # Illiterate pops participate at 1/10 the rate of fully literate pops + desc = "POP_LITERACY" + value = literacy_rate + add = 0.2 + max = 0.7 # Starts more powerful but caps out early + } + } + + revolution = { + possible = { + political_movement_support >= 0.05 + } + + forced_tags = { + SPC = { + trigger = { + owner ?= { country_has_primary_culture = cu:spanish } + } + weight = 1000 + } + } + + weight = { + value = 100 + } + } + + secession = { + possible = { + political_movement_support >= 0.05 + scope:clout <= 0 + } + + weight = { + value = 1000 + } + } + + additional_radicalism_factors = { + if = { + limit = { + owner ?= { + has_law = law_type:law_monarchy + ruler ?= { + NOT = { + has_ideology = ideology:ideology_carlist + } + } + } + } + add = { + value = 0.25 + desc = "NON_CARLIST_MONARCH" + } + } + } +} + +movement_miguelist = { + category = movement_category_ideological + + ideology = ideology_miguelist_movement + character_ideologies = { + ideology_miguelist + } + + creation_trigger = { + country_has_primary_culture = cu:portuguese + NOT = { + has_variable = monarchy_stamped_out_var + } + capital = { + is_in_geographic_region = geographic_region_iberia + } + } + creation_weight = { + value = 100 + } + on_created = { + add_movement_enthusiasm_modifier = yes + } + + disband_trigger = { + OR = { + has_variable = monarchy_stamped_out_var + NOT = { + capital = { + is_in_geographic_region = geographic_region_iberia + } + } + } + } + + character_support_trigger = { + OR = { + has_ideology = ideology:ideology_miguelist + has_ideology = ideology:ideology_traditionalist + has_ideology = ideology:ideology_royalist + has_ideology = ideology:ideology_integralist + has_ideology = ideology:ideology_theocrat + AND = { + law_stance = { + law = law_type:law_monarchy + value > neutral + } + law_stance = { + law = law_type:law_state_religion + value > neutral + } + } + } + } + character_support_weight = { + value = 200 + if = { + limit = { + has_ideology = ideology:ideology_miguelist + } + multiply = { + value = 5 + } + } + } + + pop_support_trigger = { + NOT = { + is_pop_type = slaves + } + religion = rel:catholic + # PLP - Colonized pops don't care about mainland politics + NOT = { + AND = { + state = { incorporation_progress = 0 } + pop_has_primary_culture = no + } + } + } + + pop_support_factors = { + movement_support_low_urbanization + movement_support_high_literacy + movement_support_aristocrats + movement_support_farmers + movement_support_peasants + movement_support_clergymen + movement_support_officers + } + + pop_support_weight = { + add = { + desc = "URBAN_STATE" # Increases support in rural states, decreases in urban + value = 0.5 + subtract = state.state_urbanization_rate + multiply = 10 + } + + add = { + value = 5 + desc = "POP_BASE_SUPPORT" + } + + if = { + limit = { + is_pop_type = aristocrats + } + add = { + value = 25 + desc = "POP_ARISTOCRATS" + } + } + else_if = { + limit = { + is_pop_type = farmers + } + add = { + value = 15 + desc = "POP_FARMERS" + } + } + else_if = { + limit = { + is_pop_type = peasants + } + add = { + value = 15 + desc = "POP_PEASANTS" + } + } + else_if = { + limit = { + is_pop_type = clergymen + } + add = { + value = 15 + desc = "POP_CLERGYMEN" + } + } + else_if = { + limit = { + is_pop_type = officers + } + add = { + value = 15 + desc = "POP_OFFICERS" + } + } + + multiply = { # Illiterate pops participate at 1/10 the rate of fully literate pops + desc = "POP_LITERACY" + value = literacy_rate + add = 0.2 + max = 0.7 # Starts more powerful but caps out early + } + + # PLP - Colonized pops care about mainland politics to the extent it affects them + if = { + limit = { + state = { is_incorporated = no } + pop_has_primary_culture = no + } + state = { + multiply = incorporation_progress + } + } + } + + revolution = { + possible = { + political_movement_support >= 0.05 + } + + weight = { + value = 100 + } + } + + secession = { + possible = { + political_movement_support >= 0.05 + scope:clout <= 0 + } + + weight = { + value = 1000 + } + } + + additional_radicalism_factors = { + if = { + limit = { + owner ?= { + has_law = law_type:law_monarchy + ruler ?= { + NOT = { + has_ideology = ideology:ideology_miguelist + } + } + } + } + add = { + value = 0.25 + desc = "NON_MIGUELIST_MONARCH" + } + } + } +} diff --git a/Populist Legal Power/common/political_movements/yMog_PLP_cultural_movement.txt b/Populist Legal Power/common/political_movements/yMog_PLP_cultural_movement.txt index 7d370224..13e009ee 100755 --- a/Populist Legal Power/common/political_movements/yMog_PLP_cultural_movement.txt +++ b/Populist Legal Power/common/political_movements/yMog_PLP_cultural_movement.txt @@ -33,6 +33,7 @@ REPLACE_OR_CREATE:movement_cultural_majority = { } } } + creation_weight = { value = 100 } @@ -47,6 +48,9 @@ REPLACE_OR_CREATE:movement_cultural_majority = { has_ideology = ideology:ideology_jingoist_leader has_ideology = ideology:ideology_ethno_nationalist } + NOT = { + has_variable = anti_nationalist_var + } } character_support_weight = { value = 100 @@ -693,6 +697,9 @@ REPLACE_OR_CREATE:movement_cultural_minority = { has_ideology = ideology:ideology_sovereignist_leader has_ideology = ideology:ideology_reformer } + NOT = { + has_variable = anti_nationalist_var # Please stop becoming a Polish nationalist, Rosa. + } } character_support_weight = { value = 50 @@ -716,6 +723,14 @@ REPLACE_OR_CREATE:movement_cultural_minority = { value = 5 } } + else_if = { + limit = { + has_socialist_ideology = yes + } + multiply = { + value = 0.5 + } + } } pop_support_trigger = { @@ -1145,7 +1160,7 @@ REPLACE_OR_CREATE:movement_cultural_minority = { trigger_else_if = { limit = { owner = { - is_country_type = colonial + country_is_colonial_or_company = yes } } NOT = { diff --git a/Populist Legal Power/common/political_movements/yMog_PLP_ideological_movements.txt b/Populist Legal Power/common/political_movements/yMog_PLP_ideological_movements.txt index 7f226026..d2b31961 100755 --- a/Populist Legal Power/common/political_movements/yMog_PLP_ideological_movements.txt +++ b/Populist Legal Power/common/political_movements/yMog_PLP_ideological_movements.txt @@ -3761,8 +3761,7 @@ REPLACE_OR_CREATE:movement_communist = { REPLACE_OR_CREATE:movement_fascist = { category = movement_category_ideological - # Fascists care about a lot of law groups, so the impact of each should be lesser - active_law_radicalism_multiplier = 0.5 + active_law_radicalism_multiplier = 1 ideology = ideology_fascist_movement character_ideologies = { @@ -3948,7 +3947,7 @@ REPLACE_OR_CREATE:movement_fascist = { is_political_movement_type = movement_labor is_political_movement_type = movement_nihilist } - political_movement_support >= 0.10 # (chuckles) im in danger + political_movement_support >= 0.05 } } } @@ -4047,7 +4046,7 @@ REPLACE_OR_CREATE:movement_fascist = { is_political_movement_type = movement_labor is_political_movement_type = movement_nihilist } - political_movement_support >= 0.10 + political_movement_support >= 0.05 } } } @@ -7018,12 +7017,12 @@ REPLACE_OR_CREATE:movement_reactionary = { } disband_trigger = { - OR = { - c:FRA ?= this - civil_war_origin_country ?= c:FRA - } any_political_movement = { + OR = { is_political_movement_type = movement_legitimist + is_political_movement_type = movement_carlist + is_political_movement_type = movement_miguelist + } } } @@ -7390,6 +7389,7 @@ REPLACE_OR_CREATE:movement_modernizer = { } country_has_laws_in_need_of_critical_modernization = yes } + creation_weight = { value = 100 if = { @@ -7410,6 +7410,7 @@ REPLACE_OR_CREATE:movement_modernizer = { } } } + on_created = { add_movement_enthusiasm_modifier = yes if = { @@ -7441,6 +7442,7 @@ REPLACE_OR_CREATE:movement_modernizer = { has_ideology = ideology:ideology_modernizer_leader scope:interest_group ?= { OR = { + has_ideology = ideology:ideology_cartist has_ideology = ideology:ideology_modernizer has_ideology = ideology:ideology_liberal has_ideology = ideology:ideology_liberal_modern @@ -7449,6 +7451,7 @@ REPLACE_OR_CREATE:movement_modernizer = { } } } + character_support_weight = { value = 200 if = { diff --git a/Populist Legal Power/common/political_movements/yMog_PLP_religious_movements.txt b/Populist Legal Power/common/political_movements/yMog_PLP_religious_movements.txt index 611dd308..48b80c29 100755 --- a/Populist Legal Power/common/political_movements/yMog_PLP_religious_movements.txt +++ b/Populist Legal Power/common/political_movements/yMog_PLP_religious_movements.txt @@ -16,6 +16,22 @@ } creation_weight = { value = 100 + if = { + limit = { + owner ?= { + any_political_movement = { + OR = { + is_political_movement_type = movement_legitimist + is_political_movement_type = movement_carlist + is_political_movement_type = movement_miguelist + } + } + } + } + multiply = { + value = 0.05 + } + } } on_created = {} @@ -210,12 +226,16 @@ limit = { owner ?= { any_political_movement = { - is_political_movement_type = movement_legitimist + OR = { + is_political_movement_type = movement_legitimist + is_political_movement_type = movement_carlist + is_political_movement_type = movement_miguelist + } } } } multiply = { - value = 0.25 + value = 0.05 } } } diff --git a/SIS BITC/common/script_values/zMoG_SIS_BITC_liberty_desire.txt b/SIS BITC/common/script_values/zMoG_SIS_BITC_liberty_desire.txt index 7466f158..20be8a51 100644 --- a/SIS BITC/common/script_values/zMoG_SIS_BITC_liberty_desire.txt +++ b/SIS BITC/common/script_values/zMoG_SIS_BITC_liberty_desire.txt @@ -9,7 +9,7 @@ # root.second_country: second country in the pact. Subject. # root = { liberty_desire < 50 }: compare trigger for current Liberty Desire value root. # Must return a value which will be added to the current Liberty Desire in this pact. -liberty_desire_weekly_change = { +liberty_desire_weekly_change = { #AKA liberty_desire_weekly_progress # add = { # value = 0.1 # desc = "base_value" @@ -82,9 +82,9 @@ liberty_desire_weekly_change = { add = { root.second_country = { value = num_primary_cultures } } # Use script value robustly. min = 1 } - min = 0 - max = 0.2 # Max is positive/higher *before* the multiplier multiply = -1 + max = 0 + min = -0.2 } } } @@ -114,9 +114,9 @@ liberty_desire_weekly_change = { add = { root.second_country = { value = num_primary_cultures } } # Use script value robustly. min = 1 } - min = 0 - max = 0.25 # Max is positive/higher *before* the multiplier multiply = -1 + max = 0 + min = -0.25 } #if = { # limit = { @@ -1027,6 +1027,90 @@ liberty_desire_weekly_change = { } } + #If there is a slave revolt movement, overlords' armies are useful. + if = { + limit = { + root.second_country = { + any_political_movement = { + is_political_movement_type = movement_slave_revolt + } + } + } + add = { + desc = "LIBERTY_DESIRE_WEEKLY_CHANGE_SLAVE_REVOLT" + add = { #value will be negative, overlords help put down revolts + root.second_country = { + every_political_movement = { + limit = { + is_political_movement_type = movement_slave_revolt + } + add = this.political_movement_radicalism + multiply = 0.10 + add = { + add = this.political_movement_support + multiply = 0.20 + } + } + } + } + multiply = -1 + min = -0.10 + if = { #special case in Cuban independence + limit = { + root.second_country = { + has_variable = slaves_work_with_independence_movement + } + } + multiply = -2 #turn value positive + max = 0.25 + } + } + } + + # Cuban Afro-Caribeno + if = { + limit = { + root.second_country = { + c:CUB ?= this + has_variable = slaves_work_with_independence_movement + } + } + root.second_country = { + cu:afro_caribeno = { + add = culture_current_fervor + subtract = 25 + divide = 150 + multiply = -1 + max = 0 + min = -0.2 + } + } + } + + #Any Sovereignists in government + if = { + limit = { + root.second_country = { + any_scope_character = { + has_ideology = ideology:ideology_sovereignist_leader + OR = { + is_ruler = yes + AND = { + has_role = politician + interest_group = { + is_in_government = yes + } + } + } + } + } + } + add = { + add = 0.07 + desc = "LIBERTY_DESIRE_WEEKLY_CHANGE_SOVEREIGNIST_IN_GOV" + } + } + # ADDITIONAL NON_SPECIFIC MODIFICATIONS # Modifiers for this country specifically add = { diff --git a/Sinosphere Korean/common/cultures/zz_JNI_EINI_extra_imports.txt b/Sinosphere Korean/common/cultures/zz_JNI_EINI_extra_imports.txt index d7e0b3f6..9ffb5b62 100644 --- a/Sinosphere Korean/common/cultures/zz_JNI_EINI_extra_imports.txt +++ b/Sinosphere Korean/common/cultures/zz_JNI_EINI_extra_imports.txt @@ -289,6 +289,12 @@ TRY_REPLACE:mongol= { religion = gelugpa heritage = heritage_mongolian language = language_mongolian + name_format = last_first + + obsessions = { + meat + } + traditions = { } male_common_first_names = { Badamdorj @@ -416,8 +422,8 @@ TRY_REPLACE:kalmyk= { religion = gelugpa heritage = heritage_mongolian language = language_mongolian - traditions = { tradition_russosphere } name_format = last_first + traditions = { tradition_russosphere } male_common_first_names = { Badamdorj Batbayar diff --git a/Soft Econ Adjustments/common/defines/zzz_MoG_SEA_def.txt b/Soft Econ Adjustments/common/defines/zzz_MoG_SEA_def.txt index c69bd02c..9cc107e5 100644 --- a/Soft Econ Adjustments/common/defines/zzz_MoG_SEA_def.txt +++ b/Soft Econ Adjustments/common/defines/zzz_MoG_SEA_def.txt @@ -180,11 +180,6 @@ NEconomy = { # COMPANY_MIN_LEVELS_OWNED = 2 # 5 # Min amount of ownerships that company can have, more can't be nationalized or privatized BASE_REGIONAL_HQS = 1 # Base level of regional HQs available to a company after granted investment charter LEVELS_PER_REGIONAL_HQ = 50 # How many levels company needs to aquire to get a new regional HQ - - - ## GDP reinvestment scaling - REINVESTMENT_EFFICIENCY_MAX = 2.0 # 3.0 # Maximum conversion of reinvestment to investment pool - REINVESTMENT_BASE_EFFICIENCY_THRESHOLD = 20000000 # 50000000 # Below this amount of GDP, increase reinvestment multiplier on a linear scale up to REINVESTMENT_EFFICIENCY_MAX at 0 } NAI = { diff --git a/Soft Econ Adjustments/common/static_modifiers/zMoG_SEA_modifiers.txt b/Soft Econ Adjustments/common/static_modifiers/zMoG_SEA_modifiers.txt index 0b44ea14..010e8bb5 100644 --- a/Soft Econ Adjustments/common/static_modifiers/zMoG_SEA_modifiers.txt +++ b/Soft Econ Adjustments/common/static_modifiers/zMoG_SEA_modifiers.txt @@ -24,6 +24,7 @@ REPLACE_OR_CREATE:state_region_devastation = { state_construction_mult = -0.3 # -1.0 # This is hilariously overtuned, high devastation doesn't prevent external construction resources being brought in. building_throughput_add = -0.5 building_construction_sector_throughput_add = -0.5 # Stacks with general building throughput penalty. Result is max devastation = no local construction can be *produced* + state_devastation_decay_mult = 3.0 } ## NEW MODIFIERS ## diff --git a/Soft Pop Adjustments/common/decrees/zzz_MoG_SPA_assimilation_decree.txt b/Soft Pop Adjustments/common/decrees/zzz_MoG_SPA_assimilation_decree.txt index e9aee4cc..06e56ab1 100644 --- a/Soft Pop Adjustments/common/decrees/zzz_MoG_SPA_assimilation_decree.txt +++ b/Soft Pop Adjustments/common/decrees/zzz_MoG_SPA_assimilation_decree.txt @@ -189,7 +189,7 @@ TRY_REPLACE:decree_promote_national_values = { } else_if = { limit = { - state_population < 300000 + state_population > 300000 } multiply = 2.0 } @@ -224,6 +224,16 @@ TRY_REPLACE:decree_promote_national_values = { } add = 500 } + if = { + limit = { + scope:country = { + has_journal_entry = je_vernacular_policy + has_variable = chose_assimilation_var + } + is_homeland_of_country_cultures = scope:country + } + add = 1000 + } if = { limit = { diff --git a/Soft Pop Adjustments/common/defines/zzz_MoG_SPA_def.txt b/Soft Pop Adjustments/common/defines/zzz_MoG_SPA_def.txt index 7a1cafeb..f86ea068 100644 --- a/Soft Pop Adjustments/common/defines/zzz_MoG_SPA_def.txt +++ b/Soft Pop Adjustments/common/defines/zzz_MoG_SPA_def.txt @@ -81,7 +81,8 @@ NPops = { JOB_SATISFACTION_FROM_CANNOT_AFFORD_EXPENSES = -500 # -1000(old) # -100 # Job satisfaction gained from not being able to afford your buy package (and taxes) JOB_SATISFACTION_PER_PERCENT_HIGHER_SOL_QUALIFICATION = -0.8 # -1 # Job satisfaction gained per percent of workforce qualified for a job with a higher base standard of living. Note that qualifications are assumed to overlap and the largest qualification is used in this calculation # Qualification max -ve must slightly exceed JOB_SATISFACTION_FROM_EMPLOYMENT ( 80 > 70 -> ok ) - JOB_SATISFACTION_FROM_EMPLOYMENT = 70 # 100 # Job satisfaction gained from having a job + # REMOVED 1.12 # JOB_SATISFACTION_FROM_EMPLOYMENT = 70 # 100 # Job satisfaction gained from having a job + #JOB_SATISFACTION_FROM_JOB_ATTRACTIVENESS = 100 # Job satisfaction when employed, multiplied by job attractiveness # Difference between JOB_SATISFACTION_BASE & JOB_SATISFACTION_FROM_EMPLOYMENT is default migration desire. JOB_SATISFACTION_BASE is bigger than most difficult base_migration_desire so unemployed migrate for better opportunities even if they have welfare. JOB_SATISFACTION_DIVIDENDS_MAX_MULT = 5 # Max multiplier from the ratio between pop dividends and wages JOB_SATISFACTION_DIVIDENDS_BASE = 10 # 50 # Base value to be multiplied by the ratio between dividends and wages diff --git a/Soft Pop Adjustments/common/laws/zMoG_SPA_citizenship.txt b/Soft Pop Adjustments/common/laws/zMoG_SPA_citizenship.txt index 2d9c15bb..4e2687e6 100644 --- a/Soft Pop Adjustments/common/laws/zMoG_SPA_citizenship.txt +++ b/Soft Pop Adjustments/common/laws/zMoG_SPA_citizenship.txt @@ -21,10 +21,24 @@ TRY_REPLACE:law_subjecthood = { } } + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } + unlocking_laws = { law_monarchy law_theocracy law_chiefdom + law_colonial_administration } modifier = { @@ -137,6 +151,19 @@ TRY_REPLACE:law_ethnostate = { unlocking_technologies = { nationalism } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } modifier = { country_authority_add = 200 @@ -272,6 +299,19 @@ TRY_REPLACE:law_national_supremacy = { custom_tooltip = fervor_effects_ld_tt } } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } modifier = { country_authority_add = 150 @@ -414,6 +454,19 @@ TRY_REPLACE:law_racial_segregation = { remove_modifier = modifier_polish_organic_statute } } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } modifier = { country_authority_add = 100 @@ -559,6 +612,19 @@ TRY_REPLACE:law_cultural_exclusion = { remove_modifier = modifier_polish_organic_statute } } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } modifier = { country_authority_add = 100 @@ -690,6 +756,19 @@ TRY_REPLACE:law_multicultural = { unlocking_technologies = { human_rights } + + can_impose = { + OR = { + AND = { + is_in_same_power_bloc = scope:target_country + AND = { + modifier:country_can_impose_same_lawgroup_citizenship_in_power_bloc_bool = yes + has_law = scope:law + } + } + can_impose_law_default = yes + } + } on_enact = { recalculate_pop_ig_support = yes diff --git a/Subject Interaction Suite/common/ai_strategies/MoG_diplomatic_strategies_SIS.txt b/Subject Interaction Suite/common/ai_strategies/MoG_diplomatic_strategies_SIS.txt index 1d7fbe70..14332b03 100644 --- a/Subject Interaction Suite/common/ai_strategies/MoG_diplomatic_strategies_SIS.txt +++ b/Subject Interaction Suite/common/ai_strategies/MoG_diplomatic_strategies_SIS.txt @@ -193,7 +193,7 @@ REPLACE_OR_CREATE:ai_strategy_territorial_expansion = { exists = c:FRA c:FRA = this ruler = { - has_variable = bonapartist_leader + has_variable = house_bonaparte } } add = 5 diff --git a/Subject Interaction Suite/common/diplomatic_actions/30_fund_lobbyz.txt b/Subject Interaction Suite/common/diplomatic_actions/30_fund_lobbyz.txt index d9fc4a08..530c96d7 100644 --- a/Subject Interaction Suite/common/diplomatic_actions/30_fund_lobbyz.txt +++ b/Subject Interaction Suite/common/diplomatic_actions/30_fund_lobbyz.txt @@ -94,6 +94,7 @@ value = 0.25 if = { + # SIS - Added limit = { OR = { has_law_or_variant = law_type:law_technocracy @@ -204,9 +205,7 @@ custom_tooltip = { text = "EQUAL_OR_BETTER_RANK_THAN_TARGET" country_rank >= scope:target_country.country_rank - } - - + } } } @@ -231,6 +230,16 @@ propose_score = { value = 10 + + if = { + limit = { + has_journal_entry = je_hawaiian_interest + c:HAW ?= { + this = scope:target_country + } + } + add = 100 + } } will_propose = { @@ -272,47 +281,47 @@ AND = { income >= 50000 net_fixed_income >= 4000 - scope:target_country.income <= 10000 + scope:target_country.fixed_income <= 10000 } AND = { income >= 75000 net_fixed_income >= 6000 - scope:target_country.income <= 15000 + scope:target_country.fixed_income <= 15000 } AND = { income >= 100000 net_fixed_income >= 8000 - scope:target_country.income <= 20000 + scope:target_country.fixed_income <= 20000 } AND = { income >= 125000 net_fixed_income >= 10000 - scope:target_country.income <= 25000 + scope:target_country.fixed_income <= 25000 } AND = { income >= 150000 net_fixed_income >= 12000 - scope:target_country.income <= 30000 + scope:target_country.fixed_income <= 30000 } AND = { income >= 175000 net_fixed_income >= 14000 - scope:target_country.income <= 35000 + scope:target_country.fixed_income <= 35000 } AND = { income >= 200000 net_fixed_income >= 16000 - scope:target_country.income <= 40000 + scope:target_country.fixed_income <= 40000 } AND = { income >= 225000 net_fixed_income >= 18000 - scope:target_country.income <= 45000 + scope:target_country.fixed_income <= 45000 } AND = { income >= 250000 net_fixed_income >= 20000 - scope:target_country.income <= 50000 + scope:target_country.fixed_income <= 50000 } } } @@ -367,47 +376,46 @@ NOR = { AND = { income >= 40000 - scope:target_country.income <= 12500 + scope:target_country.fixed_income <= 12500 } AND = { income >= 50000 - scope:target_country.income <= 15000 + scope:target_country.fixed_income <= 15000 } AND = { income >= 75000 - scope:target_country.income <= 20000 + scope:target_country.fixed_income <= 20000 } AND = { income >= 100000 - scope:target_country.income <= 25000 + scope:target_country.fixed_income <= 25000 } AND = { income >= 125000 - scope:target_country.income <= 30000 + scope:target_country.fixed_income <= 30000 } AND = { income >= 150000 - scope:target_country.income <= 35000 + scope:target_country.fixed_income <= 35000 } AND = { income >= 175000 - scope:target_country.income <= 40000 + scope:target_country.fixed_income <= 40000 } AND = { income >= 200000 - scope:target_country.income <= 45000 + scope:target_country.fixed_income <= 45000 } AND = { income >= 225000 - scope:target_country.income <= 50000 + scope:target_country.fixed_income <= 50000 } AND = { income >= 250000 - scope:target_country.income <= 55000 + scope:target_country.fixed_income <= 55000 } } } } } } - diff --git a/Subject Interaction Suite/common/diplomatic_actions/32_subjects_raise_paymentz.txt b/Subject Interaction Suite/common/diplomatic_actions/32_subjects_raise_paymentz.txt index 90de015b..e7ce589b 100644 --- a/Subject Interaction Suite/common/diplomatic_actions/32_subjects_raise_paymentz.txt +++ b/Subject Interaction Suite/common/diplomatic_actions/32_subjects_raise_paymentz.txt @@ -105,7 +105,7 @@ attitude = protective } AND = { - scope:target_country = { liberty_desire >= 50 } + scope:target_country ?= { liberty_desire >= 50 } "relations(scope:target_country)" >= relations_threshold:friendly NOR = { has_strategy = ai_strategy_economic_imperialism diff --git a/Subject Interaction Suite/common/diplomatic_actions/35_subjects_appoint_governorz.txt b/Subject Interaction Suite/common/diplomatic_actions/35_subjects_appoint_governorz.txt deleted file mode 100644 index 68c3095e..00000000 --- a/Subject Interaction Suite/common/diplomatic_actions/35_subjects_appoint_governorz.txt +++ /dev/null @@ -1,124 +0,0 @@ -REPLACE_OR_CREATE:da_appoint_colonial_governor = { - groups= { overlord } - - requires_approval = no - should_notify_third_parties = yes - show_effect_in_tooltip = yes - - texture = "gfx/interface/icons/diplomatic_action_icons/da_appoint_colonial_governor.dds" - confirmation_sound = "event:/SFX/UI/MapInteraction/SubjectInteractions/diplomatic_action_subjects_04_appoint_governor_benign" - selectable = { - has_dlc_feature = subject_and_bloc_actions - } - - potential = { - scope:target_country = { - NOT = { has_variable = gubernatorial_candidate } - NOT = { is_diplomatic_play_enemy_of = root } - } - } - - possible = { - custom_tooltip = { - text = "APPOINT_COLONIAL_GOVERNOR_ON_COOLDOWN" - scope:target_country = { - NOR = { - has_variable = gubernatorial_candidate - has_variable = gubernatorial_candidate_timed - } - } - } - is_revolutionary = no - scope:target_country = { - is_revolutionary = no - OR = { # don't appoint colonial governor monarchies - has_law_or_variant = law_type:law_presidential_republic - has_law_or_variant = law_type:law_parliamentary_republic - has_law_or_variant = law_type:law_council_republic - has_law_or_variant = law_type:law_corporate_state - } - } - OR = { - AND = { - OR = { - is_country_type = recognized - is_country_type = colonial - } - scope:target_country = { - is_country_type = unrecognized - } - } - AND = { - OR = { - is_country_type = recognized - is_country_type = colonial - } - scope:target_country = { - OR = { - is_country_type = recognized - is_country_type = colonial - } - OR = { - is_subject_type = subject_type_chartered_company - is_subject_type = subject_type_colony - is_subject_type = subject_type_puppet - is_subject_type = subject_type_dominion - is_subject_type = subject_type_vassal - is_subject_type = subject_type_crown_land - } - } - } - AND = { - is_country_type = unrecognized - scope:target_country = { - is_country_type = unrecognized - OR = { - is_subject_type = subject_type_chartered_company - is_subject_type = subject_type_colony - is_subject_type = subject_type_puppet - is_subject_type = subject_type_dominion - is_subject_type = subject_type_vassal - is_subject_type = subject_type_crown_land - } - } - } - } - } - - accept_effect = { - scope:target_country = { - set_variable = gubernatorial_candidate - set_variable = { - name = gubernatorial_candidate_timed - months = 61 - } - } - trigger_event = { id = subject_interactions.1 popup = yes } - } - - ai = { - evaluation_chance = { - value = 0.25 - } - - propose_score = { - value = 10 - } - - will_propose = { - "ai_ideological_opinion(scope:target_country)" <= -25 - OR = { - scope:target_country = { liberty_desire < 25 } - has_attitude = { - who = scope:target_country - attitude = domineering - } - } - OR = { - has_strategy = ai_strategy_maintain_power_balance - has_strategy = ai_strategy_anti_imperialism - has_strategy = ai_strategy_world_revolution - } - } - } -} diff --git a/Subject Interaction Suite/common/diplomatic_actions/MoG_O18_recognize_subject.txt b/Subject Interaction Suite/common/diplomatic_actions/MoG_O18_recognize_subject.txt index 9bc8dcdd..62dc4c33 100644 --- a/Subject Interaction Suite/common/diplomatic_actions/MoG_O18_recognize_subject.txt +++ b/Subject Interaction Suite/common/diplomatic_actions/MoG_O18_recognize_subject.txt @@ -12,7 +12,7 @@ REPLACE_OR_CREATE:recognize = { country_rank >= rank_value:great_power OR = { is_country_type = recognized - is_country_type = colonial + country_is_colonial_or_company = yes } scope:target_country = { is_country_type = unrecognized @@ -125,4 +125,4 @@ get_recognized = { } } } -} \ No newline at end of file +} diff --git a/Subject Interaction Suite/common/diplomatic_catalysts/MoG_SIS_diplomatic_catalysts.txt b/Subject Interaction Suite/common/diplomatic_catalysts/MoG_SIS_diplomatic_catalysts.txt index f1b9aebc..edd7489d 100644 --- a/Subject Interaction Suite/common/diplomatic_catalysts/MoG_SIS_diplomatic_catalysts.txt +++ b/Subject Interaction Suite/common/diplomatic_catalysts/MoG_SIS_diplomatic_catalysts.txt @@ -18,7 +18,7 @@ catalyst_became_subject = { value = 0.65 if = { - limit = { liberty_desire < 25 } + limit = { liberty_desire < define:NDiplomacy|WAR_GOAL_INFAMY_LOW_LIBERTY_DESIRE_THRESHOLD } add = 0.25 } else_if = { @@ -75,4 +75,4 @@ catalyst_force_laws = { FACTOR = appeasement_diplomatic_demand_made } } -} \ No newline at end of file +} diff --git a/Subject Interaction Suite/common/script_values/MoG_00_liberty_desire.txt b/Subject Interaction Suite/common/script_values/MoG_00_liberty_desire.txt index 44e832d2..d2e70650 100644 --- a/Subject Interaction Suite/common/script_values/MoG_00_liberty_desire.txt +++ b/Subject Interaction Suite/common/script_values/MoG_00_liberty_desire.txt @@ -9,7 +9,7 @@ # root.second_country: second country in the pact. Subject. # root = { liberty_desire < 50 }: compare trigger for current Liberty Desire value root. # Must return a value which will be added to the current Liberty Desire in this pact. -REPLACE_OR_CREATE:liberty_desire_weekly_change = { +REPLACE_OR_CREATE:liberty_desire_weekly_change = { #AKA liberty_desire_weekly_progress # add = { # value = 0.1 # desc = "base_value" @@ -82,9 +82,9 @@ REPLACE_OR_CREATE:liberty_desire_weekly_change = { add = { root.second_country = { value = num_primary_cultures } } # Use script value robustly. min = 1 } - min = 0 - max = 0.2 # Max is positive/higher *before* the multiplier multiply = -1 + max = 0 + min = -0.2 } } } @@ -114,9 +114,9 @@ REPLACE_OR_CREATE:liberty_desire_weekly_change = { add = { root.second_country = { value = num_primary_cultures } } # Use script value robustly. min = 1 } - min = 0 - max = 0.25 # Max is positive/higher *before* the multiplier multiply = -1 + max = 0 + min = -0.25 } #if = { # limit = { @@ -1022,6 +1022,90 @@ REPLACE_OR_CREATE:liberty_desire_weekly_change = { desc = "pacify_the_steppe_modifier" } } + + #If there is a slave revolt movement, overlords' armies are useful. + if = { + limit = { + root.second_country = { + any_political_movement = { + is_political_movement_type = movement_slave_revolt + } + } + } + add = { + desc = "LIBERTY_DESIRE_WEEKLY_CHANGE_SLAVE_REVOLT" + add = { #value will be negative, overlords help put down revolts + root.second_country = { + every_political_movement = { + limit = { + is_political_movement_type = movement_slave_revolt + } + add = this.political_movement_radicalism + multiply = 0.10 + add = { + add = this.political_movement_support + multiply = 0.20 + } + } + } + } + multiply = -1 + min = -0.10 + if = { #special case in Cuban independence + limit = { + root.second_country = { + has_variable = slaves_work_with_independence_movement + } + } + multiply = -2 #turn value positive + max = 0.25 + } + } + } + + # Cuban Afro-Caribeno + if = { + limit = { + root.second_country = { + c:CUB ?= this + has_variable = slaves_work_with_independence_movement + } + } + root.second_country = { + cu:afro_caribeno = { + add = culture_current_fervor + subtract = 25 + divide = 150 + multiply = -1 + max = 0 + min = -0.2 + } + } + } + + #Any Sovereignists in government + if = { + limit = { + root.second_country = { + any_scope_character = { + has_ideology = ideology:ideology_sovereignist_leader + OR = { + is_ruler = yes + AND = { + has_role = politician + interest_group = { + is_in_government = yes + } + } + } + } + } + } + add = { + add = 0.07 + desc = "LIBERTY_DESIRE_WEEKLY_CHANGE_SOVEREIGNIST_IN_GOV" + } + } # ADDITIONAL NON_SPECIFIC MODIFICATIONS # Modifiers for this country specifically @@ -1140,4 +1224,4 @@ REPLACE_OR_CREATE:num_primary_cultures = { every_primary_culture = { add = 1 } -} \ No newline at end of file +} diff --git a/Subject Interaction Suite/common/scripted_triggers/A_ConsolidateSubjectsTriggers.txt b/Subject Interaction Suite/common/scripted_triggers/A_ConsolidateSubjectsTriggers.txt index 1907ee8d..d37ea4e9 100644 --- a/Subject Interaction Suite/common/scripted_triggers/A_ConsolidateSubjectsTriggers.txt +++ b/Subject Interaction Suite/common/scripted_triggers/A_ConsolidateSubjectsTriggers.txt @@ -12,10 +12,7 @@ REPLACE_OR_CREATE:can_consolidate_subject = { liberty_desire < 25 # disable for testing subject_can_be_consolidation_target = yes NOT = { c:BIC ?= THIS } # Cannot consolidate India into something else. - NOR = { - is_country_type = company - is_country_type = colonial - } + country_is_colonial_or_company = no } } @@ -194,4 +191,4 @@ REPLACE_OR_CREATE:can_be_consolidation_recipient = { } } } -} \ No newline at end of file +} diff --git a/Tweaked Starting Conditions/common/history/buildings/aMoG_build_FRANCE_TEXTILES.txt b/Tweaked Starting Conditions/common/history/buildings/aMoG_build_FRANCE_TEXTILES.txt index 6295176f..e7ce659a 100644 --- a/Tweaked Starting Conditions/common/history/buildings/aMoG_build_FRANCE_TEXTILES.txt +++ b/Tweaked Starting Conditions/common/history/buildings/aMoG_build_FRANCE_TEXTILES.txt @@ -2,9 +2,9 @@ s:STATE_PROVENCE={ region_state:FRA={ # Clean things out to avoid duplication. - remove_building = building_textile_mills + remove_building = building_textile_mill create_building={ - building="building_textile_mills" + building="building_textile_mill" add_ownership={ company={ type=company_maison_worth # We swapped the ownership @@ -19,12 +19,12 @@ } s:STATE_NORMANDY={ region_state:FRA={ - remove_building = building_textile_mills + remove_building = building_textile_mill create_building={ - building="building_textile_mills" + building="building_textile_mill" add_ownership={ building={ - type="building_textile_mills" + type="building_textile_mill" country="c:FRA" levels=4 region="STATE_NORMANDY" @@ -40,4 +40,4 @@ } } } -} \ No newline at end of file +} diff --git a/Tweaked Starting Conditions/common/history/buildings/aMoG_build_MADAGASCAR.txt b/Tweaked Starting Conditions/common/history/buildings/aMoG_build_MADAGASCAR.txt index 651f5d72..f7a7cc64 100644 --- a/Tweaked Starting Conditions/common/history/buildings/aMoG_build_MADAGASCAR.txt +++ b/Tweaked Starting Conditions/common/history/buildings/aMoG_build_MADAGASCAR.txt @@ -3,7 +3,7 @@ region_state:MAD={ # Add historical ports and support create_building={ - building="building_shipyards" + building="building_shipyard" add_ownership={ building={ type="building_financial_district" @@ -39,4 +39,4 @@ } } } -} \ No newline at end of file +} diff --git a/Tweaked Starting Conditions/common/history/buildings/aMoG_build_PORTUGAL.txt b/Tweaked Starting Conditions/common/history/buildings/aMoG_build_PORTUGAL.txt index 7b5d478b..bfd8aaaf 100644 --- a/Tweaked Starting Conditions/common/history/buildings/aMoG_build_PORTUGAL.txt +++ b/Tweaked Starting Conditions/common/history/buildings/aMoG_build_PORTUGAL.txt @@ -8,8 +8,8 @@ remove_building = building_fishing_wharf remove_building = building_wheat_farm remove_building = building_livestock_ranch - remove_building = building_shipyards - remove_building = building_military_shipyards + remove_building = building_shipyard + remove_building = building_military_shipyard remove_building = building_port if = { limit = { @@ -93,7 +93,7 @@ activate_production_methods={ "pm_open_air_stockyards" "pm_simple_ranch" "pm_standard_fences" "pm_unrefrigerated" } } create_building={ - building="building_shipyards" + building="building_shipyard" add_ownership={ building={ type="building_financial_district" @@ -106,7 +106,7 @@ activate_production_methods={ "pm_basic_shipbuilding" } } create_building={ - building="building_military_shipyards" + building="building_military_shipyard" add_ownership={ country={ country="c:POR" @@ -142,4 +142,4 @@ } } } -} \ No newline at end of file +} diff --git a/Tweaked Starting Conditions/common/state_traits/yMoG_TSC_inherited_vtm_generic_traits.txt b/Tweaked Starting Conditions/common/state_traits/yMoG_TSC_inherited_vtm_generic_traits.txt index 6d64b5f2..aee656d1 100644 --- a/Tweaked Starting Conditions/common/state_traits/yMoG_TSC_inherited_vtm_generic_traits.txt +++ b/Tweaked Starting Conditions/common/state_traits/yMoG_TSC_inherited_vtm_generic_traits.txt @@ -2,8 +2,8 @@ icon = "gfx/interface/icons/state_trait_icons/cold_water_port.dds" modifier = { - building_shipyards_throughput_add = -0.1 - building_military_shipyards_throughput_add = -0.1 + building_shipyard_throughput_add = -0.1 + building_military_shipyard_throughput_add = -0.1 building_port_throughput_add = -0.4 state_building_naval_base_max_level_add = -10 } @@ -27,4 +27,4 @@ REPLACE_OR_CREATE:state_trait_very_difficult_terrain = { modifier = { state_construction_mult = -0.2 } -} \ No newline at end of file +} diff --git a/Tweaked Starting Conditions/map_data/state_regions/04_tweaked_madagascar.txt b/Tweaked Starting Conditions/map_data/state_regions/04_tweaked_madagascar.txt index 6326cdfa..e469558d 100644 --- a/Tweaked Starting Conditions/map_data/state_regions/04_tweaked_madagascar.txt +++ b/Tweaked Starting Conditions/map_data/state_regions/04_tweaked_madagascar.txt @@ -1,7 +1,7 @@ # Intentionally set up *just after* vanilla file so other mods will overwrite it easily. STATE_SOUTH_MADAGASCAR = { id = 233 - subsistence_building = "building_subsistence_farms" + subsistence_building = "building_subsistence_farm" provinces = { "x034485" "x069C0D" "x071AEC" "x097464" "x10A7DF" "x132895" "x15A1AC" "x19F69A" "x1B65BD" "x1BB5E5" "x1FAF90" "x2B3FCB" "x2D9669" "x33BDA3" "x3CE339" "x40C0E0" "x425701" "x44FC6E" "x471161" "x47F3A1" "x4DC413" "x52ED6A" "x5897EC" "x5D2D79" "x5F8C33" "x606CE0" "x637E10" "x676257" "x6D48C1" "x6DAE72" "x714D08" "x794F7A" "x7A489E" "x94059D" "x9C2288" "x9D8997" "x9F5F4C" "xA58AC5" "xADD893" "xB0B64A" "xB57D66" "xB5FA86" "xB7598B" "xB9259E" "xBCB8C0" "xBFA51F" "xC6697B" "xC910DF" "xDB3D79" "xDBFAC1" "xDCB2F8" "xDF5AED" "xE480E0" "xE655F6" "xE6F19B" "xE8FA9B" "xEA95C4" "xED95E1" "xF18FED" "xF2317F" "xF81480" "xFC9FEC" } impassable = { "x606CE0" } traits = { "state_trait_malaria" } @@ -11,20 +11,20 @@ STATE_SOUTH_MADAGASCAR = { mine = "x5F8C33" wood = "x47F3A1" arable_land = 80 - arable_resources = { "bg_millet_farms" "bg_rice_farms" "bg_livestock_ranches" "bg_silk_plantations" "bg_coffee_plantations" "bg_dye_plantations" "bg_tea_plantations" "bg_tobacco_plantations" "bg_sugar_plantations" "bg_banana_plantations" } + arable_resources = { "building_millet_farm" "building_rice_farms" "building_livestock_ranch" "building_coffee_plantation" "building_dye_plantation" "building_tea_plantation" "building_tobacco_plantation" "building_sugar_plantation" "building_banana_plantation" } capped_resources = { - bg_coal_mining = 80 - bg_logging = 23 - bg_whaling = 4 - bg_fishing = 8 + building_coal_mine = 80 + building_logging_camp = 23 + building_whaling_station = 4 + building_fishing_wharf = 8 } resource = { - type = "bg_gold_fields" - depleted_type = "bg_gold_mining" + type = "building_gold_field" + depleted_type = "building_gold_mine" undiscovered_amount = 1 } resource = { - type = "bg_rubber" + type = "building_rubber_plantation" undiscovered_amount = 16 } naval_exit_id = 3107 @@ -32,7 +32,7 @@ STATE_SOUTH_MADAGASCAR = { STATE_NORTH_MADAGASCAR = { id = 234 - subsistence_building = "building_subsistence_farms" + subsistence_building = "building_subsistence_farm" provinces = { "x00D7F5" "x054C46" "x069F1A" "x0B558A" "x0F6E52" "x1032DF" "x11F67B" "x215769" "x2240CA" "x25C5DC" "x2625B9" "x285C26" "x3450FE" "x3465B6" "x35CC6B" "x3619E0" "x3732E1" "x392CDC" "x4A0895" "x50A090" "x50BAA2" "x678DC5" "x6A1582" "x6B56F5" "x6CC56F" "x724867" "x7D2FD8" "x7F2785" "x84B32B" "x88A889" "x8CF7D2" "x8E25F6" "x9C3835" "xA0D0B6" "xA11116" "xA67461" "xA99E28" "xB1EDB4" "xB27647" "xB92804" "xBB70FE" "xBD43D8" "xBEC58A" "xC2E62D" "xC3722C" "xC3F681" "xC67F91" "xC89FD5" "xC9BB37" "xD3049A" "xD4E1D7" "xDB635D" "xDF60B0" "xE0C530" "xEFBDB7" "xF41FD5" "xF7C90E" "xF7F009" "xF9D98C" "xFFB457" } traits = { "state_trait_malaria" } city = "xBEC58A" @@ -41,19 +41,19 @@ STATE_NORTH_MADAGASCAR = { mine = "xC3722C" wood = "x2625B9" arable_land = 80 - arable_resources = { "bg_millet_farms" "bg_rice_farms" "bg_livestock_ranches" "bg_coffee_plantations" "bg_dye_plantations" "bg_tea_plantations" "bg_tobacco_plantations" "bg_sugar_plantations" "bg_banana_plantations" } + arable_resources = { "building_millet_farm" "building_livestock_ranch" "building_coffee_plantation" "building_dye_plantation" "building_tea_plantation" "building_tobacco_plantation" "building_sugar_plantation" "building_banana_plantation" } capped_resources = { - bg_logging = 20 - bg_whaling = 6 - bg_fishing = 10 + building_logging_camp = 20 + building_whaling_station = 6 + building_fishing_wharf = 10 } resource = { - type = "bg_gold_fields" - depleted_type = "bg_gold_mining" + type = "building_gold_field" + depleted_type = "building_gold_mine" undiscovered_amount = 3 } resource = { - type = "bg_rubber" + type = "building_rubber_plantation" undiscovered_amount = 16 } naval_exit_id = 3107 diff --git a/USU LLWA/common/buildings/zzzzzMoG_USU_LLWA_railway.txt b/USU LLWA/common/buildings/zzzzzMoG_USU_LLWA_railway.txt index 5a7439a6..7102a8d6 100644 --- a/USU LLWA/common/buildings/zzzzzMoG_USU_LLWA_railway.txt +++ b/USU LLWA/common/buildings/zzzzzMoG_USU_LLWA_railway.txt @@ -118,6 +118,21 @@ } add = 10000 } + else_if = { # Portugal - Regeneration + limit = { + owner = { + has_journal_entry = je_portugal_regeneration_public_works + } + is_incorporated = yes + NOR = { + has_building = building_railway + any_scope_building = { + is_building_type = building_railway + is_under_construction = yes + } + } + } + } if = { # Manchurian Railway limit = { diff --git a/Urban Synergy Unleashed/common/building_groups/yMoG_USU_building_groups.txt b/Urban Synergy Unleashed/common/building_groups/yMoG_USU_building_groups.txt index 192e59da..51cc70f6 100644 --- a/Urban Synergy Unleashed/common/building_groups/yMoG_USU_building_groups.txt +++ b/Urban Synergy Unleashed/common/building_groups/yMoG_USU_building_groups.txt @@ -79,6 +79,8 @@ REPLACE_OR_CREATE:bg_power = { infrastructure_usage_per_level = 2 urbanization = 20 # 10 + + self_investment_chance_modifier = yes } usu_bg_hydro_power = { @@ -208,4 +210,4 @@ REPLACE_OR_CREATE:bg_trade = { infrastructure_usage_per_level = 0.15 # 0.5 urbanization = 2 # down from 10 -} \ No newline at end of file +} diff --git a/Urban Synergy Unleashed/common/buildings/yMoG_USU_construction.txt b/Urban Synergy Unleashed/common/buildings/yMoG_USU_construction.txt index 9f7e59f4..33656b7a 100644 --- a/Urban Synergy Unleashed/common/buildings/yMoG_USU_construction.txt +++ b/Urban Synergy Unleashed/common/buildings/yMoG_USU_construction.txt @@ -8,7 +8,7 @@ REPLACE_OR_CREATE:building_construction_sector = { has_max_level = yes - required_construction = construction_cost_consec + required_construction = construction_cost_construction_sector unlocking_technologies = { urbanization } diff --git a/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_ports_overwrite.txt b/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_ports_overwrite.txt index 81c6cc15..aa75bc31 100644 --- a/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_ports_overwrite.txt +++ b/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_ports_overwrite.txt @@ -1737,3 +1737,17 @@ TRY_REPLACE:company_william_cramp = { value = 3 # Higher base value for flavored companies } } + +# Ynchausti y Compañía +TRY_INJECT:company_ynchausti_y_compania = { + building_types = { + building_river_port + } +} + +# Companhia União Fabril +TRY_INJECT:company_uniao_fabril = { + extension_building_types = { + building_river_port + } +} diff --git a/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_rail_overwrite.txt b/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_rail_overwrite.txt index 0520d857..a61a7030 100644 --- a/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_rail_overwrite.txt +++ b/Urban Synergy Unleashed/common/company_types/yMoG_USU_companies_rail_overwrite.txt @@ -1242,7 +1242,7 @@ TRY_REPLACE:company_standard_oil = { any_scope_state = { region = sr:region_the_midwest is_incorporated = yes - has_potential_resource = bg_oil_extraction + has_potential_resource = building_oil_rig } } @@ -1308,4 +1308,4 @@ TRY_REPLACE:company_oesterreichisch_alpine_montangesellschaft = { ai_weight = { value = 3 # Higher base value for flavored companies } -} \ No newline at end of file +} diff --git a/Urban Synergy Unleashed/common/production_method_groups/yMoG_USU_subsistence_pmgs_lawsplus_compatible.txt b/Urban Synergy Unleashed/common/production_method_groups/yMoG_USU_subsistence_pmgs_lawsplus_compatible.txt index 4180e26f..89d750f8 100644 --- a/Urban Synergy Unleashed/common/production_method_groups/yMoG_USU_subsistence_pmgs_lawsplus_compatible.txt +++ b/Urban Synergy Unleashed/common/production_method_groups/yMoG_USU_subsistence_pmgs_lawsplus_compatible.txt @@ -15,8 +15,8 @@ # production_methods = { # pm_serfdom_no # pm_corvee_labor -# pm_serfdom_building_subsistence_orchards -# pm_slavery_building_subsistence_orchards # Laws + +# pm_serfdom_building_subsistence_orchard +# pm_slavery_building_subsistence_orchard # Laws + # pm_homesteading_building_subsistence # } #} @@ -26,8 +26,8 @@ # production_methods = { # pm_serfdom_no # pm_corvee_labor -# pm_serfdom_building_subsistence_pastures -# pm_slavery_building_subsistence_pastures # Laws + +# pm_serfdom_building_subsistence_pasture +# pm_slavery_building_subsistence_pasture # Laws + # pm_homesteading_building_subsistence # } #} @@ -37,8 +37,8 @@ # production_methods = { # pm_serfdom_no # pm_corvee_labor -# pm_serfdom_building_subsistence_fishing_villages -# pm_slavery_building_subsistence_fishing_villages # Laws + +# pm_serfdom_building_subsistence_fishing_village +# pm_slavery_building_subsistence_fishing_village # Laws + # pm_homesteading_building_subsistence # } #} @@ -49,9 +49,9 @@ # production_methods = { # pm_serfdom_no # pm_corvee_labor -# pm_serfdom_building_subsistence_rice_paddies -# pm_slavery_building_subsistence_rice_paddies # Laws + +# pm_serfdom_building_subsistence_rice_farm +# pm_slavery_building_subsistence_rice_farm # Laws + # pm_homesteading_building_subsistence # } #} -# \ No newline at end of file +# diff --git a/Urban Synergy Unleashed/common/production_methods/yMoG_USU_road_carts_subsistence.txt b/Urban Synergy Unleashed/common/production_methods/yMoG_USU_road_carts_subsistence.txt index d06c1a16..fccf3742 100644 --- a/Urban Synergy Unleashed/common/production_methods/yMoG_USU_road_carts_subsistence.txt +++ b/Urban Synergy Unleashed/common/production_methods/yMoG_USU_road_carts_subsistence.txt @@ -193,6 +193,9 @@ TRY_REPLACE:pm_serfdom_no = { unlocking_laws = { law_tenant_farmers law_commercialized_agriculture + law_collectivized_agriculture + law_latifundias + law_expanded_latifundias } building_modifiers = { @@ -226,7 +229,8 @@ TRY_REPLACE:pm_corvee_labor = { state_modifiers = { workforce_scaled = { - state_construction_mult = 0.001 + building_group_bg_agriculture_construction_efficiency_add = 0.001 + building_group_bg_plantations_construction_efficiency_add = 0.001 state_tax_capacity_add = 0.8 } } @@ -254,7 +258,7 @@ TRY_REPLACE:pm_serfdom = { } } -TRY_REPLACE:pm_serfdom_building_subsistence_orchards = { +TRY_REPLACE:pm_serfdom_building_subsistence_orchard = { texture = "gfx/interface/icons/production_method_icons/serfdom.dds" unlocking_laws = { law_serfdom @@ -276,7 +280,7 @@ TRY_REPLACE:pm_serfdom_building_subsistence_orchards = { } } -TRY_REPLACE:pm_serfdom_building_subsistence_pastures = { +TRY_REPLACE:pm_serfdom_building_subsistence_pasture = { texture = "gfx/interface/icons/production_method_icons/serfdom.dds" unlocking_laws = { law_serfdom @@ -298,7 +302,7 @@ TRY_REPLACE:pm_serfdom_building_subsistence_pastures = { } } -TRY_REPLACE:pm_serfdom_building_subsistence_fishing_villages = { +TRY_REPLACE:pm_serfdom_building_subsistence_fishing_village = { texture = "gfx/interface/icons/production_method_icons/serfdom.dds" unlocking_laws = { law_serfdom @@ -320,7 +324,7 @@ TRY_REPLACE:pm_serfdom_building_subsistence_fishing_villages = { } } -TRY_REPLACE:pm_serfdom_building_subsistence_rice_paddies = { +TRY_REPLACE:pm_serfdom_building_subsistence_rice_farm = { texture = "gfx/interface/icons/production_method_icons/serfdom.dds" unlocking_laws = { law_serfdom @@ -366,7 +370,7 @@ TRY_REPLACE:pm_slavery = { } } -TRY_REPLACE:pm_slavery_building_subsistence_orchards = { +TRY_REPLACE:pm_slavery_building_subsistence_orchard = { texture = "gfx/interface/icons/production_method_icons/unused/slavery.dds" is_hidden_when_unavailable = yes unlocking_laws = { @@ -389,7 +393,7 @@ TRY_REPLACE:pm_slavery_building_subsistence_orchards = { } } -TRY_REPLACE:pm_slavery_building_subsistence_pastures = { +TRY_REPLACE:pm_slavery_building_subsistence_pasture = { texture = "gfx/interface/icons/production_method_icons/unused/slavery.dds" is_hidden_when_unavailable = yes unlocking_laws = { @@ -412,7 +416,7 @@ TRY_REPLACE:pm_slavery_building_subsistence_pastures = { } } -TRY_REPLACE:pm_slavery_building_subsistence_fishing_villages = { +TRY_REPLACE:pm_slavery_building_subsistence_fishing_village = { texture = "gfx/interface/icons/production_method_icons/unused/slavery.dds" is_hidden_when_unavailable = yes unlocking_laws = { @@ -435,7 +439,7 @@ TRY_REPLACE:pm_slavery_building_subsistence_fishing_villages = { } } -TRY_REPLACE:pm_slavery_building_subsistence_rice_paddies = { +TRY_REPLACE:pm_slavery_building_subsistence_rice_farm = { texture = "gfx/interface/icons/production_method_icons/unused/slavery.dds" is_hidden_when_unavailable = yes unlocking_laws = { diff --git a/Urban Synergy Unleashed/common/static_modifiers/yMoG_USU_code_static_overwrites.txt b/Urban Synergy Unleashed/common/static_modifiers/yMoG_USU_code_static_overwrites.txt index 494117dc..212c3cf6 100644 --- a/Urban Synergy Unleashed/common/static_modifiers/yMoG_USU_code_static_overwrites.txt +++ b/Urban Synergy Unleashed/common/static_modifiers/yMoG_USU_code_static_overwrites.txt @@ -21,6 +21,7 @@ TRY_REPLACE:unincorporated_state = { building_group_bg_infrastructure_construction_efficiency_add = -0.2 building_group_bg_extraction_construction_efficiency_add = -0.2 building_group_bg_heavy_industry_construction_efficiency_add = -0.5 + building_group_bg_military_industry_construction_efficiency_add = -0.5 building_group_bg_light_industry_construction_efficiency_add = -0.3 building_group_bg_government_construction_efficiency_add = -0.3 goods_output_usu_logistics_mult = -0.5