SPA v1.11.1

Author: MasterOfGrey

Soft Pop Adjustments/common/decrees/zzz_MoG_SPA_assimilation_decree.txt

@@ -46,7 +46,7 @@ TRY_REPLACE:decree_promote_national_values = {
 			if = { # Colonies
 				limit = {
 					scope:country = {
-						country_is_in_europe = no
+						is_not_in_geographic_region = geographic_region_europe
 						any_primary_culture = {
 							has_discrimination_trait_group = heritage_group_european
 						}
@@ -113,8 +113,8 @@ TRY_REPLACE:decree_promote_national_values = {
 				OR = {
 					NOT = { scope:country = { has_law_or_variant = law_type:law_total_separation } }
 					AND = {
-						scope:country = { country_is_in_africa = no }
-						state_is_in_africa = yes
+						scope:country = { is_not_in_geographic_region = geographic_region_africa }
+						is_in_geographic_region = geographic_region_africa
 					}
 				}
 				religion_percent_state = {

Soft Pop Adjustments/common/defines/zzz_MoG_SPA_def.txt

@@ -40,7 +40,10 @@ NPops = {
 	MIN_CONVERSION = 10 # 1							# If there is any conversion at least this many people will convert
 
 	ALLOW_ASSIMILATION_IN_HOMELANDS = no		# Can pops assimilate when living in their homelands?
-	ALLOW_ASSIMILATION_ACROSS_HERITAGES = yes 	# Can pops assimilate into pops of a different heritage?
+	# ALLOW_ASSIMILATION_ACROSS_HERITAGES = yes 	# Can pops assimilate into pops of a different heritage?
+	ALLOW_ASSIMILATION_REQUIRE_HERITAGE_GROUP = yes # no	# Can pops assimilate into pops of a different heritage group (weaker condition)
+	ALLOW_ASSIMILATION_REQUIRE_HERITAGE_TRAIT = no			# Can pops assimilate into pops of a different heritage trait (stronger condition)
+	#in case if both are allowed, heritage trait requirement takes precedence
 
 	CULTURAL_FERVOR_ASSIMILATIOM_EFFECT = 0.008 # 0.01		# The effect cultural fervor has on assimilation, it makes it this much harder to assimilate with higher fervor
 

Soft Pop Adjustments/common/script_values/yMoG_SPA_event_values_overwrites.txt

@@ -1,7 +1,14 @@
 # Discrimination statuses, aka acceptance statuses
 # SPA update note: make sure this is alligned with common/acceptance_statuses/MoG_SPA_acceptance_statuses.txt
-TRY_REPLACE:acceptance_status_1 = 0
-TRY_REPLACE:acceptance_status_2 = 20
-TRY_REPLACE:acceptance_status_3 = 45 # 40
-TRY_REPLACE:acceptance_status_4 = 70 # 60
-TRY_REPLACE:acceptance_status_5 = 95 # 80
+#TRY_REPLACE:acceptance_status_1 = { value = 0 }
+#TRY_REPLACE:acceptance_status_2 = { value = 20 }
+#TRY_REPLACE:acceptance_status_3 = { value = 45 }	# 40
+#TRY_REPLACE:acceptance_status_4 = { value = 70 }	# 60
+#TRY_REPLACE:acceptance_status_5 = { value = 95 }	# 80
+
+# Because keywords with single script values are bugged at the moment:
+acceptance_status_1 = { value = 0 }
+acceptance_status_2 = { value = 20 }
+acceptance_status_3 = { value = 45 }	# 40
+acceptance_status_4 = { value = 70 }	# 60
+acceptance_status_5 = { value = 95 }	# 80