pioneerspacesim · Web-eWorks · Aug 12, 2024 · Jul 4, 2024 · Jul 4, 2024 · Jul 4, 2024
diff --git a/data/models/ships/ac33/ac33.model b/data/models/ships/ac33/ac33.model
@@ -11,7 +11,6 @@ collision ac33_collision.obj
 #LOD
 lod 1000
 mesh ac33.dae
-mesh ac33_shield.dae
 
 lod 350
 mesh ac33_high.dae

diff --git a/data/models/ships/ac33/ac33_shield.model b/data/models/ships/ac33/ac33_shield.model
@@ -0,0 +1 @@
+mesh ac33_shield.dae
diff --git a/data/models/ships/bluenose/bluenose.model b/data/models/ships/bluenose/bluenose.model
@@ -9,7 +9,6 @@ tex_norm bluenose_norm.png
 
 lod 300
 mesh bluenose_hi.dae
-mesh bluenose_shield.dae
 
 lod 100
 mesh bluenose_med.dae

diff --git a/data/models/ships/bluenose/bluenose_shield.model b/data/models/ships/bluenose/bluenose_shield.model
@@ -0,0 +1 @@
+mesh bluenose_shield.dae
diff --git a/data/models/ships/bowfin/bowfin.model b/data/models/ships/bowfin/bowfin.model
@@ -22,7 +22,6 @@ tex_spec bowfin_spec.dds
 
 lod 300
 mesh bowfin_hi.dae
-mesh bowfin_shield.dae
 
 lod 100
 mesh bowfin_med.dae

diff --git a/data/models/ships/bowfin/bowfin_shield.model b/data/models/ships/bowfin/bowfin_shield.model
@@ -0,0 +1 @@
+mesh bowfin_shield.dae
diff --git a/data/models/ships/coronatrix/coronatrix_police.model b/data/models/ships/coronatrix/coronatrix_police.model
@@ -38,5 +38,4 @@ mesh coronatrix_low.dae
 
 anim gear_down 1 100
 
-collision coronatrix_coll.dae
-mesh coronatrix_shield.dae
+collision coronatrix_coll.dae
diff --git a/data/models/ships/deneb/deneb.model b/data/models/ships/deneb/deneb.model
@@ -11,7 +11,6 @@ collision deneb_collision.obj
 # LOD
 lod 1001
 mesh deneb.dae
-mesh deneb_shield.dae
 
 lod 350
 mesh deneb_medhigh.dae

diff --git a/data/models/ships/deneb/deneb_shield.model b/data/models/ships/deneb/deneb_shield.model
@@ -0,0 +1 @@
+mesh deneb_shield.dae
diff --git a/data/models/ships/dsminer/dsminer.model b/data/models/ships/dsminer/dsminer.model
@@ -10,7 +10,6 @@ shininess 80
 
 lod 1000
 mesh dsminer_hi.dae
-mesh dsminer_shield.dae
 
 lod 100
 mesh dsminer_med.dae

diff --git a/data/models/ships/dsminer/dsminer_shield.model b/data/models/ships/dsminer/dsminer_shield.model
@@ -0,0 +1 @@
+mesh dsminer_shield.dae
diff --git a/data/models/ships/kanara/kanara.model b/data/models/ships/kanara/kanara.model
@@ -11,7 +11,6 @@ tex_norm kanara_norm.dds
 
 lod 300
 mesh kanara_hi.dae
-mesh kanara_shield.dae
 
 lod 50
 mesh kanara_med.dae

diff --git a/data/models/ships/kanara/kanara_civ.model b/data/models/ships/kanara/kanara_civ.model
@@ -10,7 +10,6 @@ tex_norm kanara_norm.dds
 
 lod 300
 mesh kanara_hi.dae
-mesh kanara_shield.dae
 
 lod 50
 mesh kanara_med.dae

diff --git a/data/models/ships/kanara/kanara_shield.model b/data/models/ships/kanara/kanara_shield.model
@@ -0,0 +1 @@
+mesh kanara_shield.dae
diff --git a/data/models/ships/lodos/lodos.model b/data/models/ships/lodos/lodos.model
@@ -7,7 +7,6 @@ tex_spec lodos-specular.dds
 tex_glow lodos-glow.dds
 
 mesh lodos-hi.dae
-mesh lodos_shield.dae
 
 anim gear_down 1 121
 

diff --git a/data/models/ships/lodos/lodos_shield.model b/data/models/ships/lodos/lodos_shield.model
@@ -0,0 +1 @@
+mesh lodos_shield.dae
diff --git a/data/models/ships/lunarshuttle/lunarshuttle.model b/data/models/ships/lunarshuttle/lunarshuttle.model
@@ -10,15 +10,10 @@ use_patterns
 
 lod 500
 mesh lunar_shuttle_hi.dae
-mesh lunar_shuttle_shield.dae
 
 lod 100 
 mesh lunar_shuttle_lo.dae
 
 collision lunar_shuttle_col.dae
 
-anim gear_down 1 100
-
-
-
-
+anim gear_down 1 100
diff --git a/data/models/ships/lunarshuttle/lunarshuttle_shield.model b/data/models/ships/lunarshuttle/lunarshuttle_shield.model
@@ -0,0 +1 @@
+mesh lunar_shuttle_shield.dae
diff --git a/data/models/ships/malabar/malabar.model b/data/models/ships/malabar/malabar.model
@@ -9,7 +9,6 @@ tex_spec malabar_spec.dds
 
 lod 300
 mesh malabar_hi.dae
-mesh malabar_shield.dae
 
 lod 100
 mesh malabar_med.dae

diff --git a/data/models/ships/malabar/malabar_shield.model b/data/models/ships/malabar/malabar_shield.model
@@ -0,0 +1 @@
+mesh malabar_shield.dae
diff --git a/data/models/ships/malabar/vatakara.model b/data/models/ships/malabar/vatakara.model
@@ -9,7 +9,6 @@ tex_spec vatakara_spec.dds
 
 lod 300
 mesh vatakara_hi.dae
-mesh malabar_shield.dae
 
 lod 100
 mesh malabar_med.dae

diff --git a/data/models/ships/molamola/molamola.model b/data/models/ships/molamola/molamola.model
@@ -10,7 +10,6 @@ tex_spec molamola_spec.dds
 
 lod 300
 mesh molamola_1hi.dae
-mesh molamola_shield.dae
 
 lod 100
 mesh molamola_2med.dae

diff --git a/data/models/ships/molamola/molamola_shield.model b/data/models/ships/molamola/molamola_shield.model
@@ -0,0 +1 @@
+mesh molamola_shield.dae
diff --git a/data/models/ships/molaramsayi/molaramsayi.model b/data/models/ships/molaramsayi/molaramsayi.model
@@ -11,7 +11,6 @@ tex_norm molaramsayi_norm.dds
 
 lod 300
 mesh molaramsayi_hi.dae
-mesh molaramsayi_shield.dae
 
 lod 50
 mesh molaramsayi_med.dae

diff --git a/data/models/ships/molaramsayi/molaramsayi_shield.model b/data/models/ships/molaramsayi/molaramsayi_shield.model
@@ -0,0 +1 @@
+mesh molaramsayi_shield.dae
diff --git a/data/models/ships/natrix/natrix.model b/data/models/ships/natrix/natrix.model
@@ -14,7 +14,6 @@ specular 1.0 1.0 1.0
 
 lod 100
 mesh natrix.dae
-mesh natrix_shield.dae
 
 lod 10
 mesh natrix_low.dae

diff --git a/data/models/ships/natrix/natrix_shield.model b/data/models/ships/natrix/natrix_shield.model
@@ -0,0 +1 @@
+mesh natrix_shield.dae
diff --git a/data/models/ships/nerodia/nerodia.model b/data/models/ships/nerodia/nerodia.model
@@ -14,4 +14,3 @@ collision nerodia_col.obj
 
 lod 75
 mesh nerodia_LOD.dae
-mesh nerodia_shield.dae
diff --git a/data/models/ships/nerodia/nerodia_shield.model b/data/models/ships/nerodia/nerodia_shield.model
@@ -0,0 +1 @@
+mesh nerodia_shield.dae
diff --git a/data/models/ships/pumpkinseed/pumpkinseed.model b/data/models/ships/pumpkinseed/pumpkinseed.model
@@ -15,7 +15,6 @@ mesh pumpkinseed_2med.dae
 
 lod 300
 mesh pumpkinseed_1hi.dae
-mesh pumpkinseed_shield.dae
 
 collision pumpkinseed_collision.dae
 

diff --git a/data/models/ships/pumpkinseed/pumpkinseed_police.model b/data/models/ships/pumpkinseed/pumpkinseed_police.model
@@ -14,7 +14,6 @@ mesh pumpkinseed_2med.dae
 
 lod 300
 mesh pumpkinseed_1hi.dae
-mesh pumpkinseed_shield.dae
 
 collision pumpkinseed_collision.dae
 

diff --git a/data/models/ships/pumpkinseed/pumpkinseed_shield.model b/data/models/ships/pumpkinseed/pumpkinseed_shield.model
@@ -0,0 +1 @@
+mesh pumpkinseed_shield.dae
diff --git a/data/models/ships/sinonatrix/sinonatrix.model b/data/models/ships/sinonatrix/sinonatrix.model
@@ -40,4 +40,3 @@ mesh sinonatrix_low.dae
 anim gear_down 1 100
 
 collision sinonatrix_coll.dae
-mesh sinonatrix_shld.dae
diff --git a/data/models/ships/sinonatrix/sinonatrix_police.model b/data/models/ships/sinonatrix/sinonatrix_police.model
@@ -38,5 +38,4 @@ mesh sinonatrix_low.dae
 
 anim gear_down 1 100
 
-collision sinonatrix_coll.dae
-mesh sinonatrix_shld.dae
+collision sinonatrix_coll.dae
diff --git a/data/models/ships/sinonatrix/sinonatrix_shield.model b/data/models/ships/sinonatrix/sinonatrix_shield.model
@@ -0,0 +1 @@
+mesh sinonatrix_shld.dae
diff --git a/data/models/ships/skipjack/skipjack.model b/data/models/ships/skipjack/skipjack.model
@@ -9,7 +9,6 @@ tex_glow skipjack_glow.dds
 
 lod 300
 mesh skipjack_hi.dae
-mesh skipjack_shield.dae
 
 lod 100
 mesh skipjack_med.dae

diff --git a/data/models/ships/skipjack/skipjack_shield.model b/data/models/ships/skipjack/skipjack_shield.model
@@ -0,0 +1 @@
+mesh skipjack_shield.dae
diff --git a/data/models/ships/storeria/storeria.model b/data/models/ships/storeria/storeria.model
@@ -8,7 +8,6 @@ tex_glow storeria_glow.dds
 
 lod 300
 mesh storeria_hi.dae
-mesh storeria_shield.dae
 
 lod 100
 mesh storeria_med.dae

diff --git a/data/models/ships/storeria/storeria_shield.model b/data/models/ships/storeria/storeria_shield.model
@@ -0,0 +1 @@
+mesh storeria_shield.dae
diff --git a/data/models/ships/varada/varada.model b/data/models/ships/varada/varada.model
@@ -10,7 +10,6 @@ tex_spec varada_spec.dds
 
 lod 300
 mesh varada_hi.dae
-mesh varada_shield.dae
 
 lod 50
 mesh varada_med.dae

diff --git a/data/models/ships/varada/varada_shield.model b/data/models/ships/varada/varada_shield.model
@@ -0,0 +1 @@
+mesh varada_shield.dae
diff --git a/data/models/ships/venturestar/venturestar.model b/data/models/ships/venturestar/venturestar.model
@@ -11,7 +11,6 @@ collision venturestar_collision.obj
 #LOD
 lod 1000
 mesh venturestar.dae
-mesh venturestar_shield.dae
 
 lod 350
 mesh venturestar_high.dae

diff --git a/data/models/ships/venturestar/venturestar_shield.model b/data/models/ships/venturestar/venturestar_shield.model
@@ -0,0 +1 @@
+mesh venturestar_shield.dae
diff --git a/data/models/ships/wave/wave.model b/data/models/ships/wave/wave.model
@@ -24,7 +24,6 @@ mesh wave-mq.dae
 
 lod 1000
 mesh wave.dae
-mesh wave_shield.dae
 anim gear_down 0 85
 
 collision wave_coll.dae
diff --git a/data/models/ships/wave/wave_shield.model b/data/models/ships/wave/wave_shield.model
@@ -0,0 +1 @@
+mesh wave_shield.dae
diff --git a/data/models/ships/xylophis/xylophis.model b/data/models/ships/xylophis/xylophis.model
@@ -35,5 +35,4 @@ mesh xylophis_low.dae
 
 anim gear_down 0 70
 
-collision xylophis_coll.dae
-mesh xylophis_shield.dae
+collision xylophis_coll.dae
diff --git a/data/models/ships/xylophis/xylophis_shield.model b/data/models/ships/xylophis/xylophis_shield.model
@@ -0,0 +1 @@
+mesh xylophis_shield.dae
diff --git a/data/ships/ac33.json b/data/ships/ac33.json
@@ -2,6 +2,7 @@
 	"model": "ac33",
 	"name": "AC-33 Dropstar",
 	"cockpit": "",
+	"shield_model": "ac33_shield",
 	"manufacturer": "albr",
 	"ship_class": "medium_freighter",
 	"min_crew": 3,

diff --git a/data/ships/bluenose.json b/data/ships/bluenose.json
@@ -2,6 +2,7 @@
 	"model": "bluenose",
 	"name": "Bluenose",
 	"cockpit": " ",
+	"shield_model": "bluenose_shield",
 	"manufacturer": "kaluri",
 	"ship_class": "medium_freighter",
 	"min_crew": 2,

diff --git a/data/ships/bowfin.json b/data/ships/bowfin.json
@@ -2,6 +2,7 @@
 	"model": "bowfin",
 	"name": "Bowfin",
 	"cockpit": "",
+	"shield_model": "bowfin_shield",
 	"manufacturer": "kaluri",
 	"ship_class": "light_fighter",
 	"min_crew": 1,

diff --git a/data/ships/coronatrix_police.json b/data/ships/coronatrix_police.json
@@ -2,6 +2,7 @@
 	"model": "coronatrix_police",
 	"name": "Coronatrix (Police)",
 	"cockpit": "coronatrix_cockpit",
+	"shield_model": "coronatrix_shield",
 	"manufacturer": "opli",
 	"ship_class": "light_courier",
 	"min_crew": 1,

diff --git a/data/ships/deneb.json b/data/ships/deneb.json
@@ -2,6 +2,7 @@
 	"model": "deneb",
 	"name": "Deneb",
 	"cockpit": "",
+	"shield_model": "deneb_shield",
 	"manufacturer": "albr",
 	"ship_class": "medium_freighter",
 	"min_crew": 2,

diff --git a/data/ships/dsminer.json b/data/ships/dsminer.json
@@ -2,6 +2,7 @@
 	"model": "dsminer",
 	"name": "Deep Space Miner",
 	"cockpit": " ",
+	"shield_model": "dsminer_shield",
 	"manufacturer": "haber",
 	"ship_class": "heavy_freighter",
 	"min_crew": 5,

diff --git a/data/ships/kanara.json b/data/ships/kanara.json
@@ -2,6 +2,7 @@
 	"model": "kanara",
 	"name": "Kanara (Police)",
 	"cockpit": "",
+	"shield_model": "kanara_shield",
 	"manufacturer": "mandarava_csepel",
 	"ship_class": "light_fighter",
 	"min_crew": 1,

diff --git a/data/ships/kanara_civ.json b/data/ships/kanara_civ.json
@@ -2,6 +2,7 @@
 	"model": "kanara_civ",
 	"name": "Kanara (Civilian)",
 	"cockpit": " ",
+	"shield_model": "kanara_shield",
 	"manufacturer": "mandarava_csepel",
 	"ship_class": "light_fighter",
 	"min_crew": 1,

diff --git a/data/ships/lodos.json b/data/ships/lodos.json
@@ -2,6 +2,7 @@
 	"model": "lodos",
 	"name": "Lodos",
 	"cockpit": "",
+	"shield_model": "lodos_shield",
 	"manufacturer": "auronox",
 	"ship_class": "heavy_freighter",
 	"min_crew": 2,

diff --git a/data/ships/lunarshuttle.json b/data/ships/lunarshuttle.json
@@ -2,6 +2,7 @@
 	"model": "lunarshuttle",
 	"name": "Lunar Shuttle",
 	"cockpit": "",
+	"shield_model": "lunarshuttle_shield",
 	"manufacturer": "haber",
 	"ship_class": "medium_passenger_shuttle",
 	"min_crew": 1,

diff --git a/data/ships/malabar.json b/data/ships/malabar.json
@@ -2,6 +2,7 @@
 	"model": "malabar",
 	"name": "Malabar",
 	"cockpit": "",
+	"shield_model": "malabar_shield",
 	"manufacturer": "mandarava_csepel",
 	"ship_class": "heavy_passenger_transport",
 	"min_crew": 1,

diff --git a/data/ships/molamola.json b/data/ships/molamola.json
@@ -2,6 +2,7 @@
 	"model": "molamola",
 	"name": "Mola Mola",
 	"cockpit": "",
+	"shield_model": "molamola_shield",
 	"manufacturer": "kaluri",
 	"ship_class": "light_freighter",
 	"min_crew": 1,

diff --git a/data/ships/molaramsayi.json b/data/ships/molaramsayi.json
@@ -2,6 +2,7 @@
 	"model": "molaramsayi",
 	"name": "Mola Ramsayi",
 	"cockpit": " ",
+	"shield_model": "molaramsayi_shield",
 	"manufacturer": "kaluri",
 	"ship_class": "medium_freighter",
 	"min_crew": 1,

diff --git a/data/ships/natrix.json b/data/ships/natrix.json
@@ -2,6 +2,7 @@
 	"model": "natrix",
 	"name": "Natrix",
 	"cockpit": "",
+	"shield_model": "natrix_shield",
 	"manufacturer": "opli",
 	"ship_class": "medium_freighter",
 	"min_crew": 1,

diff --git a/data/ships/nerodia.json b/data/ships/nerodia.json
@@ -2,6 +2,7 @@
 	"model": "nerodia",
 	"name": "Nerodia",
 	"cockpit": "",
+	"shield_model": "nerodia_shield",
 	"manufacturer": "opli",
 	"ship_class": "medium_freighter",
 	"min_crew": 1,