2024-08-15 16:35:22
All checks were successful
sync / build (push) Successful in 15s

This commit is contained in:
actions[bot]
2024-08-15 16:35:22 +00:00
parent 1edf758efd
commit 8ad5a6c686
61 changed files with 1235 additions and 390 deletions

View File

@@ -95,7 +95,7 @@ naval_capital_battleship = {
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_radar_slot = ship_radar
fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_armor_slot = { any_of = { ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
fixed_ship_airplane_launcher_slot = ship_airplane_launcher
fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
@@ -104,7 +104,7 @@ naval_capital_battleship = {
front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
mid_1_custom_slot = ship_secondaries
mid_2_custom_slot = ship_anti_air
mid_3_custom_slot = ship_dp_secondaries
mid_3_custom_slot = ship_dp_secondaries_bb
rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
}
@@ -131,16 +131,16 @@ naval_capital_battleship = {
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_radar_slot = ship_radar
fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
fixed_ship_airplane_launcher_slot = ship_airplane_launcher
fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
mid_1_custom_slot = ship_dp_secondaries
mid_1_custom_slot = ship_dp_secondaries_bb
mid_2_custom_slot = ship_anti_air
mid_3_custom_slot = ship_dp_secondaries
mid_3_custom_slot = ship_dp_secondaries_bb
rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
}
@@ -167,16 +167,16 @@ naval_capital_battleship = {
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_radar_slot = ship_radar
fixed_ship_engine_slot = { any_of = { heavy_ship_engine_4_gas heavy_ship_engine_nuclear } }
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
fixed_ship_airplane_launcher_slot = ship_airplane_launcher
fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
mid_1_custom_slot = ship_dp_secondaries
mid_1_custom_slot = ship_dp_secondaries_bb
mid_2_custom_slot = ship_missile_1
mid_3_custom_slot = ship_dp_secondaries
mid_3_custom_slot = ship_dp_secondaries_bb
rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
rear_2_custom_slot = ship_missile_aa
}
@@ -242,7 +242,7 @@ naval_capital_battleship = {
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_radar_slot = { any_of = { ship_radar ship_mast } }
fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
@@ -273,7 +273,7 @@ naval_capital_battleship = {
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_radar_slot = ship_radar
fixed_ship_engine_slot = { upgrade > current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
@@ -306,7 +306,7 @@ naval_capital_battleship = {
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_radar_slot = ship_radar
fixed_ship_engine_slot = { upgrade > current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }

View File

@@ -1,4 +1,3 @@
# By Pelmen, 1.10.7
naval_carrier = {
category = naval
#blocked_for = {}
@@ -41,7 +40,7 @@ naval_carrier = {
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = ship_anti_air
fixed_ship_engine_slot = carrier_ship_engine
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries } }
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } }
fixed_ship_flight_deck_slot = carrier_wooden_deck
}
}
@@ -59,7 +58,7 @@ naval_carrier = {
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = ship_anti_air
fixed_ship_engine_slot = carrier_ship_engine
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries } }
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } }
mid_1_custom_slot = ship_deck_space
fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit
fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous
@@ -85,7 +84,7 @@ naval_carrier = {
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = ship_anti_air
fixed_ship_engine_slot = carrier_ship_engine_2
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries } }
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit
fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous
@@ -114,7 +113,7 @@ naval_carrier = {
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = ship_anti_air
fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries } }
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit
fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous
@@ -122,7 +121,7 @@ naval_carrier = {
front_1_custom_slot = ship_deck_space
front_2_custom_slot = carrier_side_lift
mid_1_custom_slot = ship_deck_space
mid_2_custom_slot = ship_dp_secondaries
mid_2_custom_slot = ship_dp_secondaries_bb
}
}
}
@@ -144,9 +143,9 @@ naval_carrier = {
modules = {
fixed_ship_deck_slot_1 = ship_deck_space
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = { any_of { ship_anti_air ship_missile_aa } }
fixed_ship_anti_air_slot = { any_of = { ship_anti_air ship_missile_aa } }
fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries } }
fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit
fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous
@@ -155,7 +154,7 @@ naval_carrier = {
front_2_custom_slot = carrier_side_lift
mid_1_custom_slot = ship_deck_space
mid_2_custom_slot = ship_deck_space
rear_1_custom_slot = ship_dp_secondaries
rear_1_custom_slot = ship_dp_secondaries_bb
}
}
}
@@ -177,10 +176,10 @@ naval_carrier = {
modules = {
fixed_ship_deck_slot_1 = ship_deck_space_big
fixed_ship_deck_slot_2 = ship_deck_space_big
fixed_ship_anti_air_slot = { any_of { ship_anti_air ship_missile_aa } }
fixed_ship_anti_air_slot = { any_of = { ship_anti_air ship_missile_aa } }
fixed_ship_armor_slot = ship_carrier_armor_heavy
fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit
fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous
@@ -214,7 +213,7 @@ naval_carrier = {
fixed_ship_anti_air_slot = ship_missile_aa
fixed_ship_armor_slot = ship_carrier_armor_heavy
fixed_ship_engine_slot = carrier_ship_engine_nuclear
fixed_ship_secondaries_slot = ship_dp_secondaries
fixed_ship_secondaries_slot = ship_dp_secondaries_bb
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit
fixed_ship_carrier_miscellaneous_slot_2 = economical_nuclear_reactor_carrier
@@ -247,7 +246,7 @@ naval_carrier = {
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = ship_anti_air
fixed_ship_engine_slot = carrier_ship_engine_2
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island
@@ -276,7 +275,7 @@ naval_carrier = {
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = ship_anti_air
fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island
@@ -305,9 +304,9 @@ naval_carrier = {
modules = {
fixed_ship_deck_slot_1 = ship_deck_space
fixed_ship_deck_slot_2 = ship_deck_space
fixed_ship_anti_air_slot = { any_of { ship_anti_air ship_missile_aa } }
fixed_ship_anti_air_slot = { any_of = { ship_anti_air ship_missile_aa } }
fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island
@@ -340,7 +339,7 @@ naval_carrier = {
fixed_ship_anti_air_slot = ship_missile_aa
fixed_ship_armor_slot = ship_carrier_armor_heavy
fixed_ship_engine_slot = { upgrade > current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island
@@ -373,7 +372,7 @@ naval_carrier = {
fixed_ship_anti_air_slot = ship_missile_aa
fixed_ship_armor_slot = ship_carrier_armor_heavy
fixed_ship_engine_slot = carrier_ship_engine_nuclear
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries } }
fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
fixed_ship_radar_slot = ship_radar
fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island

View File

@@ -153,7 +153,7 @@ naval_cruiser_heavy = {
type = vnr_ship_hull_cruiser_5
modules = {
fixed_ship_battery_slot = ship_medium_battery
fixed_ship_anti_air_slot = { any_of { ship_anti_air ship_missile_aa } }
fixed_ship_anti_air_slot = { any_of = { ship_anti_air ship_missile_aa } }
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } }
fixed_ship_radar_slot = { any_of = { ship_radar } }

View File

@@ -120,7 +120,7 @@ naval_cruiser_medium = {
type = vnr_ship_hull_cruiser_5
modules = {
fixed_ship_battery_slot = ship_medium_battery
fixed_ship_anti_air_slot = { any_of { ship_anti_air ship_missile_aa } }
fixed_ship_anti_air_slot = { any_of = { ship_anti_air ship_missile_aa } }
fixed_ship_fire_control_system_slot = ship_fire_control_system
fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } }
fixed_ship_radar_slot = { any_of = { ship_radar } }