From 4e3c919944d011835702f5a63f65a7bb395d3eab Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Wed, 8 Aug 2012 16:52:01 +0200
Subject: [PATCH] added realistic test data

---
 src/battle/Hero.h                 |   2 +-
 src/main.cpp                      |  66 +++++++++++++++++++++++-------
 test-data/dekar.png               | Bin 0 -> 1440 bytes
 test-data/guy.png                 | Bin 0 -> 1157 bytes
 test-data/{hero.png => maxim.png} | Bin
 test-data/selan.png               | Bin 0 -> 1252 bytes
 6 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 test-data/dekar.png
 create mode 100644 test-data/guy.png
 rename test-data/{hero.png => maxim.png} (100%)
 create mode 100644 test-data/selan.png

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index d7f6a49..b1982b0 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -31,7 +31,7 @@ public:
 
 	Uint16 MaxMana() const { return maxMana; }
 	Uint16 Mana() const { return mana; }
-	int RelativeMana(int max) const { return mana * max / maxMana; }
+	int RelativeMana(int max) const { return maxMana == 0 ? 0 : mana * max / maxMana; }
 
 	Uint8 IP() const { return ip; }
 	int RelativeIP(int max) const { return ip * max / 255; }
diff --git a/src/main.cpp b/src/main.cpp
index 850907f..c8668dc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,17 +72,53 @@ int main(int argc, char **argv) {
 		Monster monster;
 		monster.SetSprite(&dummySprite);
 
-		SDL_Surface *heroImg(IMG_Load("test-data/hero.png"));
-		Sprite heroSprite(heroImg, 64, 64);
-		Hero hero;
-		hero.SetName("Name");
-		hero.SetLevel(34);
-		hero.SetSprite(&heroSprite);
-		hero.SetMaxHealth(100);
-		hero.SetHealth(50);
-		hero.SetMaxMana(100);
-		hero.SetMana(100);
-		hero.SetIP(255);
+		SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
+		Sprite maximSprite(maximImg, 64, 64);
+		Hero maxim;
+		maxim.SetName("Maxim");
+		maxim.SetLevel(1);
+		maxim.SetSprite(&maximSprite);
+		maxim.SetMaxHealth(33);
+		maxim.SetHealth(33);
+		maxim.SetMaxMana(20);
+		maxim.SetMana(20);
+		maxim.SetIP(0);
+
+		SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
+		Sprite selanSprite(selanImg, 64, 64);
+		Hero selan;
+		selan.SetName("Selan");
+		selan.SetLevel(1);
+		selan.SetSprite(&selanSprite);
+		selan.SetMaxHealth(28);
+		selan.SetHealth(28);
+		selan.SetMaxMana(23);
+		selan.SetMana(23);
+		selan.SetIP(0);
+
+		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
+		Sprite guySprite(guyImg, 64, 64);
+		Hero guy;
+		guy.SetName("Guy");
+		guy.SetLevel(1);
+		guy.SetSprite(&guySprite);
+		guy.SetMaxHealth(38);
+		guy.SetHealth(38);
+		guy.SetMaxMana(0);
+		guy.SetMana(0);
+		guy.SetIP(0);
+
+		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
+		Sprite dekarSprite(dekarImg, 64, 64);
+		Hero dekar;
+		dekar.SetName("Dekar");
+		dekar.SetLevel(1);
+		dekar.SetSprite(&dekarSprite);
+		dekar.SetMaxHealth(38);
+		dekar.SetHealth(38);
+		dekar.SetMaxMana(0);
+		dekar.SetMana(0);
+		dekar.SetIP(0);
 
 		SDL_Surface *attackIcons(IMG_Load("test-data/attack-type-icons.png"));
 		Sprite attackIconsSprite(attackIcons, 32, 32);
@@ -107,10 +143,10 @@ int main(int argc, char **argv) {
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
+		battleState->AddHero(maxim);
+		battleState->AddHero(selan);
+		battleState->AddHero(guy);
+		battleState->AddHero(dekar);
 		Application app(&screen, battleState);
 		app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
 		app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);
diff --git a/test-data/dekar.png b/test-data/dekar.png
new file mode 100644
index 0000000000000000000000000000000000000000..f032da187117647f2f65a1a70c1490a4154cdfaf
GIT binary patch
literal 1440
zcmV;R1z-A!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000GNNkl<Zc-rk-
zJxF9%7(Ipr#%}CpiUlneGN}?P6;e2XfRjoGi}*;f5rkwU5VQ$MibV(nH-VrDEKIhL
z(L!dnTCFk`3z}-u`2t%gq?qY4-8@KPitnC@_uF^pN1rRfdpqCn>^tW>=X~FLJAyl2
zsZ9EEnB${XdnC#GzlD3gM&2~SM3CE4IoUorzGI!2$t?f?T44<UaCW>60BA>HqKxni
zxNYRq2IBW-R{;PgM<oEj%-oKJG?zxai}XYouL<GJG~(Vf;O*N+KL2GM08slOYa##J
z(<J~v@M8o3I6RX5sq>tLIJLpWlm<%b7s&kwWrAnGZC$uHR|Ek3O=cLie_^%|c_QgT
ze)ID@0ATwR@l1)l2D}*;U~Rjeu&(_wPObg<SyA=WQ>oc#MG*c3W3m2U`8ovv_-JL%
z=YTua03y3Qzahvz-yBM1iG21#&Tp>B_WH5pg2qG|08p4~0svO0+eRbO_H~S#yp|Kj
zae0*)UIT8b0j^q)VFG#`r~O{n{MvB<0C+N6>FM)Y6IQ=^BJMI#igkryncx}F4`IEy
zA4`Hrd2u85INbvf$@<TEqY2^?<!|!Vc{9%%J$nTrt`j1+(<D3t24#RoK3J04%r6Rp
zCyyot`R_!9XTI377{Em)F!2!y-S4yZv!4p`9~71W0Dl~oW0|1O*G$sMv2jrviU~dk
zxOR{c&HZ&7d9J<4VoWt9YTgdR*sgE%fvEr1qr8Q1$1s3Q7+ow`%q#47#P`p)V{-w!
z%<ldPp9HVR03ta(l@Z_FGpakc)$;-sRHggd4J<9-<R|-Z+c2bUA)PkJy4-`uwV%m#
zItM!zLuS<R-5w#dx3^SJ;u(<mJV0qd8FnrpGFemmm|8O1OV;229dB>%92h2k78qAZ
zTWUW!yJInqs^1TJ&j42r*#2n^0C4(y%V<F*_QWs}_06T410_Q)YJtuHTsjXl_eJfC
zQF^F<m`{R(Y5<=U`+PFMwTL`x?u?l~TJ5RowcVP<sOo;zR{6hVRv1B;vGJ=Qe}<09
zB}K&jJ{MC5om+SfaCL)x((J#lJXtHLG10x|$BF@C^O6M5zJFozfjD{d)rsu?SoQ~x
z<@)v7p&*-z?Br;eGWkwCu;;UB-wPy~1L*I%#;DG@meGccjl527wS_R2QT+Sxv3-8^
zx!iBr%ndp(?fW<Wk(bVg4@a!o<GNu?Io$L);6^h+S1#b3K>IpZVYg!Wx%P2tf_~c@
zg%~J5tj`xLE#a(@tIGh#%+fQU9|JTKx;1Uomwi25Ku>gB$t~AvTXTiVpMp^KeQ|?)
zB>rDLs#-I{Fk@e*eh^xkR5)6<G=T3Lcz@4;>$-q`a-$E%F5_H4&+q{I$!jLjRq8c4
zKffR~9YB)a$uENF<~R(J@xPD970hu&J}_^Z5c-Kwvhx7Vh$4|S$oH!?BFc#qYQ68r
zny#vvX6^61lrFUNVb;3-u*);xx+nHSe9$jInfZf-qSBPrSY-7ZD>8x1hz9h3&wze8
z;JS;*)32EvnFEMu;nihq!qj;|_ad%$mcvehJOgf<0Zfj1V#DONae>&RrxPDt!!?)i
z-w5563-qf&CPy-XZ<>g_PI@{yk}=a$Ydz-@H(j0qw{>C71gg9CZ75aOQ)=Bq^m75v
zfV*}9*JO#vxxPW__XR3f_Zy{z+`wx<(uixMI8)T$9`*YgO)uAs@(L3!uagkH1|(hU
zt~W}qZf;P-Ts?-K5f1ATUIUUwKBhJk(G;%2x4GC}0SJb=FB#?;aMPqm^-VgVxmNJ*
u#$XImU#z;c#k;`&?FT3Qzs>JG1O5d@<osYRXS_cE0000<MNUMnLSTYugSt=v

literal 0
HcmV?d00001

diff --git a/test-data/guy.png b/test-data/guy.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f1c2fe9715c1bd53bca36388fbea470fdcab755
GIT binary patch
literal 1157
zcmV;01bX|4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000C`Nkl<Zc-rk-
zF-+S)6n#`3U`w_v4C&N%Yb6F&Dpg84QPd?Ki&#P<QFS9?K(L`ArDQ>@&Qbvzkt#K7
zhDz;5m|$SZMmE^m;qE29Upuyg9kuHJ8}{8f@_YCG`~M7}p`r0V$4u4_m@VXfj=O)?
zAIt=e<MpiLfifT?#J$1*0I;;U1OQkpT>$`!r7{3ub)gwJe{;JC0NC9!<NbavQ${EQ
zqL7UH<|Xn(vRJwlBi8`{SM4(ZK(}2CWC(Bo0BF@-007>ee$Rvn%78E=_m({Xz=u<R
z?3<5|yvqP0Jo+2rx*MwtGnr_DG9V1m+v^(uz}$R35d)6CRh|2-T2JipOJ{Fa8eb!r
z0!K5RuH7gD(u{{`EyR2uj(piczSHfP`|U^Ke$O)FiGw_YO!JW}ODO}AGJtRXw`?%>
zjT7ls4GzMUM%7ub(>3FEDz5<m^{o@59i`xPDh-zzo7?8PZ?!-*AS(u(S;VT11IG`9
z1sxrcrzQ}2dV3=OXP$35S)|+U*(_w9dw!UA)&X+LfT`31lllQVLdgs|x!cbM@qYK%
zWPy(zN97r04DXW(Y54)wfT#g+vjP8Rex^!$1+!<5K3NTU=Q-;a7FX=J6K5QmA@6tF
z&+Saj0@Kj|BF}6Pr3G^S)q9f-3LD4Hd}<3rUhnT4<m;^yC#$607f=So?erwg2Iq&q
zRcp^tcd9z~HiLVfh#%)|-EZu`kcmIKO(&bkNXiUlKwJh8Q94A~DUwWS*47=wo-J0#
zI!ZD`j*}WBv(uTV7Na^?%797x0esVCTetH~%M%@H1Y>Wx8i*j*VIM#u%Ir~Z@%-Sx
z)(pYGQZqCQq^$u`3+@ihUd`>hD$StBpL^r>2B{&VzJKsumMSlO1Q{TEkNKCr^LtbS
z($at-^4CU<XKj7H!m6!+Ko39c-B~21AK;!{xpAvMj^{X5fwvoQs!SPN$4}TNPzFQ|
z80PtT-}Uy^$r15YTjh-$nyvdSb7YqowzD%jNiy27IqV<}0<}VRkir<D49F@ANKel_
z8s^2LPL7DA^#0OeGK=hPy&CHSGz(<K0EuYa>MP7YP_>EN;EU}PwGAU?*K)#9dX9sX
zOi%_)ivh8HgV@9L5kwg6;Q6@=7kTM4B@@D`Q_TX?W<XdcXo#fM0F<hZqa4mRhr!r+
z?2WDO!@fJ5v`456NSgud2+1n1eqoRtYz)S#Jo^UhC{5bwQ3j;l5sF(g%+2Q=CX~gv
z`o2X{%;Sj@)jf;}X@@c(?FA(hWZoX`>7E}r@9CO1eqO|vD$0Pr#R<wUO`{kScb&Lj
zuqp$lr2*2J$x~nH*=1gj8`57$O-RZxWx#zkAnf~rs585`StRN?4EemI&ruD?3i+ga
zJWNx<7$lh>Yl^VvONJ=}CUtsL-${|aZ;)|3PoQ6v+7p!xGz<JIKQ!t;P?P3=Wq^%e
XMn<i#RuMH{00000NkvXXu0mjflr<JS

literal 0
HcmV?d00001

diff --git a/test-data/hero.png b/test-data/maxim.png
similarity index 100%
rename from test-data/hero.png
rename to test-data/maxim.png
diff --git a/test-data/selan.png b/test-data/selan.png
new file mode 100644
index 0000000000000000000000000000000000000000..028cba4e43ded27457866f5e31769f0e0d42bdb8
GIT binary patch
literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000E5Nkl<Zc-rk+
zF-Tic6g`#>aZ9#jDCp23PU@tA4s|G)PDUIwI7l`V3Z+me1P2ic#ZoAyTk0UuL8?<D
z6q;^dC+lR!2py8mYz8{C!+R(8UH)$p`+v0L-R=MX{`(>4+;h*p{{uD#JBIGc4+%xX
zzq(o1YBYWQ&G!bK0r&3;@}amoj*TY(05hp10HAVE1_0F09DRpc?-vs+18zIVCGzKQ
zJ_7*8UOqLMpx4*oFB2>S`h~bey0)i~Y*p3y^Yt_UVE91<0N|`lDh90O0RZXsjX;<%
z@C+CV3i;7RQ_Z)gvH*a{lZY!5BtxkBWQg2PRtK)@l?he@`h`4IT_P;kGi0uFJ<rSP
zP^&t&3fwLO;&4SC0x?EOBkHvt`Z#w|000yh@}~NW{rLP|tAecpLFGO}BFid3)xP?1
zX<U~MP*x8HwS;lgYG5_sU;A^J`>fBB2@-kUN9QM*P|^;tGOqT!{Bmim$GDvb1j7I#
zAJ!0!J<b`|&%bQ}0Gb*~<{}Z3xyhU+^6^Gfsrt%{R(q2PnSImq(<$as1%o-vdHFoc
zfSWSF3;Ad~<$5ETAk|mqCa-@ADdc0X6!H_v3;^JJxoC8M30?15RfssXg<T<i0iS1k
z0lzdrB42tQQvdwBmg($PRhE{IVy=#lh!L5X&iTalsZxE-05V~CA#2V7P8`>+u>yC7
zSq<>p2Q;b&8u`>;H)!WR;M%7%_lYz#1H6LkT6!HPMUgYdwTrY2@S6ctcjh>mz@Ro%
zKFoB*j99zgFX<~;aSYe<SNrO)ysQ`yn@bv6V4Yx4-JtXXWI{W~HS%<Vth@3Jk92+;
zBbpJ5rVn7y4=^&X)pM)SFx>W~2DGQkb}H=iJb;K2K?V_N=eqdky_g^!=H+(UU`GDJ
zeSf)+*Lll;pe8~@wC&{=O-JX&02!5i1yyQURgv=IFaRLAcja1jHls=t>U-+^d@F1j
z&{roYb9`PS>vWhLUF{bPZ%^d6j!gt7*1sy`BP|1Y`Vf#IJ0(?39;ID1!uo)qHNXpL
zc5Td2BE@<xb2l+tFr1`BTy~etZTTFjL0;9!G9V}h5E1F*=-H)Ohp%7Rs7Vfvjbq6i
zR)wZ0{H#J;&!E;=1_V_FWH1*Q*SQ#W?G5ClDSe@k4b`+W{MdH?>i$vP6$<A^W;vo~
zuvMU68sOC<c=ZNeT_sh1a>T3(xoMr_YifO|)-;g!VwU|%tlt{If4nNHLc(L#N7c{h
zIYM%^ZukIBonsI66dGpF0iWu<Wq@BA&}|Rk<rpJ7b)z>R6P%;0F+n>0skcAb^`+ih
z2KdbYFNY|#K+X~9^bU3ojQN0cev&!T57@88Z>tJ)c8Ch0%$$0AJAbI&=5mfer1Kvu
z#<4^+v3;s1QM%Wd-TcEZ0>#4(`?dI;VgPfK$Zx%Wp}hZ+>Jk$RapQXNFx%C>M4tN{
zpEOLLp_$Ohw^#-Q<pU(*xo2<P9ii5OZk?vrb7YWVrQOnvo?{u{7xK)_UXkcEIz6`&
z<0Qju6}V|PNc9a0=}tl9r>CM+16L+=ss>gA{+A!x?YGOl&J6~h0lxuxWRJ6PN)a3Y
O0000<MNUMnLSTYJQ%kV`

literal 0
HcmV?d00001

-- 
2.39.2