Add equipment slots to all S1 ships

- Bowfin, Coronatrix, Lunar Shuttle, Mola Mola, Pumpkinseed - Most ships increased in hull mass overall - Structure and Armor mass are enumerated separately for future work - Many ships expect an internal jump fuel tank integral to the hyperdrive and do not have extra cargo space for jump fuel
pioneerspacesim · Nov 1, 2024 · e049417 · e049417
1 parent 058d406
commit e049417
Show file tree

Hide file tree

Showing 7 changed files with 475 additions and 173 deletions.
diff --git a/data/ships/bowfin.json b/data/ships/bowfin.json
@@ -7,98 +7,111 @@
 	"ship_class": "light_fighter",
 	"min_crew": 1,
 	"max_crew": 1,
-	"price": 34430,
-	"hull_mass": 25,
+	"price": 48674.18056474379,
+	"hull_mass": 19,
+	"structure_mass": 7.8,
+	"armor_mass": 11.6,
+	"volume": 135,
 	"atmospheric_pressure_limit": 6.5,
-	"capacity": 12,
-	"cargo": 6,
-	"slots": {
-		"engine": 1,
-		"cabin": 0,
-		"scoop": 0,
-		"laser_front": 1,
-		"missile": 24,
-		"cargo": 6
-	},
-	"roles": ["mercenary", "pirate", "courier"],
+	"capacity": 15,
+	"cargo": 4,
+
 	"equipment_slots": {
-		"laser_front": {
-			"type": "weapon",
+		"missile_bay_1": {
+			"type": "missile_bay.bowfin_internal",
 			"size": 2,
-			"size_min": 1,
+			"i18n_key": "HARDPOINT_MISSILE_ARRAY",
+			"tag": "tag_missile_bay_1",
 			"hardpoint": true,
-			"tag": "tag_laser_front",
-			"gimbal": [15, 15],
-			"default": "laser.pulsecannon_1mw"
+			"default": "missile_rack.bowfin_internal_s2"
 		},
-		"missile_tl": {
-			"type": "missile",
+		"missile_bay_2": {
+			"type": "missile_bay.bowfin_internal",
 			"size": 2,
-			"size_min": 1,
-			"count": 6,
+			"i18n_key": "HARDPOINT_MISSILE_ARRAY",
+			"tag": "tag_missile_bay_2",
 			"hardpoint": true,
-			"tag": "tag_missile_tl",
-			"default": "missile.guided_s2"
+			"default": "missile_rack.bowfin_internal_s2"
 		},
-		"missile_tr": {
-			"type": "missile",
+		"missile_bay_3": {
+			"type": "missile_bay.bowfin_internal",
 			"size": 2,
-			"size_min": 1,
-			"count": 6,
+			"i18n_key": "HARDPOINT_MISSILE_ARRAY",
+			"tag": "tag_missile_bay_3",
 			"hardpoint": true,
-			"tag": "tag_missile_tr",
-			"default": "missile.guided_s2"
+			"default": "missile_rack.bowfin_internal_s2"
 		},
-		"missile_bl": {
-			"type": "missile",
+		"missile_bay_4": {
+			"type": "missile_bay.bowfin_internal",
 			"size": 2,
-			"size_min": 1,
-			"count": 6,
+			"i18n_key": "HARDPOINT_MISSILE_ARRAY",
+			"tag": "tag_missile_bay_4",
 			"hardpoint": true,
-			"tag": "tag_missile_bl",
-			"default": "missile.guided_s2"
+			"default": "missile_rack.bowfin_internal_s2"
 		},
-		"missile_br": {
-			"type": "missile",
+		"shield_s1_1": {
+			"type": "shield",
+			"size": 1
+		},
+		"shield_s1_2": {
+			"type": "shield",
+			"size": 1
+		},
+		"utility_s1_1": {
+			"type": "utility",
+			"size": 1,
+			"tag": "tag_utility_s1_1",
+			"hardpoint": true
+		},
+		"computer_2": {
+			"type": "computer",
+			"size": 1
+		},
+		"laser_chin": {
+			"type": "weapon",
 			"size": 2,
 			"size_min": 1,
-			"count": 6,
+			"i18n_key": "HARDPOINT_WEAPON_CHIN",
+			"tag": "tag_laser_chin",
 			"hardpoint": true,
-			"tag": "tag_missile_br",
-			"default": "missile.guided_s2"
+			"gimbal": [8,8]
 		},
-		"shield_gen_1": {
-			"type": "shield",
+		"hyperdrive": {
+			"type": "hyperdrive",
 			"size": 1,
-			"i18n_key": "SLOT_SHIELD_LEFT",
-			"default": "shield.basic_s1"
+			"size_min": 1
 		},
-		"shield_gen_2": {
-			"type": "shield",
+		"engine": {
+			"type": "engine",
+			"size": 2,
+			"count": 2
+		},
+		"thruster": {
+			"type": "thruster",
 			"size": 1,
-			"i18n_key": "SLOT_SHIELD_RIGHT",
-			"default": "shield.basic_s1"
+			"count": 12
 		}
 	},
+	"roles": ["pirate","mercenary","police"],
 	"effective_exhaust_velocity": 8400000,
 	"thruster_fuel_use": -1.0,
-	"fuel_tank_mass": 26,
+	"fuel_tank_mass": 20,
 	"hyperdrive_class": 1,
 
 	"forward_thrust": 2000000,
 	"forward_acceleration_cap": 33.354,
 	"reverse_thrust": 1250000,
 	"reverse_acceleration_cap": 24.525,
 	"up_thrust": 1300000,
-	"up_acceleration_cap": 29.43,
+	"up_acceleration_cap": 24.525,
 	"down_thrust": 1000000,
 	"down_acceleration_cap": 24.525,
 	"left_thrust": 1000000,
 	"left_acceleration_cap": 24.525,
 	"right_thrust": 1000000,
 	"right_acceleration_cap": 24.525,
 
-	"angular_thrust": 4648782.6507229,
+	"angular_thrust": 4648782.65,
 
 	"front_cross_section": 33,
 	"side_cross_section": 27,
@@ -108,6 +121,6 @@
 	"side_drag_coeff": 0.78,
 	"top_drag_coeff": 0.92,
 
-	"lift_coeff": 0.42,
-	"aero_stability": 0.5
+	"lift_coeff": 0.21,
+	"aero_stability": 0.8
 }
diff --git a/data/ships/coronatrix.json b/data/ships/coronatrix.json
@@ -7,72 +7,77 @@
 	"ship_class": "light_courier",
 	"min_crew": 1,
 	"max_crew": 1,
-	"price": 46614,
-	"hull_mass": 18,
+	"price": 46580.34,
+	"hull_mass": 19,
+	"structure_mass": 7.1,
+	"armor_mass": 11.9,
+	"volume": 190,
 	"atmospheric_pressure_limit": 3.2,
-	"capacity": 32,
+	"capacity": 36,
 	"cargo": 16,
-	"slots": {
-		"engine": 1,
-		"cabin": 1,
-		"laser_front": 1,
-		"missile": 10,
-		"shield": 3,
-		"cargo": 16
-	},
+
 	"equipment_slots": {
-		"laser_front": {
-			"type": "weapon",
-			"size": 2,
-			"size_min": 1,
-			"i18n_key": "HARDPOINT_LASER_FRONT",
-			"tag": "tag_laser_front",
-			"gimbal": [ 5, 5 ],
+		"utility_s1_2": {
+			"type": "utility",
+			"size": 1,
+			"tag": "tag_utility_s1_2",
 			"hardpoint": true
 		},
 		"missile_bay_1": {
-			"type": "missile_rack.opli_internal",
+			"type": "missile_bay.opli_internal",
 			"size": 2,
 			"i18n_key": "HARDPOINT_MISSILE_BAY",
-			"tag": "tag_missile_launch",
+			"tag": "tag_missile_bay_1",
 			"hardpoint": true,
 			"default": "missile_rack.opli_internal_s2"
 		},
 		"missile_bay_2": {
-			"type": "missile_rack.opli_internal",
+			"type": "missile_bay.opli_internal",
 			"size": 2,
 			"i18n_key": "HARDPOINT_MISSILE_BAY",
-			"tag": "tag_missile_launch",
+			"tag": "tag_missile_bay_2",
 			"hardpoint": true,
 			"default": "missile_rack.opli_internal_s2"
 		},
-		"utility_1": {
-			"type": "utility",
+		"fuel_scoop_s1": {
+			"type": "scoop.fuel",
 			"size": 1,
-			"tag": "tag_utility_1",
+			"i18n_key": "HARDPOINT_FUEL_SCOOP",
+			"tag": "tag_fuel_scoop_s1",
 			"hardpoint": true
 		},
-		"utility_2": {
+		"utility_s1_1": {
 			"type": "utility",
 			"size": 1,
-			"tag": "tag_utility_2",
+			"tag": "tag_utility_s1_1",
 			"hardpoint": true
 		},
+		"shield_s1_1": {
+			"type": "shield",
+			"size": 1
+		},
+		"shield_s1_2": {
+			"type": "shield",
+			"size": 1
+		},
+		"computer_2": {
+			"type": "computer",
+			"size": 1
+		},
+		"laser_front_s2": {
+			"type": "weapon",
+			"size": 2,
+			"size_min": 1,
+			"i18n_key": "HARDPOINT_WEAPON_FRONT",
+			"tag": "tag_laser_front_s2",
+			"hardpoint": true,
+			"gimbal": [4,4]
+		},
 		"hyperdrive": {
 			"type": "hyperdrive",
 			"size": 2,
 			"size_min": 1
 		},
-		"shield_1": {
-			"type": "shield",
-			"size": 1,
-			"tag": "tag_shield_1"
-		},
-		"shield_2": {
-			"type": "shield",
-			"size": 1,
-			"tag": "tag_shield_2"
-		},
 		"engine": {
 			"type": "engine",
 			"size": 2,
@@ -81,17 +86,17 @@
 		"thruster": {
 			"type": "thruster",
 			"size": 1,
-			"count": 12
+			"count": 16
 		}
 	},
-	"roles": ["mercenary", "merchant", "pirate"],
+	"roles": ["pirate","mercenary"],
 	"effective_exhaust_velocity": 12600000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 23,
-	"hyperdrive_class": 2,
+	"hyperdrive_class": 1,
 
 	"forward_thrust": 1800000,
-	"forward_acceleration_cap": 26.487,
+	"forward_acceleration_cap": 40.221,
 	"reverse_thrust": 920000,
 	"reverse_acceleration_cap": 20.601,
 	"up_thrust": 1400000,
@@ -103,7 +108,7 @@
 	"right_thrust": 920000,
 	"right_acceleration_cap": 11.4777,
 
-	"angular_thrust": 3799843.41896781,
+	"angular_thrust": 3799843.42,
 
 	"front_cross_section": 16.2,
 	"side_cross_section": 39,