auto-commit: import ship json files

pioneerspacesim · Feb 1, 2025 · bc4e518 · bc4e518
1 parent 34bb58a
commit bc4e518
Show file tree

Hide file tree

Showing 15 changed files with 237 additions and 71 deletions.
diff --git a/data/ships/ac33.json b/data/ships/ac33.json
@@ -60,6 +60,7 @@
 		"weapon_front_s4_1": {
 			"type": "weapon",
 			"size": 4,
+			"size_min": 3,
 			"i18n_key": "HARDPOINT_WEAPON_FRONT",
 			"tag": "tag_weapon_front_s4_1",
 			"hardpoint": true,
@@ -68,6 +69,7 @@
 		"weapon_front_s4_2": {
 			"type": "weapon",
 			"size": 4,
+			"size_min": 3,
 			"i18n_key": "HARDPOINT_WEAPON_FRONT",
 			"tag": "tag_weapon_front_s4_2",
 			"hardpoint": true,

diff --git a/data/ships/dsminer.json b/data/ships/dsminer.json
@@ -124,6 +124,12 @@
 			"type": "computer",
 			"size": 1
 		},
+		"fuel_scoop": {
+			"type": "fuel_scoop",
+			"size": 3,
+			"tag": "tag_fuel_scoop",
+			"hardpoint": true
+		},
 		"hull_1": {
 			"type": "hull",
 			"size": 5

diff --git a/data/ships/kanara.json b/data/ships/kanara.json
@@ -3,30 +3,87 @@
 	"name": "Kanara (Police)",
 	"cockpit": "",
 	"shield_model": "kanara_shield",
-	"manufacturer": "mandarava_csepel",
+	"manufacturer": "mandarava-csepel",
 	"ship_class": "light_fighter",
 	"min_crew": 1,
-	"max_crew": 2,
+	"max_crew": 1,
 	"price": 0,
-	"hull_mass": 10,
+	"hull_mass": 11,
+	"structure_mass": 3.4,
+	"armor_mass": 6.6,
+	"volume": 53,
 	"atmospheric_pressure_limit": 7,
 	"capacity": 8,
-	"slots": {
-		"engine": 1,
-		"cabin": 1,
-		"scoop": 0,
-		"laser_front": 1,
-		"missile": 8,
-		"cargo": 4
+	"cargo": 8,
+
+	"equipment_slots": {
+		"tag_weapon_s2": {
+			"type": "weapon",
+			"size": 2,
+			"tag": "tag_tag_weapon_s2",
+			"hardpoint": true,
+			"gimbal": [3,3]
+		},
+		"pylon_s2_tl": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_tl",
+			"hardpoint": true
+		},
+		"pylon_s2_tr": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_tr",
+			"hardpoint": true
+		},
+		"pylon_s2_bl": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_bl",
+			"hardpoint": true
+		},
+		"pylon_s2_br": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_br",
+			"hardpoint": true
+		},
+		"computer_1": {
+			"type": "computer",
+			"size": 1
+		},
+		"shield_s1": {
+			"type": "shield",
+			"size": 1
+		},
+		"hull_1": {
+			"type": "hull",
+			"size": 0
+		},
+		"structure_1": {
+			"type": "structure",
+			"size": 0
+		},
+		"thruster": {
+			"type": "thruster",
+			"default": "thruster.default_s1",
+			"required": true,
+			"size": 1,
+			"count": 12
+		}
 	},
-	"roles": ["mercenary"],
-
+
+	"roles": ["police","mercenary"],
 	"effective_exhaust_velocity": 11000000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 4,
 	"hyperdrive_class": 0,
 
-	"forward_thrust": 700000,
+	"forward_thrust": 800000,
 	"forward_acceleration_cap": 38.9457,
 	"reverse_thrust": 300000,
 	"reverse_acceleration_cap": 24.525,
@@ -39,11 +96,11 @@
 	"right_thrust": 200000,
 	"right_acceleration_cap": 10.0062,
 
-	"angular_thrust": 377624.190704876,
+	"angular_thrust": 377624.19,
 
-	"front_cross_section": 7.5,
-	"side_cross_section": 38,
-	"top_cross_section": 16,
+	"front_cross_section": 7.502,
+	"side_cross_section": 38.002,
+	"top_cross_section": 16.002,
 
 	"front_drag_coeff": 1.2,
 	"side_drag_coeff": 1.1,

diff --git a/data/ships/kanara_civ.json b/data/ships/kanara_civ.json
@@ -1,30 +1,83 @@
 {
 	"model": "kanara_civ",
 	"name": "Kanara (Civilian)",
-	"cockpit": " ",
+	"cockpit": "",
 	"shield_model": "kanara_shield",
-	"manufacturer": "mandarava_csepel",
+	"manufacturer": "mandarava-csepel",
 	"ship_class": "light_fighter",
 	"min_crew": 1,
-	"max_crew": 2,
-	"price": 26409,
-	"hull_mass": 10,
+	"max_crew": 1,
+	"price": 27790,
+	"hull_mass": 9,
+	"structure_mass": 3.4,
+	"armor_mass": 4.7,
+	"volume": 53,
 	"atmospheric_pressure_limit": 7,
 	"capacity": 8,
-	"slots": {
-		"engine": 1,
-		"cabin": 2,
-		"scoop": 0,
-		"laser_front": 1,
-		"missile": 4,
-		"cargo": 8
+	"cargo": 8,
+
+	"equipment_slots": {
+		"tag_weapon_s2": {
+			"type": "weapon",
+			"size": 2,
+			"tag": "tag_tag_weapon_s2",
+			"hardpoint": true,
+			"gimbal": [3,3]
+		},
+		"pylon_s2_tl": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_tl",
+			"hardpoint": true
+		},
+		"pylon_s2_tr": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_tr",
+			"hardpoint": true
+		},
+		"pylon_s2_bl": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_bl",
+			"hardpoint": true
+		},
+		"pylon_s2_br": {
+			"type": "pylon",
+			"size": 2,
+			"size_min": 1,
+			"tag": "tag_pylon_s2_br",
+			"hardpoint": true
+		},
+		"computer_1": {
+			"type": "computer",
+			"size": 1
+		},
+		"hull_1": {
+			"type": "hull",
+			"size": 0
+		},
+		"structure_1": {
+			"type": "structure",
+			"size": 0
+		},
+		"thruster": {
+			"type": "thruster",
+			"default": "thruster.default_s1",
+			"required": true,
+			"size": 1,
+			"count": 12
+		}
 	},
-	"roles": ["mercenary", "pirate", "courier"],
-
+
+	"roles": ["pirate"],
 	"effective_exhaust_velocity": 16900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 5,
-	"hyperdrive_class": 1,
+	"hyperdrive_class": 0,
 
 	"forward_thrust": 700000,
 	"forward_acceleration_cap": 38.7495,
@@ -39,11 +92,11 @@
 	"right_thrust": 200000,
 	"right_acceleration_cap": 10.0062,
 
-	"angular_thrust": 377624.190704876,
+	"angular_thrust": 377624.19,
 
-	"front_cross_section": 7.5,
-	"side_cross_section": 38,
-	"top_cross_section": 16,
+	"front_cross_section": 7.502,
+	"side_cross_section": 38.002,
+	"top_cross_section": 16.002,
 
 	"front_drag_coeff": 1.2,
 	"side_drag_coeff": 1.1,

diff --git a/data/ships/lunarshuttle.json b/data/ships/lunarshuttle.json
@@ -37,6 +37,10 @@
 			"type": "shield",
 			"size": 1
 		},
+		"computer_1": {
+			"type": "computer",
+			"size": 1
+		},
 		"hull_1": {
 			"type": "hull",
 			"size": 1

diff --git a/data/ships/molaramsayi.json b/data/ships/molaramsayi.json
@@ -121,13 +121,15 @@
 		"weapon_s2_1": {
 			"type": "weapon",
 			"size": 2,
+			"size_min": 1,
 			"tag": "tag_weapon_s2_1",
 			"hardpoint": true,
 			"gimbal": [5,5]
 		},
 		"weapon_s2_2": {
 			"type": "weapon",
 			"size": 2,
+			"size_min": 1,
 			"tag": "tag_weapon_s2_2",
 			"hardpoint": true,
 			"gimbal": [5,5]

diff --git a/data/ships/pumpkinseed.json b/data/ships/pumpkinseed.json
@@ -73,6 +73,10 @@
 			"type": "cabin",
 			"size": 1
 		},
+		"computer_1": {
+			"type": "computer",
+			"size": 1
+		},
 		"hull_1": {
 			"type": "hull",
 			"size": 1

diff --git a/data/ships/pumpkinseed_police.json b/data/ships/pumpkinseed_police.json
@@ -73,6 +73,10 @@
 			"type": "shield",
 			"size": 1
 		},
+		"computer_1": {
+			"type": "computer",
+			"size": 1
+		},
 		"hull_1": {
 			"type": "hull",
 			"size": 1

diff --git a/data/ships/sinonatrix.json b/data/ships/sinonatrix.json
@@ -127,7 +127,7 @@
 			"type": "hyperdrive",
 			"default": "hyperspace.hyperdrive_2",
 			"size": 2,
-			"size_min": 1
+			"size_min": 2
 		},
 		"thruster": {
 			"type": "thruster",

diff --git a/data/ships/sinonatrix_police.json b/data/ships/sinonatrix_police.json
@@ -135,7 +135,7 @@
 			"type": "hyperdrive",
 			"default": "hyperspace.hyperdrive_2",
 			"size": 2,
-			"size_min": 1
+			"size_min": 2
 		},
 		"thruster": {
 			"type": "thruster",

diff --git a/data/ships/skipjack.json b/data/ships/skipjack.json
@@ -59,14 +59,16 @@
 			"size": 2,
 			"i18n_key": "HARDPOINT_PYLON_LEFT",
 			"tag": "tag_missile_rack_s2_left",
-			"hardpoint": true
+			"hardpoint": true,
+			"default": "missile_rack.221"
 		},
 		"missile_rack_s2_right": {
 			"type": "pylon.rack",
 			"size": 2,
 			"i18n_key": "HARDPOINT_PYLON_RIGHT",
 			"tag": "tag_missile_rack_s2_right",
-			"hardpoint": true
+			"hardpoint": true,
+			"default": "missile_rack.221"
 		},
 		"utility_s2_1": {
 			"type": "utility",
@@ -127,7 +129,7 @@
 		},
 		"hyperdrive": {
 			"type": "hyperdrive",
-			"default": "hyperspace.hyperdrive_3",
+			"default": "hyperspace.hyperdrive_2",
 			"size": 3,
 			"size_min": 2
 		},
@@ -144,7 +146,7 @@
 	"effective_exhaust_velocity": 15700000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 116,
-	"hyperdrive_class": 3,
+	"hyperdrive_class": 2,
 
 	"forward_thrust": 9440000,
 	"forward_acceleration_cap": 31.392,