From ab3422118416d2cdaf9960cd719d1501ff7b9d0b Mon Sep 17 00:00:00 2001 From: Szlrd Date: Thu, 4 Jul 2024 11:16:10 +0200 Subject: [PATCH 1/3] Adding shield lines to ship.jsons --- data/ships/ac33.json | 1 + data/ships/bluenose.json | 1 + data/ships/bowfin.json | 1 + data/ships/coronatrix_police.json | 1 + data/ships/deneb.json | 1 + data/ships/dsminer.json | 1 + data/ships/kanara.json | 1 + data/ships/kanara_civ.json | 1 + data/ships/lodos.json | 1 + data/ships/lunarshuttle.json | 1 + data/ships/malabar.json | 1 + data/ships/molamola.json | 1 + data/ships/molaramsayi.json | 1 + data/ships/natrix.json | 1 + data/ships/nerodia.json | 1 + data/ships/pumpkinseed.json | 1 + data/ships/pumpkinseed_police.json | 1 + data/ships/sinonatrix.json | 1 + data/ships/sinonatrix_police.json | 1 + data/ships/skipjack.json | 1 + data/ships/storeria.json | 1 + data/ships/varada.json | 1 + data/ships/vatakara.json | 1 + data/ships/venturestar.json | 1 + data/ships/wave.json | 1 + data/ships/xylophis.json | 1 + 26 files changed, 26 insertions(+) diff --git a/data/ships/ac33.json b/data/ships/ac33.json index f01b16dfa5d..339aab9288a 100644 --- 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 index b4d1904c889..c97fb9ba4c3 100644 --- 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 index c0a346e7c2f..ffe2cd5b0a3 100644 --- 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 index 9fee6c61ec7..58b9a3f9374 100644 --- 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 index 63dc3d6807d..30fa960b62d 100644 --- 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 index 4fea66aeffd..61b1af94c41 100644 --- 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 index 1cb19579039..63228e0c1e9 100644 --- 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 index fd388c73aa7..7a3e8f760f0 100644 --- 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 index da6074dd8ac..6312ef4be69 100644 --- 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 index ff0b19bf319..cedab2c2413 100644 --- 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 index 3b206b8a730..64af76ea049 100644 --- 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 index 1d41957a9fa..9f9f3007dca 100644 --- 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 index 02d3390bed2..0321ff1ffc4 100644 --- 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 index d89bdcae4b0..26a087600d5 100644 --- 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 index a7b972b8208..f0c6f940058 100644 --- 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, diff --git a/data/ships/pumpkinseed.json b/data/ships/pumpkinseed.json index bc1493aaba7..16d57d9e65d 100644 --- a/data/ships/pumpkinseed.json +++ b/data/ships/pumpkinseed.json @@ -2,6 +2,7 @@ "model": "pumpkinseed", "name": "Pumpkinseed", "cockpit": " ", + "shield_model": "pumpkinseed_shield", "manufacturer": "kaluri", "ship_class": "light_courier", "min_crew": 1, diff --git a/data/ships/pumpkinseed_police.json b/data/ships/pumpkinseed_police.json index 0698b432583..eaa46e2cef8 100644 --- a/data/ships/pumpkinseed_police.json +++ b/data/ships/pumpkinseed_police.json @@ -2,6 +2,7 @@ "model": "pumpkinseed_police", "name": "Pumpkinseed (Police)", "cockpit": "", + "shield_model": "pumpkinseed_shield", "manufacturer": "kaluri", "ship_class": "light_fighter", "min_crew": 1, diff --git a/data/ships/sinonatrix.json b/data/ships/sinonatrix.json index e5e38930da7..0a9024e9565 100644 --- a/data/ships/sinonatrix.json +++ b/data/ships/sinonatrix.json @@ -2,6 +2,7 @@ "model": "sinonatrix", "name": "Sinonatrix", "cockpit": "sinonatrix_cockpit", + "shield_model": "sinonatrix_shield", "manufacturer": "opli", "ship_class": "light_courier", "min_crew": 1, diff --git a/data/ships/sinonatrix_police.json b/data/ships/sinonatrix_police.json index 50a3c735e78..b9ebf574e3d 100644 --- a/data/ships/sinonatrix_police.json +++ b/data/ships/sinonatrix_police.json @@ -2,6 +2,7 @@ "model": "sinonatrix_police", "name": "Sinonatrix (Police)", "cockpit": "sinonatrix_cockpit", + "shield_model": "sinonatrix_shield", "manufacturer": "opli", "ship_class": "light_fighter", "min_crew": 1, diff --git a/data/ships/skipjack.json b/data/ships/skipjack.json index 290235f27f9..c52233ee71d 100644 --- a/data/ships/skipjack.json +++ b/data/ships/skipjack.json @@ -2,6 +2,7 @@ "model": "skipjack", "name": "Skipjack", "cockpit": " ", + "shield_model": "skipjack_shield", "manufacturer": "kaluri", "ship_class": "medium_courier", "min_crew": 2, diff --git a/data/ships/storeria.json b/data/ships/storeria.json index 1c30c283f23..6046add6c9a 100644 --- a/data/ships/storeria.json +++ b/data/ships/storeria.json @@ -2,6 +2,7 @@ "model": "storeria", "name": "Storeria", "cockpit": "", + "shield_model": "storeria_shield", "manufacturer": "opli", "ship_class": "medium_freighter", "min_crew": 1, diff --git a/data/ships/varada.json b/data/ships/varada.json index d40ce8db293..1447a944582 100644 --- a/data/ships/varada.json +++ b/data/ships/varada.json @@ -2,6 +2,7 @@ "model": "varada", "name": "Varada", "cockpit": " ", + "shield_model": "varada_shield", "manufacturer": "mandarava_csepel", "ship_class": "light_courier", "min_crew": 1, diff --git a/data/ships/vatakara.json b/data/ships/vatakara.json index 5084ddbef2f..a6f6ee6a5db 100644 --- a/data/ships/vatakara.json +++ b/data/ships/vatakara.json @@ -2,6 +2,7 @@ "model": "vatakara", "name": "Vatakara", "cockpit": "", + "shield_model": "malabar_shield", "manufacturer": "mandarava_csepel", "ship_class": "heavy_freighter", "min_crew": 1, diff --git a/data/ships/venturestar.json b/data/ships/venturestar.json index 6af64bd6193..7b80f70f1f3 100644 --- a/data/ships/venturestar.json +++ b/data/ships/venturestar.json @@ -1,6 +1,7 @@ { "model": "venturestar", "name": "Venturestar", + "shield_model": "venturestar_shield", "cockpit": "", "manufacturer": "albr", "ship_class": "medium_freighter", diff --git a/data/ships/wave.json b/data/ships/wave.json index 14819c99dba..49bae163512 100644 --- a/data/ships/wave.json +++ b/data/ships/wave.json @@ -2,6 +2,7 @@ "model": "wave", "name": "Wave", "cockpit": "", + "shield_model": "wave_shield", "manufacturer": "auronox", "ship_class": "medium_fighter", "min_crew": 1, diff --git a/data/ships/xylophis.json b/data/ships/xylophis.json index abed93e1961..cacf50144f2 100644 --- a/data/ships/xylophis.json +++ b/data/ships/xylophis.json @@ -2,6 +2,7 @@ "model": "xylophis", "name": "Xylophis", "cockpit": "xylophis_cockpit", + "shield_model": "xylophis_shield", "manufacturer": "opli", "ship_class": "light_passenger_shuttle", "min_crew": 1, From 494d32da0fdc0e21aaa31cd139c5b8b98767bff1 Mon Sep 17 00:00:00 2001 From: Szlrd Date: Thu, 4 Jul 2024 11:43:30 +0200 Subject: [PATCH 2/3] Adding shield.models --- data/models/ships/ac33/ac33_shield.model | 1 + data/models/ships/bluenose/bluenose_shield.model | 1 + data/models/ships/bowfin/bowfin_shield.model | 1 + data/models/ships/deneb/deneb_shield.model | 1 + data/models/ships/dsminer/dsminer_shield.model | 1 + data/models/ships/kanara/kanara_shield.model | 1 + data/models/ships/lodos/lodos_shield.model | 1 + data/models/ships/lunarshuttle/lunarshuttle_shield.model | 1 + data/models/ships/malabar/malabar_shield.model | 1 + data/models/ships/molamola/molamola_shield.model | 1 + data/models/ships/molaramsayi/molaramsayi_shield.model | 1 + data/models/ships/natrix/natrix_shield.model | 1 + data/models/ships/nerodia/nerodia_shield.model | 1 + data/models/ships/pumpkinseed/pumpkinseed_shield.model | 1 + data/models/ships/sinonatrix/sinonatrix_shield.model | 1 + data/models/ships/skipjack/skipjack_shield.model | 1 + data/models/ships/storeria/storeria_shield.model | 1 + data/models/ships/varada/varada_shield.model | 1 + data/models/ships/venturestar/venturestar_shield.model | 1 + data/models/ships/wave/wave_shield.model | 1 + data/models/ships/xylophis/xylophis_shield.model | 1 + 21 files changed, 21 insertions(+) create mode 100644 data/models/ships/ac33/ac33_shield.model create mode 100644 data/models/ships/bluenose/bluenose_shield.model create mode 100644 data/models/ships/bowfin/bowfin_shield.model create mode 100644 data/models/ships/deneb/deneb_shield.model create mode 100644 data/models/ships/dsminer/dsminer_shield.model create mode 100644 data/models/ships/kanara/kanara_shield.model create mode 100644 data/models/ships/lodos/lodos_shield.model create mode 100644 data/models/ships/lunarshuttle/lunarshuttle_shield.model create mode 100644 data/models/ships/malabar/malabar_shield.model create mode 100644 data/models/ships/molamola/molamola_shield.model create mode 100644 data/models/ships/molaramsayi/molaramsayi_shield.model create mode 100644 data/models/ships/natrix/natrix_shield.model create mode 100644 data/models/ships/nerodia/nerodia_shield.model create mode 100644 data/models/ships/pumpkinseed/pumpkinseed_shield.model create mode 100644 data/models/ships/sinonatrix/sinonatrix_shield.model create mode 100644 data/models/ships/skipjack/skipjack_shield.model create mode 100644 data/models/ships/storeria/storeria_shield.model create mode 100644 data/models/ships/varada/varada_shield.model create mode 100644 data/models/ships/venturestar/venturestar_shield.model create mode 100644 data/models/ships/wave/wave_shield.model create mode 100644 data/models/ships/xylophis/xylophis_shield.model diff --git a/data/models/ships/ac33/ac33_shield.model b/data/models/ships/ac33/ac33_shield.model new file mode 100644 index 00000000000..3838df0436e --- /dev/null +++ b/data/models/ships/ac33/ac33_shield.model @@ -0,0 +1 @@ +mesh ac33_shield.dae diff --git a/data/models/ships/bluenose/bluenose_shield.model b/data/models/ships/bluenose/bluenose_shield.model new file mode 100644 index 00000000000..2d339369077 --- /dev/null +++ b/data/models/ships/bluenose/bluenose_shield.model @@ -0,0 +1 @@ +mesh bluenose_shield.dae \ No newline at end of file diff --git a/data/models/ships/bowfin/bowfin_shield.model b/data/models/ships/bowfin/bowfin_shield.model new file mode 100644 index 00000000000..687e8ff5b21 --- /dev/null +++ b/data/models/ships/bowfin/bowfin_shield.model @@ -0,0 +1 @@ +mesh bowfin_shield.dae \ No newline at end of file diff --git a/data/models/ships/deneb/deneb_shield.model b/data/models/ships/deneb/deneb_shield.model new file mode 100644 index 00000000000..d326a4c088f --- /dev/null +++ b/data/models/ships/deneb/deneb_shield.model @@ -0,0 +1 @@ +mesh deneb_shield.dae \ No newline at end of file diff --git a/data/models/ships/dsminer/dsminer_shield.model b/data/models/ships/dsminer/dsminer_shield.model new file mode 100644 index 00000000000..76f25cb637d --- /dev/null +++ b/data/models/ships/dsminer/dsminer_shield.model @@ -0,0 +1 @@ +mesh dsminer_shield.dae \ No newline at end of file diff --git a/data/models/ships/kanara/kanara_shield.model b/data/models/ships/kanara/kanara_shield.model new file mode 100644 index 00000000000..d0b496ac595 --- /dev/null +++ b/data/models/ships/kanara/kanara_shield.model @@ -0,0 +1 @@ +mesh kanara_shield.dae \ No newline at end of file diff --git a/data/models/ships/lodos/lodos_shield.model b/data/models/ships/lodos/lodos_shield.model new file mode 100644 index 00000000000..eb0033e3812 --- /dev/null +++ b/data/models/ships/lodos/lodos_shield.model @@ -0,0 +1 @@ +mesh lodos_shield.dae \ No newline at end of file diff --git a/data/models/ships/lunarshuttle/lunarshuttle_shield.model b/data/models/ships/lunarshuttle/lunarshuttle_shield.model new file mode 100644 index 00000000000..3f6ca356a8b --- /dev/null +++ b/data/models/ships/lunarshuttle/lunarshuttle_shield.model @@ -0,0 +1 @@ +mesh lunar_shuttle_shield.dae \ No newline at end of file diff --git a/data/models/ships/malabar/malabar_shield.model b/data/models/ships/malabar/malabar_shield.model new file mode 100644 index 00000000000..7cd7038dede --- /dev/null +++ b/data/models/ships/malabar/malabar_shield.model @@ -0,0 +1 @@ +mesh malabar_shield.dae \ No newline at end of file diff --git a/data/models/ships/molamola/molamola_shield.model b/data/models/ships/molamola/molamola_shield.model new file mode 100644 index 00000000000..fbcafe5d168 --- /dev/null +++ b/data/models/ships/molamola/molamola_shield.model @@ -0,0 +1 @@ +mesh molamola_shield.dae \ No newline at end of file diff --git a/data/models/ships/molaramsayi/molaramsayi_shield.model b/data/models/ships/molaramsayi/molaramsayi_shield.model new file mode 100644 index 00000000000..2af90bb6a99 --- /dev/null +++ b/data/models/ships/molaramsayi/molaramsayi_shield.model @@ -0,0 +1 @@ +mesh molaramsayi_shield.dae \ No newline at end of file diff --git a/data/models/ships/natrix/natrix_shield.model b/data/models/ships/natrix/natrix_shield.model new file mode 100644 index 00000000000..36896a96931 --- /dev/null +++ b/data/models/ships/natrix/natrix_shield.model @@ -0,0 +1 @@ +mesh natrix_shield.dae \ No newline at end of file diff --git a/data/models/ships/nerodia/nerodia_shield.model b/data/models/ships/nerodia/nerodia_shield.model new file mode 100644 index 00000000000..c708608efab --- /dev/null +++ b/data/models/ships/nerodia/nerodia_shield.model @@ -0,0 +1 @@ +mesh nerodia_shield.dae diff --git a/data/models/ships/pumpkinseed/pumpkinseed_shield.model b/data/models/ships/pumpkinseed/pumpkinseed_shield.model new file mode 100644 index 00000000000..38e02efdfe8 --- /dev/null +++ b/data/models/ships/pumpkinseed/pumpkinseed_shield.model @@ -0,0 +1 @@ +mesh pumpkinseed_shield.dae \ No newline at end of file diff --git a/data/models/ships/sinonatrix/sinonatrix_shield.model b/data/models/ships/sinonatrix/sinonatrix_shield.model new file mode 100644 index 00000000000..31e14cd0bbf --- /dev/null +++ b/data/models/ships/sinonatrix/sinonatrix_shield.model @@ -0,0 +1 @@ +mesh sinonatrix_shld.dae diff --git a/data/models/ships/skipjack/skipjack_shield.model b/data/models/ships/skipjack/skipjack_shield.model new file mode 100644 index 00000000000..bb10922c5fc --- /dev/null +++ b/data/models/ships/skipjack/skipjack_shield.model @@ -0,0 +1 @@ +mesh skipjack_shield.dae \ No newline at end of file diff --git a/data/models/ships/storeria/storeria_shield.model b/data/models/ships/storeria/storeria_shield.model new file mode 100644 index 00000000000..22fb43a750f --- /dev/null +++ b/data/models/ships/storeria/storeria_shield.model @@ -0,0 +1 @@ +mesh storeria_shield.dae \ No newline at end of file diff --git a/data/models/ships/varada/varada_shield.model b/data/models/ships/varada/varada_shield.model new file mode 100644 index 00000000000..08b368414d5 --- /dev/null +++ b/data/models/ships/varada/varada_shield.model @@ -0,0 +1 @@ +mesh varada_shield.dae \ No newline at end of file diff --git a/data/models/ships/venturestar/venturestar_shield.model b/data/models/ships/venturestar/venturestar_shield.model new file mode 100644 index 00000000000..3b3249ecf39 --- /dev/null +++ b/data/models/ships/venturestar/venturestar_shield.model @@ -0,0 +1 @@ +mesh venturestar_shield.dae \ No newline at end of file diff --git a/data/models/ships/wave/wave_shield.model b/data/models/ships/wave/wave_shield.model new file mode 100644 index 00000000000..80655556ec2 --- /dev/null +++ b/data/models/ships/wave/wave_shield.model @@ -0,0 +1 @@ +mesh wave_shield.dae \ No newline at end of file diff --git a/data/models/ships/xylophis/xylophis_shield.model b/data/models/ships/xylophis/xylophis_shield.model new file mode 100644 index 00000000000..223956940d7 --- /dev/null +++ b/data/models/ships/xylophis/xylophis_shield.model @@ -0,0 +1 @@ +mesh xylophis_shield.dae \ No newline at end of file From 265c66760978c5819dae07ca7f985f7cfc067140 Mon Sep 17 00:00:00 2001 From: Szlrd Date: Thu, 4 Jul 2024 11:45:08 +0200 Subject: [PATCH 3/3] Removing shields from ship.models (And some empty lines here and there) --- data/models/ships/ac33/ac33.model | 1 - data/models/ships/bluenose/bluenose.model | 1 - data/models/ships/bowfin/bowfin.model | 1 - data/models/ships/coronatrix/coronatrix_police.model | 3 +-- data/models/ships/deneb/deneb.model | 1 - data/models/ships/dsminer/dsminer.model | 1 - data/models/ships/kanara/kanara.model | 1 - data/models/ships/kanara/kanara_civ.model | 1 - data/models/ships/lodos/lodos.model | 1 - data/models/ships/lunarshuttle/lunarshuttle.model | 7 +------ data/models/ships/malabar/malabar.model | 1 - data/models/ships/malabar/vatakara.model | 1 - data/models/ships/molamola/molamola.model | 1 - data/models/ships/molaramsayi/molaramsayi.model | 1 - data/models/ships/natrix/natrix.model | 1 - data/models/ships/nerodia/nerodia.model | 1 - data/models/ships/pumpkinseed/pumpkinseed.model | 1 - data/models/ships/pumpkinseed/pumpkinseed_police.model | 1 - data/models/ships/sinonatrix/sinonatrix.model | 1 - data/models/ships/sinonatrix/sinonatrix_police.model | 3 +-- data/models/ships/skipjack/skipjack.model | 1 - data/models/ships/storeria/storeria.model | 1 - data/models/ships/varada/varada.model | 1 - data/models/ships/venturestar/venturestar.model | 1 - data/models/ships/wave/wave.model | 1 - data/models/ships/xylophis/xylophis.model | 3 +-- 26 files changed, 4 insertions(+), 34 deletions(-) diff --git a/data/models/ships/ac33/ac33.model b/data/models/ships/ac33/ac33.model index 40ecc34d930..f938881fb09 100644 --- 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/bluenose/bluenose.model b/data/models/ships/bluenose/bluenose.model index 4037699d122..fae66781a67 100644 --- 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/bowfin/bowfin.model b/data/models/ships/bowfin/bowfin.model index 9bc2976879b..1fb750c73fe 100644 --- 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/coronatrix/coronatrix_police.model b/data/models/ships/coronatrix/coronatrix_police.model index 638eece7364..619b9ab5455 100644 --- 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 \ No newline at end of file diff --git a/data/models/ships/deneb/deneb.model b/data/models/ships/deneb/deneb.model index 50bb30c4cce..cf66583a3f9 100644 --- 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/dsminer/dsminer.model b/data/models/ships/dsminer/dsminer.model index c81df1bd6d3..3dabb456fdf 100644 --- 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/kanara/kanara.model b/data/models/ships/kanara/kanara.model index 506e4d376bd..2a72749f990 100644 --- 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 index 758cf6bbd85..dab64cb2692 100644 --- 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/lodos/lodos.model b/data/models/ships/lodos/lodos.model index 6db434e90df..05f1d1fc362 100644 --- 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/lunarshuttle/lunarshuttle.model b/data/models/ships/lunarshuttle/lunarshuttle.model index 04a99286975..927bdc26b7f 100644 --- 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 \ No newline at end of file diff --git a/data/models/ships/malabar/malabar.model b/data/models/ships/malabar/malabar.model index 22333a81b3c..c1c13e2b483 100644 --- 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/vatakara.model b/data/models/ships/malabar/vatakara.model index 97b8f98b182..1aba5a37d30 100644 --- 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 index a3f3cf7468b..a38dd569e65 100644 --- 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/molaramsayi/molaramsayi.model b/data/models/ships/molaramsayi/molaramsayi.model index 30bdd611600..d13cfd24880 100644 --- 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/natrix/natrix.model b/data/models/ships/natrix/natrix.model index 7a88a695125..0fb221c9dbd 100644 --- 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/nerodia/nerodia.model b/data/models/ships/nerodia/nerodia.model index c1c870aabbd..dff59f1065e 100644 --- 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/pumpkinseed/pumpkinseed.model b/data/models/ships/pumpkinseed/pumpkinseed.model index ec79bb1f17a..30fcdbdf703 100644 --- 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 index ce8a122b818..49d3f675d7f 100644 --- 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/sinonatrix/sinonatrix.model b/data/models/ships/sinonatrix/sinonatrix.model index 6de72e7e269..1453c397e57 100644 --- 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 index 8186f9615b3..92bc7228bf1 100644 --- 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 \ No newline at end of file diff --git a/data/models/ships/skipjack/skipjack.model b/data/models/ships/skipjack/skipjack.model index 01e7fc1efc2..dd6a94fdb53 100644 --- 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/storeria/storeria.model b/data/models/ships/storeria/storeria.model index 479e2c00e65..59f01e17775 100644 --- 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/varada/varada.model b/data/models/ships/varada/varada.model index 0233cf0e7b8..dea6b4c2bf1 100644 --- 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/venturestar/venturestar.model b/data/models/ships/venturestar/venturestar.model index be873fa34d2..0e886772a60 100644 --- 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/wave/wave.model b/data/models/ships/wave/wave.model index 59f9e6225ba..f3e15306deb 100644 --- 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/xylophis/xylophis.model b/data/models/ships/xylophis/xylophis.model index e5c536a9dc7..8cf4124c909 100644 --- 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 \ No newline at end of file +collision xylophis_coll.dae \ No newline at end of file