2024-11-03 16:35:55

src/common/units/equipment/modules/00_ship_modules_aviation.txt

@@ -339,6 +339,7 @@ equipment_modules = {
 			naval_range = -0.2
 			build_cost_ic = -0.2
 		}
+		dismantle_cost_ic = 1500
 	}
 	carrier_secondary_island = {
 		category = carrier_miscellaneous

src/common/units/equipment/modules/00_ship_modules_role.txt

@@ -298,5 +298,8 @@ equipment_modules = {
 			naval_speed = -0.2
 			build_cost_ic = -0.2
 		}
+		forbid_module_categories = {
+			ship_cruiser_heavy_armor
+		}
 	}
 }

src/common/units/equipment/ocean_liner.txt

@@ -0,0 +1,35 @@
+equipments = {
+	ocean_liner_equipment = {
+		year = 1910
+
+		is_archetype = yes
+		is_buildable = no
+		type = floating_harbor
+		
+		group_by = archetype
+		sprite = floating_harbor
+
+		interface_category = interface_category_other_ships
+
+		build_cost_ic = 1500
+		resources = {
+			steel = 1
+		}
+
+		can_be_lend_leased = {
+			always = no
+		}
+
+		can_be_produced = {
+			has_dlc = "No Step Back"
+		}
+	}
+    ocean_liner = {
+        year = 1910
+
+		archetype = ocean_liner_equipment
+
+		active = no
+		priority = 1
+    }
+}

src/common/units/equipment/ship_hull_carrier.txt

@@ -520,10 +520,10 @@ equipments = {
 				required = yes
 				allowed_module_categories = { carrier_ship_engine cruiser_ship_engine civilian_ship_engine }
 			}
-			fixed_ship_carrier_miscellaneous_slot_1 = { 
-				required = no
-				allowed_module_categories = { carrier_unit }
-			}
+			# fixed_ship_carrier_miscellaneous_slot_1 = { 
+			# 	required = no
+			# 	allowed_module_categories = { carrier_unit }
+			# }
 			fixed_ship_carrier_miscellaneous_slot_2 = { 
 				required = no
 				allowed_module_categories = { carrier_miscellaneous }
@@ -554,6 +554,51 @@ equipments = {
 		manpower = 700
 	}
 
+	vnr_ship_hull_merchant_carrier = {
+		derived_variant_name = carrier_equipment_cve
+		year = 1941
+		archetype = ship_hull_carrier
+		priority = 1000
+		can_convert_from = { vnr_ship_hull_merchant_carrier }
+		module_slots = {
+			fixed_ship_deck_slot_1 = {
+				required = yes
+				allowed_module_categories = { ship_deck_space_small }
+			}
+			fixed_ship_anti_air_slot = {
+				required = no
+				allowed_module_categories = { ship_anti_air }
+			}
+			fixed_ship_radar_slot = inherit
+			fixed_ship_engine_slot = {
+				required = yes
+				allowed_module_categories = { civilian_ship_engine }
+			}
+			fixed_ship_flight_deck_slot = inherit
+		}
+
+		default_modules = {
+			fixed_ship_deck_slot_1 = empty
+			fixed_ship_anti_air_slot = empty
+			fixed_ship_radar_slot = empty
+			fixed_ship_engine_slot = civilian_ship_engine_1
+		}
+		naval_range = 2000
+
+		max_strength = 35
+		fuel_consumption = 23
+
+		reliability = 0.5
+		naval_speed = 18
+		sub_detection = 4
+		surface_visibility = 16
+		build_cost_ic = 180
+		resources = {
+			steel = 1
+		}
+		manpower = 400
+	}
+
 	vnr_ship_hull_super_carrier = {
 		derived_variant_name = carrier_equipment_cvh
 		year = 1944

src/common/units/equipment/ship_hull_cruiser.txt

@@ -295,7 +295,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = no
-				allowed_module_categories = { ship_cruiser_armor }
+				allowed_module_categories = { ship_cruiser_armor ship_cruiser_heavy_armor }
 			}
 			fixed_ship_airplane_launcher_slot = {
 				required = no

src/common/units/equipment/ship_hull_light.txt

@@ -418,6 +418,7 @@ equipments = {
 				allowed_module_categories = { dd_role dd_role_missile }
 			}
 			fixed_ship_extra_secondaries_slot = inherit
+			fixed_ship_extra_missile_slot = fixed_ship_extra_secondaries_slot
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {