From 737e1ac1cb26b75668a233619cfc79a5a69266d2 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sat, 6 Jun 2020 15:35:01 +0200 Subject: [PATCH] added character squares he can move --- core/assets/square2.png | Bin 914 -> 907 bytes .../client/game/map/GameInputProcessor.java | 2 ++ .../game/client/game/map/MapRenderer.java | 5 ++++- .../game/util/game/GameCharacter.java | 13 +++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/core/assets/square2.png b/core/assets/square2.png index 70d3648d614fe0f1e8056fd920d952d162e0b6a3..155f96c8ab2486d0e75861bb02eb63a9d669bd5b 100644 GIT binary patch delta 809 zcmV+^1J?YK2a5-gBmv)%B_DrFlH@21hWDIej$la$iQ`}%5q*O>{`_FdS(#Pc5!2I) zS)>UYEQAF51kMco?;j)lg^RKrA*y-GDIK_Cj+qM@eq7g8(-GHmUA(*S{v;1~2SX&N z<$6th>leuNF~H)MpU?7Ob=&c6Xm@-Vl<9eT+j_nY314#B?;-DTC4PTe&b~+G)vf2% z_4*zS!DtG5!hySx9C-TlBG+ATr|StN5=C25cOfhn2L(N=SmdwRCbCro8&O(Dtva}!$P8HMy zV!r1>%Wq!(Dmgqif+iD;5k`C|;XC2)l-tl4Gj)j$zhi}Y@yuyVW0IRsXaNX~9aCNL zT_t?Vo8uE$0YP11b}XVmPj?LDsebgb07W6_Y_0M>-M`n-U$y zY($8ogHOTCSt6exK&sp*46qUG1Y_sv8)J-?E-PPR94!E$*fa(-SqfmqsK_6SjvOi~ z8iT4PHFeEelBAe4rDSQIQN_ffsUA9<9U+NSzUjb6z8ni_3tlUQ7O_Mir_*@p?5$B9m6AjXkE+$I4eG*4!S zQ;a;xO=d@CYzk#iBb{&>O=2JzJFyPB**(bpl3URDueeR|&&Y*|?oW^l6Wu2FmD@Me zT3KHdS%Bs)oH0FQ;9!G7_rhN0H|e+Q@LvtQ4ZRJ$4ZRJ$4ZRJ$4gG%%4g7e(f5-3- zd~lKe1ZDLNlMn+mOCAfLVJu7l001pXL_t(o!|l#N0RS)v0HMz{Ek{6GSxdL7!1 n2?z)X2nYxW2nYxW2nYy#SWEz9&s{Lg00000NkvXXu0mjf#0GJE delta 816 zcmV-01JC@62a*SnBmv`*B_DrLa^xrshTl2G9sx-RiQ`}}ReOUu{{CR%PIod>HBG3nAUeayob<#l81YMArjPb zb@RFPE9Cl^U}?*bXL+!;?f5pd2R;nS^gO+7J>Q0eFFEagD0^N_pSFLq-_dvt>v0Xe z_LCtPU11L~;!{W>zCOLk^;W$3`a+3B(Poh)`AO`;-Fyk&-Fk^#tXnS6p$IW=h5Qnu zEhqgxb}K@kS40obPXng6i?6X8-N!hu-PM#4sT}sEKDM%2P((PBtZ5m=@G9E2N$(cD#VEPphSP2Dh)bU-Kb%SiBC4v%#CHqT#O4hnF!J>G}xp_58~j_KusX# zdo8s5mgTRJ!*eHSGQk*O#+MSl6aGoL4UI8VmnixjE3AuWPGcF9-26fdKxpik>Wc3w z;ZxqkPhbTEb%oin!5WXt#G&-aEm@oedKy!R*U=#B+W_5kbpqUNNma!joFA0 zM+cvZm9r#1K!8-aQy5?)I0?qi(>LZAEnQZ=#JE}jLUCveXo^(8N=cDFmK-@$RWt=v z&1&jev}VaEYtGs7yrZg#B~#00=2on_cyjgZ=I+I7;Uc)gwB%x;cqye;IIS>UF}p&e z)`Jf@(xFE_?C^i19JL{RT58&Iv*xX|+PO=|@$b1?=-x}OC!I*8Go5N7QZA@^%)w5d&EY3bR68pLKFCTLzKI+=kOCjxPs1dz}?nMJ3R zc#@mUVwo3}GN_SGIGrXj5KJer4!YSr$o-OA(DYl}_-9e%!bJCfkP8#tCij)wH`IDv zzbLW*%~LpI8fD;O8(b=Tq;vY_Y8+sdh8+sdh8+sdh8~Qs93I2e< z|BvB6vp$mf3|^!blMDkiP8R^?aZZf@001yaL_t(o!|l#75dbg<1hA(ju!;YHs|=Pz uK`OnILode!1Ox;G1Ox;G1Ox;G1Oz^jUIE1*lVPU-0000= 0 && cy < gameTiles.length) if (cx >= 0 && cx < gameTiles[cy].length) - res.add(gameTiles[cy][cx]); + if (gameTiles[cy][cx].getSymbol() != '#') + res.add(gameTiles[cy][cx]); } surroundedTilesOfCurrentCharacter = res; return res; } + public int getPos(GameTile tile, String choice) { for (int row = 0; row < this.gameTiles.length; row++) { for (int col = 0; col < this.gameTiles[0].length; col++) { diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java index db91787..576c92d 100644 --- a/core/src/netwerkprog/game/util/game/GameCharacter.java +++ b/core/src/netwerkprog/game/util/game/GameCharacter.java @@ -5,10 +5,13 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.scenes.scene2d.Actor; +import netwerkprog.game.client.game.map.GameTile; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Objects; public abstract class GameCharacter extends Actor implements Comparable { @@ -18,6 +21,7 @@ public abstract class GameCharacter extends Actor implements Comparable allowedToMove; public GameCharacter(String name, Faction faction, TextureRegion textureRegion, Ability... abilities) { super(); @@ -27,6 +31,7 @@ public abstract class GameCharacter extends Actor implements Comparable(); } public String getName() { @@ -106,4 +111,12 @@ public abstract class GameCharacter extends Actor implements Comparable