From 4bff93e148bc0e2dfa997eb546f4ada78c5a3581 Mon Sep 17 00:00:00 2001 From: Allanis Date: Sat, 16 Mar 2013 19:24:06 +0000 Subject: [PATCH] [Add] More ship types. --- TODO | 1 + dat/ship.xml | 2 +- src/ship.c | 7 ++++++- src/ship.h | 11 ++++++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index e128fd1..eea7e39 100644 --- a/TODO +++ b/TODO @@ -5,6 +5,7 @@ Vital: -- Commodities. -- Main Menu. -- Player death! + -- Player faction system. Major: -- Nicer AI. diff --git a/dat/ship.xml b/dat/ship.xml index 662c474..23a7b16 100644 --- a/dat/ship.xml +++ b/dat/ship.xml @@ -168,7 +168,7 @@ drone minimal engine - 1 + 7 300000 RoboSys 99 diff --git a/src/ship.c b/src/ship.c index 9d4c64b..2c0e43d 100644 --- a/src/ship.c +++ b/src/ship.c @@ -42,7 +42,12 @@ Ship* ship_get(const char* name) { // Get the ship's classname. static char* ship_classes[] = { - "NULL", "Civialian Light", "Civilian Medium", "Civilian Heavy" + "NULL", + "Civialian Light", "Civilian Medium", "Civilian Heavy" + "Military Light", "Military Medium", "Military Heavy" + "Robotic Light", "Robotic Medium", "Robotic Heavy" + "Hybrid Light", "Hybrid Medium", "Hybrid Heavy" + }; // Return all the ships in text form. diff --git a/src/ship.h b/src/ship.h index 1728cce..0aced74 100644 --- a/src/ship.h +++ b/src/ship.h @@ -11,7 +11,16 @@ typedef enum ShipClass_ { SHIP_CLASS_NULL = 0, SHIP_CLASS_CIV_LIGHT = 1, SHIP_CLASS_CIV_MEDIUM = 2, - SHIP_CLASS_CIV_HEAVY = 3 + SHIP_CLASS_CIV_HEAVY = 3, + SHIP_CLASS_MIL_LIGHT = 4, + SHIP_CLASS_MIL_MEDIUM = 5, + SHIP_CLASS_MIL_HEAVY = 6, + SHIP_CLASS_ROB_LIGHT = 7, + SHIP_CLASS_ROB_MEDIUM = 8, + SHIP_CLASS_ROB_HEAVY = 9, + SHIP_CLASS_HYB_LIGHT = 10, + SHIP_CLASS_HYB_MEDIUM = 11, + SHIP_CLASS_HYB_HEAVY = 12 } ShipClass; // Small wrapper for the outfits.