Updating roles to arrays. Adjusting the roles of some ships as well

pioneerspacesim · Jul 7, 2021 · d540d23 · d540d23
1 parent b13bcef
commit d540d23
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 142 deletions.
diff --git a/data/ships/ac33.json b/data/ships/ac33.json
@@ -18,11 +18,8 @@
 		"missile": 26,
 		"cargo": 480
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate"],
+
 	"effective_exhaust_velocity": 20300000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 870,

diff --git a/data/ships/amphiesma.json b/data/ships/amphiesma.json
@@ -17,12 +17,8 @@
 		"missile": 2,
 		"cargo": 14
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 6900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 24,

diff --git a/data/ships/bluenose.json b/data/ships/bluenose.json
@@ -18,12 +18,8 @@
 		"missile": 2,
 		"cargo": 550
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant", "pirate"],
+
 	"effective_exhaust_velocity": 16900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 400,

diff --git a/data/ships/bowfin.json b/data/ships/bowfin.json
@@ -18,12 +18,8 @@
 		"missile": 24,
 		"cargo": 6
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": false,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 8400000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 26,

diff --git a/data/ships/deneb.json b/data/ships/deneb.json
@@ -18,11 +18,8 @@
 		"missile": 2,
 		"cargo": 360
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate"],
+
 	"effective_exhaust_velocity": 23900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 225,

diff --git a/data/ships/dsminer.json b/data/ships/dsminer.json
@@ -19,11 +19,8 @@
 		"atmo_shield": 0,
 		"cargo": 4600
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant"],
+
 	"effective_exhaust_velocity": 12900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 1200,

diff --git a/data/ships/kanara.json b/data/ships/kanara.json
@@ -18,12 +18,8 @@
 		"missile": 8,
 		"cargo": 4
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": false,
-		"pirate": true
-	},
+	"roles": ["mercenary"],
+
 	"effective_exhaust_velocity": 11000000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 4,

diff --git a/data/ships/kanara_civ.json b/data/ships/kanara_civ.json
@@ -18,11 +18,8 @@
 		"missile": 4,
 		"cargo": 8
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": false,
-		"pirate": true
-	},
+	"roles": ["mercenary", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 17900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 4,

diff --git a/data/ships/lodos.json b/data/ships/lodos.json
@@ -18,11 +18,8 @@
 		"missile": 2,
 		"cargo": 2800
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant"],
+
 	"effective_exhaust_velocity": 18900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 2100,

diff --git a/data/ships/lunarshuttle.json b/data/ships/lunarshuttle.json
@@ -17,12 +17,8 @@
 		"missile": 1,
 		"cargo": 30
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 7900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 25,

diff --git a/data/ships/malabar.json b/data/ships/malabar.json
@@ -18,11 +18,8 @@
 		"missile": 6,
 		"cargo": 1600
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant"],
+
 	"effective_exhaust_velocity": 14900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 2000,

diff --git a/data/ships/molamola.json b/data/ships/molamola.json
@@ -17,12 +17,8 @@
 		"missile": 2,
 		"cargo": 80
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 13000000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 40,

diff --git a/data/ships/molaramsayi.json b/data/ships/molaramsayi.json
@@ -18,11 +18,8 @@
 		"missile": 3,
 		"cargo": 900
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+		"roles": ["merchant"],
+
 	"effective_exhaust_velocity": 30000000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 273,

diff --git a/data/ships/natrix.json b/data/ships/natrix.json
@@ -18,12 +18,8 @@
 		"missile": 2,
 		"cargo": 80
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 18000000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 60,

diff --git a/data/ships/nerodia.json b/data/ships/nerodia.json
@@ -19,11 +19,8 @@
 		"atmo_shield": 0,
 		"cargo": 2500
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant"],
+
 	"effective_exhaust_velocity": 21900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 1000,

diff --git a/data/ships/pumpkinseed.json b/data/ships/pumpkinseed.json
@@ -17,11 +17,8 @@
 		"missile": 4,
 		"cargo": 10
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 32300000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 7,

diff --git a/data/ships/pumpkinseed_police.json b/data/ships/pumpkinseed_police.json
@@ -19,11 +19,8 @@
 		"missile": 8,
 		"cargo": 10
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": false,
-		"pirate": true
-	},
+		"roles": ["mercenary"],
+
 	"effective_exhaust_velocity": 9900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 9,

diff --git a/data/ships/sinonatrix.json b/data/ships/sinonatrix.json
@@ -17,12 +17,8 @@
 		"missile": 4,
 		"cargo": 30
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 14900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 66,

diff --git a/data/ships/sinonatrix_police.json b/data/ships/sinonatrix_police.json
@@ -19,11 +19,8 @@
 		"missile": 8,
 		"cargo": 25
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": false,
-		"pirate": true
-	},
+	"roles": ["mercenary"],	
+
 	"effective_exhaust_velocity": 8900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 30,

diff --git a/data/ships/skipjack.json b/data/ships/skipjack.json
@@ -19,12 +19,8 @@
 		"sensor": 1,
 		"cargo": 140
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 18900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 180,

diff --git a/data/ships/storeria.json b/data/ships/storeria.json
@@ -18,11 +18,8 @@
 		"missile": 1,
 		"cargo": 1500
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant"],	
+
 	"effective_exhaust_velocity": 11900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 1000,

diff --git a/data/ships/varada.json b/data/ships/varada.json
@@ -17,12 +17,8 @@
 		"laser_front": 1,
 		"cargo": 5
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": false,
-		"pirate": true
-	},
+	"roles": ["mercenary", "pirate", "courier"],
+
 	"effective_exhaust_velocity": 8900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 2,

diff --git a/data/ships/vatakara.json b/data/ships/vatakara.json
@@ -18,11 +18,8 @@
 		"missile": 6,
 		"cargo": 2900
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant"],
+
 	"effective_exhaust_velocity": 16900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 2200,

diff --git a/data/ships/venturestar.json b/data/ships/venturestar.json
@@ -18,11 +18,8 @@
 		"missile": 6,
 		"cargo": 880
 	},
-	"roles": {
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["merchant"],	
+
 	"effective_exhaust_velocity": 21700000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 700,

diff --git a/data/ships/wave.json b/data/ships/wave.json
@@ -19,12 +19,8 @@
 		"missile": 12,
 		"cargo": 30
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": false,
-		"pirate": true
-	},
+	"roles": ["mercenary", "pirate", "courier"],	
+
 	"effective_exhaust_velocity": 16900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 22,

diff --git a/data/ships/xylophis.json b/data/ships/xylophis.json
@@ -17,12 +17,8 @@
 		"laser_front": 1,
 		"cargo": 10
 	},
-	"roles": {
-		"courier": true,
-		"mercenary": true,
-		"merchant": true,
-		"pirate": true
-	},
+	"roles": ["mercenary", "merchant", "pirate", "courier"],	
+
 	"effective_exhaust_velocity": 9900000,
 	"thruster_fuel_use": -1.0,
 	"fuel_tank_mass": 4,