Merge branch 'lack/service-economy' into law-updates

Author: JackEPepper

common/buildings/06_urban.txt

@@ -166,6 +166,7 @@ building_hotels = {
 	}
 	production_method_groups = {
 		pmg_base_hotels
+		pmg_hotel_transportation
 		pmg_hotel_gambling
 	}
 	required_construction = construction_cost_medium
@@ -286,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/production_method_groups/06_urban.txt

@@ -108,6 +108,16 @@ pmg_base_hotels = {
 	}
 }
 
+pmg_hotel_transportation = {
+	texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
+	ai_selection = most_productive
+	production_methods = {
+		pm_no_hotel_transport
+		pm_tourist_shuttles
+		pm_integrated_travel_packages
+	}
+}
+
 pmg_hotel_gambling = {
 	texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
 	production_methods = {
@@ -180,16 +190,6 @@ pmg_amenities = {
 	}
 }
 
-pmg_commerce_services = {
-	texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
-	production_methods = {
-		pm_traditional_city_center
-		pm_modern_downtown
-		pm_developed_city_center
-		pm_highrise_downtown_area
-	}
-}
-
 pmg_public_transport = {
 	texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
 	production_methods = {

common/production_method_groups/07_government.txt

@@ -22,6 +22,15 @@ pmg_admin_telecom = {
 	}
 }
 
+pmg_administration_outsourcing = {
+	texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
+	ai_selection = most_productive
+	production_methods = {
+		pm_no_administration_outsourcing
+		pm_professional_bureaucratic_services
+	}
+}
+
 # University
 pmg_base_university = {
 	texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
@@ -45,3 +54,12 @@ pmg_university_telecom = {
 		pm_world_wide_web_university
 	}
 }
+
+pmg_university_outsourcing = {
+	texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
+	ai_selection = most_productive
+	production_methods = {
+		pm_no_university_outsourcing
+		pm_professional_research_services
+	}
+}

common/production_methods/06_urban.txt

@@ -683,6 +683,38 @@ pm_luxury_resorts = {
 	}
 }
 
+pm_no_hotel_transport = {
+	texture = "gfx/interface/icons/production_method_icons/unused/base1.dds"
+}
+
+pm_tourist_shuttles = {
+	texture = "gfx/interface/icons/production_method_icons/urban/public_trams.dds"
+	unlocking_technologies = {
+		package_vacation
+	}
+	building_modifiers = {
+		workforce_scaled = {
+			goods_input_transportation_add = 10
+			goods_output_tourism_add = 15
+			# balance: inputs 300 (transportation 10x30); outputs 900 (tourism 15x60); weekly productivity 0.060
+		}
+	}
+}
+
+pm_integrated_travel_packages = {
+	texture = "gfx/interface/icons/production_method_icons/urban/public_motor_carriages.dds"
+	unlocking_technologies = {
+		wide_body_jetliners
+	}
+	building_modifiers = {
+		workforce_scaled = {
+			goods_input_transportation_add = 25
+			goods_output_tourism_add = 40
+			# balance: inputs 750 (transportation 25x30); outputs 2400 (tourism 40x60); weekly productivity 0.165
+		}
+	}
+}
+
 pm_no_gambling = {
 	texture = "gfx/interface/icons/production_method_icons/unused/base1.dds"
 }
@@ -1086,8 +1118,8 @@ pm_open_air_markets = {
 	city_lights_color_index = 0	# set in defines/cwp_graphics.txt
 	building_modifiers = {
 		workforce_scaled = {
-			goods_output_services_add = 10
-			# balance: inputs 0 (none); outputs 300 (services 10x30); weekly productivity 0.050
+			goods_output_deposits_add = 10
+			# balance: inputs 0 (none); outputs 250 (deposits 10x25); weekly productivity 0.042
 		}
 		level_scaled = {
 			building_employment_shopkeepers_add = 500
@@ -1108,8 +1140,8 @@ pm_enclosed_arcades = {
 			goods_input_wood_add = 1
 			goods_input_glass_add = 1
 			goods_input_cement_add = 1
-			goods_output_services_add = 20
-			# balance: inputs 90 (wood 1x20 + glass 1x40 + cement 1x30); outputs 600 (services 20x30); weekly productivity 0.085
+			goods_output_deposits_add = 20
+			# balance: inputs 90 (wood 1x20 + glass 1x40 + cement 1x30); outputs 500 (deposits 20x25); weekly productivity 0.068
 		}
 		level_scaled = {
 			building_employment_shopkeepers_add = 1000
@@ -1131,8 +1163,8 @@ pm_enclosed_shopping_malls = {
 			goods_input_glass_add = 2
 			goods_input_electricity_add = 2
 			goods_input_cement_add = 2
-			goods_output_services_add = 30
-			# balance: inputs 300 (steel 2x50 + glass 2x40 + electricity 2x30 + cement 2x30); outputs 900 (services 30x30); weekly productivity 0.100
+			goods_output_deposits_add = 30
+			# balance: inputs 300 (steel 2x50 + glass 2x40 + electricity 2x30 + cement 2x30); outputs 750 (deposits 30x25); weekly productivity 0.075
 		}
 		level_scaled = {
 			building_employment_shopkeepers_add = 1000
@@ -1154,8 +1186,8 @@ pm_vertical_shopping_malls = {
 			goods_input_glass_add = 4
 			goods_input_electricity_add = 3
 			goods_input_cement_add = 4
-			goods_output_services_add = 60
-			# balance: inputs 520 (steel 3x50 + glass 4x40 + electricity 3x30 + cement 4x30); outputs 1800 (services 60x30); weekly productivity 0.213
+			goods_output_deposits_add = 60
+			# balance: inputs 520 (steel 3x50 + glass 4x40 + electricity 3x30 + cement 4x30); outputs 1500 (deposits 60x25); weekly productivity 0.163
 		}
 		level_scaled = {
 			building_employment_shopkeepers_add = 1500
@@ -1165,101 +1197,8 @@ pm_vertical_shopping_malls = {
 	}
 }
 
-## Commerce Services
-pm_traditional_city_center = {
-	texture = "gfx/interface/icons/production_method_icons/government_run.dds"
-	unlocking_technologies = {
-		planned_cities
-	}
-	building_modifiers = {
-		workforce_scaled = {
-			goods_input_cement_add = 1
-			goods_output_professional_services_add = 5
-			# balance: inputs 30 (cement 1x30); outputs 450 (professional_services 5x90); weekly productivity 0.105
-		}
-		level_scaled = {
-			building_employment_shopkeepers_add = 1000
-			building_employment_clerks_add = 3000
-		}
-	}
-}
-
-pm_modern_downtown = {
-	texture = "gfx/interface/icons/production_method_icons/government_run.dds"
-	unlocking_technologies = {
-		shopping_malls
-	}
-	building_modifiers = {
-		workforce_scaled = {
-			goods_input_iron_add = 1
-			goods_input_glass_add = 2
-			goods_input_electricity_add = 1
-			goods_input_cement_add = 2
-			goods_output_professional_services_add = 10
-			# balance: inputs 210 (iron 1x40 + glass 2x40 + electricity 1x30 + cement 2x30); outputs 900 (professional_services 10x90); weekly productivity 0.172
-		}
-		level_scaled = {
-			building_employment_shopkeepers_add = 1000
-			building_employment_clerks_add = 3000
-		}
-	}
-}
-
-pm_developed_city_center = {
-	texture = "gfx/interface/icons/production_method_icons/government_run.dds"
-	unlocking_technologies = {
-		sky_lobbies
-	}
-	building_modifiers = {
-		workforce_scaled = {
-			goods_input_steel_add = 2
-			goods_input_glass_add = 2
-			goods_input_electricity_add = 2
-			goods_input_cement_add = 3
-			goods_output_professional_services_add = 20
-			# balance: inputs 330 (steel 2x50 + glass 2x40 + electricity 2x30 + cement 3x30); outputs 1800 (professional_services 20x90); weekly productivity 0.367
-		}
-		level_scaled = {
-			building_employment_shopkeepers_add = 1000
-			building_employment_clerks_add = 3000
-		}
-	}
-	state_modifiers = {
-		workforce_scaled = {
-			building_banks_throughput_add = 0.05
-		}
-	}
-}
-
-pm_highrise_downtown_area = {
-	texture = "gfx/interface/icons/production_method_icons/urban/professional_districts.dds"
-	unlocking_technologies = {
-		highrise_shopping_complexes
-	}
-	building_modifiers = {
-		workforce_scaled = {
-			goods_input_steel_add = 2
-			goods_input_glass_add = 4
-			goods_input_electricity_add = 3
-			goods_input_cement_add = 5
-			goods_output_professional_services_add = 40
-			# balance: inputs 500 (steel 2x50 + glass 4x40 + electricity 3x30 + cement 5x30); outputs 3600 (professional_services 40x90); weekly productivity 0.775
-		}
-		level_scaled = {
-			building_employment_shopkeepers_add = 1000
-			building_employment_clerks_add = 3000
-		}
-	}
-	state_modifiers = {
-		workforce_scaled = {
-			building_banks_throughput_add = 0.05
-			building_university_throughput_add = 0.05
-		}
-	}
-}
-
-## Public Transportation
-pm_no_public_transport = {
+## Public Transportation
+pm_no_public_transport = {
     texture = "gfx/interface/icons/production_method_icons/urban/no_public_transport.dds"
     ai_value = 1
 }
@@ -1346,8 +1285,8 @@ pm_integrated_metro_transport = {
 ## Urban Churches
 pm_state_churches = {
 	texture = "gfx/interface/icons/production_method_icons/government/ownership_clergy.dds"
-	disallowing_laws = {
-		law_state_atheism
+	unlocking_laws = {
+		law_state_religion
 	}
 	building_modifiers = {
 		level_scaled = {
@@ -1358,6 +1297,10 @@ pm_state_churches = {
 
 pm_free_churches = {
 	texture = "gfx/interface/icons/production_method_icons/government/ownership_aristocrats.dds"
+	disallowing_laws = {
+		law_state_religion
+		law_state_atheism
+	}
 	building_modifiers = {
 		level_scaled = {
 			building_employment_clergymen_add = 100
@@ -1368,6 +1311,9 @@ pm_free_churches = {
 
 pm_anticlericalism = {
 	texture = "gfx/interface/icons/production_method_icons/government/ownership_bureaucrats.dds"
+	unlocking_laws = {
+		law_state_atheism
+	}
 	building_modifiers = {
 		level_scaled = {
 			building_employment_bureaucrats_add = 50
@@ -1397,12 +1343,12 @@ pm_bus_tramways_for_urban_center = {
             goods_input_engines_add = 1
             goods_input_refined_fuel_add = 1
 			goods_input_cement_add = 1
-            goods_output_services_add = 6
-            # balance: inputs 240 (automobiles 1x100 + engines 1x60 + refined_fuel 1x50 + cement 1x30); outputs 180 (services 6x30); weekly productivity per worker removed -0.240
+            goods_output_transportation_add = 6
+            # balance: inputs 240 (automobiles 1x100 + engines 1x60 + refined_fuel 1x50 + cement 1x30); outputs 180 (transportation 6x30); weekly productivity per worker removed -0.240
         }
         level_scaled = {
             building_employment_laborers_add = -500
-            # automation balance: subtracts 500 laborers; inputs automobiles 1, engines 1, refined_fuel 1; outputs services 6; target net cost 25, actual net cost 30, raw input cost 210
+            # automation balance: subtracts 500 laborers; inputs automobiles 1, engines 1, refined_fuel 1; outputs transportation 6; target net cost 25, actual net cost 30, raw input cost 210
             building_employment_machinists_add = 250
         }
     }
@@ -1427,12 +1373,12 @@ pm_metropolitan_railway_for_urban_center = {
             goods_input_engines_add = 4
             goods_input_electricity_add = 4
 			goods_input_cement_add = 3
-            goods_output_services_add = 9
-            # balance: inputs 450 (engines 4x60 + electricity 4x30 + cement 3x30); outputs 270 (services 9x30); weekly productivity per worker removed -0.360
+            goods_output_transportation_add = 9
+            # balance: inputs 450 (engines 4x60 + electricity 4x30 + cement 3x30); outputs 270 (transportation 9x30); weekly productivity per worker removed -0.360
         }
         level_scaled = {
             building_employment_laborers_add = -1000
-            # automation balance: subtracts 1000 laborers; inputs electricity 4, engines 4; outputs services 9; target net cost 90, actual net cost 90, raw input cost 360
+            # automation balance: subtracts 1000 laborers; inputs electricity 4, engines 4; outputs transportation 9; target net cost 90, actual net cost 90, raw input cost 360
             building_employment_machinists_add = 500
         }
     }
@@ -1458,12 +1404,12 @@ pm_integrated_metro_transport_for_urban_center = {
             goods_input_automobiles_add = 3
             goods_input_electricity_add = 3
 			goods_input_cement_add = 5
-            goods_output_services_add = 12
-            # balance: inputs 720 (engines 3x60 + automobiles 3x100 + electricity 3x30 + cement 5x30); outputs 360 (services 12x30); weekly productivity per worker removed -0.360
+            goods_output_transportation_add = 12
+            # balance: inputs 720 (engines 3x60 + automobiles 3x100 + electricity 3x30 + cement 5x30); outputs 360 (transportation 12x30); weekly productivity per worker removed -0.360
         }
         level_scaled = {
             building_employment_laborers_add = -2000
-            # automation balance: subtracts 2000 laborers; inputs automobiles 3, electricity 3, engines 3; outputs services 12; target net cost 220, actual net cost 210, raw input cost 570
+            # automation balance: subtracts 2000 laborers; inputs automobiles 3, electricity 3, engines 3; outputs transportation 12; target net cost 220, actual net cost 210, raw input cost 570
             building_employment_machinists_add = 1000
         }
     }