Merge branch 'dev' into pm-errors

Cold-War-Project · Jul 11, 2023 · a1c1213 · a1c1213
2 parents 267ff13 + dddd279
commit a1c1213
Show file tree

Hide file tree

Showing 215 changed files with 2,618 additions and 2,654 deletions.
diff --git a/common/country_creation/00_releasable_countries.txt b/common/country_creation/00_releasable_countries.txt
@@ -102,7 +102,8 @@ EST = {
 
 LIT = {
 	states = {
-		STATE_LITHUANIA
+		STATE_WEST_LITHUANIA
+		STATE_EAST_LITHUANIA
 	}
 	ai_will_do = {
 		always = no
@@ -223,6 +224,15 @@ UKR = {
 	}
 }
 
+MLV = {
+	states = {
+		STATE_BESSARABIA
+	}
+	ai_will_do = {
+		always = no
+	}
+}
+
 HUN = {
 	use_culture_states = yes
 	required_num_states = 2
@@ -824,7 +834,7 @@ ALD = {
 	states = {
 		STATE_ALGIERS
 		STATE_CONSTANTINE
-		STATE_TLEMCEN
+		STATE_ORAN
 		STATE_SAHARA
 	}
 	ai_will_do = {
@@ -1210,3 +1220,67 @@ XIN = {
 		always = no
 	}
 }
+
+UZB = {
+	states = {
+		STATE_WEST_UZBEKIA
+		STATE_EAST_UZBEKIA
+	}
+	ai_will_do = {
+		always = no
+	}
+}
+
+KAZ = {
+	states = {
+		STATE_AKMOLINSK
+		STATE_KHIVA
+		STATE_URALSK
+		STATE_SEMIRECHE
+		STATE_JETISY
+	}
+	ai_will_do = {
+		always = no
+	}
+}
+
+KYR = {
+	states = {
+		STATE_KIRGHIZIA
+	}
+	ai_will_do = {
+		always = no
+	}
+}
+
+TJK = {
+	states = {
+		STATE_TAJIKISTAN
+	}
+	ai_will_do = {
+		always = no
+	}
+}
+
+TKM = {
+	states = {
+		STATE_TURKMENIA
+	}
+	ai_will_do = {
+		always = no
+	}
+}
+
+LAO = {
+	states = { STATE_LAOS }
+
+	required_num_states = 1
+
+	ai_will_do = { always = no }
+}
+
+CAM = {
+	states = { STATE_CAMBODIA }
+
+	ai_will_do = { always = no }
+}
diff --git a/common/country_definitions/00_countries.txt b/common/country_definitions/00_countries.txt
@@ -782,8 +782,8 @@ LIT = {
 	cultures = {
 		lithuanian
 	}
-	capital = STATE_LITHUANIA
-	is_named_from_capital = yes
+	capital = STATE_EAST_LITHUANIA
+	is_named_from_capital = no
 }
 
 LAT = {
@@ -1106,7 +1106,7 @@ BUK = {
 	cultures = {
 		uzbek
 	}
-	capital = STATE_UZBEKIA
+	capital = STATE_EAST_UZBEKIA
 }
 
 GEO = {
@@ -3475,7 +3475,7 @@ TRH = {
 		tajik
 		uighur
 	}
-	capital = STATE_UZBEKIA
+	capital = STATE_EAST_UZBEKIA
 }
 
 # India
@@ -5733,7 +5733,7 @@ VNM = {
 		lao
 		khmu
 	}
-	capital = STATE_LAOS
+	capital = STATE_TONKIN
 }
 
 NEP = {
@@ -5831,7 +5831,7 @@ UZB = {
 	cultures = {
 		uzbek
 	}
-	capital = STATE_UZBEKIA
+	capital = STATE_EAST_UZBEKIA
 }
 
 TJK = {
@@ -5845,7 +5845,7 @@ TJK = {
 	cultures = {
 		tajik
 	}
-	capital = STATE_UZBEKIA
+	capital = STATE_TAJIKISTAN
 }
 
 AFH = {

diff --git a/common/history/buildings/01_south_europe.txt b/common/history/buildings/01_south_europe.txt
@@ -5775,42 +5775,6 @@
 				}
 			}
 		}
-		region_state:BUL = {
-			create_building = {
-				building = "building_government_administration"
-				level = 1
-				reserves = 1
-				activate_production_methods = {
-					"pm_professional_bureaucrats"
-					"pm_professional_service_industry_no"
-					"pm_modern_bureaucracy"
-				}
-			}
-			create_building = {
-				building = "building_wheat_farm"
-				level = 3
-				subsidized = yes
-				reserves = 1
-				activate_production_methods = {
-					"pm_simple_farming"
-					"pm_privately_owned_farm"
-					"pm_no_honey_production"
-					"pm_manual_harvesting"
-					"pm_citrus_orchards"
-				}
-			}
-			create_building = {
-				building = "building_logging_camp"
-				level = 2
-				reserves = 1
-				activate_production_methods = {
-					"pm_simple_forestry"
-					"pm_no_equipment"
-					"pm_manual_transportation"
-					"pm_privately_owned_mine"
-				}
-			}
-		}
 	}
 	s:STATE_ALBANIA = {
 		region_state:ALB = {

diff --git a/common/history/buildings/02_east_europe.txt b/common/history/buildings/02_east_europe.txt
@@ -2101,7 +2101,7 @@
 			}
 		}
 	}
-	s:STATE_LITHUANIA = {
+	s:STATE_WEST_LITHUANIA = {
 		region_state:RUS = {
 			create_building = {
 				building = "building_barracks"
@@ -2136,6 +2136,108 @@
 					"pm_basic_port"
 				}
 			}
+			create_building = {
+				building = "building_logging_camp"
+				level = 2
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_electric_saw_mills"
+					"pm_no_equipment"
+					"pm_manual_transportation"
+					"pm_government_run_mine"
+				}
+			}
+			create_building = {
+				building = "building_livestock_ranch"
+				level = 7
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_open_air_stockyards"
+					"pm_butchering_tools"
+					"pm_standard_fences"
+					"pm_unrefrigerated"
+					"pm_government_run_farm"
+				}
+			}
+		}
+	}
+	s:STATE_EAST_LITHUANIA = {
+		region_state:RUS = {
+			create_building = {
+				building = "building_barracks"
+				level = 5
+				reserves = 1
+				activate_production_methods = {
+					"pm_post_war_infantry"
+					"pm_wartime_artillery"
+					"pm_main_battle_tanks"
+					"pm_motorized"
+					"pm_no_formal_medical_support"
+					"pm_no_special_reconnaissance"
+					"pm_no_communications_support"
+					"pm_no_aircraft"
+				}
+			}
+			create_building = {
+				building = "building_government_administration"
+				level = 5
+				reserves = 1
+				activate_production_methods = {
+					"pm_modern_bureaucracy"
+					"pm_professional_service_industry_no"
+					"pm_professional_bureaucrats"
+				}
+			}
+			create_building = {
+				building = "building_rye_farm"
+				level = 7
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_fertilizers"
+					"pm_no_secondary"
+					"pm_no_sugar_beets"
+					"pm_manual_harvesting"
+					"pm_government_run_farm"
+				}
+			}
+			create_building = {
+				building = "building_logging_camp"
+				level = 3
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_electric_saw_mills"
+					"pm_no_equipment"
+					"pm_manual_transportation"
+					"pm_government_run_mine"
+				}
+			}
+			create_building = {
+				building = "building_combustion_plant"
+				level = 3
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_coal_fired_plant"
+					"pm_professional_service_industry_no"
+					"pm_government_run_utility"
+				}
+			}
+			create_building = {
+				building = "building_railway"
+				level = 5
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_steam_trains"
+					"pm_paved_roads"
+					"pm_cargo_prioritization"
+					"pm_government_run_building_railway"
+				}
+			}
 		}
 	}
 	s:STATE_KRALOVEC = {
@@ -2156,7 +2258,8 @@
 			}
 			create_building = {
 				building = "building_railway"
-				level = 1
+				level = 2
+				subsidized = yes
 				reserves = 1
 				activate_production_methods = {
 					"pm_steam_trains"
@@ -2165,6 +2268,39 @@
 					"pm_government_run_building_railway"
 				}
 			}
+			create_building = {
+				building = "building_livestock_ranch"
+				level = 3
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_open_air_stockyards"
+					"pm_butchering_tools"
+					"pm_standard_fences"
+					"pm_unrefrigerated"
+					"pm_government_run_farm"
+				}
+			}
+			create_building = {
+				building = "building_oil_rig"
+				level = 2
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_oil_rigs"
+					"pm_manual_transportation"
+					"pm_government_run_mine"
+				}
+			}
+			create_building = {
+				building = "building_port"
+				level = 4
+				subsidized = yes
+				reserves = 1
+				activate_production_methods = {
+					"pm_anchorage"
+				}
+			}
 		}
 	}
 	s:STATE_MAZOVIA = {
@@ -4152,14 +4288,6 @@
 					"pm_professional_bureaucrats"
 				}
 			}
-			create_building = {
-				building = "building_port"
-				level = 4
-				reserves = 1
-				activate_production_methods = {
-					"pm_basic_port"
-				}
-			}
 		}
 	}
 }
diff --git a/common/history/buildings/03_north_africa.txt b/common/history/buildings/03_north_africa.txt
@@ -746,7 +746,7 @@
 			}
 		}
 	}
-	s:STATE_TLEMCEN = {
+	s:STATE_ORAN = {
 		region_state:FRA = {
 			create_building = {
 				building = "building_port"