Merge pull request #592 from Cold-War-Project/1.4-Compatch

1.4 compatch
Cold-War-Project · Aug 30, 2023 · a65155c · a65155c
2 parents 6124ba3 + 2e0c4b6
commit a65155c
Show file tree

Hide file tree

Showing 383 changed files with 4,709 additions and 3,488 deletions.
diff --git a/.metadata/metadata.json b/.metadata/metadata.json
@@ -1,8 +1,8 @@
 {
   "name": "Cold War Project",
   "id": "",
-  "version": "0.2.8",
-  "supported_game_version": "1.3.6",
+  "version": "0.2.9",
+  "supported_game_version": "1.4.0",
   "short_description": "",
   "tags": [],
   "relationships": [],
@@ -18,6 +18,7 @@
       "common/customizable_localization",
       "common/decisions",
       "common/discrimination_traits",
+      "common/character_templates",
       "common/government_types",
       "common/history",
       "common/history/ai",

diff --git a/common/alert_types/00_alert_types.txt b/common/alert_types/00_alert_types.txt
@@ -195,7 +195,7 @@ secession_growing_alert = {
 		has_any_secessionists_growing = yes
 		has_any_secessionists_broken_out = no
 	}
-	open_panel = culture|cultures
+	open_panel = politics|default
 	type = alert
 	alert_group = secession_growing
 }

diff --git a/common/building_groups/00_building_groups.txt b/common/building_groups/00_building_groups.txt
@@ -520,7 +520,7 @@ bg_public_infrastructure = {
 
 bg_construction = {
 	parent_group = bg_public_infrastructure
-	infrastructure_usage_per_level = 0.2
+	infrastructure_usage_per_level = 0.2 # Is 3 in 1.4, left it for now
 	lens = government
 	is_government_funded = yes
 	urbanization = 5

diff --git a/common/buildings/07_government.txt b/common/buildings/07_government.txt
@@ -30,6 +30,15 @@ building_government_administration = {
 	unlocking_technologies = {
 		informal_bureaucracy
 	}
+	should_auto_expand = {
+		occupancy >= 0.8
+		OR = {
+			state.tax_capacity < state.tax_capacity_usage
+			owner = {
+				bureaucracy < -10
+			}
+		}
+	}
 	production_method_groups = {
 		pmg_base_government_administration
 		pmg_professional_service_use_administrators

diff --git a/common/buildings/08_monuments.txt b/common/buildings/08_monuments.txt
@@ -327,7 +327,7 @@ building_vatican_city = {
 	}
 	city_gfx_interactions = {
 		clear_size_area = yes
-		size = 6
+		size = 4
 	}
 	production_method_groups = {
 		pmg_base_building_vatican_city
@@ -778,3 +778,93 @@ building_central_park = {
 		pmg_dummy
 	}
 }
+
+### AP1 - models not present in basegame ###
+
+building_martandsuntemple = {
+	building_group = bg_monuments_hidden
+	expandable = no
+	buildable = no
+	downsizeable = no
+	unique = yes
+	locator = "monument_martandsuntemple_locator"
+
+	entity_not_constructed = {monument_martandsuntemple_entity}
+	entity_under_construction = { }
+	entity_constructed = { "monument_martandsuntemple_entity"}
+
+	city_gfx_interactions = {
+		clear_size_area = yes
+		size = 6
+	}
+
+	production_method_groups = {
+		pmg_dummy
+	}
+}
+
+building_observatorygreenwich = {
+	building_group = bg_monuments_hidden
+	expandable = no
+	buildable = no
+	downsizeable = no
+	unique = yes
+	locator = "monument_observatorygreenwich_locator"
+
+	entity_not_constructed = {"monument_observatorygreenwich_entity"}
+	entity_under_construction = {"monument_observatorygreenwich_entity"}
+	entity_constructed = {"monument_observatorygreenwich_entity"}
+
+	city_gfx_interactions = {
+		clear_size_area = yes
+		size = 4
+	}
+
+	production_method_groups = {
+		pmg_dummy
+	}
+}
+
+building_temple_of_poseidon = {
+	building_group = bg_monuments_hidden
+	expandable = no
+	buildable = no
+	downsizeable = no
+	unique = yes
+	locator = "templeofposeidon_locator"
+
+	entity_not_constructed = {"monument_templeofposeidon_entity"}
+	entity_under_construction = {"monument_templeofposeidon_entity"}
+	entity_constructed = {"monument_templeofposeidon_entity"}
+
+	city_gfx_interactions = {
+		clear_size_area = yes
+		size = 3
+	}
+
+	production_method_groups = {
+		pmg_dummy
+	}
+}
+
+building_wat_arun = {
+	building_group = bg_monuments_hidden
+	expandable = no
+	buildable = no
+	downsizeable = no
+	unique = yes
+	locator = "wat_arun_locator"
+
+	entity_not_constructed = {"monument_watarun_entity"}
+	entity_under_construction = {"monument_watarun_entity"}
+	entity_constructed = {"monument_watarun_entity"}
+
+	city_gfx_interactions = {
+		clear_size_area = yes
+		size = 3
+	}
+
+	production_method_groups = {
+		pmg_dummy
+	}
+}
diff --git a/common/buildings/11_private_infrastructure.txt b/common/buildings/11_private_infrastructure.txt
@@ -14,11 +14,21 @@ building_railway = {
 	required_construction = construction_cost_high
 	ai_value = 2000	# Railways are important
 	should_auto_expand = {
+		occupancy >= 0.8
 		OR = {
 			cash_reserves_ratio > 0.5
 			is_subsidized = yes
 		}
-		state.market_access < 1
+		OR = {
+			owner = {
+				market = {
+					mg:transportation = { 
+						market_goods_pricier > 0.5 
+					}
+				}
+			}
+			state.market_access < 1
+		}
 		NOT = { is_under_construction = yes }
 	}
 }