Skip to content

Commit 3889505

Browse files
JackEPepperJackEPepper
committed
Merge branch 'law-updates' into culture-update
2 parents 74e8f47 + 23eb072 commit 3889505

92 files changed

Lines changed: 44801 additions & 1140 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common/amendments/cwp_amendments_enactment.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
amendment_corporate_state_nominating_body_tu = {
22

33
allowed_laws = {
4-
law_corporate_state
54
}
65

76
modifier = {
@@ -30,7 +29,6 @@
3029
amendment_corporate_state_nominating_body_id = {
3130

3231
allowed_laws = {
33-
law_corporate_state
3432
}
3533

3634
modifier = {
@@ -59,7 +57,6 @@ amendment_corporate_state_nominating_body_id = {
5957
amendment_corporate_state_nominating_body_it = {
6058

6159
allowed_laws = {
62-
law_corporate_state
6360
}
6461

6562
modifier = {
@@ -1115,7 +1112,6 @@ amendment_industrial_socialization = {
11151112
parent = law_cooperative_ownership
11161113

11171114
allowed_laws = {
1118-
law_corporate_state
11191115
}
11201116

11211117
modifier = {
@@ -1165,7 +1161,6 @@ amendment_shop_councils = {
11651161
parent = law_interventionism # TODO PRCAL-35135 change to State Capitalism
11661162

11671163
allowed_laws = {
1168-
law_corporate_state
11691164
}
11701165

11711166
modifier = {
@@ -1211,7 +1206,6 @@ amendment_foreign_investment_seizures = {
12111206
parent = law_protectionism
12121207

12131208
allowed_laws = {
1214-
law_corporate_state
12151209
}
12161210

12171211
modifier = {

‎common/buildings/06_urban.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ building_hotels = {
166166
}
167167
production_method_groups = {
168168
pmg_base_hotels
169+
pmg_hotel_transportation
169170
pmg_hotel_gambling
170171
}
171172
required_construction = construction_cost_medium
@@ -286,7 +287,6 @@ building_urban_center = {
286287

287288
production_method_groups = {
288289
pmg_amenities
289-
pmg_commerce_services
290290
pmg_public_transport_urban_center
291291
pmg_urban_churches
292292
}

‎common/buildings/07_government.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
production_method_groups = {
2323
pmg_base_government_administration
2424
pmg_admin_telecom
25+
pmg_administration_outsourcing
2526
}
2627

2728
icon = "gfx/interface/icons/building_icons/building_government_administration.dds"
@@ -44,6 +45,7 @@ building_university = {
4445
production_method_groups = {
4546
pmg_base_university
4647
pmg_university_telecom
48+
pmg_university_outsourcing
4749
}
4850

4951
icon = "gfx/interface/icons/building_icons/building_university.dds"

‎common/commander_orders/00_interception.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
texture = "gfx/interface/icons/commander_order_icons/patrol_coast.dds"
33

44
military_type = navy
5-
behavior = intercept
5+
behavior = defend
66
is_basic_order_type = yes
77

88
target_involvement_ratio = 0

‎common/country_ranks/00_country_ranks.txt‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ superpower = {
3737
country_influence_add = 2000
3838
country_diplomatic_play_maneuvers_add = 200
3939
country_loan_interest_rate_mult = -0.75
40-
state_migration_pull_mult = 0.5
41-
country_agitator_slots_add = 4
40+
state_migration_pull_mult = 0.35
41+
country_agitator_slots_add = 3
4242
country_support_independence_weekly_liberty_desire_add = 0.50
4343
country_leverage_resistance_add = 1500
44-
country_free_charters_add = 3
45-
country_max_companies_add = 10
4644
country_max_unassigned_generals_add = 5
4745
country_max_unassigned_admirals_add = 5
4846
}
@@ -81,10 +79,8 @@ great_power = {
8179
country_support_independence_weekly_liberty_desire_add = 0.20
8280
state_migration_pull_mult = 0.25
8381
country_leverage_resistance_add = 1000
84-
country_free_charters_add = 1
8582
country_max_unassigned_generals_add = 3
8683
country_max_unassigned_admirals_add = 3
87-
country_max_companies_add = 8
8884
}
8985
}
9086

@@ -123,7 +119,6 @@ major_power = {
123119
country_leverage_resistance_add = 750
124120
country_max_unassigned_generals_add = 2
125121
country_max_unassigned_admirals_add = 2
126-
country_max_companies_add = 6
127122
}
128123
}
129124

@@ -154,7 +149,6 @@ minor_power = {
154149
country_leverage_resistance_add = 500
155150
country_max_unassigned_generals_add = 1
156151
country_max_unassigned_admirals_add = 1
157-
country_max_companies_add = 4
158152
}
159153
}
160154

@@ -183,7 +177,6 @@ insignificant_power = {
183177
country_support_independence_weekly_liberty_desire_add = 0.03
184178
country_agitator_slots_add = 1
185179
country_leverage_resistance_add = 250
186-
country_max_companies_add = 2
187180
}
188181
}
189182

‎common/diplomatic_catalysts/00_diplomatic_catalysts.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,3 +2271,27 @@ catalyst_declined_military_assistance = {
22712271
}
22722272
}
22732273
}
2274+
2275+
catalyst_strait_toll_high = {
2276+
category = cc_relations_change
2277+
}
2278+
2279+
catalyst_strait_toll_reduced = {
2280+
category = cc_relations_change
2281+
}
2282+
2283+
catalyst_strait_no_military = {
2284+
category = cc_diplomatic_incident
2285+
}
2286+
2287+
catalyst_strait_opened = {
2288+
category = cc_relations_change
2289+
}
2290+
2291+
catalyst_strait_partially_opened = {
2292+
category = cc_relations_change
2293+
}
2294+
2295+
catalyst_strait_closed = {
2296+
category = cc_diplomatic_aggression
2297+
}

‎common/ideologies/cwp_character_ideologies_agrarianism.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ideology_land_reformer = {
1818
law_serfdom = strongly_disapprove
1919
law_tenant_farmers = disapprove
2020
law_commercialized_agriculture = neutral
21-
law_homesteading = approve
21+
law_peasant_proprietorship = approve
2222
law_collectivized_agriculture = approve
2323
}
2424

@@ -35,7 +35,7 @@ ideology_land_reformer = {
3535
owner = {
3636
NOT = { has_law_or_variant = law_type:law_land_based_taxation }
3737
OR = {
38-
has_law_or_variant = law_type:law_homesteading
38+
has_law_or_variant = law_type:law_peasant_proprietorship
3939
has_law_or_variant = law_type:law_collectivized_agriculture
4040
}
4141
}
@@ -108,7 +108,7 @@ ideology_land_reformer = {
108108
owner = {
109109
NOT = { has_law_or_variant = law_type:law_land_based_taxation }
110110
OR = {
111-
has_law_or_variant = law_type:law_homesteading
111+
has_law_or_variant = law_type:law_peasant_proprietorship
112112
has_law_or_variant = law_type:law_collectivized_agriculture
113113
}
114114
}

‎common/ideologies/cwp_character_ideologies_authoritarianism.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ ideology_corporatist_leader = {
126126
law_monarchy = neutral
127127
law_presidential_republic = neutral
128128
law_parliamentary_republic = neutral
129-
law_corporate_state = approve
130129
law_council_republic = strongly_disapprove
131130
}
132131

@@ -266,7 +265,6 @@ ideology_fascist = {
266265
law_monarchy = neutral
267266
law_presidential_republic = neutral
268267
law_parliamentary_republic = neutral
269-
law_corporate_state = approve
270268
law_council_republic = strongly_disapprove
271269
}
272270

@@ -410,7 +408,6 @@ ideology_vanguardist = {
410408
law_monarchy = strongly_disapprove
411409
law_presidential_republic = disapprove
412410
law_parliamentary_republic = disapprove
413-
law_corporate_state = strongly_disapprove
414411
law_theocracy = strongly_disapprove
415412
law_council_republic = strongly_approve
416413
}
@@ -449,7 +446,7 @@ ideology_vanguardist = {
449446
law_commercialized_agriculture = strongly_disapprove
450447
law_serfdom = strongly_disapprove
451448
law_tenant_farmers = disapprove
452-
law_homesteading = neutral
449+
law_peasant_proprietorship = neutral
453450
law_collectivized_agriculture = approve
454451
}
455452

‎common/ideologies/cwp_character_ideologies_economics.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ ideology_market_liberal = {
130130
law_collectivized_agriculture = strongly_disapprove
131131
law_serfdom = disapprove
132132
law_tenant_farmers = neutral
133-
law_homesteading = neutral
133+
law_peasant_proprietorship = neutral
134134
law_commercialized_agriculture = approve
135135
}
136136

‎common/ideologies/cwp_character_ideologies_humanitarianism.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ideology_abolitionist = {
1818
lawgroup_land_reform = {
1919
law_serfdom = strongly_disapprove
2020
law_tenant_farmers = neutral
21-
law_homesteading = neutral
21+
law_peasant_proprietorship = neutral
2222
law_collectivized_agriculture = neutral
2323
law_commercialized_agriculture = neutral
2424
}

0 commit comments

Comments
 (0)