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 0000000..9ffb0bf Binary files /dev/null and b/gfx/craft/shuttle.png differ 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);