Skip to content

Commit 6190ab3

Browse files
MasterOfGreyMasterOfGrey
committed
SPA v1.9.1
1 parent 5db5245 commit 6190ab3

File tree

15 files changed

+141
-8
lines changed

15 files changed

+141
-8
lines changed

‎Soft Pop Adjustments/common/on_actions/MoG_SPA_sol_on_actions.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ MoG_SPA_sol_setup_action = {
1515
}
1616
}
1717

18-
on_monthly_pulse_state = {
18+
on_monthly_pulse_country = { # on_monthly_pulse_state = {
1919
on_actions = {
2020
MoG_SPA_sol_monthly_pulse_state
2121
}
2222
}
2323

2424
MoG_SPA_sol_monthly_pulse_state = {
2525
effect = {
26-
refresh_expected_sol_modifier = yes
26+
every_scope_state = {
27+
refresh_expected_sol_modifier = yes
28+
}
2729
}
2830
}
2931

‎Soft Pop Adjustments/common/on_actions/zzz_MoG_SPA_country_form_on_actions.txt‎

Lines changed: 115 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,118 @@ clear_colonial_company_migration_penalty_on_actions = {
2121
remove_modifier = mog_company_migration_penalty
2222
}
2323
}
24-
}
24+
}
25+
26+
# Backup because apparently some things aren't working.
27+
28+
on_monthly_pulse_country = {
29+
on_actions = {
30+
MoG_SPA_colonial_company_migration_penalty_check
31+
}
32+
}
33+
34+
MoG_SPA_colonial_company_migration_penalty_check = {
35+
effect = {
36+
if = { # If extraction economy or chartered company - action based on subject status
37+
limit = {
38+
OR = {
39+
has_law_or_variant = law_type:law_extraction_economy
40+
has_government_type = gov_chartered_company
41+
}
42+
}
43+
if = { # If subject with extraction economy. Add extraction econ modifier.
44+
limit = {
45+
NOT = { has_modifier = mog_company_migration_penalty }
46+
is_subject = yes
47+
}
48+
add_modifier = mog_company_migration_penalty
49+
if = {
50+
limit = { has_modifier = mog_legacy_migration_penalty } # Countries can go backwards.
51+
remove_modifier = mog_legacy_migration_penalty
52+
}
53+
}
54+
else_if = { # If no longer subject with extraction economy. Add legacy modifier.
55+
limit = {
56+
has_modifier = mog_company_migration_penalty
57+
is_subject = no
58+
has_law_or_variant = law_type:law_extraction_economy
59+
}
60+
remove_modifier = mog_company_migration_penalty
61+
add_modifier = mog_legacy_migration_penalty
62+
}
63+
}
64+
else_if = { # If have bad modifier - action based on law status
65+
limit = {
66+
has_modifier = mog_company_migration_penalty
67+
}
68+
if = { # If subject that escaped extraction economy. Add legacy modifier.
69+
limit = {
70+
NOT = { has_modifier = mog_legacy_migration_penalty }
71+
NOT = { has_law_or_variant = law_type:law_extraction_economy }
72+
is_subject = yes
73+
}
74+
remove_modifier = mog_company_migration_penalty
75+
add_modifier = mog_legacy_migration_penalty
76+
}
77+
}
78+
else_if = { # If have legacy modifier - action based on law status
79+
limit = {
80+
has_modifier = mog_legacy_migration_penalty
81+
}
82+
if = { # If independent with legacy. Add extraction econ modifier.
83+
limit = {
84+
NOR = {
85+
has_law_or_variant = law_type:law_extraction_economy
86+
has_law_or_variant = law_type:law_traditionalism
87+
has_law_or_variant = law_type:law_agrarianism
88+
has_law_or_variant = law_type:law_industry_banned
89+
}
90+
has_law_or_variant = law_type:law_slavery_banned
91+
is_subject = no
92+
}
93+
remove_modifier = mog_company_migration_penalty
94+
add_modifier = mog_legacy_migration_penalty
95+
}
96+
}
97+
else_if = { # If special country check - final cleanup check
98+
limit = {
99+
OR = {
100+
c:BIC ?= this
101+
c:DEI ?= this
102+
c:ALK ?= this
103+
c:HBC ?= this
104+
c:CAN ?= this
105+
c:JAV ?= this
106+
c:IDN ?= this
107+
c:BHT ?= this
108+
is_country_type = company
109+
}
110+
NOR = {
111+
has_law_or_variant = law_type:law_extraction_economy
112+
has_law_or_variant = law_type:law_traditionalism
113+
has_law_or_variant = law_type:law_agrarianism
114+
has_law_or_variant = law_type:law_industry_banned
115+
has_law_or_variant = law_type:law_isolationism
116+
has_law_or_variant = law_type:law_colonial_exploitation
117+
has_law_or_variant = law_type:law_serfdom
118+
has_law_or_variant = law_type:law_tenant_farmers
119+
has_law_or_variant = law_type:law_hindu_caste_enforced
120+
has_law_or_variant = law_type:law_hindu_caste_codified
121+
}
122+
has_law_or_variant = law_type:law_slavery_banned
123+
}
124+
if = { # If still have legacy modifier, remove.
125+
limit = {
126+
has_modifier = mog_legacy_migration_penalty
127+
}
128+
remove_modifier = mog_legacy_migration_penalty
129+
}
130+
if = { # If still have bad modifier, remove.
131+
limit = {
132+
has_modifier = mog_company_migration_penalty
133+
}
134+
remove_modifier = mog_company_migration_penalty
135+
}
136+
}
137+
}
138+
}

‎Soft Pop Adjustments/common/scripted_effects/MoG_refresh_sol_modifiers.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Expects state scope
22
refresh_expected_sol_modifier = {
3-
if = {
4-
limit = { this = this.owner } # This is only needed because apparently on_monthly_pulse_state is bugged and can report a country scope.
3+
#if = {
4+
# limit = { this = this.owner } # This is only needed because apparently on_monthly_pulse_state is bugged and can report a country scope.
55
# I'm in country scope
6-
}
7-
else = {
6+
#}
7+
#else = {
88
save_temporary_scope_as = sol_calc_target_state
99

1010
# any_scope_state = THIS
@@ -55,7 +55,7 @@ refresh_expected_sol_modifier = {
5555
refresh_strata_expected_sol_modifier = { strata = middle scale = 1 literacy_factor = 0.4 }
5656
refresh_strata_expected_sol_modifier = { strata = upper scale = 2 literacy_factor = 0 }
5757
}
58-
}
58+
#}
5959
}
6060

6161
refresh_strata_expected_sol_modifier = {

‎Soft Pop Adjustments/common/static_modifiers/MoG_SPA_static_modifiers.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ mog_company_migration_penalty = {
55
state_assimilation_mult = -0.7
66
}
77

8+
mog_legacy_migration_penalty = {
9+
icon = "gfx/interface/icons/timed_modifier_icons/modifier_flag_negative.dds"
10+
state_migration_pull_mult = -0.3
11+
state_assimilation_mult = -0.3
12+
}
13+
814
mog_education_access_from_urbanization = {
915
icon = "gfx/interface/icons/generic_icons/literacy.dds"
1016
state_education_access_add = 0.2

‎Soft Pop Adjustments/localization/braz_por/MoG_SPA_base_l_braz_por.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
l_braz_por:
22
# Modifiers
33
mog_company_migration_penalty: "Administração Colonial Extrativista" #deepl:2992389861
4+
mog_legacy_migration_penalty: "Legado da administração extrativista" #deepl:262004478
45
mog_education_access_from_urbanization: "Acesso à educação a partir de [concept_urbanization]" #deepl:3673977485
56
state_slaves_education_access_add: "Acesso à educação para [GetPopType('slaves').GetName]" #deepl:637100415
67
state_slaves_education_access_add_desc: "Um bônus ou penalidade para o acesso à educação para [GetPopType('slaves').GetName]" #deepl:3338121199

‎Soft Pop Adjustments/localization/english/MoG_SPA_base_l_english.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
l_english:
22
# Modifiers
33
mog_company_migration_penalty: "Extractive Colonial Administration"
4+
mog_legacy_migration_penalty: "Legacy of Extractive Administration"
45
mog_education_access_from_urbanization: "Education access from [concept_urbanization]"
56
state_slaves_education_access_add: "Education Access for [GetPopType('slaves').GetName]"
67
state_slaves_education_access_add_desc: "A bonus or penalty to education access for [GetPopType('slaves').GetName]"

‎Soft Pop Adjustments/localization/french/MoG_SPA_base_l_french.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
l_french:
22
# Modifiers
33
mog_company_migration_penalty: "Administration des colonies d'extraction" #deepl:2992389861
4+
mog_legacy_migration_penalty: "L'héritage de l'administration extractive" #deepl:262004478
45
mog_education_access_from_urbanization: "Accès à l'éducation à partir de [concept_urbanization]" #deepl:3673977485
56
state_slaves_education_access_add: "Accès à l'éducation pour les [GetPopType('slaves').GetName]" #deepl:637100415
67
state_slaves_education_access_add_desc: "Une prime ou une pénalité à l'accès à l'éducation pour [GetPopType('slaves').GetName]" #deepl:3338121199

‎Soft Pop Adjustments/localization/german/MoG_SPA_base_l_german.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
l_german:
22
# Modifiers
33
mog_company_migration_penalty: "Koloniale Verwaltung des Bergbaus" #deepl:2992389861
4+
mog_legacy_migration_penalty: "Erbe der Rohstoffverwaltung" #deepl:262004478
45
mog_education_access_from_urbanization: "Bildungszugang von [concept_urbanization]" #deepl:3673977485
56
state_slaves_education_access_add: "Bildungszugang für [GetPopType('slaves').GetName]" #deepl:637100415
67
state_slaves_education_access_add_desc: "Ein Bonus oder eine Strafe für den Bildungszugang für [GetPopType('slaves').GetName]" #deepl:3338121199

‎Soft Pop Adjustments/localization/japanese/MoG_SPA_base_l_japanese.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
l_japanese:
22
# Modifiers
33
mog_company_migration_penalty: "採掘植民地行政" #deepl:2992389861
4+
mog_legacy_migration_penalty: "採掘行政の遺産" #deepl:262004478
45
mog_education_access_from_urbanization: "教育へのアクセス[concept_urbanization]" #deepl:3673977485
56
state_slaves_education_access_add: "教育へのアクセス[GetPopType('slaves').GetName]" #deepl:637100415
67
state_slaves_education_access_add_desc: "教育へのアクセスに対するボーナスまたはペナルティ[GetPopType('slaves').GetName]" #deepl:3338121199

‎Soft Pop Adjustments/localization/korean/MoG_SPA_base_l_korean.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
l_korean:
22
# Modifiers
33
mog_company_migration_penalty: "추출 식민지 관리" #deepl:2992389861
4+
mog_legacy_migration_penalty: "추출 관리의 유산" #deepl:262004478
45
mog_education_access_from_urbanization: "교육 액세스 위치 [concept_urbanization]" #deepl:3673977485
56
state_slaves_education_access_add: "교육 액세스 대상 [GetPopType('slaves').GetName]" #deepl:637100415
67
state_slaves_education_access_add_desc: "교육 액세스 권한에 대한 보너스 또는 페널티 [GetPopType('slaves').GetName]" #deepl:3338121199

0 commit comments

Comments
 (0)