Merge pull request #232 from Cold-War-Project/dev

Patch 0.1.4
Cold-War-Project · Apr 21, 2023 · 03d02d2 · 03d02d2
2 parents 75d4edf + 70999e1
commit 03d02d2
Show file tree

Hide file tree

Showing 238 changed files with 69,994 additions and 55,400 deletions.
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
@@ -34,7 +34,6 @@ Anguillan
 ANTIOQUIA
 antiretroviral
 antiship
-Apacheria
 apcs
 arcologies
 argebam
@@ -485,7 +484,6 @@ ONELINE
 onmousehierarchyenter
 onmousehierarchyleave
 onrightclick
-oodham
 organochloride
 organochlorines
 organophosphates
@@ -642,7 +640,6 @@ supercruise
 supercruiser
 supranation
 supranationalism
-Svalbardi
 SVEALAND
 tangena
 TARAPACA

diff --git a/common/ai_strategies/00_default_strategy.txt b/common/ai_strategies/00_default_strategy.txt
@@ -66,12 +66,12 @@ ai_strategy_default = {
 	# How many barracks relative to incorporated population should the AI have
 	# Using a different value in a strategy will override this value
 	wanted_army_ratio = {
-		value = 500000		# 1 barrack per 500k incorporated population
+		value = 3000000		# 1 barrack per 3M incorporated population
 	}
 	# How many naval bases relative to incorporated coastal population should the AI have
 	# Using a different value in a strategy will override this value
 	wanted_navy_ratio = {
-		value = 800000		# 1 naval base per 800k coastal incorporated population
+		value = 10000000		# 1 naval base per 5M coastal incorporated population
 	}
 	# Chance each update that the AI is willing to start changing a law (1 = 1%)
 	# Using this value in other strategies will function additively
@@ -351,6 +351,10 @@ ai_strategy_default = {
 	# Using this value in other strategies will result in several multiplications
 	building_group_weights = {
 		bg_basic_infrastructure = 2
+		bg_bureaucracy = 2
+		bg_construction = 1.5
+		bg_navy = 0.5
+		bg_army = 0.5
 	}
 	# Which buildings should the AI subsidize
 	# Using a different value in a strategy will override this value

diff --git a/common/ai_strategies/01_admin_strategies.txt b/common/ai_strategies/01_admin_strategies.txt
@@ -615,15 +615,6 @@ ai_strategy_maintain_hegemony = {
 				country_rank >= rank_value:major_power
 			}
 		}
-		aircraft_carriers = {
-			stance = wants_export
-			trigger = {
-				has_technology_researched = ironclad_tech
-				has_technology_researched = gantry_cranes
-				has_port = yes
-				country_rank >= rank_value:great_power
-			}
-		}
 		uranium = {
 			stance = wants_high_supply
 		}

diff --git a/common/ai_strategies/02_diplomatic_strategies.txt b/common/ai_strategies/02_diplomatic_strategies.txt
@@ -106,10 +106,10 @@ ai_strategy_territorial_expansion = {
 	icon = "gfx/interface/icons/ai_strategy_icons/territorial_expansion.dds"
 	type = diplomatic
 	wanted_army_ratio = {
-		value = 300000
+		value = 3000000
 	}
 	wanted_navy_ratio = {
-		value = 600000
+		value = 5000000
 	}
 	undesirable_infamy_level = {
 		value = 50
@@ -215,10 +215,10 @@ ai_strategy_colonial_expansion = {
 	icon = "gfx/interface/icons/ai_strategy_icons/colonial_expansion.dds"
 	type = diplomatic
 	wanted_army_ratio = {
-		value = 300000
+		value = 3000000
 	}
 	wanted_navy_ratio = {
-		value = 600000
+		value = 5000000
 	}
 	undesirable_infamy_level = {
 		value = 25
@@ -423,10 +423,10 @@ ai_strategy_armed_isolationism = {
 	icon = "gfx/interface/icons/ai_strategy_icons/armed_isolationism.dds"
 	type = diplomatic
 	wanted_army_ratio = {
-		value = 250000
+		value = 3000000
 	}
 	wanted_navy_ratio = {
-		value = 700000
+		value = 5000000
 	}
 	undesirable_infamy_level = {
 		value = 1
@@ -510,10 +510,10 @@ ai_strategy_economic_imperialism = {
 	icon = "gfx/interface/icons/ai_strategy_icons/economic_imperialism.dds"
 	type = diplomatic
 	wanted_army_ratio = {
-		value = 200000
+		value = 3000000
 	}
 	wanted_navy_ratio = {
-		value = 300000
+		value = 5000000
 	}
 	undesirable_infamy_level = {
 		value = 25
@@ -758,10 +758,10 @@ ai_strategy_global_liberalism = {
 	icon = "gfx/interface/icons/ai_strategy_icons/economic_imperialism.dds"
 	type = diplomatic
 	wanted_army_ratio = {
-		value = 500000
+		value = 3000000
 	}
 	wanted_navy_ratio = {
-		value = 400000
+		value = 5000000
 	}
 	undesirable_infamy_level = {
 		value = 25
@@ -964,10 +964,10 @@ ai_strategy_international_socialism = {
 	icon = "gfx/interface/icons/ai_strategy_icons/economic_imperialism.dds"
 	type = diplomatic
 	wanted_army_ratio = {
-		value = 300000
+		value = 3000000
 	}
 	wanted_navy_ratio = {
-		value = 800000
+		value = 5000000
 	}
 	undesirable_infamy_level = {
 		value = 50

diff --git a/common/building_groups/00_building_groups.txt b/common/building_groups/00_building_groups.txt
@@ -13,7 +13,7 @@
 #										If unspecified, will return first non-default land usage type found in parent building group tree.
 # cash_reserves_max = number			Maximum amount of £ (per level) that buildings in this group can store into their cash reserves. If unspecified or set to 0, it will use the value from the parent group. Default 0
 # inheritable_construction =  yes/no	If yes, a construction of this building group will survive a state changing hands or a split state merging
-# stateregion_max_level = yes/no		If yes, any building types in this group with the has_max_level property will consider its level restrictions on state-region rather than state level	
+# stateregion_max_level = yes/no		If yes, any building types in this group with the has_max_level property will consider its level restrictions on state-region rather than state level
 # urbanization = number					The amount of urbanization buildings in this group provides per level
 # should_auto_expand = trigger			Under which condition buildings in this group should auto-expand if auto-expand is toggled on (trigger on more specific group or building type overrides)
 # 										If this trigger has any contents at all, the game will think the building is potentially auto-expandable, so do not write triggers that can never evaluate to true here
@@ -567,7 +567,7 @@ bg_monuments = {
 }
 
 bg_skyscraper = {
-	parent_group = bg_private_infrastructure
+	parent_group = bg_urban_facilities
 }
 
 bg_monuments_hidden = {

diff --git a/common/buildings/01_industry.txt b/common/buildings/01_industry.txt
@@ -18,6 +18,7 @@ building_food_industry = {
 		pmg_ownership_food
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_distilleries = {
@@ -37,6 +38,7 @@ building_distilleries = {
 		pmg_ownership_distillery
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_textile_manufactories = {
@@ -55,6 +57,7 @@ building_textile_manufactories = {
 		pmg_ownership_textiles
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_furniture_manufactories = {
@@ -74,13 +77,17 @@ building_furniture_manufactories = {
 		pmg_ownership_furniture
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_glassworks = {
 	building_group = bg_light_industry
 	texture = "gfx/interface/icons/building_icons/glassworks.dds"
 	city_type = city
 	levels_per_mesh = 5
+	unlocking_technologies = {
+		early_production
+	}
 	production_method_groups = {
 		pmg_base_glassworks
 		pmg_automation_glassworks
@@ -89,6 +96,7 @@ building_glassworks = {
 		pmg_ownership_glassworks
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_tool_manufactories = {
@@ -107,6 +115,7 @@ building_tool_manufactories = {
 		pmg_ownership_tools
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 	ai_value = 2000	# Tools are very important
 }
 
@@ -126,6 +135,7 @@ building_paper_manufactories = {
 		pmg_ownership_paper
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_chemical_plants = {
@@ -144,6 +154,7 @@ building_chemical_plants = {
 		pmg_ownership_chemical_plants
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_synthetics_plant = {
@@ -163,6 +174,7 @@ building_synthetics_plant = {
 		pmg_ownership_synthetics_plant
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_steelworks = {
@@ -181,6 +193,7 @@ building_steelworks = {
 		pmg_ownership_steelworks
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_aluminum_refinery = {
@@ -199,6 +212,7 @@ building_aluminum_refinery = {
 		pmg_ownership_steelworks
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_motor_industry = {
@@ -218,6 +232,7 @@ building_motor_industry = {
 		pmg_ownership_motors
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_automobile_manufactories = {
@@ -238,6 +253,7 @@ building_automobile_manufactories = {
 		pmg_ownership_automobiles
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_shipyards = {
@@ -255,6 +271,7 @@ building_shipyards = {
 		pmg_ownership_shipyard
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 	possible = {
 		error_check = {
 			severity = fail
@@ -280,6 +297,7 @@ building_drydocks = {
 		pmg_ownership_shipyard
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 	possible = {
 		error_check = {
 			severity = fail
@@ -305,6 +323,7 @@ building_advanced_military_manufactories = {
 		pmg_ownership_advanced_military_manufactories
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_electronics_manufactories = {
@@ -324,6 +343,7 @@ building_electronics_manufactories = {
 		pmg_ownership_electronics
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_small_arms_manufactories = {
@@ -343,6 +363,7 @@ building_small_arms_manufactories = {
 		pmg_ownership_small_arms
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_explosives_industry = {
@@ -362,6 +383,7 @@ building_explosives_industry = {
 		pmg_ownership_munitions
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_fuel_refineries = {
@@ -381,6 +403,7 @@ building_fuel_refineries = {
 		pmg_ownership_fuel_refineries
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_semiconductor_manufactories = {
@@ -399,6 +422,7 @@ building_semiconductor_manufactories = {
 		pmg_ownership_semiconductor
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_aircraft_manufactories = {
@@ -419,6 +443,7 @@ building_aircraft_manufactories = {
 		pmg_ownership_aircraft
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_uranium_refineries = {
@@ -438,6 +463,7 @@ building_uranium_refineries = {
 		pmg_ownership_uranium_refineries
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_battery_manufactories = {
@@ -456,6 +482,7 @@ building_battery_manufactories = {
 		pmg_ownership_battery
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_pharmaceutical_industry = {
@@ -476,6 +503,7 @@ building_pharmaceutical_industry = {
 		pmg_ownership_pharmaceuticals
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_computer_manufactories = {
@@ -494,6 +522,7 @@ building_computer_manufactories = {
 		pmg_ownership_computers
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_consumer_electronics_manufactories = {
@@ -512,4 +541,5 @@ building_consumer_electronics_manufactories = {
 		pmg_ownership_household_appliance_manufactories
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }