Lack/service economy

common/building_groups/00_building_groups.txt

@@ -390,8 +390,13 @@ bg_financial_services = {
 	parent_group = bg_urban_facilities
 }
 
+bg_service_sectors = {
+	parent_group = bg_urban_facilities
+}
+
 bg_tourism = {
 	parent_group = bg_urban_facilities
+	default_building = building_hotels
 }
 
 bg_telecommunications = {

common/buildings/06_urban.txt

@@ -131,6 +131,54 @@ building_media_industry = {
 	}
 }
 
+building_service_sectors = {
+	ownership_type = self
+	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_light_industry.dds"
+	building_group = bg_service_sectors
+	icon ="gfx/interface/icons/building_icons/urban_center.dds"
+	levels_per_mesh = 50
+	unlocking_technologies = {
+		modern_urbanism
+	}
+	production_method_groups = {
+		pmg_base_service_sectors
+		pmg_restaurants
+		pmg_clubs
+	}
+	required_construction = construction_cost_medium
+	possible = {
+		owner = {
+			not = {
+				has_law_or_variant = law_type:law_industry_banned
+			}
+		}
+	}
+}
+
+building_hotels = {
+	ownership_type = self
+	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_light_industry.dds"
+	building_group = bg_tourism
+	icon ="gfx/interface/icons/building_icons/tourism_industry.dds"
+	levels_per_mesh = 50
+	unlocking_technologies = {
+		modern_urbanism
+	}
+	production_method_groups = {
+		pmg_base_hotels
+		pmg_hotel_transportation
+		pmg_hotel_gambling
+	}
+	required_construction = construction_cost_medium
+	possible = {
+		owner = {
+			not = {
+				has_law_or_variant = law_type:law_industry_banned
+			}
+		}
+	}
+}
+
 building_nuclear_power_plant = {
 	ownership_type = self
 	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_light_industry.dds"
@@ -239,7 +287,6 @@ building_urban_center = {
 
 	production_method_groups = {
 		pmg_amenities
-		pmg_commerce_services
 		pmg_public_transport_urban_center
 		pmg_urban_churches
 	}

common/buildings/07_government.txt

@@ -22,6 +22,7 @@
 	production_method_groups = {
 		pmg_base_government_administration
 		pmg_admin_telecom
+		pmg_administration_outsourcing
 	}
 
 	icon = "gfx/interface/icons/building_icons/building_government_administration.dds"
@@ -44,6 +45,7 @@ building_university = {
 	production_method_groups = {
 		pmg_base_university
 		pmg_university_telecom
+		pmg_university_outsourcing
 	}
 
 	icon = "gfx/interface/icons/building_icons/building_university.dds"

common/buildings/08_monuments.txt

@@ -315,6 +315,45 @@ building_vatican_city = {
 	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_monuments.dds"
 }
 
+building_kaaba = {
+	building_group = bg_monuments
+	icon = "gfx/interface/icons/building_icons/mosque_of_djenne.dds"
+	expandable = no
+	buildable = no
+	downsizeable = no
+	unique = yes
+	locator = "kaaba_locator"
+
+	entity_not_constructed = { }
+	entity_under_construction = { "building_construction_3x3_entity" }
+	entity_constructed = { "wonder_great_mosque_of_djenne_01_entity" }
+
+	city_gfx_interactions = {
+		clear_size_area = yes
+		size = 3
+	}
+
+	production_method_groups = {
+		pmg_base_building_kaaba
+	}
+
+	potential = {
+		state_region = s:STATE_HEDJAZ
+	}
+
+	possible = {
+		owner = {
+			NOT = {
+				has_law_or_variant = law_type:law_state_atheism
+			}
+		}
+	}
+
+	required_construction = construction_cost_monument
+
+	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_monuments.dds"
+}
+
 building_white_house = {
 	building_group = bg_monuments
 	icon = "gfx/interface/icons/building_icons/white_house.dds"
@@ -806,4 +845,126 @@ building_power_bloc_statue = {
 	}
 
 	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_monuments.dds"
-}
+}
+
+building_interstate_highway_system = {
+
+	building_group = bg_monuments
+
+	city_type = city
+
+	levels_per_mesh = 1
+
+	expandable = no
+
+	production_method_groups = {
+		pmg_base_building_interstate_highway_system
+	}
+
+	icon = "gfx/interface/icons/building_icons/automobile_industry.dds"
+
+	required_construction = construction_cost_monument
+
+	unlocking_technologies = {
+		controlled_access_highway
+	}
+
+	can_build_government = {
+		always = yes
+	}
+
+	can_build_private = {
+		always = no
+	}
+
+	potential = {
+		owner ?= {
+			has_variable = cwp_interstate_highway_system_eligible
+			has_technology_researched = controlled_access_highway
+		}
+	}
+
+	ai_value = {
+		value = 0
+
+		if = {
+			limit = {
+				is_incorporated = yes
+				state_population >= 250000
+			}
+
+			add = {
+				value = state_population
+				divide = 2000
+				max = 7500
+			}
+		}
+
+		if = {
+			limit = {
+				is_incorporated = yes
+				state_population >= 500000
+				any_scope_building = {
+					is_building_type = building_urban_center
+					level >= 5
+				}
+			}
+
+			add = {
+				value = state_population
+				divide = 1000
+				max = 12000
+			}
+		}
+
+		if = {
+			limit = {
+				is_incorporated = yes
+				state_population >= 1000000
+				any_scope_building = {
+					is_building_type = building_urban_center
+					level >= 10
+				}
+			}
+
+			add = 15000
+		}
+
+		if = {
+			limit = {
+				is_incorporated = yes
+				state_population >= 1000000
+				NOT = { has_building = building_interstate_highway_system }
+				owner ?= {
+					has_journal_entry = je_interstate_highway_system
+				}
+			}
+
+			add = 50000
+		}
+
+		if = {
+			limit = {
+				is_incorporated = yes
+				state_population >= 1000000
+				NOT = { has_building = building_interstate_highway_system }
+				any_scope_building = {
+					is_building_type = building_urban_center
+					level >= 10
+				}
+				owner ?= {
+					has_journal_entry = je_interstate_highway_system
+				}
+			}
+
+			add = 25000
+		}
+
+		if = {
+			limit = { is_capital = yes }
+			add = 2500
+		}
+	}
+
+	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_railways.dds"
+}

common/buildings/11_private_infrastructure.txt

@@ -390,6 +390,44 @@ building_railway = {
 	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_railways.dds"
 }
 
+building_airport = {
+	building_group = bg_public_infrastructure
+	city_type = city
+	levels_per_mesh = 5
+	icon = "gfx/interface/icons/building_icons/airport.dds"
+
+	unlocking_technologies = {
+		civilian_airlines
+	}
+
+	production_method_groups = {
+		pmg_base_airport
+	}
+
+	required_construction = construction_cost_very_high
+
+	ai_value = {
+		value = 1500
+	}
+
+	should_auto_expand = {
+		occupancy >= 0.8
+		OR = {
+			state = {
+				sg:transportation = {
+					state_goods_pricier > 0.25
+				}
+			}
+			state = {
+				infrastructure_delta <= -30
+			}
+		}
+		NOT = { is_under_construction = yes }
+	}
+
+	background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_railways.dds"
+}
+
 building_trade_center = {
 	building_group = bg_trade
 	city_type = city