From 627b18d0b7933b9f133f4a525e9f73c95539a7f2 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Mon, 16 Nov 2015 11:26:23 +0000
Subject: [PATCH] Added shuttle.

---
 data/fighters/list.json    |   3 ++-
 data/fighters/shuttle.json |  10 ++++++++++
 gfx/craft/shuttle.png      | Bin 0 -> 1662 bytes
 src/defs.h                 |   4 +++-
 src/system/lookup.c        |   1 +
 5 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 data/fighters/shuttle.json
 create mode 100644 gfx/craft/shuttle.png

diff --git a/data/fighters/list.json b/data/fighters/list.json
index a57b216..e307be2 100644
--- a/data/fighters/list.json
+++ b/data/fighters/list.json
@@ -13,5 +13,6 @@
 	"data/fighters/hyena.json",
 	"data/fighters/leopard.json",
 	"data/fighters/civilian.json",
-	"data/fighters/tug.json"
+	"data/fighters/tug.json",
+	"data/fighters/shuttle.json"
 ]
diff --git a/data/fighters/shuttle.json b/data/fighters/shuttle.json
new file mode 100644
index 0000000..6f1ffc0
--- /dev/null
+++ b/data/fighters/shuttle.json
@@ -0,0 +1,10 @@
+{
+	"name" : "Shuttle",
+	"health" : 10,
+	"shield" : 10,
+	"speed" : 2.25,
+	"reloadTime" : 0,
+	"shieldRechargeRate" : 60,
+	"textureName" : "gfx/craft/shuttle.png",
+	"flags" : "EF_COLLECTS_ITEMS"
+}
diff --git a/gfx/craft/shuttle.png b/gfx/craft/shuttle.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ffb0bf9e5b97c15f6b1d518c0b356df98d293b9
GIT binary patch
literal 1662
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
IM6N<$f|y?rp8x;=

literal 0
HcmV?d00001

diff --git a/src/defs.h b/src/defs.h
index 498d0d3..8db6119 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -73,6 +73,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EF_CIVILIAN			(2 << 7)
 #define EF_HAS_ROPE			(2 << 8)
 #define EF_ALWAYS_FLEES		(2 << 9)
+#define EF_COLLECTS_ITEMS	(2 << 10)
 
 /* player abilities */
 #define BOOST_RECHARGE_TIME 	(FPS * 7)
@@ -83,7 +84,8 @@ enum
 {
 	ET_FIGHTER,
 	ET_WAYPOINT,
-	ET_EXTRACTION_POINT
+	ET_EXTRACTION_POINT,
+	ET_ITEM
 };
 
 enum
diff --git a/src/system/lookup.c b/src/system/lookup.c
index d179cbc..daa2ac2 100644
--- a/src/system/lookup.c
+++ b/src/system/lookup.c
@@ -41,6 +41,7 @@ void initLookups(void)
 	addLookup("EF_FLEEING", EF_FLEEING);
 	addLookup("EF_CIVILIAN", EF_CIVILIAN);
 	addLookup("EF_HAS_ROPE", EF_HAS_ROPE);
+	addLookup("EF_COLLECTS_ITEMS", EF_COLLECTS_ITEMS);
 	
 	addLookup("TT_DESTROY", TT_DESTROY);
 	addLookup("TT_DISABLE", TT_DISABLE);