Skip to content

Commit 3cec438

Browse files
authored
Merge pull request #732 from Cold-War-Project/hylexicon/remove-slavery
feat: remove slavery
2 parents a32d480 + b44ad75 commit 3cec438

32 files changed

Lines changed: 12 additions & 3092 deletions

common/ai_strategies/03_political_strategies.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ ai_strategy_reactionary_agenda = {
195195
movement_cultural_majority
196196
movement_reactionary
197197
movement_legitimist
198-
movement_pro_slavery
199198
}
200199

201200
anti_movements = {
@@ -248,7 +247,6 @@ ai_strategy_reactionary_agenda = {
248247
}
249248
OR = {
250249
has_ideology = ideology:ideology_traditionalist
251-
has_ideology = ideology:ideology_slaver
252250
has_ideology = ideology:ideology_theocrat
253251
}
254252
}
@@ -371,7 +369,6 @@ ai_strategy_progressive_agenda = {
371369
pro_movements = {
372370
movement_liberal
373371
movement_modernizer
374-
movement_anti_slavery
375372
movement_land_reform
376373
movement_positivist
377374
movement_utilitarian
@@ -387,7 +384,6 @@ ai_strategy_progressive_agenda = {
387384
movement_fascist
388385
movement_reactionary
389386
movement_royalist_absolutist
390-
movement_pro_slavery
391387
}
392388

393389
institution_scores = {
@@ -545,7 +541,6 @@ ai_strategy_egalitarian_agenda = {
545541
movement_communist
546542
movement_nihilist
547543
movement_feminist
548-
movement_anti_slavery
549544
movement_land_reform
550545
}
551546

@@ -558,7 +553,6 @@ ai_strategy_egalitarian_agenda = {
558553
movement_reactionary
559554
movement_fascist
560555
movement_legitimist
561-
movement_pro_slavery
562556
movement_liberal
563557
movement_orleanist
564558
movement_bonapartist

common/building_groups/00_building_groups.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# capped_by_resources = yes/no
99
# discoverable_resource = yes/no
1010
# depletable_resource = yes/no
11-
# can_use_slaves = yes/no Default no, setting yes enables slavery for all contained buildings and groups
1211
# land_usage = urban/rural Which type of state resource the building uses. urban = Urbanization, rural = Arable Land. Default no state resource usage.
1312
# If unspecified, will return first non-default land usage type found in parent building group tree.
1413
# 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 = {
498497

499498
default_building = building_trade_center
500499

501-
can_use_slaves = yes
502-
503500
infrastructure_usage_per_level = 0.5
504501
}
505502

common/buildings/_buildings.info

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ building_key = {
3434
ai_value = fixed_point # base AI value, default NAI.BUILDING_BASE_VALUE or NAI.GOVERNMENT_BUILDING_BASE_VALUE
3535
ai_subsidies_weight = fixed_point # how important the AI considers subsidizing this building to be, default 1.0
3636

37-
slaves_role = pop_type_key # defines which pop type should slaves work as. Defaults to DEFAULT_POP_TYPE.
38-
3937
production_methods = { # a building's behavior can be modified by its production methods
4038
# list of Production Method Groups
4139
}

common/history/political_movements/00_movements.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@
1717
create_political_movement = { type = movement_royalist_constitutional }
1818
}
1919

20-
### Abolitionist movements
21-
if = {
22-
limit = {
23-
NOT = { has_law = law_type:law_slavery_banned }
24-
}
25-
create_political_movement = { type = movement_pro_slavery }
26-
create_political_movement = { type = movement_anti_slavery }
27-
}
28-
2920
### Religious movements
3021
create_political_movement = { type = movement_religious_majority }
3122

common/ideologies/_cwp_replace_01_character_ideologies.txt

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -692,128 +692,6 @@ ideology_feminist = {
692692
}
693693
}
694694

695-
ideology_abolitionist = {
696-
icon = "gfx/interface/icons/ideology_icons/ideology_leader/ideology_leader_abolitionist.dds"
697-
698-
character_ideology = yes
699-
700-
lawgroup_slavery = {
701-
law_slavery_banned = strongly_approve
702-
law_legacy_slavery = disapprove
703-
law_debt_slavery = strongly_disapprove
704-
law_slave_trade = strongly_disapprove
705-
}
706-
707-
lawgroup_land_reform = {
708-
law_serfdom = strongly_disapprove
709-
law_tenant_farmers = neutral
710-
law_homesteading = neutral
711-
law_collectivized_agriculture = neutral
712-
law_commercialized_agriculture = neutral
713-
}
714-
715-
country_trigger = {
716-
OR = {
717-
NOT = { has_law = law_type:law_slavery_banned }
718-
has_law = law_type:law_serfdom
719-
}
720-
}
721-
722-
# Character scope
723-
interest_group_leader_trigger = {
724-
ideology_abolitionist_valid_trigger = yes
725-
}
726-
727-
non_interest_group_leader_trigger = {
728-
interest_group = {
729-
ideology_abolitionist_valid_trigger = yes
730-
}
731-
}
732-
733-
interest_group_leader_weight = {
734-
value = 100
735-
if = {
736-
limit = { is_interest_group_type = ig_trade_unions }
737-
add = 150
738-
}
739-
if = {
740-
limit = { is_interest_group_type = ig_intelligentsia }
741-
add = 150
742-
}
743-
}
744-
745-
non_interest_group_leader_weight = {
746-
value = 100
747-
748-
if = {
749-
limit = { has_trait = tactful }
750-
add = 75
751-
}
752-
}
753-
}
754-
755-
ideology_slaver = {
756-
icon = "gfx/interface/icons/ideology_icons/ideology_leader/ideology_leader_slaver.dds"
757-
758-
character_ideology = yes
759-
760-
lawgroup_slavery = {
761-
law_slave_trade = strongly_approve
762-
law_legacy_slavery = approve
763-
law_debt_slavery = neutral
764-
law_slavery_banned = strongly_disapprove
765-
}
766-
767-
country_trigger = {
768-
NOT = {
769-
has_law = law_type:law_slavery_banned
770-
}
771-
}
772-
773-
interest_group_leader_trigger = {
774-
ideology_slaver_valid_trigger = yes
775-
}
776-
777-
non_interest_group_leader_trigger = {
778-
interest_group = {
779-
ideology_slaver_valid_trigger = yes
780-
}
781-
}
782-
783-
interest_group_leader_weight = {
784-
value = 50
785-
if = {
786-
limit = { is_interest_group_type = ig_landowners }
787-
add = 500
788-
}
789-
if = {
790-
limit = { is_interest_group_type = ig_rural_folk }
791-
add = 250
792-
}
793-
if = { # very difficult to reintroduce slavery once you ban it and its supporters have faded from the political scene
794-
limit = {
795-
owner = {
796-
NOT = { has_law = law_type:law_slavery_banned }
797-
}
798-
}
799-
multiply = 0.1
800-
}
801-
}
802-
803-
non_interest_group_leader_weight = {
804-
value = 100
805-
806-
if = {
807-
limit = { has_trait = cruel }
808-
add = 75
809-
}
810-
if = {
811-
limit = { has_trait = bigoted }
812-
add = 75
813-
}
814-
}
815-
}
816-
817695
ideology_pacifist = {
818696
icon = "gfx/interface/icons/ideology_icons/ideology_leader/ideology_leader_pacifist.dds"
819697

@@ -3539,13 +3417,6 @@ ideology_utilitarian_leader = {
35393417
law_womens_suffrage = strongly_approve
35403418
}
35413419

3542-
lawgroup_slavery = {
3543-
law_slavery_banned = neutral
3544-
law_debt_slavery = strongly_disapprove
3545-
law_slave_trade = strongly_disapprove
3546-
law_legacy_slavery = disapprove
3547-
}
3548-
35493420
lawgroup_taxation = {
35503421
law_consumption_based_taxation = disapprove
35513422
law_per_capita_based_taxation = neutral
@@ -3719,13 +3590,6 @@ ideology_utopian = {
37193590
law_collectivized_agriculture = approve
37203591
}
37213592

3722-
lawgroup_slavery = {
3723-
law_slavery_banned = strongly_approve
3724-
law_legacy_slavery = disapprove
3725-
law_debt_slavery = strongly_disapprove
3726-
law_slave_trade = strongly_disapprove
3727-
}
3728-
37293593
country_trigger = {}
37303594

37313595
interest_group_leader_trigger = {

common/interest_groups/00_intelligentsia.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
ideology_liberal_modern
99
ideology_anti_clerical
1010
ideology_republican
11-
ideology_anti_slavery
1211
}
1312

1413
character_ideologies = {

common/interest_groups/00_landowners.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,6 @@
9696
limit = { owner = { has_law = law_type:law_homesteading } }
9797
multiply = 1.25
9898
}
99-
100-
if = {
101-
limit = {
102-
state = {
103-
is_slave_state = yes
104-
}
105-
}
106-
multiply = 4
107-
}
10899
}
109100
}
110101

@@ -182,14 +173,12 @@
182173
value = 2
183174
}
184175
}
185-
# More likely with Serfdom or Slavery
176+
# More likely with Serfdom
186177
if = {
187178
limit = {
188179
owner = {
189180
OR = {
190181
has_law = law_type:law_serfdom
191-
has_law = law_type:law_slave_trade
192-
has_law = law_type:law_legacy_slavery
193182
}
194183
}
195184
}

common/interest_groups/00_petty_bourgeoisie.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,6 @@
167167
}
168168
}
169169
value = 25
170-
171-
if = {
172-
limit = {
173-
state = {
174-
is_slave_state = yes
175-
}
176-
}
177-
subtract = 25
178-
}
179170
}
180171
}
181172

common/interest_groups/00_trade_unions.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
ideology_proletarian
99
ideology_egalitarian_modern
1010
ideology_populist
11-
ideology_anti_slavery
1211
ideology_socialist
1312
}
1413

common/journal_entries/00_liberalism.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ je_liberalism_4 = {
151151
has_law = law_type:law_freedom_of_conscience
152152
has_law = law_type:law_total_separation
153153
}
154-
has_law = law_type:law_slavery_banned
155154
has_law = law_type:law_multicultural
156155
has_law = law_type:law_no_migration_controls
157156
average_sol >= 12

0 commit comments

Comments
 (0)