walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

INF Corvette updates.

This commit is contained in:
Steve 2015-12-18 08:26:21 +00:00
parent 929e942bba
commit 7325bbe506
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/capitalShips/infCorvette01.json
View File

@ -14,49 +14,49 @@
}, },
{ {
"health" : 150, "health" : 150,
"texture" : "gfx/capitalShips/infCorvette01/component1.png", "texture" : "gfx/capitalShips/infCorvette01/component2.png",
"x" : 27, "x" : 27,
"y" : 100, "y" : 100,
"flags" : "EF_TAKES_DAMAGE+EF_STATIC" "flags" : "EF_TAKES_DAMAGE+EF_STATIC"
}, },
{ {
"health" : 150, "health" : 150,
"texture" : "gfx/capitalShips/infCorvette01/component2.png", "texture" : "gfx/capitalShips/infCorvette01/component3.png",
"x" : 20, "x" : 20,
"y" : -17, "y" : -17,
"flags" : "EF_TAKES_DAMAGE+EF_STATIC" "flags" : "EF_TAKES_DAMAGE+EF_STATIC"
}, },
{ {
"health" : 150, "health" : 150,
"texture" : "gfx/capitalShips/infCorvette01/component2.png", "texture" : "gfx/capitalShips/infCorvette01/component3.png",
"x" : -20, "x" : -20,
"y" : -17, "y" : -17,
"flags" : "EF_TAKES_DAMAGE+EF_STATIC" "flags" : "EF_TAKES_DAMAGE+EF_STATIC"
}, },
{ {
"health" : 150, "health" : 150,
"texture" : "gfx/capitalShips/infCorvette01/component3.png", "texture" : "gfx/capitalShips/infCorvette01/component4.png",
"x" : -21, "x" : -21,
"y" : -64, "y" : -64,
"flags" : "EF_TAKES_DAMAGE+EF_STATIC" "flags" : "EF_TAKES_DAMAGE+EF_STATIC"
}, },
{ {
"health" : 150, "health" : 150,
"texture" : "gfx/capitalShips/infCorvette01/component3.png", "texture" : "gfx/capitalShips/infCorvette01/component5.png",
"x" : 21, "x" : 21,
"y" : -64, "y" : -64,
"flags" : "EF_TAKES_DAMAGE+EF_STATIC" "flags" : "EF_TAKES_DAMAGE+EF_STATIC"
}, },
{ {
"health" : 150, "health" : 150,
"texture" : "gfx/capitalShips/infCorvette01/component4.png", "texture" : "gfx/capitalShips/infCorvette01/component6.png",
"x" : -22, "x" : -22,
"y" : -243, "y" : -243,
"flags" : "EF_TAKES_DAMAGE+EF_STATIC" "flags" : "EF_TAKES_DAMAGE+EF_STATIC"
}, },
{ {
"health" : 150, "health" : 150,
"texture" : "gfx/capitalShips/infCorvette01/component4.png", "texture" : "gfx/capitalShips/infCorvette01/component6.png",
"x" : 22, "x" : 22,
"y" : -243, "y" : -243,
"flags" : "EF_TAKES_DAMAGE+EF_STATIC" "flags" : "EF_TAKES_DAMAGE+EF_STATIC"

BIN
gfx/capitalShips/infCorvette01/component2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
gfx/capitalShips/infCorvette01/component3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 472 B

BIN
gfx/capitalShips/infCorvette01/component4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
gfx/capitalShips/infCorvette01/component5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
gfx/capitalShips/infCorvette01/component6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 368 B

2
src/battle/capitalShips.c
View File

@ -360,7 +360,7 @@ static void loadComponents(Entity *parent, cJSON *components)
Entity *e; Entity *e;
cJSON *component; cJSON *component;
parent->health = 1; parent->health = 0;
if (components) if (components)
{ {