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

…to dev
Cold-War-Project · Apr 21, 2023 · 70999e1 · 70999e1
2 parents 5ed0744 + 6309471
commit 70999e1
Show file tree

Hide file tree

Showing 116 changed files with 30,242 additions and 52,510 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/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,6 +77,7 @@ building_furniture_manufactories = {
 		pmg_ownership_furniture
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_glassworks = {
@@ -92,6 +96,7 @@ building_glassworks = {
 		pmg_ownership_glassworks
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_tool_manufactories = {
@@ -110,6 +115,7 @@ building_tool_manufactories = {
 		pmg_ownership_tools
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 	ai_value = 2000	# Tools are very important
 }
 
@@ -129,6 +135,7 @@ building_paper_manufactories = {
 		pmg_ownership_paper
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_chemical_plants = {
@@ -147,6 +154,7 @@ building_chemical_plants = {
 		pmg_ownership_chemical_plants
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_synthetics_plant = {
@@ -166,6 +174,7 @@ building_synthetics_plant = {
 		pmg_ownership_synthetics_plant
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_steelworks = {
@@ -184,6 +193,7 @@ building_steelworks = {
 		pmg_ownership_steelworks
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_aluminum_refinery = {
@@ -202,6 +212,7 @@ building_aluminum_refinery = {
 		pmg_ownership_steelworks
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_motor_industry = {
@@ -221,6 +232,7 @@ building_motor_industry = {
 		pmg_ownership_motors
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_automobile_manufactories = {
@@ -241,6 +253,7 @@ building_automobile_manufactories = {
 		pmg_ownership_automobiles
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_shipyards = {
@@ -258,6 +271,7 @@ building_shipyards = {
 		pmg_ownership_shipyard
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 	possible = {
 		error_check = {
 			severity = fail
@@ -283,6 +297,7 @@ building_drydocks = {
 		pmg_ownership_shipyard
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 	possible = {
 		error_check = {
 			severity = fail
@@ -308,6 +323,7 @@ building_advanced_military_manufactories = {
 		pmg_ownership_advanced_military_manufactories
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_electronics_manufactories = {
@@ -327,6 +343,7 @@ building_electronics_manufactories = {
 		pmg_ownership_electronics
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_small_arms_manufactories = {
@@ -346,6 +363,7 @@ building_small_arms_manufactories = {
 		pmg_ownership_small_arms
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_explosives_industry = {
@@ -365,6 +383,7 @@ building_explosives_industry = {
 		pmg_ownership_munitions
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_fuel_refineries = {
@@ -384,6 +403,7 @@ building_fuel_refineries = {
 		pmg_ownership_fuel_refineries
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_semiconductor_manufactories = {
@@ -402,6 +422,7 @@ building_semiconductor_manufactories = {
 		pmg_ownership_semiconductor
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_aircraft_manufactories = {
@@ -422,6 +443,7 @@ building_aircraft_manufactories = {
 		pmg_ownership_aircraft
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_uranium_refineries = {
@@ -441,6 +463,7 @@ building_uranium_refineries = {
 		pmg_ownership_uranium_refineries
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_battery_manufactories = {
@@ -459,6 +482,7 @@ building_battery_manufactories = {
 		pmg_ownership_battery
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_pharmaceutical_industry = {
@@ -479,6 +503,7 @@ building_pharmaceutical_industry = {
 		pmg_ownership_pharmaceuticals
 	}
 	required_construction = construction_cost_very_high
+	generates_residences = no
 }
 
 building_computer_manufactories = {
@@ -497,6 +522,7 @@ building_computer_manufactories = {
 		pmg_ownership_computers
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
 
 building_consumer_electronics_manufactories = {
@@ -515,4 +541,5 @@ building_consumer_electronics_manufactories = {
 		pmg_ownership_household_appliance_manufactories
 	}
 	required_construction = construction_cost_high
+	generates_residences = no
 }
diff --git a/common/buildings/05_military.txt b/common/buildings/05_military.txt
@@ -4,6 +4,7 @@ building_barracks = {
 	recruits_combat_unit = combat_unit_regular
 	texture = "gfx/interface/icons/building_icons/building_barracks.dds"
 	city_type = city
+	generates_residences = no
 	has_max_level = yes
 	levels_per_mesh = 25
 	unlocking_technologies = {

diff --git a/common/buildings/06_urban_center.txt b/common/buildings/06_urban_center.txt
@@ -4,6 +4,7 @@ building_urban_center = {
 	texture = "gfx/interface/icons/building_icons/urban_center.dds"
 	city_type = city
 	residence_points_per_level = 0
+	generates_residences = yes
 	unlocking_technologies = {
 		urbanization
 	}
@@ -21,10 +22,30 @@ building_urban_center = {
 	terrain_manipulator = urban_city
 }
 
+building_skyscraper = {
+	building_group = bg_skyscraper
+	city_type = city
+	levels_per_mesh = 1
+	#override_centerpiece_mesh = yes
+	has_max_level = yes
+	generates_residences = no
+	unlocking_technologies = {
+		urbanization
+	}
+	production_method_groups = {
+		pmg_base_skyscraper
+		pmg_skyscraper_focus
+		pmg_ownership_skyscraper
+	}
+	texture = "gfx/interface/icons/building_icons/skyscraper.dds"
+	required_construction = construction_cost_monument
+}
+
 building_combustion_plant = {
 	building_group = bg_combustion_power
 	texture = "gfx/interface/icons/building_icons/power_plant.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		early_electrical_generation
 	}
@@ -40,6 +61,7 @@ building_nuclear_power_plant = {
 	building_group = bg_nuclear_power
 	texture = "gfx/interface/icons/building_icons/nuclear_power_plant.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		nuclear_reactors
 	}
@@ -56,6 +78,7 @@ building_renewable_energy_facility = {
 	texture = "gfx/interface/icons/building_icons/placeholder.dds"
 	levels_per_mesh = 5
 	has_max_level = yes
+	generates_residences = no
 	unlocking_technologies = {
 		early_electrical_generation
 	}
@@ -73,6 +96,7 @@ building_geothermal_power_plant = {
 	building_group = bg_geothermal_power
 	texture = "gfx/interface/icons/building_icons/placeholder.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		geothermal_power
 	}
@@ -118,6 +142,7 @@ building_telecommunications = {
 	building_group = bg_telecommunications
 	texture = "gfx/interface/icons/building_icons/telecommunications_industry.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		telecommunications_tech
 	}
@@ -133,11 +158,14 @@ building_tourism_industry = {
 	building_group = bg_tourism
 	texture = "gfx/interface/icons/building_icons/tourism_industry.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		rapid_transit
 	}
 	production_method_groups = {
 		pmg_base_tourism
+		pmg_tourism_entertainment
+		pmg_supporting_industry_tourism
 		pmg_advertisements_tourism
 		pmg_professional_service_use
 		pmg_ownership_tourism
@@ -149,11 +177,14 @@ building_financial_services = {
 	building_group = bg_financial_services
 	texture = "gfx/interface/icons/building_icons/financial_services_industry.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		fiat_currencies
 	}
 	production_method_groups = {
 		pmg_base_financial_services
+		pmg_commercial_banking
+		pmg_investment_services
 		pmg_professional_service_use
 		pmg_ownership_financial_services
 	}
@@ -164,11 +195,13 @@ building_media_industry = {
 	building_group = bg_media
 	texture = "gfx/interface/icons/building_icons/media_industry.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		pre_war_ideological_thought
 	}
 	production_method_groups = {
 		pmg_base_media_industry
+		pmg_news_media_industry
 		pmg_media_industry_content
 		pmg_professional_service_use
 		pmg_ownership_media_industry
@@ -180,6 +213,7 @@ building_hospitals = {
 	building_group = bg_healthcare
 	texture = "gfx/interface/icons/building_icons/hospitals.dds"
 	levels_per_mesh = 5
+	generates_residences = no
 	unlocking_technologies = {
 		pre_war_healthcare
 	}
@@ -198,6 +232,7 @@ building_slums = {
 	city_type = city
 	levels_per_mesh = 5
 	has_max_level = yes
+	generates_residences = no
 	buildable = no
 	expandable = no
 	downsizeable = no
@@ -207,3 +242,4 @@ building_slums = {
 	}
 	min_raise_to_hire = 0.3
 }
+