Merge branch 'dev' of https://github.com/Cold-War-Project/CWP-Main in…

…to econ_imf_branch
Cold-War-Project · Jun 30, 2023 · 80e547c · 80e547c
2 parents e88b997 + 6ca7913
commit 80e547c
Show file tree

Hide file tree

Showing 174 changed files with 5,366 additions and 4,403 deletions.
diff --git a/.metadata/metadata.json b/.metadata/metadata.json
@@ -1,8 +1,8 @@
 {
   "name": "Cold War Project",
   "id": "",
-  "version": "0.2.0",
-  "supported_game_version": "1.3.5",
+  "version": "0.2.1",
+  "supported_game_version": "1.3.6",
   "short_description": "",
   "tags": [],
   "relationships": [],

diff --git a/common/country_creation/00_releasable_countries.txt b/common/country_creation/00_releasable_countries.txt
@@ -525,7 +525,7 @@ MCH = {
 
 	possible = {
 		custom_tooltip = {
-			text = "Chinese Civil War has ended"
+			text = "chinese_civilw_war_tt"
 			NAND = {
 				exists = c:PRC
 				exists = c:ROC
@@ -560,15 +560,6 @@ LEB = {
 	ai_will_do = { always = no }
 }
 
-SUD = {
-	states = {
-		STATE_BLUE_NILE
-		STATE_KORDOFAN
-		STATE_DONGOLA
-	}
-	ai_will_do = { always = no }
-}
-
 MEX = {
 	use_culture_states = yes
 	ai_will_do = { always = no }
@@ -610,22 +601,6 @@ NET = {
 	ai_will_do = { always = no }
 }
 
-JAP = {
-	use_culture_states = yes
-
-	required_num_states = 3
-
-	ai_will_do = { always = no }	
-}
-
-RUS = {
-	use_culture_states = yes
-
-	required_num_states = 5
-
-	ai_will_do = { always = no }	
-}
-
 GBR = {
 	use_culture_states = yes
 
@@ -666,73 +641,6 @@ CAN = {
 	ai_will_do = { always = no }
 }
 
-SWE = {
-	states = { 
-		STATE_SVEALAND 
-		STATE_GOTALAND 
-		STATE_SCANIA 
-		STATE_NORRLAND 
-	}
-
-	required_num_states = 2
-
-	ai_will_do = { always = no }
-}
-
-FIN = {
-	states = { 
-		STATE_SOUTHERN_FINLAND 
-		STATE_OSTROBOTHNIA 
-		STATE_WEST_KARELIA
-	}
-
-	required_num_states = 2
-
-	ai_will_do = { always = no }
-}
-
-NOR = {
-	use_culture_states = yes
-
-	required_num_states = 2
-
-	ai_will_do = { always = no }
-}
-
-DEN = {
-	use_culture_states = yes
-
-	required_num_states = 2
-
-	ai_will_do = { always = no }
-}
-
-FRA = {
-	states = { 
-		STATE_ILE_DE_FRANCE 
-		STATE_PROVENCE 
-		STATE_NORMANDY 
-		STATE_LANGUEDOC
-		STATE_RHONE
-		STATE_FRENCH_LOW_COUNTRIES
-		STATE_PICARDY
-		STATE_ALSACE_LORRAINE
-		STATE_POITOU
-		STATE_GUYENNE
-		STATE_AUVERGNE_LIMOUSIN
-		STATE_BRITTANY
-		STATE_BURGUNDY
-		STATE_CHAMPAGNE
-		STATE_FRANCHE_COMTE
-		STATE_LORRAINE
-		STATE_AQUITAINE
-		STATE_ORLEANS
-		STATE_MAINE_ANJOU
-	}
-
-	ai_will_do = { always = no }
-}
-
 CLM = {
 	states = {
 		STATE_ANTIOQUIA
@@ -1003,7 +911,6 @@ ORG = {
 	states = {
 		STATE_OREGON
 		STATE_WASHINGTON
-		STATE_IDAHO
 		STATE_BRITISH_COLUMBIA
 	}
 	ai_will_do = { always = no }
@@ -1067,11 +974,6 @@ YUN = {
 	ai_will_do = { always = no }
 }
 
-YUE = {
-	use_culture_states = yes
-	ai_will_do = { always = no }
-}
-
 ARG = {
 	use_culture_states = yes
 
@@ -1160,11 +1062,5 @@ BHN = {
 XIN = {
 	states = { STATE_DZUNGARIA STATE_TIANSHAN STATE_JETISY }
 
-	ai_will_do = { always = no }
-}
-
-PPY = {
-	states = { STATE_EASTERN_NEW_GUINEA STATE_BOUGAINVILLE }
-
 	ai_will_do = { always = no }
 }
diff --git a/common/country_definitions/00_countries.txt b/common/country_definitions/00_countries.txt
@@ -122,6 +122,7 @@ USA = {
 		94
 		193
 	}
+	country_type = recognized
 	tier = empire
 	cultures = {
 		american
@@ -335,7 +336,7 @@ FER = {
 	color = { 207 25 25 }
 	country_type = unrecognized
 	tier = principality
-	cultures = { siberian inuit }
+	cultures = { siberian }
 	capital = STATE_OKHOTSK
 }
 
@@ -2094,6 +2095,7 @@ CUB = {
 		192
 		204
 	}
+	country_type = recognized
 	tier = principality
 	cultures = {
 		caribeno
@@ -2168,7 +2170,7 @@ MEX = {
 		143
 		53
 	}
-	#173  242  175
+	country_type = recognized
 	tier = kingdom
 	cultures = {
 		mexican
@@ -2183,6 +2185,7 @@ NEN = {
 		224
 		85
 	}
+	country_type = unrecognized
 	tier = grand_principality
 	cultures = {
 		american
@@ -2288,6 +2291,7 @@ TEX = {
 	cultures = {
 		american
 	}
+	country_type = unrecognized
 	capital = STATE_TEXAS
 	is_named_from_capital = yes
 }
@@ -2298,6 +2302,7 @@ UCA = {
 		175
 		255
 	}
+	country_type = unrecognized
 	tier = kingdom
 	capital = STATE_SAN_SALVADOR
 	cultures = {
@@ -2576,6 +2581,7 @@ ORG = {
 		80
 		126
 	}
+	country_type = unrecognized
 	tier = principality
 	cultures = {
 		american
@@ -2649,6 +2655,7 @@ GRN = {
 		80
 		52
 	}
+	country_type = unrecognized
 	tier = principality
 	cultures = {
 		danish
@@ -3073,6 +3080,7 @@ YUC = {
 		142
 		20
 	}
+	country_type = unrecognized
 	tier = principality
 	cultures = {
 		mexican

diff --git a/common/decisions/pmc_decisions.txt b/common/decisions/pmc_decisions.txt