From b44ad757f623e226cc6d061d4c9412b7a4a534e8 Mon Sep 17 00:00:00 2001 From: hylexicon Date: Mon, 17 Nov 2025 21:03:40 -0500 Subject: [PATCH] feat: remove slavery --- .../ai_strategies/03_political_strategies.txt | 6 - common/building_groups/00_building_groups.txt | 3 - common/buildings/_buildings.info | 2 - .../political_movements/00_movements.txt | 9 - .../_cwp_replace_01_character_ideologies.txt | 136 --- common/interest_groups/00_intelligentsia.txt | 1 - common/interest_groups/00_landowners.txt | 13 +- .../interest_groups/00_petty_bourgeoisie.txt | 9 - common/interest_groups/00_trade_unions.txt | 1 - common/journal_entries/00_liberalism.txt | 1 - .../00_slave_owner_paranoia.txt | 82 -- common/law_groups/00_laws.txt | 15 - common/laws/00_caste_hegemony.txt | 4 - common/laws/00_citizenship.txt | 9 - common/laws/00_slavery.txt | 338 -------- .../cwp_unwanted_modifiers.txt | 5 - common/on_actions/00_code_on_actions.txt | 72 -- common/on_actions/00_on_actions_yearly.txt | 13 - .../00_political_movement_pop_support.txt | 14 - .../00_ideological_movements.txt | 780 +----------------- ...country_specific_ideological_movements.txt | 14 +- .../scripted_effects/00_scripted_effects.txt | 32 - .../00_victoria_scripted_effects.txt | 59 -- .../_cwp_replace_20_law_commitment.txt | 35 - .../agitators_election_events.txt | 313 ------- .../agitators_events/slave_revolt_events.txt | 70 -- events/vanilla_events/communism.txt | 15 - .../diplomatic_friction_events.txt | 87 -- .../law_events/corporate_state_events.txt | 3 - .../law_events/slavery_laws.txt | 628 -------------- events/vanilla_events/slave_revolts.txt | 327 -------- .../soi_events/00_lobbies_events_03.txt | 8 +- 32 files changed, 12 insertions(+), 3092 deletions(-) delete mode 100755 common/journal_entries/00_slave_owner_paranoia.txt delete mode 100755 common/laws/00_slavery.txt delete mode 100755 events/vanilla_events/agitators_events/slave_revolt_events.txt delete mode 100755 events/vanilla_events/law_events/slavery_laws.txt delete mode 100755 events/vanilla_events/slave_revolts.txt diff --git a/common/ai_strategies/03_political_strategies.txt b/common/ai_strategies/03_political_strategies.txt index 2a067891d..788c94648 100755 --- a/common/ai_strategies/03_political_strategies.txt +++ b/common/ai_strategies/03_political_strategies.txt @@ -195,7 +195,6 @@ ai_strategy_reactionary_agenda = { movement_cultural_majority movement_reactionary movement_legitimist - movement_pro_slavery } anti_movements = { @@ -248,7 +247,6 @@ ai_strategy_reactionary_agenda = { } OR = { has_ideology = ideology:ideology_traditionalist - has_ideology = ideology:ideology_slaver has_ideology = ideology:ideology_theocrat } } @@ -371,7 +369,6 @@ ai_strategy_progressive_agenda = { pro_movements = { movement_liberal movement_modernizer - movement_anti_slavery movement_land_reform movement_positivist movement_utilitarian @@ -387,7 +384,6 @@ ai_strategy_progressive_agenda = { movement_fascist movement_reactionary movement_royalist_absolutist - movement_pro_slavery } institution_scores = { @@ -545,7 +541,6 @@ ai_strategy_egalitarian_agenda = { movement_communist movement_nihilist movement_feminist - movement_anti_slavery movement_land_reform } @@ -558,7 +553,6 @@ ai_strategy_egalitarian_agenda = { movement_reactionary movement_fascist movement_legitimist - movement_pro_slavery movement_liberal movement_orleanist movement_bonapartist diff --git a/common/building_groups/00_building_groups.txt b/common/building_groups/00_building_groups.txt index 55f5e5060..39685c4b8 100644 --- a/common/building_groups/00_building_groups.txt +++ b/common/building_groups/00_building_groups.txt @@ -8,7 +8,6 @@ # capped_by_resources = yes/no # discoverable_resource = yes/no # depletable_resource = yes/no -# can_use_slaves = yes/no Default no, setting yes enables slavery for all contained buildings and groups # land_usage = urban/rural Which type of state resource the building uses. urban = Urbanization, rural = Arable Land. Default no state resource usage. # If unspecified, will return first non-default land usage type found in parent building group tree. # cash_reserves_max = number Maximum amount of £ (per level) that buildings in this group can store into their cash reserves. If unspecified or set to 0, it will use the value from the parent group. Default 0 @@ -498,8 +497,6 @@ bg_trade = { default_building = building_trade_center - can_use_slaves = yes - infrastructure_usage_per_level = 0.5 } diff --git a/common/buildings/_buildings.info b/common/buildings/_buildings.info index 49029544d..52f2e5e98 100644 --- a/common/buildings/_buildings.info +++ b/common/buildings/_buildings.info @@ -34,8 +34,6 @@ building_key = { ai_value = fixed_point # base AI value, default NAI.BUILDING_BASE_VALUE or NAI.GOVERNMENT_BUILDING_BASE_VALUE ai_subsidies_weight = fixed_point # how important the AI considers subsidizing this building to be, default 1.0 - slaves_role = pop_type_key # defines which pop type should slaves work as. Defaults to DEFAULT_POP_TYPE. - production_methods = { # a building's behavior can be modified by its production methods # list of Production Method Groups } diff --git a/common/history/political_movements/00_movements.txt b/common/history/political_movements/00_movements.txt index 070d2eadf..fa9aa2998 100755 --- a/common/history/political_movements/00_movements.txt +++ b/common/history/political_movements/00_movements.txt @@ -17,15 +17,6 @@ create_political_movement = { type = movement_royalist_constitutional } } - ### Abolitionist movements - if = { - limit = { - NOT = { has_law = law_type:law_slavery_banned } - } - create_political_movement = { type = movement_pro_slavery } - create_political_movement = { type = movement_anti_slavery } - } - ### Religious movements create_political_movement = { type = movement_religious_majority } diff --git a/common/ideologies/_cwp_replace_01_character_ideologies.txt b/common/ideologies/_cwp_replace_01_character_ideologies.txt index aa62a1927..9e8370207 100644 --- a/common/ideologies/_cwp_replace_01_character_ideologies.txt +++ b/common/ideologies/_cwp_replace_01_character_ideologies.txt @@ -692,128 +692,6 @@ ideology_feminist = { } } -ideology_abolitionist = { - icon = "gfx/interface/icons/ideology_icons/ideology_leader/ideology_leader_abolitionist.dds" - - character_ideology = yes - - lawgroup_slavery = { - law_slavery_banned = strongly_approve - law_legacy_slavery = disapprove - law_debt_slavery = strongly_disapprove - law_slave_trade = strongly_disapprove - } - - lawgroup_land_reform = { - law_serfdom = strongly_disapprove - law_tenant_farmers = neutral - law_homesteading = neutral - law_collectivized_agriculture = neutral - law_commercialized_agriculture = neutral - } - - country_trigger = { - OR = { - NOT = { has_law = law_type:law_slavery_banned } - has_law = law_type:law_serfdom - } - } - - # Character scope - interest_group_leader_trigger = { - ideology_abolitionist_valid_trigger = yes - } - - non_interest_group_leader_trigger = { - interest_group = { - ideology_abolitionist_valid_trigger = yes - } - } - - interest_group_leader_weight = { - value = 100 - if = { - limit = { is_interest_group_type = ig_trade_unions } - add = 150 - } - if = { - limit = { is_interest_group_type = ig_intelligentsia } - add = 150 - } - } - - non_interest_group_leader_weight = { - value = 100 - - if = { - limit = { has_trait = tactful } - add = 75 - } - } -} - -ideology_slaver = { - icon = "gfx/interface/icons/ideology_icons/ideology_leader/ideology_leader_slaver.dds" - - character_ideology = yes - - lawgroup_slavery = { - law_slave_trade = strongly_approve - law_legacy_slavery = approve - law_debt_slavery = neutral - law_slavery_banned = strongly_disapprove - } - - country_trigger = { - NOT = { - has_law = law_type:law_slavery_banned - } - } - - interest_group_leader_trigger = { - ideology_slaver_valid_trigger = yes - } - - non_interest_group_leader_trigger = { - interest_group = { - ideology_slaver_valid_trigger = yes - } - } - - interest_group_leader_weight = { - value = 50 - if = { - limit = { is_interest_group_type = ig_landowners } - add = 500 - } - if = { - limit = { is_interest_group_type = ig_rural_folk } - add = 250 - } - if = { # very difficult to reintroduce slavery once you ban it and its supporters have faded from the political scene - limit = { - owner = { - NOT = { has_law = law_type:law_slavery_banned } - } - } - multiply = 0.1 - } - } - - non_interest_group_leader_weight = { - value = 100 - - if = { - limit = { has_trait = cruel } - add = 75 - } - if = { - limit = { has_trait = bigoted } - add = 75 - } - } -} - ideology_pacifist = { icon = "gfx/interface/icons/ideology_icons/ideology_leader/ideology_leader_pacifist.dds" @@ -3539,13 +3417,6 @@ ideology_utilitarian_leader = { law_womens_suffrage = strongly_approve } - lawgroup_slavery = { - law_slavery_banned = neutral - law_debt_slavery = strongly_disapprove - law_slave_trade = strongly_disapprove - law_legacy_slavery = disapprove - } - lawgroup_taxation = { law_consumption_based_taxation = disapprove law_per_capita_based_taxation = neutral @@ -3719,13 +3590,6 @@ ideology_utopian = { law_collectivized_agriculture = approve } - lawgroup_slavery = { - law_slavery_banned = strongly_approve - law_legacy_slavery = disapprove - law_debt_slavery = strongly_disapprove - law_slave_trade = strongly_disapprove - } - country_trigger = {} interest_group_leader_trigger = { diff --git a/common/interest_groups/00_intelligentsia.txt b/common/interest_groups/00_intelligentsia.txt index ec5fc3248..49de9da42 100644 --- a/common/interest_groups/00_intelligentsia.txt +++ b/common/interest_groups/00_intelligentsia.txt @@ -8,7 +8,6 @@ ideology_liberal_modern ideology_anti_clerical ideology_republican - ideology_anti_slavery } character_ideologies = { diff --git a/common/interest_groups/00_landowners.txt b/common/interest_groups/00_landowners.txt index 0d717bce5..52ef85f57 100644 --- a/common/interest_groups/00_landowners.txt +++ b/common/interest_groups/00_landowners.txt @@ -96,15 +96,6 @@ limit = { owner = { has_law = law_type:law_homesteading } } multiply = 1.25 } - - if = { - limit = { - state = { - is_slave_state = yes - } - } - multiply = 4 - } } } @@ -182,14 +173,12 @@ value = 2 } } - # More likely with Serfdom or Slavery + # More likely with Serfdom if = { limit = { owner = { OR = { has_law = law_type:law_serfdom - has_law = law_type:law_slave_trade - has_law = law_type:law_legacy_slavery } } } diff --git a/common/interest_groups/00_petty_bourgeoisie.txt b/common/interest_groups/00_petty_bourgeoisie.txt index cfe971406..384220c8b 100644 --- a/common/interest_groups/00_petty_bourgeoisie.txt +++ b/common/interest_groups/00_petty_bourgeoisie.txt @@ -167,15 +167,6 @@ } } value = 25 - - if = { - limit = { - state = { - is_slave_state = yes - } - } - subtract = 25 - } } } diff --git a/common/interest_groups/00_trade_unions.txt b/common/interest_groups/00_trade_unions.txt index 1ae5110a5..bff7a5277 100644 --- a/common/interest_groups/00_trade_unions.txt +++ b/common/interest_groups/00_trade_unions.txt @@ -8,7 +8,6 @@ ideology_proletarian ideology_egalitarian_modern ideology_populist - ideology_anti_slavery ideology_socialist } diff --git a/common/journal_entries/00_liberalism.txt b/common/journal_entries/00_liberalism.txt index 1ec1aca7c..bd333df2e 100755 --- a/common/journal_entries/00_liberalism.txt +++ b/common/journal_entries/00_liberalism.txt @@ -151,7 +151,6 @@ je_liberalism_4 = { has_law = law_type:law_freedom_of_conscience has_law = law_type:law_total_separation } - has_law = law_type:law_slavery_banned has_law = law_type:law_multicultural has_law = law_type:law_no_migration_controls average_sol >= 12 diff --git a/common/journal_entries/00_slave_owner_paranoia.txt b/common/journal_entries/00_slave_owner_paranoia.txt deleted file mode 100755 index c81083695..000000000 --- a/common/journal_entries/00_slave_owner_paranoia.txt +++ /dev/null @@ -1,82 +0,0 @@ -slave_owner_paranoia = { - - icon = "gfx/interface/icons/event_icons/event_skull.dds" - - group = je_group_internal_affairs - - is_shown_when_inactive = { - OR = { - has_law = law_type:law_slave_trade - has_law = law_type:law_legacy_slavery - } - radical_fraction = { - value >= 0.1 - pop_type = slaves - } - NOT = { has_journal_entry = je_matter_of_slavery } # Disabled for Brazil - } - - possible = { - radical_fraction = { - value >= 0.2 - pop_type = slaves - } - any_interest_group = { - any_scope_character = { - OR = { - has_role = politician - has_role = agitator - } - has_ideology = ideology:ideology_abolitionist - } - } - NOT = { c:BRZ ?= this } - } - - status_desc = { - first_valid = { - triggered_desc = { - desc = slave_owner_paranoia_radicalization_high - trigger = { - radical_fraction = { - value >= 0.5 - pop_type = slaves - } - } - } - triggered_desc = { - desc = slave_owner_paranoia_radicalization_mid - trigger = { - radical_fraction = { - value >= 0.2 - pop_type = slaves - } - } - } - triggered_desc = { - desc = slave_owner_paranoia_radicalization_low - } - } - } - - complete = { - radical_fraction = { - value < 0.05 - pop_type = slaves - } - } - - # 5 years - timeout = 1825 - - on_yearly_pulse = { - random_events = { - 40 = 0 - 10 = slave_owner_paranoia_events.1 - 10 = slave_owner_paranoia_events.2 - 10 = slave_owner_paranoia_events.3 - } - } - - weight = 200 -} diff --git a/common/law_groups/00_laws.txt b/common/law_groups/00_laws.txt index 7a415c5a4..cf00aeb84 100755 --- a/common/law_groups/00_laws.txt +++ b/common/law_groups/00_laws.txt @@ -178,18 +178,3 @@ lawgroup_migration = { progressive_movement_chance = 1 regressive_movement_chance = 0.255 } - -lawgroup_slavery = { - law_group_category = human_rights - enactment_approval_mult = 2.0 - base_enactment_days = 150 - - progressive_movement_chance = 5 - regressive_movement_chance = 0.25 - - change_allowed_trigger = { - NOT = { - has_modifier = forced_slavery_ban - } - } -} diff --git a/common/laws/00_caste_hegemony.txt b/common/laws/00_caste_hegemony.txt index 56600fd68..436d88748 100755 --- a/common/laws/00_caste_hegemony.txt +++ b/common/laws/00_caste_hegemony.txt @@ -132,10 +132,6 @@ law_affirmative_action = { progressiveness = 50 - unlocking_laws = { - law_slavery_banned - } - on_enact = { recalculate_pop_ig_support = yes } diff --git a/common/laws/00_citizenship.txt b/common/laws/00_citizenship.txt index 60c93bc03..eabd8809e 100755 --- a/common/laws/00_citizenship.txt +++ b/common/laws/00_citizenship.txt @@ -251,11 +251,6 @@ law_cultural_exclusion = { progressiveness = 25 - unlocking_laws = { - law_slavery_banned - law_debt_slavery - } - on_enact = { recalculate_pop_ig_support = yes } @@ -331,10 +326,6 @@ law_multicultural = { progressiveness = 75 - unlocking_laws = { - law_slavery_banned - } - on_enact = { recalculate_pop_ig_support = yes } diff --git a/common/laws/00_slavery.txt b/common/laws/00_slavery.txt deleted file mode 100755 index 83944f1bc..000000000 --- a/common/laws/00_slavery.txt +++ /dev/null @@ -1,338 +0,0 @@ -# group = this is the law_group a law belongs to -# icon = graphical icon shown in-game -# modifier = {} modifier on country for having adopted this law - -law_slavery_banned = { - group = lawgroup_slavery - - progressiveness = 100 - - icon = "gfx/interface/icons/law_icons/slavery_banned.dds" - - on_activate = { - if = { - limit = { has_variable = slavery_recently_enacted } - remove_variable = slavery_recently_enacted - } - - set_variable = { - name = slavery_recently_abolished - value = yes - days = 1825 - } - every_scope_state = { - limit = { - any_scope_pop = { - is_pop_type = slaves - } - } - set_variable = { - name = former_slave_state - value = yes - days = 1825 - } - } - custom_tooltip = { - text = liberate_slaves_tt - liberate_slaves = yes - } - } - - ai_enact_weight_modifier = { - value = 0 - # Brazilian AI is less likely to pursue slavery banned if there are no abolitionists in power. - if = { - limit = { - c:BRZ ?= this - has_law = law_type:law_slave_trade - NOR = { - any_interest_group = { - is_in_government = yes - leader = { - has_ideology = ideology:ideology_abolitionist - } - } - ruler ?= { has_ideology = ideology:ideology_abolitionist } - heir ?= { has_ideology = ideology:ideology_abolitionist } - } - scope:law.type = law_type:law_slavery_banned - } - add = -100 - } - #Petitions - if = { - limit = { ai_has_enact_weight_modifier_journal_entries = yes } - add = 750 - } - - # This was funny while it lasted. - if = { - limit = { - has_law = law_type:law_council_republic - } - add = 750 - } - - # Strong tendency towards abolitionism in the late game - if = { - limit = { - 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_slavery_banned - value > neutral - } - political_movement_support >= 0.10 - } - } - } - add = 1000 - } - } - - ai_impose_chance = { - value = 0 - - if = { - limit = { - has_law = law_type:law_slavery_banned - NOT = { has_strategy = ai_strategy_reactionary_agenda } - } - - add = base_impose_law_weight - if = { - limit = { - OR = { - has_strategy = ai_strategy_progressive_agenda - has_strategy = ai_strategy_egalitarian_agenda - } - } - multiply = 5 - } - } - } -} - -law_debt_slavery = { - group = lawgroup_slavery - - progressiveness = 0 - - icon = "gfx/interface/icons/law_icons/debt_slavery.dds" - - disallowing_laws = { - law_multicultural - law_affirmative_action - } - - on_activate = { - set_variable = { - name = slavery_recently_enacted - value = yes - days = 1825 - } - every_scope_state = { - limit = { - NOT = { - any_scope_pop = { - is_pop_type = slaves - } - } - } - set_variable = { - name = former_free_state - value = yes - days = 1825 - } - } - ig:ig_landowners ?= { - if = { - limit = { - NOT = { has_ideology = ideology:ideology_pro_slavery } - } - add_ideology = ideology_pro_slavery - } - } - } - - modifier = { - interest_group_ig_landowners_pol_str_mult = 0.25 - } - - # AI should never enact debt slavery - ai_will_do = { - always = no - } - - ai_enact_weight_modifier = { #Petitions - value = 0 - - if = { - limit = { ai_has_enact_weight_modifier_journal_entries = yes } - add = 750 - } - } -} - -law_slave_trade = { - group = lawgroup_slavery - - progressiveness = 0 - - icon = "gfx/interface/icons/law_icons/slave_trade.dds" - - disallowing_laws = { - law_cultural_exclusion - law_multicultural - law_affirmative_action - } - - on_activate = { - set_variable = { - name = slavery_recently_enacted - value = yes - days = 1825 - } - every_scope_state = { - limit = { - NOT = { - any_scope_pop = { - is_pop_type = slaves - } - } - } - set_variable = { - name = former_free_state - value = yes - days = 1825 - } - } - if = { - limit = { has_variable = slavery_recently_abolished } - custom_tooltip = { - text = enslave_discriminated_farm_workers_tt - every_scope_state = { - limit = { has_variable = former_slave_state } - enslave_discriminated_farm_workers = yes - } - } - remove_variable = slavery_recently_abolished - every_scope_state = { - remove_variable = former_slave_state - } - } - - ig:ig_landowners ?= { - if = { - limit = { - NOT = { has_ideology = ideology:ideology_pro_slavery } - } - add_ideology = ideology_pro_slavery - } - } - } - - modifier = { - interest_group_ig_landowners_pol_str_mult = 0.5 - } - - ai_will_do = { - exists = ruler - ruler = { - has_ideology = ideology:ideology_slaver - } - } - - ai_enact_weight_modifier = { #Petitions - value = 0 - - if = { - limit = { ai_has_enact_weight_modifier_journal_entries = yes } - add = 750 - } - } -} - -law_legacy_slavery = { - group = lawgroup_slavery - - progressiveness = 50 - - icon = "gfx/interface/icons/law_icons/legacy_slavery.dds" - - # no need to add disallowing_laws here since it can only be enacted from Slave Trade - - unlocking_laws = { - law_slave_trade - } - - on_activate = { - if = { - limit = { has_variable = slavery_recently_abolished } - custom_tooltip = { - text = enslave_discriminated_farm_workers_tt - every_scope_state = { - limit = { has_variable = former_slave_state } - enslave_discriminated_farm_workers = yes - } - } - remove_variable = slavery_recently_abolished - every_scope_state = { - remove_variable = former_slave_state - } - } - - ig:ig_landowners ?= { - if = { - limit = { - NOT = { has_ideology = ideology:ideology_pro_slavery } - } - add_ideology = ideology_pro_slavery - } - } - } - - modifier = { - interest_group_ig_landowners_pol_str_mult = 0.25 - } - - ai_enact_weight_modifier = { - value = 0 - #Brazilian AI is more likely to pursue legacy slavery if there are no abolitionists in power. - if = { - limit = { - c:BRZ ?= this - has_law = law_type:law_slave_trade - NOR = { - any_interest_group = { - is_in_government = yes - leader = { - has_ideology = ideology:ideology_abolitionist - } - } - ruler = { has_ideology = ideology:ideology_abolitionist } - heir = { has_ideology = ideology:ideology_abolitionist } - } - scope:law = law_type:law_legacy_slavery - } - add = 50 - } - # Brazilian AI is more likely to pursue legacy slavery if the Aberdeen Act is being enforced - if = { - limit = { - c:BRZ ?= this - has_law = law_type:law_slave_trade - has_modifier = aberdeen_act_enforced_brz - scope:law = law_type:law_legacy_slavery - } - add = 50 - } - #Petitions - if = { - limit = { ai_has_enact_weight_modifier_journal_entries = yes } - add = 750 - } - } -} diff --git a/common/modifier_type_definitions/cwp_unwanted_modifiers.txt b/common/modifier_type_definitions/cwp_unwanted_modifiers.txt index fa57e96e2..719ca251f 100644 --- a/common/modifier_type_definitions/cwp_unwanted_modifiers.txt +++ b/common/modifier_type_definitions/cwp_unwanted_modifiers.txt @@ -70,8 +70,3 @@ country_clergymen_voting_power_add = { color = neutral percent = yes } - -state_slaves_mortality_mult = { - color = neutral - percent = yes -} diff --git a/common/on_actions/00_code_on_actions.txt b/common/on_actions/00_code_on_actions.txt index 762828c65..73922fce2 100755 --- a/common/on_actions/00_code_on_actions.txt +++ b/common/on_actions/00_code_on_actions.txt @@ -452,7 +452,6 @@ on_yearly_pulse_country = { historical_agitators_yearly_events famine_yearly_events delay = { days = 13 } - slavery_abolition_yearly_events delay = { days = 21 } lobby_yearly_events delay = { days = 34 } @@ -1127,26 +1126,6 @@ on_country_released_as_independent = { add_homeland = cu:ashkenazi } } - if = { - limit = { - scope:target ?= { - OR = { - country_has_primary_culture = cu:afro_caribbean - country_has_primary_culture = cu:afro_antillean - country_has_primary_culture = cu:afro_american - country_has_primary_culture = cu:afro_caribeno - country_has_primary_culture = cu:afro_brazilian - } - OR = { - has_law = law_type:law_legacy_slavery - has_law = law_type:law_slave_trade - } - } - } - scope:target ?= { - trigger_event = { id = slave_revolt_events.1 days = 0 } - } - } } } @@ -1745,8 +1724,6 @@ on_law_checkpoint_advance = { 10 = rights_of_women_laws.1 10 = rights_of_women_laws.2 10 = internal_security_events.2 - 10 = slavery_law_events.1 - 10 = slavery_law_events.4 10 = laws_police.1 10 = anarchy.3 10 = tax.2 @@ -1844,8 +1821,6 @@ on_law_checkpoint_debate = { 10 = free_speech_laws.5 10 = free_speech_laws.6 10 = internal_security_events.3 - 10 = slavery_law_events.2 - 10 = slavery_law_events.5 10 = laws_police.2 10 = anarchy.2 10 = tax.3 @@ -1947,8 +1922,6 @@ on_law_checkpoint_stall = { 10 = bureaucracy.1 10 = rights_of_women_laws.3 10 = internal_security_events.1 - 10 = slavery_law_events.3 - 10 = slavery_law_events.6 10 = laws_police.3 10 = anarchy.1 10 = tax.1 @@ -2060,51 +2033,6 @@ on_law_enactment_pass = { } set_variable = achievement_amish_paradise_var } - if = { - limit = { - OR = { - has_modifier = unrestricted_slave_trade_modifier - has_modifier = restricted_slave_trade_modifier - has_modifier = slave_shipments_intercepted_small - has_modifier = slave_shipments_intercepted_large - } - has_law = law_type:law_slave_trade - OR = { - is_enacting_law = law_type:law_debt_slavery - is_enacting_law = law_type:law_legacy_slavery - } - } - if = { - limit = { - has_modifier = unrestricted_slave_trade_modifier - } - remove_modifier = unrestricted_slave_trade_modifier - } - if = { - limit = { - has_modifier = restricted_slave_trade_modifier - } - remove_modifier = restricted_slave_trade_modifier - } - if = { - limit = { - has_modifier = slave_shipments_intercepted_small - } - remove_modifier = slave_shipments_intercepted_small - } - if = { - limit = { - has_modifier = slave_shipments_intercepted_large - } - remove_modifier = slave_shipments_intercepted_large - } - if = { - limit = { - has_variable = var_slave_trade_suppression_var - } - remove_variable = var_slave_trade_suppression_var - } - } } } diff --git a/common/on_actions/00_on_actions_yearly.txt b/common/on_actions/00_on_actions_yearly.txt index 2bdd158aa..b2e61a66f 100755 --- a/common/on_actions/00_on_actions_yearly.txt +++ b/common/on_actions/00_on_actions_yearly.txt @@ -174,11 +174,6 @@ on_yearly_events = { 30 = cholera.1 - # Slave revolts - 5 = slave_revolt.1 - 5 = slave_revolt.2 - 5 = slave_revolt.3 - # Discrimination Events 10 = discrimination_events.1 10 = discrimination_events.2 @@ -291,14 +286,6 @@ historical_agitators_yearly_events = { } } -# Slavery Abolition -slavery_abolition_yearly_events = { - random_events = { - chance_to_happen = 20 - 1 = slavery_law_events.7 - } -} - # Lobby Events lobby_yearly_events = { random_events = { diff --git a/common/political_movement_pop_support/00_political_movement_pop_support.txt b/common/political_movement_pop_support/00_political_movement_pop_support.txt index f9ffca7ec..f3cf0182e 100755 --- a/common/political_movement_pop_support/00_political_movement_pop_support.txt +++ b/common/political_movement_pop_support/00_political_movement_pop_support.txt @@ -13,16 +13,6 @@ movement_support_low_urbanization = { name = POP_LOW_URBANIZATION } -movement_support_slave_state = { - name = SLAVE_STATE - - visible = { - owner ?= { - any_scope_state = { is_slave_state = yes } - } - } -} - movement_support_colonial_settlers = { name = COLONIAL_SETTLERS @@ -165,10 +155,6 @@ movement_support_shopkeepers = { name = POP_SHOPKEEPERS } -movement_support_slaves = { - name = POP_SLAVES -} - movement_support_soldiers = { name = POP_SOLDIERS } diff --git a/common/political_movements/00_ideological_movements.txt b/common/political_movements/00_ideological_movements.txt index 1240d1e9e..96fb256e8 100755 --- a/common/political_movements/00_ideological_movements.txt +++ b/common/political_movements/00_ideological_movements.txt @@ -1,729 +1,6 @@ # This file contains only vanilla political movements that need to be modified to work with CWP # Do not add any non-vanilla political movements here -movement_anti_slavery = { - category = movement_category_ideological - - ideology = ideology_anti_slavery_movement - character_ideologies = { - ideology_abolitionist - ideology_humanitarian - } - - disband_trigger = { - has_law = law_type:law_slavery_banned - } - on_disbanded = {} - - creation_trigger = { - NOT = { has_law = law_type:law_slavery_banned } - } - creation_weight = { - value = 100 - } - on_created = { - add_movement_enthusiasm_modifier = yes - } - - character_support_trigger = { - OR = { - has_ideology = ideology:ideology_abolitionist - has_ideology = ideology:ideology_humanitarian - has_ideology = ideology:ideology_humanitarian_royalist - OR = { - is_interest_group_type = ig_intelligentsia - is_interest_group_type = ig_trade_unions - } - } - } - character_support_weight = { - value = 200 - if = { - limit = { - OR = { - has_ideology = ideology:ideology_abolitionist - has_ideology = ideology:ideology_humanitarian - has_ideology = ideology:ideology_humanitarian_royalist - } - } - multiply = { - value = 5 - } - } - } - - pop_support_factors = { - movement_support_high_urbanization - movement_support_high_literacy - movement_support_capitalists - movement_support_academics - movement_support_clergymen - movement_support_bureaucrats - movement_support_clerks - movement_support_slaves - } - - pop_support_weight = { - if = { - limit = { - exists = scope:political_movement - scope:political_movement ?= { - OR = { - is_being_suppressed = yes - is_being_bolstered = yes - } - } - } - if = { - limit = { - scope:political_movement = { - is_being_suppressed = yes - } - } - add = { - value = suppression_base_value - multiply = { - value = -0.5 - add = owner.modifier:country_suppression_attraction_factor - } - desc = "concept_suppressed" - } - } - else = { - add = { - value = bolstering_base_value - multiply = { - value = 0.5 - add = owner.modifier:country_bolster_attraction_factor - } - desc = "concept_bolstered" - } - } - } - add = { - desc = "URBAN_STATE" - value = 3 - multiply = state.state_urbanization_rate - } - - if = { - limit = { - strata = upper - } - if = { - limit = { - is_pop_type = capitalists - } - add = { - value = 12 - desc = "POP_CAPITALISTS" - } - } - else = { - add = { - value = 3 - desc = "UPPER_NO_ICON" - } - } - } - else_if = { - limit = { - strata = middle - } - if = { - limit = { - is_pop_type = academics - } - add = { - value = 25 - desc = "POP_ACADEMICS" - } - } - else_if = { - limit = { - is_pop_type = clergymen - } - add = { - value = 25 - desc = "POP_CLERGYMEN" - } - } - else_if = { - limit = { - is_pop_type = bureaucrats - } - add = { - value = 15 - desc = "POP_BUREAUCRATS" - } - } - else = { - add = { - value = 10 - desc = "MIDDLE_NO_ICON" - } - } - } - else_if = { - limit = { - strata = lower - } - if = { - limit = { - is_pop_type = clerks - } - add = { - value = 10 - desc = "POP_CLERKS" - } - } - else_if = { - limit = { - is_pop_type = slaves - } - add = { - value = 30 - desc = "POP_SLAVES" - } - } - else = { - add = { - value = 3 - desc = "LOWER_NO_ICON" - } - } - } - - if = { - limit = { - owner = { - has_law = law_type:law_legacy_slavery - OR = { - country_has_primary_culture = cu:american - } - } - } - multiply = { - desc = "SLAVE_STATE" - value = 1.0 - - if = { - limit = { - state = { is_slave_state = yes } - } - - if = { - limit = { - OR = { - is_pop_type = aristocrats - is_pop_type = clergymen - is_pop_type = officers - is_pop_type = farmers - } - } - - subtract = 0.95 - } - else = { - subtract = 0.75 - } - } - } - } - else = { - multiply = { - desc = "SLAVE_STATE" - value = 1.0 - if = { - limit = { - state = { is_slave_state = yes } - OR = { - is_pop_type = aristocrats - is_pop_type = clergymen - is_pop_type = officers - is_pop_type = farmers - } - } - subtract = 0.5 - } - } - } - - multiply = { # Illiterate pops participate at 1/10 the rate of fully literate pops - desc = "POP_LITERACY" - value = literacy_rate - add = 0.10 - } - - if = { - limit = { - owner ?= { - has_law_commitment = law_type:law_slavery_banned - } - } - multiply = { - desc = "law_commitment" - value = 2.0 - } - } - } - - revolution = { - possible = { - political_movement_support >= 0.05 - } - - weight = { - value = 100 - } - - state_weight = { - value = 1 - if = { - limit = { - is_slave_state = yes - NOT = { has_variable = former_free_state } - } - if = { - limit = { - owner ?= { - OR = { - has_law = law_type:law_legacy_slavery - has_variable = slavery_recently_enacted - } - any_scope_state = { - OR = { - is_slave_state = no - has_variable = former_free_state - } - } - } - } - multiply = 0.0 - } - else = { - multiply = 0.25 - } - } - - if = { - limit = { is_capital = yes } - if = { - limit = { owner ?= { has_law = law_type:law_slavery_banned } } - multiply = 10.0 - } - else = { - multiply = 0.1 - } - } - } - } - - secession = { - possible = { - political_movement_support >= 0.05 - OR = { - scope:clout <= 0 - owner = { - OR = { - has_law = law_type:law_legacy_slavery - has_variable = slavery_recently_enacted - } - } - } - } - - weight = { - value = 50 - } - - state_weight = { - value = 1 - if = { - limit = { - is_slave_state = yes - NOT = { has_variable = former_free_state } - } - if = { - limit = { - owner ?= { - OR = { - has_law = law_type:law_legacy_slavery - has_variable = slavery_recently_enacted - } - any_scope_state = { - OR = { - is_slave_state = no - has_variable = former_free_state - } - } - } - } - multiply = 0.0 - } - else = { - multiply = 0.25 - } - } - } - } - - additional_radicalism_factors = { - if = { - limit = { - owner.ruler ?= { - OR = { - has_ideology = ideology:ideology_jacksonian_democrat - has_ideology = ideology:ideology_slaver - } - } - } - - add = { - value = 0.1 - desc = "RULER_IS_PRO_SLAVERY" - } - } - - add = { - value = 10 - subtract = "owner.average_sol_for_slaves" - multiply = 0.05 - max = 0.5 - min = -0.25 - desc = "STANDARD_OF_LIVING_FOR_SLAVES" - } - } -} - -movement_pro_slavery = { - category = movement_category_ideological - - ideology = ideology_pro_slavery_movement - character_ideologies = { - ideology_slaver - ideology_jacksonian_democrat - } - - creation_trigger = { - NOT = { has_law = law_type:law_slavery_banned } - } - creation_weight = { - value = 100 - } - on_created = { - add_movement_enthusiasm_modifier = yes - } - - character_support_trigger = { - OR = { - has_ideology = ideology:ideology_slaver - has_ideology = ideology:ideology_jacksonian_democrat - } - scope:interest_group ?= { - has_ideology = ideology:ideology_pro_slavery - } - } - character_support_weight = { - value = 200 - if = { - limit = { - OR = { - has_ideology = ideology:ideology_slaver - } - } - multiply = { - value = 5 - } - } - } - - pop_support_trigger = { - state = { is_slave_state = yes } - } - - pop_support_factors = { - movement_support_slave_state - movement_support_high_literacy - movement_support_aristocrats - movement_support_farmers - movement_support_clergymen - movement_support_officers - movement_support_clergymen - } - - pop_support_weight = { - if = { - limit = { - exists = scope:political_movement - scope:political_movement ?= { - OR = { - is_being_suppressed = yes - is_being_bolstered = yes - } - } - } - if = { - limit = { - scope:political_movement = { - is_being_suppressed = yes - } - } - add = { - value = suppression_base_value - multiply = { - value = -0.5 - add = owner.modifier:country_suppression_attraction_factor - } - desc = "concept_suppressed" - } - } - else = { - add = { - value = bolstering_base_value - multiply = { - value = 0.5 - add = owner.modifier:country_bolster_attraction_factor - } - desc = "concept_bolstered" - } - } - } - add = { - value = 9 - desc = "SLAVE_STATE" - } - - if = { - limit = { - is_pop_type = aristocrats - } - add = { - value = 45 - desc = "POP_ARISTOCRATS" - } - } - else_if = { - limit = { - is_pop_type = farmers - } - add = { - value = 15 - desc = "POP_FARMERS" - } - } - 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.10 - } - } - - revolution = { - possible = { - political_movement_support >= 0.05 - } - - weight = { - value = 100 - } - - state_weight = { - value = 1 - if = { - limit = { - is_slave_state = no - NOT = { has_variable = former_slave_state } - } - if = { - limit = { - owner ?= { - OR = { - has_law = law_type:law_legacy_slavery - has_variable = slavery_recently_abolished - } - any_scope_state = { - OR = { - is_slave_state = yes - has_variable = former_slave_state - } - } - } - } - multiply = 0.0 - } - else = { - multiply = 0.25 - } - } - - if = { - limit = { is_capital = yes } - if = { - limit = { owner ?= { NOT = { has_law = law_type:law_slavery_banned } } } - multiply = 10.0 - } - else = { - multiply = 0.1 - } - } - } - } - - secession = { - possible = { - political_movement_support >= 0.05 - OR = { - scope:clout <= 0 - owner = { - OR = { - has_law = law_type:law_legacy_slavery - has_variable = slavery_recently_abolished - } - } - } - } - - weight = { - value = 10 - - if = { - limit = { - OR = { - owner ?= { - has_variable = slavery_recently_abolished - } - scope:clout <= 0 - } - } - add = 1000 - } - } - - state_weight = { - value = 1 - if = { - limit = { - is_slave_state = no - NOT = { has_variable = former_slave_state } - } - if = { - limit = { - owner ?= { - OR = { - has_law = law_type:law_legacy_slavery - has_variable = slavery_recently_abolished - } - any_scope_state = { - OR = { - is_slave_state = yes - has_variable = former_slave_state - } - } - } - } - multiply = 0.0 - } - else = { - multiply = 0.25 - } - } - } - } - - additional_radicalism_factors = { - if = { - limit = { - owner.ruler ?= { has_ideology = ideology:ideology_abolitionist } - } - - add = { - value = 0.1 - desc = "RULER_IS_ANTI_SLAVERY" - } - } - - if = { - limit = { - owner.army_size > 0 - owner = { NOT = { has_law = law_type:law_slavery_banned } } - } - - add = { - owner = { - every_scope_building = { - limit = { - is_building_type = building_barracks - state = { is_slave_state = yes } - } - add = this.level - } - } - - divide = { - value = owner.army_size - min = 1 - } - - subtract = 0.5 - multiply = -1 - min = 0 - max = 0.5 - desc = "ARMY_FRACTION_IN_SLAVE_STATES" - } - } - - if = { - limit = { - owner.navy_size > 0 - owner = { NOT = { has_law = law_type:law_slavery_banned } } - } - - add = { - owner = { - every_scope_building = { - limit = { - is_building_type = building_naval_base - state = { is_slave_state = yes } - } - add = this.level - } - } - - divide = { - value = owner.navy_size - min = 1 - } - - subtract = 0.5 - multiply = -0.5 - min = 0 - max = 0.25 - desc = "NAVY_FRACTION_IN_SLAVE_STATES" - } - } - } -} - movement_royalist_absolutist = { category = movement_category_ideological @@ -816,11 +93,7 @@ movement_royalist_absolutist = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_ruler_popularity @@ -1139,11 +412,7 @@ movement_royalist_constitutional = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_ruler_popularity @@ -1493,11 +762,7 @@ movement_labor = { # Explicitly non-socialist labour movement } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_urbanization @@ -1881,7 +1146,6 @@ movement_socialist = { NOR = { is_pop_type = capitalists is_pop_type = aristocrats - is_pop_type = slaves } } @@ -2215,7 +1479,6 @@ movement_anarchist = { NOR = { is_pop_type = capitalists is_pop_type = aristocrats - is_pop_type = slaves } } @@ -2526,7 +1789,6 @@ movement_communist = { NOR = { is_pop_type = capitalists is_pop_type = aristocrats - is_pop_type = slaves } } @@ -2828,11 +2090,7 @@ movement_fascist = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_literacy @@ -3204,11 +2462,7 @@ movement_corporatist = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_literacy @@ -3516,11 +2770,7 @@ movement_liberal = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_urbanization @@ -3837,7 +3087,6 @@ movement_radical = { pop_support_trigger = { NOR = { is_pop_type = aristocrats - is_pop_type = slaves AND = { is_pop_type = clergymen religion = owner.religion @@ -4185,7 +3434,6 @@ movement_nihilist = { is_pop_type = peasants is_pop_type = aristocrats is_pop_type = clergymen - is_pop_type = slaves } } @@ -4451,7 +3699,6 @@ movement_positivist = { NOR = { is_pop_type = clergymen is_pop_type = peasants - is_pop_type = slaves } } @@ -4783,7 +4030,6 @@ movement_land_reform = { pop_support_trigger = { NOR = { is_pop_type = aristocrats - is_pop_type = slaves } } @@ -5047,11 +4293,7 @@ movement_feminist = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_urbanization @@ -5239,7 +4481,6 @@ movement_reactionary = { has_law = law_type:law_traditionalism has_law = law_type:law_serfdom } - has_law = law_type:law_slavery_banned country_has_voting_franchise = yes NOT = { # Reactionary and Legitimist movements cannot co-exist OR = { @@ -5341,11 +4582,7 @@ movement_reactionary = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_literacy @@ -5699,7 +4936,6 @@ movement_modernizer = { NOR = { is_pop_type = clergymen is_pop_type = peasants - is_pop_type = slaves } } diff --git a/common/political_movements/04_country_specific_ideological_movements.txt b/common/political_movements/04_country_specific_ideological_movements.txt index f8d3ba6e1..1bb3a9c9a 100755 --- a/common/political_movements/04_country_specific_ideological_movements.txt +++ b/common/political_movements/04_country_specific_ideological_movements.txt @@ -74,7 +74,6 @@ movement_utilitarian = { NOR = { is_pop_type = laborers is_pop_type = peasants - is_pop_type = slaves } } @@ -388,11 +387,7 @@ movement_orleanist = { } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_urbanization @@ -658,11 +653,7 @@ movement_bonapartist = { } } } - pop_support_trigger = { - NOT = { - is_pop_type = slaves - } - } + pop_support_factors = { movement_support_high_literacy @@ -944,7 +935,6 @@ movement_legitimist = { pop_support_trigger = { NOT = { - is_pop_type = slaves } religion = rel:catholic } diff --git a/common/scripted_effects/00_scripted_effects.txt b/common/scripted_effects/00_scripted_effects.txt index ff801c0e0..ea81de9c0 100755 --- a/common/scripted_effects/00_scripted_effects.txt +++ b/common/scripted_effects/00_scripted_effects.txt @@ -87,38 +87,6 @@ scripted_effect_parties_disappearence = { deactivate_parties = yes } -liberate_slaves = { - every_scope_pop = { - limit = { - is_pop_type = slaves - } - if = { - limit = { - is_employed = yes - } - change_poptype = workplace.type.slaves_role - } - else = { - change_poptype = pop_type:laborers - } - } -} - -enslave_discriminated_farm_workers = { - every_scope_pop = { - limit = { - is_pop_type = laborers - pop_acceptance < acceptance_status_4 - OR = { - pop_employment_building_group = bg_agriculture - pop_employment_building_group = bg_ranching - pop_employment_building_group = bg_plantations - } - } - change_poptype = pop_type:slaves - } -} - save_revolution_scopes = { random_civil_war = { save_scope_as = ongoing_revolution diff --git a/common/scripted_effects/00_victoria_scripted_effects.txt b/common/scripted_effects/00_victoria_scripted_effects.txt index 36c2c30c9..8ef2eb85d 100644 --- a/common/scripted_effects/00_victoria_scripted_effects.txt +++ b/common/scripted_effects/00_victoria_scripted_effects.txt @@ -791,64 +791,6 @@ set_ideology = ideology:ideology_republican_leader } - 50 = { - trigger = { - ideology_abolitionist_valid_trigger = yes - scope:exiling_country_scope ?= { - NOT = { - ruler = { - has_ideology = ideology:ideology_abolitionist - } - } - OR = { - has_law = law_type:law_serfdom - NOT = { - has_law = law_type:law_slavery_banned - } - } - } - } - modifier = { - if = { - limit = { - scope:exiling_country_scope ?= { - has_law = law_type:law_serfdom - } - } - add = 25 - } - if = { - limit = { - scope:exiling_country_scope ?= { - NOT = { - has_law = law_type:law_slavery_banned - } - } - } - add = 25 - } - if = { - limit = { - scope:exiling_country_scope ?= { - has_law = law_type:law_slave_trade - } - } - add = 50 - } - if = { - limit = { - this.interest_group = { - is_interest_group_type = ig_landowners - } - } - multiply = { - value = 0.05 - } - } - } - set_ideology = ideology:ideology_abolitionist - } - 50 = { trigger = { ideology_positivist_valid_trigger = yes @@ -1452,7 +1394,6 @@ conservative_agitator_election_scope_effect = { } OR = { has_ideology = ideology:ideology_traditionalist - has_ideology = ideology:ideology_slaver this.interest_group = { is_member_of_party = owner.py:conservative_party } diff --git a/common/treaty_articles/_cwp_replace_20_law_commitment.txt b/common/treaty_articles/_cwp_replace_20_law_commitment.txt index 9c3711e5d..628159063 100644 --- a/common/treaty_articles/_cwp_replace_20_law_commitment.txt +++ b/common/treaty_articles/_cwp_replace_20_law_commitment.txt @@ -373,7 +373,6 @@ this = law_type:law_no_home_affairs this = law_type:law_serfdom this = law_type:law_no_police - this = law_type:law_debt_slavery this = law_type:law_consumption_based_taxation this = law_type:law_no_social_security } @@ -425,20 +424,6 @@ } } - if = { - limit = { - scope:article.input_law = law_type:law_slavery_banned - OR = { - has_strategy = ai_strategy_egalitarian_agenda - has_strategy = ai_strategy_progressive_agenda - } - } - add = { - desc = "DIPLOMATIC_ACCEPTANCE_ANTI_SLAVERY" - value = 25 - } - } - if = { limit = { scope:article.input_law = law_type:law_council_republic @@ -485,20 +470,6 @@ } } - if = { - limit = { - scope:article.input_law = law_type:law_slavery_banned - OR = { - has_strategy = ai_strategy_egalitarian_agenda - has_strategy = ai_strategy_progressive_agenda - } - } - add = { - desc = "DIPLOMATIC_ACCEPTANCE_ANTI_SLAVERY" - value = 25 - } - } - if = { limit = { scope:article.input_law = law_type:law_free_trade @@ -612,12 +583,6 @@ wargoal_score_multiplier = { value = 1 - - if = { - limit = { - scope:article.input_law ?= law_type:law_slavery_banned - } - } } } diff --git a/events/vanilla_events/agitators_events/agitators_election_events.txt b/events/vanilla_events/agitators_events/agitators_election_events.txt index 1ba4882ac..549c93d3c 100755 --- a/events/vanilla_events/agitators_events/agitators_election_events.txt +++ b/events/vanilla_events/agitators_events/agitators_election_events.txt @@ -4196,165 +4196,6 @@ agitators_election_events.31 = { } } -agitators_election_events.32 = { - type = country_event - placement = root - - duration = 3 - - title = agitators_election_events.32.t - desc = agitators_election_events.32.d - flavor = agitators_election_events.32.f - - event_image = { - video = "votp_agitator_speaking" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_election.dds" - - cooldown = { days = very_long_modifier_time } - - trigger = { - in_election_campaign = yes - any_scope_character = { - has_role = agitator - NOT = { - has_variable = agitator_election_participation - } - OR = { - has_ideology = ideology:ideology_reformer - has_ideology = ideology:ideology_humanitarian - has_ideology = ideology:ideology_humanitarian_royalist - has_ideology = ideology:ideology_market_liberal - trigger_if = { - limit = { - this.interest_group = { - has_party = yes - } - } - this.interest_group.party = { - is_party_type = liberal_party - } - } - } - OR = { - law_stance = { - law = law_type:law_slavery_banned - value > neutral - } - AND = { - law_stance = { - law = law_type:law_slavery_banned - value > strongly_approve # Equals 'count' - } - interest_group = { - law_stance = { - law = law_type:law_slavery_banned - value > neutral - } - NOT = { - law_stance = { - law = law_type:law_slavery_banned - value > strongly_approve # Equals 'count' - } - } - } - } - } - } - any_active_party = { - is_party_type = liberal_party - } - NOT = { - has_law = law_type:law_slavery_banned - } - } - - cancellation_trigger = { - OR = { - scope:agitator_scope = { - is_character_alive = no - } - NOT = { - exists = scope:agitator_scope - } - in_election_campaign = no - } - } - - immediate = { - liberal_agitator_election_scope_effect = yes - if = { - limit = { - any_interest_group = { - leader = { - has_ideology = ideology:ideology_slaver - } - } - } - random_interest_group = { - limit = { - leader = { - has_ideology = ideology:ideology_slaver - } - } - save_scope_as = slaver_ig_scope - } - } - else = { - random_interest_group = { - limit = { - law_stance = { - law = law_type:law_slavery_banned - value < neutral - } - } - save_scope_as = slaver_ig_scope - } - } - capital = { - save_scope_as = capital_scope - } - scope:agitator_scope = { - set_variable = { name = agitator_election_participation days = 180 } - } - } - - option = { - name = agitators_election_events.32.a - default_option = yes - scope:agitator_party_scope = { - add_momentum = momentum_large - } - scope:slaver_ig_scope = { - add_modifier = { - name = modifier_slavers_upset_by_election - days = normal_modifier_time - multiplier = 0.5 - } - } - } - - option = { - name = agitators_election_events.32.b - add_modifier = { - name = modifier_liberal_slavery_banned_support - days = normal_modifier_time - } - scope:agitator_party_scope = { - add_momentum = momentum_small - } - scope:slaver_ig_scope = { - add_modifier = { - name = modifier_slavers_upset_by_election - days = normal_modifier_time - } - } - } -} - agitators_election_events.33 = { type = country_event placement = root @@ -4829,7 +4670,6 @@ agitators_election_events.36 = { } OR = { has_ideology = ideology:ideology_traditionalist - has_ideology = ideology:ideology_slaver trigger_if = { limit = { this.interest_group = { @@ -4952,7 +4792,6 @@ agitators_election_events.37 = { } OR = { has_ideology = ideology:ideology_traditionalist - has_ideology = ideology:ideology_slaver trigger_if = { limit = { this.interest_group = { @@ -5196,7 +5035,6 @@ agitators_election_events.38 = { } OR = { has_ideology = ideology:ideology_traditionalist - has_ideology = ideology:ideology_slaver trigger_if = { limit = { this.interest_group = { @@ -5357,7 +5195,6 @@ agitators_election_events.39 = { } OR = { has_ideology = ideology:ideology_traditionalist - has_ideology = ideology:ideology_slaver trigger_if = { limit = { this.interest_group = { @@ -5445,148 +5282,6 @@ agitators_election_events.39 = { } } -agitators_election_events.40 = { - type = country_event - placement = root - - duration = 3 - - title = agitators_election_events.40.t - desc = agitators_election_events.40.d - flavor = agitators_election_events.40.f - - event_image = { - video = "southamerica_election" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_election.dds" - - cooldown = { days = very_long_modifier_time } - - trigger = { - in_election_campaign = yes - any_scope_character = { - has_role = agitator - NOT = { - has_ideology = ideology:ideology_abolitionist - } - NOT = { - has_variable = agitator_election_participation - } - OR = { - has_ideology = ideology:ideology_traditionalist - has_ideology = ideology:ideology_slaver - trigger_if = { - limit = { - this.interest_group = { - has_party = yes - } - } - this.interest_group.party = { - is_party_type = conservative_party - } - } - } - } - any_active_party = { - is_party_type = conservative_party - } - any_scope_culture = { - ROOT = { - cultural_acceptance_base = { target = prev.culture value < acceptance_status_5 } - } - root = { - culture_percent_country = { - target = prev - value >= 0.05 - } - } - } - } - - cancellation_trigger = { - OR = { - scope:agitator_scope = { - is_character_alive = no - } - NOT = { - exists = scope:agitator_scope - } - in_election_campaign = no - } - } - - immediate = { - conservative_agitator_election_scope_effect = yes - random_interest_group = { - limit = { - law_stance = { - law = law_type:law_slavery_banned - value >= approve - } - } - save_scope_as = abolitionist_ig - } - random_scope_culture = { - limit = { - ROOT = { - cultural_acceptance_base = { target = prev.culture value < acceptance_status_5 } - culture_percent_country = { - target = prev - value >= 0.05 - } - } - } - save_scope_as = discrim_culture - } - scope:agitator_scope = { - set_variable = { name = agitator_election_participation days = 180 } - } - } - - option = { - name = agitators_election_events.40.a - default_option = yes - scope:agitator_party_scope = { - add_momentum = momentum_small - } - } - - option = { - name = agitators_election_events.40.b - scope:agitator_party_scope = { - add_momentum = momentum_large - } - add_radicals = { - value = medium_radicals - culture = scope:discrim_culture - } - } - - option = { - name = agitators_election_events.40.c - trigger = { - NOT = { - has_law = law_type:law_slavery_banned - } - } - highlighted_option = yes - add_radicals = { - value = medium_radicals - pop_type = slaves - } - add_radicals = { - value = small_radicals - interest_group = scope:abolitionist_ig - } - scope:agitator_party_scope = { - add_momentum = momentum_small - } - } -} - agitators_election_events.41 = { type = country_event placement = root @@ -6024,20 +5719,12 @@ agitators_election_events.44 = { } } OR = { - law_stance = { - law = law_type:law_slavery_banned - value < neutral - } AND = { law_stance = { law = law_type:law_universal_suffrage value > strongly_approve # Equals 'count' } interest_group = { - law_stance = { - law = law_type:law_slavery_banned - value < neutral - } NOT = { law_stance = { law = law_type:law_universal_suffrage diff --git a/events/vanilla_events/agitators_events/slave_revolt_events.txt b/events/vanilla_events/agitators_events/slave_revolt_events.txt deleted file mode 100755 index 671346515..000000000 --- a/events/vanilla_events/agitators_events/slave_revolt_events.txt +++ /dev/null @@ -1,70 +0,0 @@ -namespace = slave_revolt_events - -# The Edict of Abolition (?) -slave_revolt_events.1 = { - type = country_event - placement = root - event_image = { - video = "southamerica_slave_chains" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_scales.dds" - - title = slave_revolt_events.1.t - desc = slave_revolt_events.1.d - flavor = slave_revolt_events.1.f - - duration = 3 - - trigger = { - # triggered by on_created - } - - immediate = { - random_primary_culture = { - limit = { - OR = { - this = cu:afro_caribbean - this = cu:afro_antillean - this = cu:afro_american - this = cu:afro_caribeno - this = cu:afro_brazilian - } - } - save_scope_as = freed_slave_culture_scope - } - } - - option = { # Slavery is abolished - name = slave_revolt_events.1.a - default_option = yes - activate_law = law_type:law_slavery_banned - add_loyalists = { - value = small_radicals - culture = scope:freed_slave_culture_scope - } - ai_chance = { - base = 95 - } - } - option = { # The awful Dessalines-ish option. Slavery remains. - name = slave_revolt_events.1.b - highlighted_option = yes - trigger = { - OR = { - has_law = law_type:law_autocracy - has_law = law_type:law_oligarchy - } - } - change_infamy = 10 - add_radicals = { - value = very_large_radicals - culture = scope:freed_slave_culture_scope - } - ai_chance = { - base = 5 - } - } -} diff --git a/events/vanilla_events/communism.txt b/events/vanilla_events/communism.txt index accfdaca7..8e32adf4b 100755 --- a/events/vanilla_events/communism.txt +++ b/events/vanilla_events/communism.txt @@ -80,21 +80,6 @@ communism.1 = { custom_tooltip = communist_unions.tt } } - option = { # ban slavery - name = communism.1.b - trigger = { - NOT = { has_law = law_type:law_slavery_banned } - } - activate_law = law_type:law_slavery_banned - if = { - limit = { - any_interest_group = { - has_variable = communist_ig_var - } - } - custom_tooltip = communist_unions.tt - } - } option = { # Regulatory bodies name = communism.1.c trigger = { diff --git a/events/vanilla_events/diplomatic_friction_events.txt b/events/vanilla_events/diplomatic_friction_events.txt index cce575afd..141daa04a 100755 --- a/events/vanilla_events/diplomatic_friction_events.txt +++ b/events/vanilla_events/diplomatic_friction_events.txt @@ -228,90 +228,3 @@ diplomatic_friction.3 = { # Soldiers from another country cross the Border } } } - - -diplomatic_friction.20 = { #Condemn Slavery - type = country_event - placement = ROOT - - title = diplomatic_friction.20.t - desc = diplomatic_friction.20.d - flavor = diplomatic_friction.20.f - - event_image = { - video = "unspecific_ruler_speaking_to_people" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - duration = 3 - - trigger = { - has_law = law_type:law_slavery_banned - country_rank >= rank_value:major_power - any_country = { - country_rank >= rank_value:major_power - has_diplomatic_pact = { - who = root - type = rivalry - } - relations:root <= relations_threshold:cold - OR = { - has_law = law_type:law_debt_slavery - has_law = law_type:law_slave_trade - has_law = law_type:law_legacy_slavery - } - } - } - - immediate = { - random_country = { - limit = { - country_rank >= rank_value:major_power - has_diplomatic_pact = { - who = root - type = rivalry - } - relations:root <= relations_threshold:cold - OR = { - has_law = law_type:law_debt_slavery - has_law = law_type:law_slave_trade - has_law = law_type:law_legacy_slavery - } - } - save_scope_as = rival_scope - } - } - - option = { # - name = diplomatic_friction.20.a - default_option = yes - add_modifier = { - name = condemning_slavery - days = normal_modifier_time - } - scope:rival_scope = { - add_modifier = { - name = slavery_practice_condemned - days = normal_modifier_time - } - - hidden_effect = { post_notification = rival_comdemns_slavery } - } - } - - option = { #Opt out - name = diplomatic_friction.20.b - ig:ig_intelligentsia = { - add_modifier = { - name = refused_condemning_slavery - days = normal_modifier_time - } - } - } -} - - - - - diff --git a/events/vanilla_events/law_events/corporate_state_events.txt b/events/vanilla_events/law_events/corporate_state_events.txt index e7c42cd6e..daff59c4b 100755 --- a/events/vanilla_events/law_events/corporate_state_events.txt +++ b/events/vanilla_events/law_events/corporate_state_events.txt @@ -274,7 +274,6 @@ corporate_state.3 = { is_employed = yes NOR = { is_pop_type = peasants - is_pop_type = slaves } standard_of_living < state.average_expected_sol } @@ -293,7 +292,6 @@ corporate_state.3 = { is_employed = yes NOR = { is_pop_type = peasants - is_pop_type = slaves } standard_of_living < state.average_expected_sol } @@ -305,7 +303,6 @@ corporate_state.3 = { is_employed = yes NOR = { is_pop_type = peasants - is_pop_type = slaves } standard_of_living < state.average_expected_sol } diff --git a/events/vanilla_events/law_events/slavery_laws.txt b/events/vanilla_events/law_events/slavery_laws.txt deleted file mode 100755 index 7017e2f89..000000000 --- a/events/vanilla_events/law_events/slavery_laws.txt +++ /dev/null @@ -1,628 +0,0 @@ -namespace = slavery_law_events - -# The Classical Case for Chains -slavery_law_events.1 = { # Advancing the cause of slavery - type = country_event - - title = slavery_law_events.1.t - desc = slavery_law_events.1.d - flavor = slavery_law_events.1.f - - category = enactment - - event_image = { - video = "unspecific_ruler_speaking_to_people" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_newspaper.dds" - - duration = 3 - - cooldown = { days = normal_modifier_time } - - trigger = { - NOT = { has_modifier = natural_state_of_man } - has_law = law_type:law_slavery_banned - OR = { - is_enacting_law = law_type:law_debt_slavery - is_enacting_law = law_type:law_slave_trade - is_enacting_law = law_type:law_legacy_slavery - } - any_interest_group = { - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - } - - immediate = { - currently_enacting_law = { - save_scope_as = current_law_scope - } - random_interest_group = { - limit = { - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - save_scope_as = slaver_ig_scope - leader = { - save_scope_as = slaver_ig_leader_scope - } - } - } - - cancellation_trigger = { - NOT = { currently_enacting_law = scope:current_law_scope } - } - - option = { - name = slavery_law_events.1.a - default_option = yes - - add_enactment_modifier = { - name = natural_state_of_man - } - scope:slaver_ig_leader_scope = { - add_modifier = { - name = erudite_slaver - days = normal_modifier_time - } - } - } - - option = { - name = slavery_law_events.1.b - - add_enactment_modifier = { - name = natural_state_of_man - } - scope:slaver_ig_scope = { - add_modifier = { - name = erudite_praise - days = normal_modifier_time - } - } - } -} - -# Slavery, Hypothetically -slavery_law_events.2 = { # debating slavery - type = country_event - - title = slavery_law_events.2.t - desc = slavery_law_events.2.d - flavor = slavery_law_events.2.f - - category = enactment - - event_image = { - video = "southamerica_election" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_newspaper.dds" - - duration = 3 - - cooldown = { days = normal_modifier_time } - - trigger = { - has_law = law_type:law_slavery_banned - OR = { - is_enacting_law = law_type:law_debt_slavery - is_enacting_law = law_type:law_slave_trade - is_enacting_law = law_type:law_legacy_slavery - } - any_interest_group = { - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - NOT = { - has_variable = slave_law_debate_timer - } - } - - immediate = { - currently_enacting_law = { - save_scope_as = current_law_scope - } - random_interest_group = { - limit = { - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - save_scope_as = slaver_ig_scope - leader = { - save_scope_as = slaver_ig_leader_scope - } - } - set_variable = { - name = slave_law_debate_timer - days = 730 # two years - } - } - - cancellation_trigger = { - NOT = { currently_enacting_law = scope:current_law_scope } - } - - option = { - name = slavery_law_events.2.a - default_option = yes - add_enactment_modifier = { - name = slaver_debate - } - } - option = { - name = slavery_law_events.2.b - random_list = { - 1 = { - add_enactment_modifier = { - name = slaver_debate_success - } - } - 3 = { - add_enactment_modifier = { - name = slaver_debate_fail - } - } - } - } -} - -# Imported Slave Narratives -slavery_law_events.3 = { # Stall event - type = country_event - placement = root - title = slavery_law_events.3.t - desc = slavery_law_events.3.d - flavor = slavery_law_events.3.f - - category = enactment - - duration = 3 - - event_image = { - video = "southamerica_slaves_night" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_protest.dds" - - cooldown = { days = normal_modifier_time } - - trigger = { - has_law = law_type:law_slavery_banned - OR = { - is_enacting_law = law_type:law_debt_slavery - is_enacting_law = law_type:law_slave_trade - is_enacting_law = law_type:law_legacy_slavery - } - - any_interest_group = { - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - NOT = { - has_variable = slave_law_stall_timer - } - } - - immediate = { - currently_enacting_law = { - save_scope_as = current_law_scope - } - - random_interest_group = { - limit = { - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - save_scope_as = book_burning_ig - } - - set_variable = { - name = slave_law_stall_timer - days = 730 # two years - } - } - - cancellation_trigger = { - NOT = { currently_enacting_law = scope:current_law_scope } - } - - option = { - name = slavery_law_events.3.a - default_option = yes - add_enactment_modifier = { - name = slave_narrative_stall - } - } - option = { - name = slavery_law_events.3.b - random_list = { - 2 = { - add_enactment_modifier = { - name = slave_narrative_stall_fail - } - } - 2 = { - add_enactment_modifier = { - name = slave_narrative_stall_success - } - } - } - } -} - -# Life Among the Lowly -slavery_law_events.4 = { # Advancing the cause of Abolition - type = country_event - - title = slavery_law_events.4.t - desc = slavery_law_events.4.d - flavor = slavery_law_events.4.f - - category = enactment - - event_image = { - video = "southamerica_slaves_night" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_newspaper.dds" - - duration = 3 - - cooldown = { days = normal_modifier_time } - - trigger = { - NOT = { has_modifier = life_among_the_lowly_well_received } - is_enacting_law = law_type:law_slavery_banned - any_interest_group = { - is_marginal = no - law_stance = { - law = law_type:law_debt_slavery - value < neutral - } - } - } - - immediate = { - random_interest_group = { - limit = { - is_marginal = no - law_stance = { - law = law_type:law_debt_slavery - value < neutral - } - } - save_scope_as = abolitionist_ig_scope - leader = { - save_scope_as = abolitionist_ig_leader_scope - } - } - currently_enacting_law = { - save_scope_as = current_law_scope - } - } - - cancellation_trigger = { - NOT = { currently_enacting_law = scope:current_law_scope } - } - - option = { - name = slavery_law_events.4.a - default_option = yes - - add_enactment_modifier = { - name = life_among_the_lowly_well_received - } - scope:abolitionist_ig_leader_scope = { - add_modifier = { - name = life_among_the_lowly_author - days = normal_modifier_time - } - } - } - - option = { - name = slavery_law_events.4.b - - add_enactment_modifier = { - name = life_among_the_lowly_well_received - } - scope:abolitionist_ig_scope = { - add_modifier = { - name = life_among_the_lowly_ig - days = normal_modifier_time - } - } - } -} - -# The Great Debates -slavery_law_events.5 = { # debating abolition - type = country_event - - title = slavery_law_events.5.t - desc = slavery_law_events.5.d - flavor = slavery_law_events.5.f - - category = enactment - - event_image = { - video = "southamerica_election" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_newspaper.dds" - - duration = 3 - - cooldown = { days = normal_modifier_time } - - trigger = { - has_law = law_type:law_slavery_banned - OR = { - is_enacting_law = law_type:law_debt_slavery - is_enacting_law = law_type:law_slave_trade - is_enacting_law = law_type:law_legacy_slavery - } - any_interest_group = { - is_in_government = no - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - NOT = { - has_variable = law_debate_timer - } - } - - immediate = { - currently_enacting_law = { - save_scope_as = current_law_scope - } - random_interest_group = { - limit = { - is_marginal = no - law_stance = { - law = owner.currently_enacting_law.type - value > neutral - } - } - save_scope_as = slaver_ig_scope - leader = { - save_scope_as = slaver_ig_leader_scope - } - } - set_variable = { - name = law_debate_timer - days = 730 # two years - } - } - - cancellation_trigger = { - NOT = { currently_enacting_law = scope:current_law_scope } - } - - option = { - name = slavery_law_events.5.a - default_option = yes - add_enactment_modifier = { - name = great_debates - } - } - option = { - name = slavery_law_events.5.b - random_list = { - 1 = { - add_enactment_modifier = { - name = great_debates_success - } - } - 3 = { - add_enactment_modifier = { - name = great_debates_fail - } - } - } - } -} - -# Plantation Proponents Publicize Policies -slavery_law_events.6 = { # Stall event - type = country_event - placement = root - title = slavery_law_events.6.t - desc = slavery_law_events.6.d - flavor = slavery_law_events.6.f - - category = enactment - - duration = 3 - - cooldown = { days = normal_modifier_time } - - event_image = { - video = "southamerica_aristocrats" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_protest.dds" - - trigger = { - is_enacting_law = law_type:law_slavery_banned - OR = { - has_law = law_type:law_debt_slavery - has_law = law_type:law_slave_trade - has_law = law_type:law_legacy_slavery - } - NOT = { - has_variable = law_stall_timer - } - } - - immediate = { - set_variable = { - name = law_stall_timer - days = 730 # two years - } - currently_enacting_law = { - save_scope_as = current_law_scope - } - } - - cancellation_trigger = { - NOT = { currently_enacting_law = scope:current_law_scope } - } - - option = { - name = slavery_law_events.6.a - default_option = yes - add_enactment_modifier = { - name = plantation_reaction_stall - } - } - option = { - name = slavery_law_events.6.b - random_list = { - 1 = { - add_enactment_modifier = { - name = plantation_reaction_stall_fail - } - } - 3 = { - add_enactment_modifier = { - name = plantation_reaction_stall_success - } - } - } - } -} - -###### - -#Forgiveness and Forgetting -slavery_law_events.7 = { - type = country_event - placement = root - title = slavery_law_events.7.t - desc = slavery_law_events.7.d - flavor = slavery_law_events.7.f - - duration = 3 - - cooldown = { days = long_modifier_time } - - event_image = { - video = "southamerica_aristocrats" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_protest.dds" - - trigger = { - has_law = law_type:law_slavery_banned - any_interest_group = { - has_ideology = ideology:ideology_pro_slavery - } - OR = { - NOT = { - this = c:USA - has_variable = slavery_recently_abolished - } - AND = { - this = c:USA - OR = { - has_variable = je_acw_countdown_complete - NOT = { - has_journal_entry = je_acw_countdown - } - } - } - } - } - - immediate = { - random_interest_group = { - limit = { - has_ideology = ideology:ideology_pro_slavery - } - save_scope_as = slaver_ig - } - - random_law = { - limit = { type = law_type:law_slavery_banned } - save_scope_as = slavery_banned_scope - } - } - - option = { - name = slavery_law_events.7.a - default_option = yes - scope:slaver_ig = { - add_modifier = { - name = modifier_slavery_forgotten - days = normal_modifier_time - } - } - add_modifier = { - name = modifier_slavery_whitewashing - days = long_modifier_time - } - every_interest_group = { - limit = { - has_ideology = ideology:ideology_pro_slavery - } - remove_ideology = ideology_pro_slavery - } - } - option = { - name = slavery_law_events.7.b - scope:slaver_ig = { - add_modifier = { - name = modifier_slavery_forgotten_bad - days = normal_modifier_time - } - } - add_radicals = { - value = small_radicals - strata = upper - } - every_interest_group = { - limit = { - has_ideology = ideology:ideology_pro_slavery - } - remove_ideology = ideology_pro_slavery - } - } -} diff --git a/events/vanilla_events/slave_revolts.txt b/events/vanilla_events/slave_revolts.txt deleted file mode 100755 index 3d6847f6f..000000000 --- a/events/vanilla_events/slave_revolts.txt +++ /dev/null @@ -1,327 +0,0 @@ -namespace = slave_revolt - -# Slave Schooner Mutiny -slave_revolt.1 = { - type = country_event - placement = scope:neighbor_state - title = slave_revolt.1.t - desc = slave_revolt.1.d - flavor = slave_revolt.1.f - - duration = 3 - - event_image = { - video = "southamerica_slave_chains" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_protest.dds" - - trigger = { - NOT = { has_law = law_type:law_slavery_banned } - any_neighbouring_state = { - owner = { - has_law = law_type:law_slavery_banned - any_scope_state = { - is_coastal = yes - } - } - } - any_interest_group = { - OR = { - has_ideology = ideology:ideology_pro_slavery - leader = { has_ideology = ideology:ideology_slaver } - } - } - any_interest_group = { - OR = { - leader = { has_ideology = ideology:ideology_abolitionist } - has_ideology = ideology:ideology_anti_slavery - } - } - } - - immediate = { - random_neighbouring_state = { - limit = { - owner = { - has_law = law_type:law_slavery_banned - any_scope_state = { - is_coastal = yes - } - } - } - save_scope_as = neighbor_state - owner = { - save_scope_as = neighbor_country - } - } - save_scope_as = originator - } - - option = { - name = slave_revolt.1.a - default_option = yes - - change_relations = { - country = scope:neighbor_country - value = -30 - } - every_interest_group = { - limit = { - OR = { - has_ideology = ideology:ideology_pro_slavery - leader = { has_ideology = ideology:ideology_slaver } - } - } - add_modifier = { - name = protested_slave_ship_release - days = normal_modifier_time - } - } - every_interest_group = { - limit = { - OR = { - leader = { has_ideology = ideology:ideology_abolitionist } - has_ideology = ideology:ideology_anti_slavery - } - } - add_modifier = { - name = protested_slave_ship_release - days = normal_modifier_time - multiplier = -0.5 - } - } - hidden_effect = { scope:neighbor_country = { post_notification = slave_revolt_1 } } - } - - option = { - name = slave_revolt.1.b - - every_interest_group = { - limit = { - OR = { - leader = { has_ideology = ideology:ideology_abolitionist } - has_ideology = ideology:ideology_anti_slavery - } - } - add_modifier = { - name = did_not_protest_ship_seizure - days = normal_modifier_time - } - } - every_interest_group = { - limit = { - OR = { - has_ideology = ideology:ideology_pro_slavery - leader = { has_ideology = ideology:ideology_slaver } - } - } - add_modifier = { - name = did_not_protest_ship_seizure - days = normal_modifier_time - multiplier = -0.5 - } - } - } -} - -# Escaping Fugitives -slave_revolt.2 = { - type = country_event - placement = ROOT - title = slave_revolt.2.t - desc = slave_revolt.2.d - flavor = slave_revolt.2.f - - duration = 3 - - event_image = { - video = "southamerica_slave_chains" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_protest.dds" - - trigger = { - NOT = { has_law = law_type:law_slavery_banned } - any_neighbouring_state = { - owner = { - has_law = law_type:law_slavery_banned - } - } - } - - immediate = { - random_neighbouring_state = { - limit = { - owner = { - has_law = law_type:law_slavery_banned - } - } - save_scope_as = neighbor_state - owner = { - save_scope_as = neighbor_country - } - } - save_scope_as = originator - } - - option = { - name = slave_revolt.2.a - default_option = yes - - # Pay for slave-catchers and track them all down! - - add_modifier = { - name = government_slave_catchers - days = normal_modifier_time - } - every_interest_group = { - limit = { - OR = { - has_ideology = ideology:ideology_pro_slavery - leader = { has_ideology = ideology:ideology_slaver } - } - } - add_modifier = { - name = government_pays_for_slave_catchers - days = normal_modifier_time - } - } - every_interest_group = { - limit = { - leader = { has_ideology = ideology:ideology_abolitionist } - } - add_modifier = { - name = government_pays_for_slave_catchers - days = normal_modifier_time - multiplier = -0.5 - } - } - } - - option = { - name = slave_revolt.2.b - - every_interest_group = { - limit = { - leader = { has_ideology = ideology:ideology_abolitionist } - } - add_modifier = { - name = government_lets_fugitives_go - days = normal_modifier_time - } - } - every_interest_group = { - limit = { - OR = { - has_ideology = ideology:ideology_pro_slavery - leader = { has_ideology = ideology:ideology_slaver } - } - } - add_modifier = { - name = government_lets_fugitives_go - days = normal_modifier_time - multiplier = -0.5 - } - } - hidden_effect = { scope:neighbor_country = { post_notification = slave_revolt_2 } } - } -} - -# The [statename] Insurrection -slave_revolt.3 = { - type = country_event - placement = scope:slave_insurrection_state - title = slave_revolt.3.t - desc = slave_revolt.3.d - flavor = slave_revolt.3.f - - duration = 3 - - event_image = { - video = "southamerica_slave_chains" - } - - on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear" - - icon = "gfx/interface/icons/event_icons/event_protest.dds" - - trigger = { - NOT = { has_law = law_type:law_slavery_banned } - any_scope_state = { - any_scope_pop = { - is_pop_type = slaves - } - } - } - - immediate = { - random_scope_state = { - limit = { - any_scope_pop = { - is_pop_type = slaves - } - } - save_scope_as = slave_insurrection_state - } - } - - option = { - name = slave_revolt.3.a # Negotiate a deal with the slaves' leaders - - - scope:slave_insurrection_state = { - add_radicals_in_state = { - value = 0.1 - pop_type = aristocrats - } - add_radicals_in_state = { - value = 0.2 - pop_type = slaves - } - } - every_interest_group = { - limit = { - OR = { - has_ideology = ideology:ideology_pro_slavery - leader = { has_ideology = ideology:ideology_slaver } - } - } - - add_modifier = { - name = soft_approach_to_slaves - days = normal_modifier_time - } - } - } - - option = { - name = slave_revolt.3.b # We do not negotiate with insurrectionists - default_option = yes - - scope:slave_insurrection_state = { - add_radicals_in_state = { - value = 0.6 - pop_type = slaves - } - } - - every_interest_group = { - limit = { - OR = { - has_ideology = ideology:ideology_pro_slavery - leader = { has_ideology = ideology:ideology_slaver } - } - } - - add_modifier = { - name = tough_approach_to_slaves - days = normal_modifier_time - } - } - } -} diff --git a/events/vanilla_events/soi_events/00_lobbies_events_03.txt b/events/vanilla_events/soi_events/00_lobbies_events_03.txt index d0f3e7a45..b5e4bce27 100755 --- a/events/vanilla_events/soi_events/00_lobbies_events_03.txt +++ b/events/vanilla_events/soi_events/00_lobbies_events_03.txt @@ -730,7 +730,6 @@ lobby_events.34 = { trigger = { has_dlc_feature = lobbies is_revolutionary = no - has_law = law_type:law_slavery_banned any_political_lobby = { is_political_lobby_type = lobby_anti_country any_lobby_member = { @@ -743,7 +742,6 @@ lobby_events.34 = { } } target = { - has_law = law_type:law_slavery_banned OR = { has_law = law_type:law_protected_speech has_law = law_type:law_womens_suffrage @@ -764,7 +762,6 @@ lobby_events.34 = { limit = { is_political_lobby_type = lobby_anti_country target = { - has_law = law_type:law_slavery_banned OR = { has_law = law_type:law_protected_speech has_law = law_type:law_womens_suffrage @@ -858,8 +855,7 @@ lobby_events.35 = { } any_political_lobby = { is_political_lobby_type = lobby_anti_country - target = { # law_slavery_banned AND one from the list - has_law = law_type:law_slavery_banned + target = { OR = { # one of five laws that are progressiveness = 100 has_law = law_type:law_womens_suffrage has_law = law_type:law_cooperative_ownership @@ -894,8 +890,6 @@ lobby_events.35 = { limit = { is_political_lobby_type = lobby_anti_country target = { - # law_slavery_banned AND one from the list - has_law = law_type:law_slavery_banned OR = { # one of five laws that are progressiveness = 100 has_law = law_type:law_womens_suffrage has_law = law_type:law_cooperative_ownership