From 7abe8e22a1ec6338cbfea8cc2026a941e22c55fa Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sat, 6 Jun 2020 23:00:35 +0200 Subject: [PATCH] made them bois killable --- core/assets/dead.png | Bin 0 -> 1287 bytes core/assets/grave.png | Bin 0 -> 2940 bytes .../game/client/game/map/MapRenderer.java | 21 ++++++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 core/assets/dead.png create mode 100644 core/assets/grave.png diff --git a/core/assets/dead.png b/core/assets/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..27e10c5ecc2013e6498fb7bd8ca46996d7bb3f93 GIT binary patch literal 1287 zcmV+i1^D`jP)0-}mY(^Mp_bMZB{=Q}JscI|i^#|fV_k~P+x^Pcy-=kmeP#{gde z0iZKJLHMni=3vs1@KH{FbjZ#`CzF7E3w*eE^JdP^6$-|fiBKf8^69(pkWHsaUAaLl zljDzHey)7|`DeSpkHB5P9{$!nBJwl9A|gf{7ZK;EKu`@Z#sLM1B{6;u*H0FJTxctj zQHgN=9dL8$^*64@e7}5teu3iIbLbJy`)q5Yj)QXR)@_QVvye>DjnA>O`OlL(AAj%= z_%+mpMloPQ0M~)HjpO3P6U6;Fe1Gm(V)$$G3DsJS)yvOlJ4&*6j!b!xPP1MH%Aqh# zXvz*VAi(!PY5C3DZyDDuU%2=Zsceq8=MhgNaHcSzK($&WumO25hVMFDUb#+bzKpmI zb%f^5vnOAC^!`u4HgE?}cL>0Hz>>$jj)7-|EofyQD=Q)b5LrNs@ZBlCY!}E&Ja~PRXHw4+a(@PFkdQx z*eMKvam<)50D^jzgRQ4DD_b)H0FtRB$y72T5{c|c5)p7`=P8}aQ}*`vW(Uyic4@ae zxUNIY^H5a|TCGS8Bzzwu5#2rRpZOk-+rTjWFl?hccj%Ss7Gr&_UWQx(BV< zMVQOw$mjE@_6jN<_gK05%D4nHY;8I&!h_8HKLccFb_+wN9 zh>QYL#e_Y;I8JD51^|k(yHjE9@%o@Qq|+&uFD=ov0lz(XFnHh7zzSZ>8=uoB?gQG3 zY#6u=EUG1#)qOZVz{xoIs(?X&dmGM6b(SkIAEL+ zyZsp=VLs(pJDp%>q#zQ2N`H(fcE+SiWLuCK8BnNHcBnTRGq1q{RBLqr zHlFVgI35C6lzOci3BU}`=-x0E_V#P&e(gAw6ullHY}Xs;-hS9mEX{iD@ZxJ+;2RO4 zn0z@K6Bl;dbiF#KI^o_?^(xrL0is}4>9pD`WR_9L{#*U~u4-@94Mc>+;tdls9w!TV z(vDz9H4wJaAn3C8{JvGyK?;yC6QbS3;*<+n+U+*? z?%g+IA{4+W`j~_}Xt6U#Es6~k+YBgNEK-;+4M@$We6F2e0EHj!>EtR91mu(w2%Dye z^p;T_YTJ=z*iX|bH6X+Jj@X(ej^l37MMQAB0mM#zDOMC~J6H|CTGV#YaE=&-Zl{B_ x_VATrc!Emg+@3uJFVZ+{@38&T-v3X1{sU~2v`?uYvm*ci002ovPDHLkV1k{(ST_Iw literal 0 HcmV?d00001 diff --git a/core/assets/grave.png b/core/assets/grave.png new file mode 100644 index 0000000000000000000000000000000000000000..6c2ec2535bbf788b31e3e54a555132b604a76882 GIT binary patch literal 2940 zcmeAS@N?(olHy`uVBq!ia0y~yU}OPeJ`OgZNdDx^90mq%XHOT$kczmsccc4a%!M2d ze*CrNUfg^(wr7m}jf}mMb0P$@qi=Id_ zd9$!2o?H|=`9Nob!W@mtwgWrh=PJ)Asf$#B3`7aurX!Uua`QFEp;T^hAa~Q7Qjj^^KyKtWE1)@tSO>z`M~Alm zW$lZ(Z}+a;#4O1%qwaMbd(x9%-wGWwjx=5P!=m`hx1ZZdShVGtI>*KQsu+P;D-=xZ z9XskSKW@6M4Ieivxd0}p= z$Ke|yFl)Yo%l?-@qZa{aOk=0Ei1y+hCS z-`_sIynj)HBR3Tkz6*aJ75-;T3C127JK{kfe)L|fQ2IL_u* zMF}hdMzI4h4yk7JTt26ox%R#O{|`-lx&OfZg82C_8@Tiz{I%2K5G<&;lkbzYfVOFk z8u5oC8IKx`mal0TAnW*@_S`E57Cd2Uq?R^hx$0u6;}2jyym`VWU+9LIgyW4bFUzj) z*HPf8pZR7j<9&g9x2~_Ri+22RRr<#>`*?wUl0OdjiMQ}azxWTV2kdGN9=G?njgDZA08IBsj+pGVB7oF!f{8ga{2y#g*$ua|0!#lz!@&9z#+dc&+*3x zR{nT@fi}l{Yd?X!+b8b6SLP^xufBh-Ldu~~c8){s>!XK;b3T@_aMUb5ugTe~DWM4fE`k$e literal 0 HcmV?d00001 diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java index ada9960..ac24f2a 100644 --- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java +++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java @@ -27,7 +27,7 @@ public class MapRenderer implements Renderable { private Texture square; private Texture square2; private Texture hitMarker; - + private Texture tombStone; public static TextureRegion FLOOR_TILE; public static TextureRegion WALL_TILE; @@ -63,10 +63,12 @@ public class MapRenderer implements Renderable { mainGame.assets.load("square2.png", Texture.class); mainGame.assets.load(tilePath, Texture.class); mainGame.assets.load("hit.png",Texture.class); + mainGame.assets.load("dead.png",Texture.class); mainGame.assets.finishLoading(); square = mainGame.assets.get("square.png"); square2 = mainGame.assets.get("square2.png"); hitMarker = mainGame.assets.get("hit.png"); + tombStone = mainGame.assets.get("dead.png"); Texture texture = mainGame.assets.get(tilePath); TextureRegion[][] tileTextures = TextureRegion.split(texture, 32, 32); @@ -121,16 +123,21 @@ public class MapRenderer implements Renderable { if (cur.containsCharacter()) { GameCharacter character = cur.getCharacter(); - batch.draw(character.getTextureRegion(), cur.x, cur.y); + if (!character.isDead()) { + batch.draw(character.getTextureRegion(), cur.x, cur.y); // System.out.println("character " + character.getName() + " showing: " + character.isShowingAnimation()); - if (character.isShowingAnimation()) { + if (character.isShowingAnimation()) { // System.out.println("animation"); - batch.draw(hitMarker,cur.x,cur.y); - } + batch.draw(hitMarker, cur.x, cur.y); + } - if (cur.getCharacter().equals(mainGame.getSelectedCharacter())) { - batch.draw(square, cur.x, cur.y); + if (cur.getCharacter().equals(mainGame.getSelectedCharacter())) { + batch.draw(square, cur.x, cur.y); + } + + } else { + batch.draw(tombStone,cur.x,cur.y); } } }