Merged start.dat fighter changes to shatter.dat and content.dat

12 files changed, 16 insertions, 1381 deletions

diff --git a/data/content/Ships/Alliance_Fighters/Eagle.def b/data/content/Ships/Alliance_Fighters/Eagle.def
index 72b2460..03f9be3 100644
--- a/data/content/Ships/Alliance_Fighters/Eagle.def
+++ b/data/content/Ships/Alliance_Fighters/Eagle.def
@@ -50,7 +50,7 @@ bridge:     (0,  102,  23)
 power:      {
    type:    Fusion,
    max_output: 75,
-   fuel_range: 0.5,
+   fuel_range: 1.0,
    
    loc:     (0, 0, -40),
    size:    32,
diff --git a/data/content/Ships/Alliance_Fighters/Falcon.def b/data/content/Ships/Alliance_Fighters/Falcon.def
index 81847d6..46155fb 100644
--- a/data/content/Ships/Alliance_Fighters/Falcon.def
+++ b/data/content/Ships/Alliance_Fighters/Falcon.def
@@ -50,7 +50,7 @@ bridge:     (0,  131,  23)
 power:      {
    type:    Fusion,
    max_output: 65,
-   fuel_range: 0.5,
+   fuel_range: 0.75,
    
    loc:     (0, 0, -40),
    size:    32,
diff --git a/data/content/Ships/Alliance_Fighters/Stormhawk.def b/data/content/Ships/Alliance_Fighters/Stormhawk.def
index 73d546c..6dd67b9 100644
--- a/data/content/Ships/Alliance_Fighters/Stormhawk.def
+++ b/data/content/Ships/Alliance_Fighters/Stormhawk.def
@@ -50,7 +50,7 @@ bridge:     (0,  102,  23)
 power:      {
    type:    Fusion,
    max_output: 75,
-   fuel_range: 0.5,
+   fuel_range: 0.75,
    
    loc:     (0, 0, -40),
    size:    32,
diff --git a/data/content/Ships/Alliance_Fighters/Thunderbolt.def b/data/content/Ships/Alliance_Fighters/Thunderbolt.def
index 0990ee1..ec53e56 100644
--- a/data/content/Ships/Alliance_Fighters/Thunderbolt.def
+++ b/data/content/Ships/Alliance_Fighters/Thunderbolt.def
@@ -47,10 +47,11 @@ chase:          (0, -1000, 130)
 bridge:		(0,   180,  20)
 
 power: {
-   type:        Fusion
-   name:        "Fusion Reactor"
-   design:      "Fusion Reactor"
-   max_output:  75
+   type:        Fusion,
+   name:        "Fusion Reactor",
+   design:      "Fusion Reactor",
+   max_output:  75,
+   fuel_range:  0.75,
 
    loc:         (0, 0, 0)
    size:        10
diff --git a/data/shatter/Ships/Alliance_Fighters/Eagle.def b/data/shatter/Ships/Alliance_Fighters/Eagle.def
index 929b288..a498855 100644
--- a/data/shatter/Ships/Alliance_Fighters/Eagle.def
+++ b/data/shatter/Ships/Alliance_Fighters/Eagle.def
@@ -50,7 +50,7 @@ bridge:     (0,  102,  23)
 power:      {
    type:    Fusion,
    max_output: 75,
-   fuel_range: 0.5,
+   fuel_range: 1.0,
    
    loc:     (0, 0, -40),
    size:    32,
diff --git a/data/shatter/Ships/Alliance_Fighters/Falcon.def b/data/shatter/Ships/Alliance_Fighters/Falcon.def
index bd99e31..ede8d5a 100644
--- a/data/shatter/Ships/Alliance_Fighters/Falcon.def
+++ b/data/shatter/Ships/Alliance_Fighters/Falcon.def
@@ -50,7 +50,7 @@ bridge:     (0,  131,  23)
 power:      {
    type:    Fusion,
    max_output: 65,
-   fuel_range: 0.5,
+   fuel_range: 0.75,
    
    loc:     (0, 0, -40),
    size:    32,
diff --git a/data/shatter/Ships/Alliance_Fighters/Stormhawk.def b/data/shatter/Ships/Alliance_Fighters/Stormhawk.def
index 3598c97..f47b4fe 100644
--- a/data/shatter/Ships/Alliance_Fighters/Stormhawk.def
+++ b/data/shatter/Ships/Alliance_Fighters/Stormhawk.def
@@ -50,7 +50,7 @@ bridge:     (0,  102,  23)
 power:      {
    type:    Fusion,
    max_output: 75,
-   fuel_range: 0.5,
+   fuel_range: 0.75,
    
    loc:     (0, 0, -40),
    size:    32,
diff --git a/data/shatter/Ships/Alliance_Fighters/Thunderbolt.def b/data/shatter/Ships/Alliance_Fighters/Thunderbolt.def
index 946fd31..9223be9 100644
--- a/data/shatter/Ships/Alliance_Fighters/Thunderbolt.def
+++ b/data/shatter/Ships/Alliance_Fighters/Thunderbolt.def
@@ -47,10 +47,11 @@ chase:          (0, -1000, 130)
 bridge:		(0,   180,  20)
 
 power: {
-   type:        Fusion
-   name:        "Fusion Reactor"
-   design:      "Fusion Reactor"
-   max_output:  75
+   type:       Fusion,
+   name:       "Fusion Reactor",
+   design:     "Fusion Reactor",
+   max_output: 75,
+   fuel_range: 0.75,
 
    loc:         (0, 0, 0)
    size:        10
diff --git a/data/start/Ships/Alliance_Fighters/Eagle.def b/data/start/Ships/Alliance_Fighters/Eagle.def
deleted file mode 100644
index a498855..0000000
--- a/data/start/Ships/Alliance_Fighters/Eagle.def
+++ /dev/null
@@ -1,366 +0,0 @@
-SHIP
-
-name:          Eagle
-display_name:  Eagle
-class:         Fighter
-abrv:          "F-34D"
-
-hud_icon:      "EagleHud.pcx"
-description:   "The F-34D EAGLE is a compact, multi-role fighter spacecraft. It is highly maneuverable and has proven itself in spaceborne and airborne combat as well as in surface attack missions. It provides a relatively low-cost, high-performance weapon system for Alliance forces.   Like the F-32 Falcon, the Eagle is armed with twin Delta particle cannon, along with four underwing hard points capable of mounting a variety of anti-fighter ordnance.  The Eagle's heavier structure also provides support for air-to-ground and antiship weapons and increased survivability at some cost in overall maneuverability."
-
-detail_0:   "Eagle_0.mag"
-feature_0:  25
-detail_1:   "Eagle_1b.mag"
-feature_1:  1
-
-cockpit_model: "EaglePit2t.mag"
-cockpit_scale: 0.02
-
-mass:       17.3
-integrity:  6e3
-scuttle:    2e3
-vlimit:     300
-agility:    130
-air_factor: 0.25
-roll_rate:  1700
-scale:      0.25
-acs:        1.1
-detet:      50e3
-
-trans_x:    3e3
-trans_y:    3e3
-trans_z:    3e3
-
-arcade_drag: 0.13
-drag:       3.0e-5
-roll_drag:  10
-pitch_drag: 7.5
-yaw_drag:   7.5
-
-CL:         1.8e-2 //1.1e-2
-CD:         5.1e-2 //1.1e-1
-stall:      0.45
-
-prep_time:  15
-avoid_fighter: 7
-
-chase:      (0, -770,  80)
-bridge:     (0,  102,  23)
-
-power:      {
-   type:    Fusion,
-   max_output: 75,
-   fuel_range: 1.0,
-   
-   loc:     (0, 0, -40),
-   size:    32,
-   hull_factor: 0.75
-   }
-
-drive:      {
-   type:    Plasma,
-   thrust:  20,
-   augmenter: 60,
-   scale:   0.35,
-   port:    (-8, 1, -188),
-   port:    ( 8, 1, -188),
-
-   loc:     (0, 0, -150),
-   size:    16,
-   hull_factor: 0.85
-   }
-
-
-weapon:     {
-   type:    "Delta Cannon",
-   abrv:    Cannon,
-   muzzle:  (-19, -3, 177),
-   muzzle:  ( 19, -3, 177),
-
-   loc:     (  0,  0,  32),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-1",
-   muzzle:  (-69, -22, -75)
-
-   loc:     (-69, -22, -60)
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   type:    "Rockets",
-   abrv:    "STA-2",
-   muzzle:  (-48, -17,  -75)
-
-   loc:     (-48, -17,  -60)
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   abrv:    "STA-3",
-   muzzle:  (-20, -13,  -25)
-
-   loc:     (-20, -13,  -15)
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   abrv:    "STA-4",
-   muzzle:  (-14, -14,   52)
-
-   loc:     (-14, -14,   60)
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   abrv:    "STA-5",
-   muzzle:  ( 15, -14,   52)
-
-   loc:     ( 15, -14,   60)
-   size:    16,
-   hull_factor: 0.2
-}
-
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   abrv:    "STA-6",
-   muzzle:  ( 20, -13,  -25)
-
-   loc:     ( 20, -13,  -15)
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   type:    "Rockets",
-   abrv:    "STA-7",
-   muzzle:  ( 48, -17,  -75)
-
-   loc:     ( 48, -17,  -60)
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-8",
-   muzzle:  ( 70, -22, -75)
-
-   loc:     ( 70, -22, -60)
-   size:    16,
-   hull_factor: 0.2
-}
-
-decoy:     {
-   type:    "Fighter Decoy",
-   abrv:    Decoy,
-   muzzle:  ( 0, -32, 0),
-
-   loc:     (0, 0, 0),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-sensor:     {
-   pcs:                 25,
-   active_efficiency:   2e9,
-   passive_efficiency:  500,
-   range:   25e3,
-   range:   50e3,
-   range:   75e3,
-
-   loc:     (0, 0, 100),
-   size:    25,
-   hull_factor: 0.25
-   }
-
-computer:   {
-   name:    "Avionics Package",
-   abrv:    HUD,
-   type:    1,
-
-   loc:     (20, 0, 80),
-   size:    8,
-   hull_factor: 0.2
-   }
-
-computer:   {
-   name:    "Flight Computer",
-   abrv:    Flight,
-   type:    2,
-
-   loc:     (-20, 0, 80),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-gear: {
-   name:    "Undercarriage",
-   abrv:    Gear,
-   loc:     (0, 0, 0),
-   size:    16,
-   hull_factor: 0.5,
-
-   gear: {
-      model: "GearNose1.mag",
-      start: (0, -18, 100),
-      end:   (0, -38, 130)
-      },
-
-   gear: {
-      model: "GearLeft1.mag",
-      start: (-20, -20, -74),
-      end:   (-40, -50, -70)
-      },
-
-   gear: {
-      model: "GearRight1.mag",
-      start: ( 20, -20, -74),
-      end:   ( 40, -50, -70)
-      },
-   }
-
-nav:        {
-   loc:     (0, 0, 60),
-   size:    16,
-   hull_factor: 0.1
-   }
-
-
-thruster: {
-   design:           Thruster,
-   type:             Plasma,
-   scale:            0.12,
-   loc:              (0, -52,0),
-   size:             32,
-   hull_factor:      0.8
-
-   port_fore:   {loc:( -40,   5,  28), fire: 0x0044},
-   port_fore:   {loc:( -40,  -9,  28), fire: 0x0044},
-   port_fore:   {loc:(  40,  -9,  28), fire: 0x0084},
-   port_fore:   {loc:(  40,   5,  28), fire: 0x0084},
-
-   port_aft:    {loc:(  -3,  -8,-188), fire: 0x0008},
-   port_aft:    {loc:(   3,  -8,-188), fire: 0x0008},
-
-   port_top:    {loc:(  -3,  17,-145), fire: 0x0210},
-   port_top:    {loc:(   3,  17,-145), fire: 0x0210},
-
-   port_bottom: {loc:(  -3, -17,-145), fire: 0x0120},
-   port_bottom: {loc:(   3, -17,-145), fire: 0x0120},
-
-   port_top:    {loc:( -19,   6,  98), fire: 0x0510},
-   port_top:    {loc:(  19,   6,  98), fire: 0x0910},
-
-   port_bottom: {loc:( -19,  -9,  98), fire: 0x0A20},
-   port_bottom: {loc:(  19,  -9,  98), fire: 0x0620},
-}
-
-/*
-0x0001 = Translate Right
-0x0002 = "" Left
-0x0004 = "" Backwards
-0x0008 = "" Forewards
-0x0010 = "" Down
-0x0020 = "" Up
-0x0040 = Yaw Left
-0x0080 = Yaw Right
-0x0100 = Pitch Up
-0x0200 = Pitch Down
-0x0400 = Roll Left
-0x0800 = Roll Right
-*/
-
-loadout: { name: "Clean",            stations: (-1, -1, -1, -1, -1, -1, -1, -1) }
-loadout: { name: "ACM Light",        stations: (-1, -1,  0,  0,  0,  0, -1, -1) }
-loadout: { name: "ACM Short Range",  stations: ( 0,  0,  0,  1,  1,  0,  0,  0) }
-loadout: { name: "ACM Medium Range", stations: ( 0,  1,  1,  1,  1,  1,  1,  0) }
-loadout: { name: "Ground Strike",    stations: ( 3,  3,  0,  1,  1,  0,  3,  3) }
-loadout: { name: "Ship Strike",      stations: ( 2,  2,  0,  1,  1,  0,  2,  2) }
-loadout: { name: "Hvy Ship Strike",  stations: ( 2,  2,  0,  1,  1,  0,  2,  2) }
-loadout: { name: "Rockets",          stations: ( 0,  4,  1,  1,  1,  1,  4,  0) }
-loadout: { name: "Scout/Recon",      stations: (-1, -1,  0,  0,  0,  0, -1, -1) }
-
-death_spiral: {
-   time:             3.2,
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.1,
-   explosion_loc:    (0, 0, -64),
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.9,
-   explosion_loc:    (20, 10, -20),
-
-   final_type:       23,   // LARGE_EXPLOSION
-   final_loc:        (0, 0, -32),
-
-   final_type:       12,   // LARGE_BURST
-   final_loc:        (0, 0, -32),
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (0,0,-2)
-   debris_mass:      20
-   debris_count:     3
-   debris_life:      1.8
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.2
-   debris_speed:     160
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (0,0,3)
-   debris_mass:      20
-   debris_count:     4
-   debris_life:      2.2
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.25
-   debris_speed:     180
-}
-
-map: {
-   sprite: "e_map0.pcx",
-   sprite: "e_map1.pcx",
-   sprite: "e_map2.pcx",
-   sprite: "e_map3.pcx",
-   sprite: "e_map4.pcx",
-   sprite: "e_map5.pcx",
-   sprite: "e_map6.pcx",
-   sprite: "e_map7.pcx"
-}
-
diff --git a/data/start/Ships/Alliance_Fighters/Falcon.def b/data/start/Ships/Alliance_Fighters/Falcon.def
deleted file mode 100644
index ede8d5a..0000000
--- a/data/start/Ships/Alliance_Fighters/Falcon.def
+++ /dev/null
@@ -1,309 +0,0 @@
-SHIP
-
-name:          Falcon
-display_name:  Falcon
-class:         Fighter
-abrv:          "F-32"
-
-hud_icon:      "FalconHud.pcx"
-description:   "The F-32 FALCON is the premier single-seat intercept fighter craft for the Alliance FORCE:Space.  Designed to be lightweight, low cost and easy to maintain, the Falcon is a respected highly maneuverable and versatile tactical fighter.  It is armed with twin Delta particle cannon, and four underwing hard points capable of mounting a variety of anti-fighter ordnance.  The Falcon is routinely tasked with patrol, escort, and intercept mission profiles."
-
-detail_0:   "falcon6_0.mag"
-feature_0:  25
-detail_1:   "Falcon6_1.mag"
-feature_1:  1
-
-cockpit_model: "FalconPit.mag"
-cockpit_scale: 0.02
-
-mass:       14.5
-integrity:  4e3
-scuttle:    1e3
-vlimit:     290
-agility:    170
-air_factor: 0.25
-roll_rate:  1900
-scale:      0.27
-acs:        1.1
-detet:      50e3
-
-trans_x:    2e3
-trans_y:    1e3
-trans_z:    2e3
-
-arcade_drag: 0.1
-drag:       3.0e-5
-roll_drag:  10
-pitch_drag: 10
-yaw_drag:   10
-
-CL:         1.3e-2
-CD:         0.7e-1
-stall:      0.40
-
-prep_time:  15
-avoid_fighter: 7
-
-chase:      (0, -750,  80)
-bridge:     (0,  131,  23)
-
-power:      {
-   type:    Fusion,
-   max_output: 65,
-   fuel_range: 0.75,
-   
-   loc:     (0, 0, -40),
-   size:    32,
-   hull_factor: 0.75
-   }
-
-drive:      {
-   type:    Plasma,
-   thrust:  20,
-   augmenter: 50,
-   scale:   0.32,
-   port:    ( 33, 12, -175),
-   port:    (-33, 12, -175),
-
-   loc:     (0, 0, -130),
-   size:    16,
-   hull_factor: 0.85
-   }
-
-
-weapon:     {
-   type:    "Delta Cannon",
-   abrv:    Cannon,
-   muzzle:  (-21, 0, 130),
-   muzzle:  ( 21, 0, 130),
-
-   loc:     (0, 0, -32),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   abrv:    "STA-1",
-   muzzle:  (-110, -7, -145),
-
-   loc:     (-110, -7, -145),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Rockets",
-   abrv:    "STA-2",
-   muzzle:  (-93, -5, -145),
-
-   loc:     (-93, -5, -145),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Rockets",
-   abrv:    "STA-3",
-   muzzle:  ( 93, -5, -145),
-
-   loc:     ( 93, -5, -145),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   abrv:    "STA-4",
-   muzzle:  (110, -7, -145),
-
-   loc:     (110, -7, -145),
-   size:    16,
-   hull_factor: 0.2
-}
-
-loadout: { name: "Clean",            stations: (-1, -1, -1, -1) }
-loadout: { name: "ACM Light",        stations: ( 0, -1, -1,  0) }
-loadout: { name: "ACM Short Range",  stations: ( 0,  0,  0,  0) }
-loadout: { name: "ACM Medium Range", stations: ( 0,  1,  1,  0) }
-loadout: { name: "Ground Strike",    stations: ( 1,  3,  3,  1) }
-loadout: { name: "Ship Strike",      stations: ( 1,  2,  2,  1) }
-loadout: { name: "Hvy Ship Strike",  stations: ( 1,  2,  2,  1) }
-loadout: { name: "Rockets",          stations: ( 0,  3,  3,  0) }
-loadout: { name: "Scout/Recon",      stations: ( 0, -1, -1,  0) }
-
-
-decoy:     {
-   type:    "Fighter Decoy",
-   abrv:    Decoy,
-   muzzle:  ( 0, -32, 0),
-
-   loc:     (0, 0, 0),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-sensor:     {
-   pcs:                 25,
-   active_efficiency:   2e9,
-   passive_efficiency:  500,
-   range:   25e3,
-   range:   50e3,
-   range:   75e3,
-
-   loc:     (0, 0, 100),
-   size:    25,
-   hull_factor: 0.25
-   }
-
-computer:   {
-   name:    "Avionics Package",
-   abrv:    HUD,
-   type:    1,
-
-   loc:     (20, 0, 80),
-   size:    8,
-   hull_factor: 0.2
-   }
-
-computer:   {
-   name:    "Flight Computer",
-   abrv:    Flight,
-   type:    2,
-
-   loc:     (-20, 0, 80),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-gear: {
-   name:    "Undercarriage",
-   abrv:    Gear,
-   loc:     (0, 0, 0),
-   size:    16,
-   hull_factor: 0.5,
-
-   gear: {
-      model: "GearNose1.mag",
-      start: (0,  -8,  90),
-      end:   (0, -28, 120)
-      },
-
-   gear: {
-      model: "GearLeft1.mag",
-      start: (-20, -17, -79),
-      end:   (-40, -37, -75)
-      },
-
-   gear: {
-      model: "GearRight1.mag",
-      start: ( 20, -17, -79),
-      end:   ( 40, -37, -75)
-      },
-   }
-
-nav:        {
-   loc:     (0, 0, 60),
-   size:    16,
-   hull_factor: 0.1
-   }
-
-
-thruster: {
-   design:           Thruster,
-   type:             Plasma,
-   loc:              (0, -52,0),
-   size:             32,
-   hull_factor:      0.8
-   scale:            0.12,
-
-   port_fore:   {loc:( -31,   8,   5), fire: 0x0044},
-   port_fore:   {loc:( -27,  14,   5), fire: 0x0044},
-   port_fore:   {loc:(  27,  14,   5), fire: 0x0084},
-   port_fore:   {loc:(  31,   8,   5), fire: 0x0084},
-
-   port_aft:    {loc:(  -8,   2,-172), fire: 0x0088},
-   port_aft:    {loc:(   8,   2,-172), fire: 0x0048},
-
-   port_top:    {loc:(  -2,  12,-162), fire: 0x0110},
-   port_top:    {loc:(   2,  12,-162), fire: 0x0110},
-
-   port_bottom: {loc:(  -2, -12,-162), fire: 0x0220},
-   port_bottom: {loc:(   2, -12,-162), fire: 0x0220},
-
-   port_top:    {loc:(-124,  -4, -96), fire: 0x0410},
-   port_top:    {loc:(-124,  -4,-115), fire: 0x0410},
-
-   port_top:    {loc:( 124,  -4, -96), fire: 0x0810},
-   port_top:    {loc:( 124,  -4,-115), fire: 0x0810},
-
-   port_bottom: {loc:(-123,  -5, -96), fire: 0x0820},
-   port_bottom: {loc:(-123,  -5,-115), fire: 0x0820},
-
-   port_bottom: {loc:( 123,  -5, -96), fire: 0x0420},
-   port_bottom: {loc:( 123,  -5,-115), fire: 0x0420},
-
-   port_bottom: {loc:(  -2,  -6, 141), fire: 0x0120},
-   port_bottom: {loc:(   2,  -6, 141), fire: 0x0120},
-
-}
-
-
-death_spiral: {
-   time:             3,
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.1,
-   explosion_loc:    (0, 0, -64),
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.8,
-   explosion_loc:    (20, 10, -20),
-
-   final_type:       23,   // LARGE_EXPLOSION
-   final_loc:        (0, 0, -32),
-
-   final_type:       12,   // LARGE_BURST
-   final_loc:        (0, 0, -32),
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (1,0,-2)
-   debris_mass:      20
-   debris_count:     4
-   debris_life:      1.8
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.3
-   debris_speed:     190
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (0,0,3)
-   debris_mass:      20
-   debris_count:     3
-   debris_life:      2.2
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.35
-   debris_speed:     220
-}
-
-map: {
-   sprite: "f_map0.pcx",
-   sprite: "f_map1.pcx",
-   sprite: "f_map2.pcx",
-   sprite: "f_map3.pcx",
-   sprite: "f_map4.pcx",
-   sprite: "f_map5.pcx",
-   sprite: "f_map6.pcx",
-   sprite: "f_map7.pcx"
-}
-
diff --git a/data/start/Ships/Alliance_Fighters/Stormhawk.def b/data/start/Ships/Alliance_Fighters/Stormhawk.def
deleted file mode 100644
index f47b4fe..0000000
--- a/data/start/Ships/Alliance_Fighters/Stormhawk.def
+++ /dev/null
@@ -1,335 +0,0 @@
-SHIP
-
-name:          Stormhawk
-display_name:  Stormhawk
-class:         Fighter
-abrv:          "F-36C"
-
-hud_icon:      "StormhawkHud.pcx"
-description:   "The F-36C STORMHAWK is a compact, multi-role fighter spacecraft. It is highly maneuverable and has proven itself in spaceborne and airborne combat as well as in surface attack missions. It provides a relatively low-cost, high-performance weapon system for Alliance forces.   Like the F-32 Falcon, the Stormhawk is armed with twin Delta particle cannon, along with four underwing hard points capable of mounting a variety of anti-fighter ordnance.  The Stormhawk's heavier structure also provides support for air-to-ground and antiship weapons and increased survivability at some cost in overall maneuverability."
-
-detail_0:   "Storm6_0.mag"
-feature_0:  25
-detail_1:   "Storm6_1.mag"
-feature_1:  1
-
-cockpit_model: "StormPit2b.mag"
-cockpit_scale: 0.02
-
-mass:       15.1
-integrity:  5e3
-scuttle:    1e3
-vlimit:     290
-agility:    140
-air_factor: 0.3
-roll_rate:  1700
-scale:      0.25
-acs:        1.1
-detet:      50e3
-
-trans_x:    3e3
-trans_y:    2e3
-trans_z:    3e3
-
-arcade_drag: 0.13
-drag:       3.0e-5
-roll_drag:  10
-pitch_drag: 7.5
-yaw_drag:   7.5
-
-CL:         1.8e-2 //1.1e-2
-CD:         5.1e-2 //1.1e-1
-stall:      0.45
-
-prep_time:  15
-avoid_fighter: 7
-
-chase:      (0, -790,  90)
-bridge:     (0,  102,  23)
-
-power:      {
-   type:    Fusion,
-   max_output: 75,
-   fuel_range: 0.75,
-   
-   loc:     (0, 0, -40),
-   size:    32,
-   hull_factor: 0.75
-   }
-
-drive:      {
-   type:    Plasma,
-   thrust:  20,
-   augmenter: 60,
-   scale:   0.35,
-   port:    (0, 0, -178),
-
-   loc:     (0, 0, -100),
-   size:    16,
-   hull_factor: 0.85
-   }
-
-
-weapon:     {
-   type:    "Delta Cannon"
-   abrv:    Cannon
-   muzzle:  (-28, 2, 77)
-   muzzle:  ( 28, 2, 77)
-
-   loc:     (0, 0, 32)
-   size:    16,
-   hull_factor: 0.5
-   }
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   abrv:    "STA-1",
-   muzzle:  (-78, -10, -120),
-
-   loc:     (-78, -10, -120),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-2",
-   muzzle:  (-50, -5, -110),
-
-   loc:     (-50, -5, -110),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   type:    "Rockets",
-   abrv:    "STA-3",
-   muzzle:  (-16, -18, -110),
-
-   loc:     (-16, -18, -110),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   type:    "Rockets",
-   type:    "Recon Pod",
-   abrv:    "STA-4",
-   muzzle:  ( 16, -18, -110),
-
-   loc:     ( 16, -18, -110),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-5",
-   muzzle:  ( 50, -5, -110),
-
-   loc:     ( 50, -5, -110),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   abrv:    "STA-6",
-   muzzle:  ( 78, -10, -120),
-
-   loc:     ( 78, -10, -120),
-   size:    16,
-   hull_factor: 0.2
-}
-
-decoy:     {
-   type:    "Fighter Decoy",
-   abrv:    Decoy,
-   muzzle:  ( 0, -32, 0),
-
-   loc:     (0, 0, 0),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-sensor:     {
-   pcs:                 25,
-   active_efficiency:   2e9,
-   passive_efficiency:  500,
-   range:   25e3,
-   range:   50e3,
-   range:   75e3,
-
-   loc:     (0, 0, 100),
-   size:    25,
-   hull_factor: 0.25
-   }
-
-computer:   {
-   name:    "Avionics Package",
-   abrv:    HUD,
-   type:    1,
-
-   loc:     (20, 0, 80),
-   size:    8,
-   hull_factor: 0.2
-   }
-
-computer:   {
-   name:    "Flight Computer",
-   abrv:    Flight,
-   type:    2,
-
-   loc:     (-20, 0, 80),
-   size:    16,
-   hull_factor: 0.5
-   }
-
-gear: {
-   name:    "Undercarriage",
-   abrv:    Gear,
-   loc:     (0, 0, 0),
-   size:    16,
-   hull_factor: 0.5,
-
-   gear: {
-      model: "GearNose1.mag",
-      start: (0, -18, 100),
-      end:   (0, -38, 130)
-      },
-
-   gear: {
-      model: "GearLeft1.mag",
-      start: (-20, -20, -74),
-      end:   (-40, -50, -70)
-      },
-
-   gear: {
-      model: "GearRight1.mag",
-      start: ( 20, -20, -74),
-      end:   ( 40, -50, -70)
-      },
-   }
-
-nav:        {
-   loc:     (0, 0, 60),
-   size:    16,
-   hull_factor: 0.1
-   }
-
-
-thruster: {
-   design:           Thruster,
-   type:             Plasma,
-   scale:            0.12,
-   loc:              (0, -52,0),
-   size:             32,
-   hull_factor:      0.8
-
-   port_fore:   {loc:(-104,  -5, -40), fire: 0x0044},
-   port_fore:   {loc:( -95,  -4, -31), fire: 0x0044},
-   port_fore:   {loc:(  95,  -4, -31), fire: 0x0084},
-   port_fore:   {loc:( 104,  -5, -40), fire: 0x0084},
-
-   port_aft:    {loc:(-104,  -5,-119), fire: 0x0088},
-   port_aft:    {loc:( -95,  -4,-121), fire: 0x0088},
-   port_aft:    {loc:(  95,  -4,-121), fire: 0x0048},
-   port_aft:    {loc:( 104,  -5,-119), fire: 0x0048},
-
-   port_top:    {loc:(  -6,  13, 120), fire: 0x0210},
-   port_top:    {loc:(  -6,  13, 113), fire: 0x0210},
-   port_top:    {loc:(   6,  13, 113), fire: 0x0210},
-   port_top:    {loc:(   6,  13, 120), fire: 0x0210},
-
-   port_bottom: {loc:(  -6, -15, 120), fire: 0x0120},
-   port_bottom: {loc:(  -6, -15, 113), fire: 0x0120},
-   port_bottom: {loc:(   6, -15, 113), fire: 0x0120},
-   port_bottom: {loc:(   6, -15, 120), fire: 0x0120},
-
-   port_top:    {loc:( -83,   0,-100), fire: 0x0510},
-   port_top:    {loc:( -83,   0,-107), fire: 0x0510},
-   port_top:    {loc:(  83,   0,-100), fire: 0x0910},
-   port_top:    {loc:(  83,   0,-107), fire: 0x0910},
-
-   port_bottom: {loc:( -96,  -9, -96), fire: 0x0A20},
-   port_bottom: {loc:( -96,  -9,-115), fire: 0x0A20},
-   port_bottom: {loc:(  96,  -9, -96), fire: 0x0620},
-   port_bottom: {loc:(  96,  -9,-115), fire: 0x0620},
-}
-
-
-loadout: { name: "Clean",            stations: (-1, -1, -1, -1, -1, -1) }
-loadout: { name: "ACM Light",        stations: (-1,  0, -1, -1,  0, -1) }
-loadout: { name: "ACM Short Range",  stations: ( 0,  0,  1,  1,  0,  0) }
-loadout: { name: "ACM Medium Range", stations: ( 0,  1,  1,  1,  1,  0) }
-loadout: { name: "Ground Strike",    stations: ( 0,  3,  3,  3,  3,  0) }
-loadout: { name: "Ship Strike",      stations: ( 0,  1,  2,  2,  1,  0) }
-loadout: { name: "Hvy Ship Strike",  stations: ( 0,  2,  2,  2,  2,  0) }
-loadout: { name: "Rockets",          stations: ( 0,  1,  4,  4,  1,  0) }
-loadout: { name: "Scout/Recon",      stations: (-1,  0, -1,  5,  0, -1) }
-
-death_spiral: {
-   time:             3.2,
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.1,
-   explosion_loc:    (0, 0, -64),
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.9,
-   explosion_loc:    (20, 10, -20),
-
-   final_type:       23,   // LARGE_EXPLOSION
-   final_loc:        (0, 0, -32),
-
-   final_type:       12,   // LARGE_BURST
-   final_loc:        (0, 0, -32),
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (0,0,-2)
-   debris_mass:      20
-   debris_count:     4
-   debris_life:      1.9
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.3
-   debris_speed:     190
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (0,0,3)
-   debris_mass:      20
-   debris_count:     3
-   debris_life:      2.7
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.35
-   debris_speed:     220
-}
-
-map: {
-   sprite: "s_map0.pcx",
-   sprite: "s_map1.pcx",
-   sprite: "s_map2.pcx",
-   sprite: "s_map3.pcx",
-   sprite: "s_map4.pcx",
-   sprite: "s_map5.pcx",
-   sprite: "s_map6.pcx",
-   sprite: "s_map7.pcx"
-}
-
diff --git a/data/start/Ships/Alliance_Fighters/Thunderbolt.def b/data/start/Ships/Alliance_Fighters/Thunderbolt.def
deleted file mode 100644
index 7784b47..0000000
--- a/data/start/Ships/Alliance_Fighters/Thunderbolt.def
+++ /dev/null
@@ -1,357 +0,0 @@
-SHIP
-
-name:           Thunderbolt
-display_name:   Thunderbolt
-class:          attack
-abrv:           "F/A-38D"
-
-hud_icon:      "ThunderboltHud.pcx"
-description:   "The F/A-38D THUNDERBOLT is the primary Alliance attack craft, and the first specially designed for close air support of ground forces. They are tough, effective and powerful four-engine spacecraft that can be used against all ground targets, as well as fulfilling a secondary role in killing spaceborne platforms and starships.  The 'Bolt has six underwing hardpoints for standard attack ordnance, as well as dual front-mounted Heavy Energy Cannon.  For rear protection from hostile fighters and high-speed threats, the Thunderbolt features an autonomous tail gun turret."
-
-detail_0:       "Thunderbolt_0a.mag"
-feature_0:      25
-detail_1:       "Thunderbolt_1a.mag"
-feature_1:      1
-
-cockpit_model: "BoltPit2a.mag"
-cockpit_scale: 0.02
-
-mass:        	29.7
-integrity:   	7.5e3
-vlimit:      	230
-agility:     	40
-air_factor:  	0.25
-roll_rate:   	500
-scale:       	0.27
-acs:         	1.0
-detet:	 	50e3
-
-trans_x:     	2500
-trans_y:     	2500
-trans_z:     	2500
-
-arcade_drag:    0.17
-drag:           3.6e-5
-roll_drag:      5
-pitch_drag:     4
-yaw_drag:       4
-
-CL:             1.6e-2
-CD:             0.7e-1
-stall:          0.38
-
-prep_time:     	15
-avoid_fighter: 	7
-
-chase:          (0, -1000, 130)
-bridge:		(0,   180,  20)
-
-power: {
-   type:        Fusion
-   name:        "Fusion Reactor"
-   design:      "Fusion Reactor"
-   max_output:  75
-   fuel_range:  0.75,
-
-   loc:         (0, 0, 0)
-   size:        10
-   hull_factor: 0.5,
-}
-
-drive: {
-   type:        Plasma
-   design:      "Plasma Drive"
-   thrust:      19
-   augmenter:	30
-   scale:       0.35
-   port:        ( 83, -8, -94)
-   port:        (-83, -8, -94)
-
-   loc:         (  0,  0, -90)
-   size:        24
-   hull_factor: 0.5
-}
-
-weapon:     {
-   type:    "Heavy Cannon"
-   abrv:    Cannon
-   muzzle:  (-22, -1, 200)
-   muzzle:  ( 21, -1, 200)
-
-   loc:     (0, 0, 160)
-   size:    32
-   hull_factor: 0.5
-}
-
-weapon: {
-   type:    "Fighter Turret"
-   abrv:    Turret
-   muzzle:  (0, 0,   24)
-   loc:     (0, 0, -195)
-   azimuth: 3.1416
-   size:    32
-   hull_factor: 0.3
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-1",
-   muzzle:  (-116, -25, -82),
-
-   loc:     (-116, -25, -70),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-2",
-   muzzle:  (-60, -16, -72),
-
-   loc:     (-60, -16, -60),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   type:    "Rockets",
-   abrv:    "STA-3",
-   muzzle:  (-40, -16, -72),
-
-   loc:     (-40, -16, -60),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   type:    "Rockets",
-   abrv:    "STA-4",
-   muzzle:  ( 40, -16, -72),
-
-   loc:     ( 40, -16, -60),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-5",
-   muzzle:  ( 60, -16, -72),
-
-   loc:     ( 60, -16, -60),
-   size:    16,
-   hull_factor: 0.2
-}
-
-hardpoint:     {
-   type:    "Javelin",
-   type:    "Vector",
-   type:    "Harpoon",
-   type:    "Hammer",
-   abrv:    "STA-6",
-   muzzle:  (116, -25, -82),
-
-   loc:     (116, -25, -70),
-   size:    16,
-   hull_factor: 0.2
-}
-
-
-loadout: { name: "Clean",            stations: (-1, -1, -1, -1, -1, -1,) }
-loadout: { name: "ACM Light",        stations: ( 0, -1, -1, -1, -1,  0,) }
-loadout: { name: "ACM Short Range",  stations: ( 0,  0,  1,  1,  0,  0,) }
-loadout: { name: "ACM Medium Range", stations: ( 0,  1,  1,  1,  1,  0,) }
-loadout: { name: "Ground Strike",    stations: ( 1,  3,  3,  3,  3,  1,) }
-loadout: { name: "Ship Strike",      stations: ( 1,  2,  2,  2,  2,  1,) }
-loadout: { name: "Hvy Ship Strike",  stations: ( 2,  2,  2,  2,  2,  2,) }
-loadout: { name: "Rockets",          stations: ( 0,  1,  4,  4,  1,  0,) }
-loadout: { name: "Scout/Recon",      stations: ( 0,  1, -1, -1,  1,  0,) }
-
-decoy:     {
-   type:    "Fighter Decoy"
-   abrv:    Decoy
-   muzzle:  ( 0, -32, 0)
-
-   loc:     (0, 0, 0)
-   size:    16
-   hull_factor: 0.5
-}
-
-sensor: {
-   design:              Sensor
-   pcs:                 20
-   active_efficiency:   1e6
-   passive_efficiency:  10e3
-   range:               25e3
-   range:               50e3
-   range:               75e3
-
-   loc:                 (0, 0, 30)
-   size:                16
-   hull_factor:         0.1
-}
-
-computer: {
-   name:             "Avionics Package"
-   abrv:             "HUD"
-   type:             1
-   design:           Computer
-
-   loc:              (0, 0, 40)
-   size:             16
-   hull_factor:      0.5
-}
-
-computer: {
-   name:             "Flight Computer"
-   abrv:             "Flight"
-   type:             2
-   design:           Computer
-   loc:              (0, 0, 90)
-   size:             16
-   hull_factor:      0.2
-}
-
-nav: {
-   loc:              (0, 0, -10)
-   design:           Computer
-   size:             16
-   hull_factor:      0.1
-}
-
-gear: {
-   name:    "Undercarriage"
-   abrv:    Gear
-   loc:     (0, 0, 0)
-   size:    16
-   hull_factor: 0.5
-
-   gear: {
-      model: "GearNose1.mag"
-      start: (0, -15, 144)
-      end:   (0, -35, 158)
-   }
-
-   gear: {
-      model: "GearLeft1.mag"
-      start: (-20, -22, -64)
-      end:   (-42, -48, -64)
-   }
-
-   gear: {
-      model: "GearRight1.mag"
-      start: ( 20, -22, -64)
-      end:   ( 42, -48, -64)
-   }
-}
-
-thruster: {
-   design:           Thruster
-   type:             Plasma
-   scale:            0.12
-   loc:              (0, -52,0)
-   size:             32
-   hull_factor:      0.5
-
-   port_fore:   {loc:( -48,  -2,  61), fire: 0x0044}
-   port_fore:   {loc:( -36,  -1,  61), fire: 0x0044}
-   port_fore:   {loc:(  36,  -1,  61), fire: 0x0084}
-   port_fore:   {loc:(  48,  -2,  61), fire: 0x0084}
-
-   port_aft:    {loc:( -48,  -2, -84), fire: 0x0088}
-   port_aft:    {loc:( -36,  -1, -90), fire: 0x0088}
-   port_aft:    {loc:(  36,  -1, -90), fire: 0x0048}
-   port_aft:    {loc:(  48,  -2, -84), fire: 0x0048}
-
-   port_left:   {loc:( -26,   0, 127), fire: 0x0080}
-   port_left:   {loc:( -38,   0,-144), fire: 0x0040}
-   port_right:  {loc:(  26,   0, 127), fire: 0x0040}
-   port_right:  {loc:(  38,   0,-144), fire: 0x0080}
-
-   port_top:    {loc:( -86,  10,  29), fire: 0x0610}
-   port_top:    {loc:(  86,  10,  29), fire: 0x0A10}
-   port_top:    {loc:( -86,  10, -60), fire: 0x0410}
-   port_top:    {loc:(  86,  10, -60), fire: 0x0810}
-
-   port_top:    {loc:(  -9,  22,-125), fire: 0x0110}
-   port_top:    {loc:(  -9,  22,-164), fire: 0x0110}
-   port_top:    {loc:(   9,  22,-125), fire: 0x0110}
-   port_top:    {loc:(   9,  22,-164), fire: 0x0110}
-
-   port_bottom: {loc:( -86, -24,  29), fire: 0x0920}
-   port_bottom: {loc:(  86, -24,  29), fire: 0x0520}
-   port_bottom: {loc:( -86, -24, -60), fire: 0x0820}
-   port_bottom: {loc:(  86, -24, -60), fire: 0x0420}
-
-   port_bottom: {loc:(  -9, -20,-125), fire: 0x0220}
-   port_bottom: {loc:(  -9, -20,-164), fire: 0x0220}
-   port_bottom: {loc:(   9, -20,-125), fire: 0x0220}
-   port_bottom: {loc:(   9, -20,-164), fire: 0x0220}
-}
-
-death_spiral: {
-   time:             2.5,
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.1,
-   explosion_loc:    (0, 0, -64),
-
-   explosion_type:   22,   // SMALL_EXPLOSION
-   explosion_time:   1.5,
-   explosion_loc:    (20, 10, -20),
-
-   final_type:       23,   // LARGE_EXPLOSION
-   final_loc:        (0, 0, -32),
-
-   final_type:       12,   // LARGE_BURST
-   final_loc:        (0, 0, -32),
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (0,0,-2)
-   debris_mass:      20
-   debris_count:     4
-   debris_life:      1.8
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.3
-   debris_speed:     190
-
-   debris:           "DebrisX.mag"
-   debris_loc:       (0,0,3)
-   debris_mass:      20
-   debris_count:     3
-   debris_life:      2.2
-   debris_fire:      (1,1,1)
-   debris_fire_type: 25
-   debris_drag:      0.35
-   debris_speed:     220
-}
-
-
-map: {
-   sprite: "b_map0.pcx"
-   sprite: "b_map1.pcx"
-   sprite: "b_map2.pcx"
-   sprite: "b_map3.pcx"
-   sprite: "b_map4.pcx"
-   sprite: "b_map5.pcx"
-   sprite: "b_map6.pcx"
-   sprite: "b_map7.pcx"
-}