diff --git a/data/capitalShips/infCorvette01.json b/data/capitalShips/infCorvette01.json index f76457c..e04ee60 100644 --- a/data/capitalShips/infCorvette01.json +++ b/data/capitalShips/infCorvette01.json @@ -14,49 +14,49 @@ }, { "health" : 150, - "texture" : "gfx/capitalShips/infCorvette01/component1.png", + "texture" : "gfx/capitalShips/infCorvette01/component2.png", "x" : 27, "y" : 100, "flags" : "EF_TAKES_DAMAGE+EF_STATIC" }, { "health" : 150, - "texture" : "gfx/capitalShips/infCorvette01/component2.png", + "texture" : "gfx/capitalShips/infCorvette01/component3.png", "x" : 20, "y" : -17, "flags" : "EF_TAKES_DAMAGE+EF_STATIC" }, { "health" : 150, - "texture" : "gfx/capitalShips/infCorvette01/component2.png", + "texture" : "gfx/capitalShips/infCorvette01/component3.png", "x" : -20, "y" : -17, "flags" : "EF_TAKES_DAMAGE+EF_STATIC" }, { "health" : 150, - "texture" : "gfx/capitalShips/infCorvette01/component3.png", + "texture" : "gfx/capitalShips/infCorvette01/component4.png", "x" : -21, "y" : -64, "flags" : "EF_TAKES_DAMAGE+EF_STATIC" }, { "health" : 150, - "texture" : "gfx/capitalShips/infCorvette01/component3.png", + "texture" : "gfx/capitalShips/infCorvette01/component5.png", "x" : 21, "y" : -64, "flags" : "EF_TAKES_DAMAGE+EF_STATIC" }, { "health" : 150, - "texture" : "gfx/capitalShips/infCorvette01/component4.png", + "texture" : "gfx/capitalShips/infCorvette01/component6.png", "x" : -22, "y" : -243, "flags" : "EF_TAKES_DAMAGE+EF_STATIC" }, { "health" : 150, - "texture" : "gfx/capitalShips/infCorvette01/component4.png", + "texture" : "gfx/capitalShips/infCorvette01/component6.png", "x" : 22, "y" : -243, "flags" : "EF_TAKES_DAMAGE+EF_STATIC" diff --git a/gfx/capitalShips/infCorvette01/component2.png b/gfx/capitalShips/infCorvette01/component2.png index b33b214..f3e93ba 100644 Binary files a/gfx/capitalShips/infCorvette01/component2.png and b/gfx/capitalShips/infCorvette01/component2.png differ diff --git a/gfx/capitalShips/infCorvette01/component3.png b/gfx/capitalShips/infCorvette01/component3.png index 0f817a6..cf053ca 100644 Binary files a/gfx/capitalShips/infCorvette01/component3.png and b/gfx/capitalShips/infCorvette01/component3.png differ diff --git a/gfx/capitalShips/infCorvette01/component4.png b/gfx/capitalShips/infCorvette01/component4.png index 3924d85..bc71c1d 100644 Binary files a/gfx/capitalShips/infCorvette01/component4.png and b/gfx/capitalShips/infCorvette01/component4.png differ diff --git a/gfx/capitalShips/infCorvette01/component5.png b/gfx/capitalShips/infCorvette01/component5.png new file mode 100644 index 0000000..07c1015 Binary files /dev/null and b/gfx/capitalShips/infCorvette01/component5.png differ diff --git a/gfx/capitalShips/infCorvette01/component6.png b/gfx/capitalShips/infCorvette01/component6.png new file mode 100644 index 0000000..0937d06 Binary files /dev/null and b/gfx/capitalShips/infCorvette01/component6.png differ diff --git a/src/battle/capitalShips.c b/src/battle/capitalShips.c index 274888b..47c2e5d 100644 --- a/src/battle/capitalShips.c +++ b/src/battle/capitalShips.c @@ -360,7 +360,7 @@ static void loadComponents(Entity *parent, cJSON *components) Entity *e; cJSON *component; - parent->health = 1; + parent->health = 0; if (components) {