From 6cf4512df273da31032ebb15503cbd9c17c44e13 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Mon, 1 Jun 2020 21:47:51 +0200 Subject: [PATCH] EHRE ALA --- android/assets/buttonLeft.png | Bin 1073 -> 2453 bytes android/assets/buttonRight.png | Bin 1059 -> 2548 bytes android/assets/projectile.png | Bin 0 -> 737 bytes core/src/com/throwgame/main/Main.java | 16 +++++++++--- core/src/model/Projectile.java | 2 +- core/src/view/AbstractScreen.java | 5 ++++ core/src/view/Gamescreen.java | 34 +++++++++++++++++++++----- core/src/view/Levelscreen.java | 9 ++++--- 8 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 android/assets/projectile.png diff --git a/android/assets/buttonLeft.png b/android/assets/buttonLeft.png index 095ddce7cf50a346f84405c5a90c2111a5baab86..19baf885209decfa6e0d87ab7a14a51f600707c8 100644 GIT binary patch literal 2453 zcmXX|c_5Tq8=nP($&Bb)X6%%@8kC(fmTX^0MiB~4Xb3~ug$b3il+lE-rj(*l#1Qp1 zH1(AR*|MZTx)T>uS6MFk&fNR`ao+Qs<@YSVbDrnC*&gmrGSWC{7z`%k;(Wjp^a-H7 zmXrWr?T6d%f=-I+eC#X?CN?2zaQ!;$9WbeU&cWv#DJtY#d{9gA^=sn-S6}B~V!=g;Y^}#H3kL|TW_Ewi1^(dG z9iv4i3^$g)Of3)pVm*_**c$pgMEfYy!?Wjgf~C<6<2otvkqr|{q7saEOFKF-nR zDevDtt{jS+WX61Tx}wTi40F1c4`+G&G%y>oOuQP`dQm8})f?A0+_~^xLzO=!kQh7N zSa&4Z6}Dhc{NNb>cJ#^1!%#&Z_DP?iq2ItGO?T8dyUcTREgu`A6EGV#WEq&^e@dD; ztI(VPg_}E;0<%U(pr&-1aOVE+o5W*ex@Lyt)8g=#k=|cIj6Tz#|=r-CoQ5d{w`G)Ofzg3j|s0JTvfj z;kLCP?x?NOa`J@9cW0*q#4iKkn2%-Kp(9{V(R36F%_-QF$wwfHIww;^)L8`{0U05ujjPQxNm!B zgqr~szZO)Jbj`!ol29bJF9!tC-uccZ7a47p9xlG0S;eKXBcPEB2ll z5xHGtQ!5tJ^)WA=U2h@1f(8+P$C$}C(&|N2yYc%AYU&O1sXMO4RX#FB-gPc%wlR|R z9`mG|KwD#)BMi$MZn#->dma3SX)ysoC0=4?<4{u)v`6*d}F(^esL z=%M^KUUZ~(oI}QUw|}xDcKcY-SXV4fyHZ4VS;pKOT=I~^!(G!vA;t`kLZ&$p2OJ+r zT3M934tNc0!j$yFhZXL6zT)j7a@^7}!sMmSAIsD%w$cVQKxf=R1%9*|zpyC8c;{FM zF3vqI%xXoJ1u`+i0jgU+!#LS~cRE!O)&WpOBCjfi?I)Fi%roqOE}_%DkTNT5dlY~9 zH?Eh)q_sX5n;>x+{T{OkgNu`@52ZI=OFWfd@!ey_+tf_#o`q3uE%e;4Z2mHa6xJ2? z-%pg=EHJshsvL}1m?F}z7)h*k8)0{LqqD>PPZol4xn3)~5{c(!KWg{;VOT z7Ti)?*(q4NCOU5>D-E7u40uk^O@(%atrVoQjhWZ0~G1kLde()uh`-T?; zvHHMH^@y9-A3<19b8e`+7Z>Byqt?DXE^aMsyNGIAf%lDANF~5UK5ShqE*9lyL#@IT z6Z3cvoUORwL8{j{(-yzCSF?Lx_@$CC!UQ2SSnV-B^{2xIqzn?_+g5(?Qbw+cr2lrx zD6T*Kd6oK^x-WyuiwvVa)NUu@2apGm7Wn-TK>*+~)Xd7Lv%59+W%goBheG(6Jr zbcB{`FSy^A8Ae9(A1qS1HCO4VSh4)k*^Mx zG;?PLMhF!I!H9}3DWIi2L&#~TXYa}+w2r>0`5tMZEua2(FVw@(!Vj$o)tQBf1nTKMchT+XF}k7tHDv%R)#1B3!geaeXle=YHf39aI5@Njl)ec0Pie=$&0l}pt-}vm%5Zxkreq)(+tvYTiI~GJ zG8#Rn9~ku@j6_yR5MF@7hr`$&@0(0Q;62sg$c{s~pcF>y#FjG3!}d&CWzcCzDZhj! zfJUUX7w6XasW}3_^}bacKGu3+t!>5uJYSw;zTC;p<8=CUGEKJ+yv1^dTO5m>&BuJK z#`S|}Ol=!%ke0m_-bx1gF(jmp2fI z8?u|K`+YJ}xAgtOPR);m9`Hhs$ScaWjgL?26DXX-P;1FES^;dl5c%x>v@;*ugpHRZ zzJKP+MG~uyL)LwVE#CQZ&wpjyoK9x{#6PoPf6Ox;cgtLj2qm60)t+N~+EGV6_tQQP zp4wU7sS2~Mj*E3yu!Mp$Qxo+jhdRoscH>Rg*O8mz-t!eItn;Rs;Fk*K;^2PZp=H literal 1073 zcmeAS@N?(olHy`uVBq!ia0vp^pMiKG2OE$S+R%BJfq}6t)7d$|)7e>}peR2rGbfdS zL1SX=L|c!;0V1vb!CRF?S*<%b(pLD1xwx{3uS^ounX=7kHJ_UPU%^=>Dw=wIP1y$z z&Of@UxqI_EzI9CsKbRjqd9mb$lIp$bB2h;w9)7etxBK~rd$kP#+J;wiq?tp`8co`` zV#djJ9gX272ioI!65W!P$@%Lpc^Dc0{fc*~_`}G1we?}!CmBmV5bjK$nHO>7^^xG& z)6P}Sw>Z)@$*IQAChG!gr~FR6-G7ele6Znwv9p_%rMrxh7`Lv@b^~oGt&b{&5rL+s z#EtZ{=WMrFy_75a&gA_DGcHdHj#+NnAt5H{&ZLwQvY}B($0g&shvCE}pI5ZkANZ(# zLUnRBbC1kt4d>P;KMwwX@IB}3pCdbFi}WzP)!+8lkcXwLvFhr!{r$PS>zIDbZ`5A< zQvZ6xOaDu&eRXSCzT_~AU-$LB$E;W0@J~I~NX7lrWuZ@%5B~P-)8zhgmnnAjyE{_P zEovDqnXFza{osLsgl53ES;u!1$&oI z28wVNctjR6Fz6|RFk{71`!b*)dx@v7EBg~RMj&MZ z8)m*uE||$^*gS)A_DwT1LFOd3**ERLf(6IZw>>w}0~+LTrr~UkeDi6ZB(@_wH_m)B z+;IjfC=C|0*=)P=U@B0qLoz4rw?qs`!;FJz+j^mb7JH#qGB2NZbKaE)MnGGR@RZ*_ zvkhoc!wg14X5F=>FnwT$8G==SRCNH|tdIu6AVVD?%9Ge23P6$&1rA^r9Vl2?^>_VO zm46Mjg`uMHQ0sqWy}lW|%>-mss!-+p#yT)hMB*&ZIR{G1G^x>`2GEh+rXi9z_|Lx=i8U1L7}aX zb|7ur;zD3(13i@UOuKB0ZZ9Z01dJ1mzvpIJOMw(UnECc4T-1Nt;@nJ-i$GeJ<$K@0 h2y(aMnFH~aOrD$xGwnS$IRn!TgQu&X%Q~loCID~|zjOcq diff --git a/android/assets/buttonRight.png b/android/assets/buttonRight.png index 86dd0331ccbfc793bd0ba0b5fe67ab0e05261bf6..9f9b02c815240d1956cd7b405c5d1f0e7f668915 100644 GIT binary patch delta 2144 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 Gdx.graphics.getWidth() * 0.2){ + if(buttonLeft.getX() + buttonLeft.getWidth() > Gdx.graphics.getWidth() * 0.12){ movement = false; } if(movement){ @@ -64,9 +64,10 @@ public class Levelscreen extends AbstractScreen{ buttonLeft.setX(buttonLeft.getX() - 2); } } - },0 , 0.04f); + },0 , 0.045f); } + @Override public void show() { } @@ -90,11 +91,11 @@ public class Levelscreen extends AbstractScreen{ batch.end(); if(Gdx.input.justTouched()){ - if(Gdx.input.getX() < Gdx.graphics.getWidth() * 0.2){ + if(Gdx.input.getX() < Gdx.graphics.getWidth() * 0.15){ if(selectedLevel > 0) selectedLevel --; } - else if(Gdx.input.getX() > Gdx.graphics.getWidth() * 0.8){ + else if(Gdx.input.getX() > Gdx.graphics.getWidth() * 0.85){ if(selectedLevel < levelPreview.length) selectedLevel ++; }