From 8234a4909e73606e7c7891d80831d62377e10106 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Sun, 26 Apr 2020 23:03:21 +0200 Subject: [PATCH] bestes Game ever - Raytracing incoming --- core/assets/sprites/AttackHori.png | Bin 633 -> 726 bytes core/assets/sprites/AttackVert.png | Bin 635 -> 741 bytes core/assets/sprites/torch.png | Bin 0 -> 987 bytes .../dungeoncrawler/control/Controller.java | 2 +- core/src/com/dungeoncrawler/model/Entity.java | 18 ++++---- .../com/dungeoncrawler/view/GameScreen.java | 43 +++++++++--------- 6 files changed, 32 insertions(+), 31 deletions(-) create mode 100644 core/assets/sprites/torch.png diff --git a/core/assets/sprites/AttackHori.png b/core/assets/sprites/AttackHori.png index 3361a85c2953476cc70135d7aee1f8e4af27f1af..67d5bd9f7b0117798c65ca2b8062d7c037865184 100644 GIT binary patch delta 706 zcmV;z0zLit1l9#1iBL{Q4GJ0x0000DNk~Le0000m0000W2nGNE094fb9FZX+enNgNw7S4z7YA_yOYN=%nZ( zCH^ldw21NGxF7HCJ?`EC{$`b_W^e*fHOojR;$kkpDu!MWL<9l?7?hZ)Co_v#c#f}o z`1pDk<5}M4{v7>E!DN6>B%Wise_;`C5YKE{I_G_2ft4kN_?&p$pbHW|a$R=$jdRIi zKhG45YF_EVIxQ9RD_*3MP$yEU(#{z0lAvu2VKlt6PS)7`5f0M#-py$Q5 zKSqJjF3@V&_V=-Ew@!e-GjOGK{Iw=9`$>AEqeYK^fo~Ur z8WbiCEoBxu0002fNkla86|11kuESu+dq&224lw;4Ken%F;Lmel0bZ17MIaFG6_weEC zyCu#S*?)ijVk$QqvklWnnalMhlPj7l(k@@IcrWZ85jmyveCP4fT?!wSudBA-x0s&u z?bDf#dA{d`-8))?#JywBoZ97N<0~^&bn2(QmhGwMqUTJ_n!EM=$#@C9721;PF3Y$v zd3z|aG77y~v4Bh1Fe)^NXGy00yGQby{%RI^K3UZ;F`3a+Lm=1why0&+*EIZm>#aN= zT3q;?6e+*hAwfLDROj{Y8=Iok8{SLq2(tbcB|PJ=%HE3?7r8s!H!CQ-dvS^FgCcf` zic2oBTU6zJ^EYzrnSaszY2&|Wg)Ps%T)TJtCG&)(>!#&5G&?7(ak=?g?>%4H_iyiK zmet#bEH9cZId4%OFzDHmyxm8d@BeIx*K~EWk87r3BmjMOYOFVsD z*`KgTa_}gY$2)Tag(OQ{BTAg}b8}PkN*J7rQWHy3QxwWGOEMJPJ$(bh8~Mb6iUK`d z977@wzrDGT_kaP9tE2U)ZA)d9O+GI(Q4Wd!KI5UMS<(7i%bTP{<7^77?j4TyS6}dM m^X5ejSU}>|=iCqW|7JL|ioNl5DZdfWbOujXKbLh*2~7ZAvi`XM diff --git a/core/assets/sprites/AttackVert.png b/core/assets/sprites/AttackVert.png index cc44dc59f9cd895c7f2705f40af2dcd560a2e8a6..e424aab748e29fd2be1a6a2df6c42c36862909b2 100644 GIT binary patch delta 700 zcmV;t0z>`#1my*g7YZ;41^@s6aIAQ5ks%^~A{7NQNO8zeoh*ooI7$_ZV4<`XT6HkF z^b49aBq=VAf@{ISkHxBki?gl{u7V)=0pjH7r060g{x2!Ci1FaKAMfrx?%o0ZW|gUC zZ~{;@%Sb2UVlKZbhF%dw1OfsWl$fa}GmBYxj<0+8_<9%PS>EUV9Q{hcWPnd3o@2Uy zVG(Z-&um&c=Y3*w2OPbRO{6iD^ui3UAVYbLe_+N7 z8rd3I;PHZ125dm)l$URAZSnT(vx~q#JJQfhCM+Yfkvh1^;q> zmN&R(!@FWFZ!kT8xwvpo$Ch&I4F#gDA7O&Q?Pq3+y}IFwjoDL24Mwyl1t(1F1@E2< i7z64EqkYTj><3)lnoMDCa*cKX00005(ej@)Wnk16ovB4k_-iRPv3y>Mm}+%qF_%K$B>A_Z*MLXJYc}X>|i}T z*W21H>C+oJn93f@pScbS?83{1OV1c^85e* diff --git a/core/assets/sprites/torch.png b/core/assets/sprites/torch.png new file mode 100644 index 0000000000000000000000000000000000000000..4601909e5cae90e9e6a94b7f6037f957dc37944e GIT binary patch literal 987 zcmeAS@N?(olHy`uVBq!ia0y~yV0-{%8*s1z$&+(e@&N@}GM$|RJe{2t3X1a6GILTH z7&Io>zVA-hPRaD66qY;fa8`IvrgWUZULz3%7_yl^X2)!ad7GMN_Y@Df{5T z{-dj!yEm`nTi2xUgYnUm7fW6!ss7W~+|u#!!4CQN?`+@QWBivkb!A!sQ-JAd5A{b$ zdi%B7;sjk-n3yD{%vh;z+#Olbx4!zvk1FxUk@ueellkj)Fr~p?WnS{GM8SN4^Epvg z&ufz!r>eI8m{W0Q0k@ESQEb`I-r|#q_UA=XaL5OKW{JDGUiTJ@x&0 zOqfM}Vc6=@Yx~se6L&0Fo3g{Nn1xeEu~Wq5#EQjDS~^EEu6h_wT=sWIyZxgd!A~Zg z3}sY4&Xg6PXj%8c{>R<5k#lC1Og>b&;Q7&Q_HKe?w#LgGaj-pR7Lcl+WPL67RMr9*nd8B?(s8FU~*3?7ZFK{;b>4)$+^v z9j5Jy+Q-Pp*SJwAb$#`o-P?C>uRp)#_iskC&qe(@v+8C8qlGQW+ua371Hn({-St3< zv%n*=n1O-s2naJy)#j513bL1Y`ns||VUZGL5(;pi5C@FO8=fwXAr-gYUO$-E6d>Yy zk@?gA_%(Lyd?x2u9@_57R`r!)*AD?vndA05Dr`KaH{k|LhEN1c@ zJ3F^3vs=IS*k>0Xui0i7UA4d3`o(tJBFESFt54PLShCME{pBCO%WF&QZqHYpS)8SN z!PZ`qN&C$6|6(zYe{?(c|2H_WPNCtn`(DOrN|&7LBoZ`(zH@mA{0uB^;5Gcj%(Fqe zLy+xdV1C2Wjz1IR*eV)CR5^FlNF)@n9;`pY7SX0)|D>I9n&KzspOO#$p9|>Q(c~e( ztmC?b{gd&5AeNVk_BS&v06>?37>KjvBUzE(Se$AbG{hAIde=pU<7q&}*ZivuFPmYX>x6FzAZn-xd5nB@+&ax&WQZyU1a}e8y`EG7$@e3R!qJ z2y-N~7#^@%5?0G~$mP{HFo!)pPNjxRh0RxYg@ zg3EwT^;6(t0h-I(#58d}qg(S8?SRgNhPe(5$Iml7wokeO@{JYCS4Defo*hjJ_RN2l z^IElP2sr07TvX&@c`2D7%Vbf 3f){ - return 0; + else if(movementY == 3f){ + facing = 0; } - else if(movementY < -3f){ - return 2; + else if(movementY == -3f){ + facing = 2; } - return -1; + return facing; } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 89ef623..0feab51 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -234,15 +234,16 @@ public class GameScreen { - public Entity[] playerAttack(Entity e[], Player p){ + public Entity[] playerAttack(Entity e[], Player p, SpriteBatch batch){ if(p.direction() == 0){ - Texture verticalAttack = new Texture("sprites/AttackVert.png"); - Sprite verticalAttackSprite = new Sprite(verticalAttack); - verticalAttackSprite.setX(p.getxPos()-2f); - verticalAttackSprite.setY(p.getyPos()-2f); + Texture attackTexture = new Texture("sprites/AttackHori.png"); + Sprite attackSprite = new Sprite(attackTexture); + attackSprite.setX(p.getxPos() - 8f); + attackSprite.setY(p.getyPos() + 32f); + for(int i = 0; i< e.length ; i++){ if(e[i] != null){ - if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), verticalAttackSprite.getBoundingRectangle())){ + if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), attackSprite.getBoundingRectangle())){ if(e[i] != null){ if(e[i].getHp() - p.getDmg() <= 0){ e[i] = null; @@ -256,13 +257,13 @@ public class GameScreen { } } else if(p.direction() == 1){ - Texture horizontalAttack = new Texture("sprites/AttackHori.png"); - Sprite horizontalAttackSprite = new Sprite(horizontalAttack); - horizontalAttackSprite.setX(p.getxPos()-2f); - horizontalAttackSprite.setY(p.getyPos()-2f); + Texture attackTexture = new Texture("sprites/AttackVert.png"); + Sprite attackSprite = new Sprite(attackTexture); + attackSprite.setX(p.getxPos()+ 32f); + attackSprite.setY(p.getyPos()- 2f); for(int i = 0; i< e.length ; i++){ if(entitySprites[i] != null){ - if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), horizontalAttackSprite.getBoundingRectangle())){ + if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), attackSprite.getBoundingRectangle())){ if(e[i] != null){ if(e[i].getHp() - p.getDmg() <= 0){ e[i] = null; @@ -276,13 +277,13 @@ public class GameScreen { } } else if(p.direction() == 2){ - Texture verticalAttack = new Texture("sprites/AttackVert.png"); - Sprite verticalAttackSprite = new Sprite(verticalAttack); - verticalAttackSprite.setX(p.getxPos()-2f); - verticalAttackSprite.setY(p.getyPos() - 24f-2f); + Texture attackTexture = new Texture("sprites/AttackHori.png"); + Sprite attackSprite = new Sprite(attackTexture); + attackSprite.setX(p.getxPos() - 8f); + attackSprite.setY(p.getyPos()); for(int i = 0; i