From 7325bbe506e2c708bc1f4c48c6a59c57b8fff8db Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 18 Dec 2015 08:26:21 +0000 Subject: [PATCH] INF Corvette updates. --- data/capitalShips/infCorvette01.json | 14 +++++++------- gfx/capitalShips/infCorvette01/component2.png | Bin 178 -> 1853 bytes gfx/capitalShips/infCorvette01/component3.png | Bin 215 -> 472 bytes gfx/capitalShips/infCorvette01/component4.png | Bin 179 -> 1668 bytes gfx/capitalShips/infCorvette01/component5.png | Bin 0 -> 1654 bytes gfx/capitalShips/infCorvette01/component6.png | Bin 0 -> 368 bytes src/battle/capitalShips.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 gfx/capitalShips/infCorvette01/component5.png create mode 100644 gfx/capitalShips/infCorvette01/component6.png 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 b33b21479b1acd56669ff37db29b04c76b710da0..f3e93bac1a608f2e7c089627b97a5df109901e63 100644 GIT binary patch delta 1836 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ⅇG|Ya!@i4P1+GQrdeS0lZIB9+xGj zXJ`C!GU0dMfB#!0JJYd}y8x2VuAIYE71tLR%y--S-<9CCwoZ2^fT%kI@9|Z|$~op$ z1@KOnRDd(a+zk+V-UevBf9J+IHmemHs-0quafh4C2LP3(wDF!cGKw#IA3z@%YO~pX zOxpK744pUhLHj8HCX%)N*uwjsx5n&UxwS9caVoyW%zH21`+S?{v}H+NmK>KQqq3yP zbG-Mt_g?N~pc6TeyU7IU_2~6_d=6~un!!#;B~W?qt6OPQW6=ct}jJOG3<$m*^j3Q+w1#f$sWUL4vS z0ytpv=WoAdaC*wwa7YULd$}Y#Kj$|uUTmTU{sBOxRW|$i?ORsY*VsHK1Fouyqg@PU zQ6)wPO=FyX`K$oyZKLx+dLaVHQ{7Ed~lw0q$xxLqu)~#qE0HDmMNg z20G#X5Pi+M=rCc7ss5*Gti8v3PwhR|-ebHczvtubPJk-p$>5g_3ao4*0MD0000ERLtq$PlulYe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00rJjL_t(o!=0DAavMh$hQFR^ zU-#B5SPK+ z&P+SNX;h1%WN}e7HG}EXf1k^LE@S=$&H))v0%yP+_#f~EFaio72L`|~P^m0{EsOzO zv_P!)o(ed<8z2ha^;FKf@t95*5`8%WK2ojvy3qndU5i4H<0nsOfRVKfRH(0j4@59P zryCL=)qCfG|NiBd)KSDZj>-CchN|vaU1Qsprt1!>_Y`~wwB84gpFKmYCF}Lb(v&2M zh`SETlD286M2OlJ<2R@oqFNZ|ocGiJ^|Sx^?mME=_jI_8}j9n zb)M4`!L=>5no+3+Enp`vUXYxe5Z5)sI0m5IY+yEHH<@s=T#^(8UDvTz2bMsiCfHwo z{+aRP#|(gRngSq;1xzO7FJ3VJ{dY!1K_kLc0d}DY%gKb;T8gu?{mFpaZ0MFts_B$s zGJ(~KLWI|9LLG3!7ONHIW<#Cln5qIGswyPUkdp9K_te_nhc}$f#f)2zBb|D$oW6^Y$A( zI6^~G1@sh6-%@j+(+yVFJU|CTowqjtXf#xLkVrnIC3psiTHV+NCe*4?5%}izK|T_; z3r-FlDrhoR39_PEUC#LKZmB zGuOsIVl6g~aoQKMhYztL)W-1n*%=fCkGhUgz*e6R)~nx(W9aWAKNydRWbOrCCllQ;dV=| z^U_>T9_X`OiLk9IlEs4I)fE8i%S-0J{l@n7Ys&eYQCU)pum-NR$Yj70u;1=>1O0!l z*I@qgpC<3oz&U4~bLk*W8D|;C zSw@;=v{^=zra0$P=bXJ$16@dgbaZ~sqa@*zBq0GdRfX(l$P6f*bEPpx4gk8@s=!C% zr%$n`r+kv841jf6(k&J!)#rdX=P<@ds7?wz0M3s;{glz8M?5?_!T^~L-wIGGW4DK5 zq#9(v-+<46AKu~guYg~GD`0zD13#P;|NZ70YSo|tt~ML;*^IBh|Go$&y|=7LWy<#@lN1*hyqZi{CkZw1M^(}8qcGLY@(G5=*#}JM4YbPD#JFLLtJYRdsw+-7a*_GLE?*GcyGNH`6 zkGbi=4Zn_g>$mfAFc_XYCMbAfM?5q8ip35I-*?M~vkGtddMABRb5Ba*g&yCArAp5x z%xs#Oe|g(y2QxPhHtxp;5(yLao?ejJVzezSGcaViQLgp3MXOnsyu4&I_0+5Ahkv7T zt-t3uHeGh?f6p;GWKVfQhcVjty={2BZH@_ KpUXO@geCx9uapD; literal 0 HcmV?d00001 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) {