Merge branch 'unstable' of https://github.com/Radsterman/Victorian-Fl…

…avor-Mod into unstable
Radsterman · Jun 1, 2023 · acda01a · acda01a
2 parents 28490bb + 21d5208
commit acda01a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/common/ai_strategies/00_default_strategy.txt b/common/ai_strategies/00_default_strategy.txt
@@ -1096,7 +1096,9 @@ ai_strategy_default = {
 				}
 				has_interest_marker_in_region = scope:target_country.capital.region
 				scope:target_country.capital.region = {
-					has_claim_by = root
+				    any_scope_state = {
+					    has_claim_by = root
+					}
 				}
 			}
 			add = 10

diff --git a/common/ideologies/00_ig_ideologies_flavored.txt b/common/ideologies/00_ig_ideologies_flavored.txt
@@ -334,9 +334,12 @@ ideology_caudillismo = {
 		law_cultural_exclusion = disapprove
 		law_multicultural = strongly_disapprove	
 	}
+
+	lawgroup_land_reform = {
+		law_serfdom = approve
+	}
 
 	lawgroup_labor_rights = {
-		law_serfdom = approve
 		law_regulatory_bodies = disapprove
 		law_worker_protections = disapprove
 	}
@@ -736,11 +739,13 @@ ideology_heavenly_kingdom_theocratic = {
 		law_womens_suffrage = disapprove
 	}
 
-	lawgroup_labor_rights = {		
+	lawgroup_land_reform = {
+		law_serfdom = strongly_disapprove
+	}
+
+	lawgroup_labor_rights = {	
 		law_worker_protections = neutral
 		law_regulatory_bodies = approve
-		law_serfdom_banned = approve
-		law_serfdom = strongly_disapprove
 	}	
 }
 

diff --git a/common/production_methods/12_subsistence.txt b/common/production_methods/12_subsistence.txt
@@ -57,10 +57,12 @@ pm_home_workshops_building_subsistence_farms = {
 pm_serfdom_no = {
 	texture = "gfx/interface/icons/production_method_icons/no_serfdom.dds"
 	unlocking_laws = {
-		law_serfdom_banned
 		law_regulatory_bodies
 		law_worker_protections
 	}
+	disallowing_laws = {
+		law_serfdom
+	}
 
 	building_modifiers = {					
 		unscaled = {

diff --git a/common/technology/technologies/30_society.txt b/common/technology/technologies/30_society.txt
@@ -5,6 +5,10 @@ sickle_cell = {
 	texture = "gfx/interface/icons/invention_icons/quinine.dds"
 	category = society
 	can_research = no
+
+	ai_weight = {
+		value = 1
+	}
 }
 
 urbanization = {

diff --git a/events/law_events/crime_events.txt → events/crime_events.txt b/events/law_events/crime_events.txt → events/crime_events.txt
diff --git a/events/flavor_new_zealand_events.txt b/events/flavor_new_zealand_events.txt
@@ -253,7 +253,7 @@ flavor_new_zealand.4 = { #Treaty of Waitangi
 	}
 }
 
-flavor_new_zealand.5 = { Hobson proclaims sovereignty
+flavor_new_zealand.5 = { #Hobson proclaims sovereignty
 	type = country_event
 	placement = root
 
@@ -328,7 +328,7 @@ flavor_new_zealand.5 = { Hobson proclaims sovereignty
 	}
 }
 
-flavor_new_zealand.6 = { New Zealand Crown Colony Founded
+flavor_new_zealand.6 = { #New Zealand Crown Colony Founded
 	type = country_event
 	placement = root