From 7cbcf826adea6e77aed38f7a63684be36f393919 Mon Sep 17 00:00:00 2001 From: DLGesus Date: Thu, 19 Jan 2017 13:17:41 -0600 Subject: [PATCH 1/8] Changed floor to floor.png --- .gitignore | 1 + .../com/mygdx/overstory/OverstoryMain.class | Bin 4821 -> 4818 bytes .../com/mygdx/overstory/OverstoryMain.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 852e7eb..40ff0ca 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ *.iws *.iws *.iws +*.iws *.iws \ No newline at end of file diff --git a/core/build/classes/main/com/mygdx/overstory/OverstoryMain.class b/core/build/classes/main/com/mygdx/overstory/OverstoryMain.class index 48db14e53c2b63e8076dc780c2ecb7f346f5a67d..b358f28b88cfa9225a621a9567c79b43f104b4e6 100644 GIT binary patch delta 19 acmcbrdP#Ld6)PKOT26j`(dK5>AYK4V<_7El delta 22 dcmcbldR28p6)PuCaY15oYG!Ww<_6XvUI1hu2o?YU diff --git a/core/src/com/mygdx/overstory/OverstoryMain.java b/core/src/com/mygdx/overstory/OverstoryMain.java index 26d8c83..8d78d29 100644 --- a/core/src/com/mygdx/overstory/OverstoryMain.java +++ b/core/src/com/mygdx/overstory/OverstoryMain.java @@ -26,7 +26,7 @@ public Player getPlayer() { public void create () { stage = new Stage(new ScreenViewport()); - map = new MyActor(new Sprite(new Texture("spaceimg.jpg"))); + map = new MyActor(new Sprite(new Texture("floor.jpg"))); map.setName("Map"); map.setTouchable(Touchable.disabled); From 5467886eaca0c3fe1d1e7be0052e877a8f94206b Mon Sep 17 00:00:00 2001 From: DLGesus Date: Thu, 19 Jan 2017 13:19:15 -0600 Subject: [PATCH 2/8] ignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 40ff0ca..c3c2489 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ *.iws *.iws *.iws +*.iws +*.iws *.iws \ No newline at end of file From a9f9485f05cdf5ede64c30d9cd38bf40acf4a658 Mon Sep 17 00:00:00 2001 From: RyanK Date: Thu, 19 Jan 2017 13:56:51 -0600 Subject: [PATCH 3/8] Made Basic AI 5 choices : up, right, down, left, stay --- .idea/modules/OVERSTORY.iml | 4 +- .idea/modules/desktop/desktop.iml | 40 +++++++------- .../main/com/mygdx/overstory/Enemy$1.class | Bin 1052 -> 0 bytes .../main/com/mygdx/overstory/Enemy.class | Bin 1355 -> 2628 bytes core/src/com/mygdx/overstory/Enemy.java | 49 +++++++++++++++--- 5 files changed, 65 insertions(+), 28 deletions(-) delete mode 100644 core/build/classes/main/com/mygdx/overstory/Enemy$1.class diff --git a/.idea/modules/OVERSTORY.iml b/.idea/modules/OVERSTORY.iml index 4699a32..c546907 100644 --- a/.idea/modules/OVERSTORY.iml +++ b/.idea/modules/OVERSTORY.iml @@ -1,6 +1,8 @@ - + + + diff --git a/.idea/modules/desktop/desktop.iml b/.idea/modules/desktop/desktop.iml index 04ba4b5..f2fe902 100644 --- a/.idea/modules/desktop/desktop.iml +++ b/.idea/modules/desktop/desktop.iml @@ -15,26 +15,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/build/classes/main/com/mygdx/overstory/Enemy$1.class b/core/build/classes/main/com/mygdx/overstory/Enemy$1.class deleted file mode 100644 index 7f62e440a13455a9c2d6fc653120dde322e53bc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1052 zcma)5QEw7K5dIcuuUt=yRkToxtwjY|d!^MUOnpGkHUTxk^nJP89IMA2xjRVtSteK$ zAN&FSDC6wWYD}QSK6kEKC*=`qSwaCDq0BBuNLK_?XkZTfXfDk@Ve;i2H$~p=w|iH3M1bO4>89kLMZ=44637P&cSp z8wQT?f{L)P2IV@#vD&>U-cc;Q$ZV?Qv}F`i8bXG`LQaO)bJFLAeAt(EWV)2R?l6?G zpu|~LTV2rfxbK?XIHU_UR5H^QHK&3B!|vRwy}$0I4wpXFZf9ON|9}{>u82Q)e4@fH zRjPA&XZu80oJV+lI{l{emf9;61M2Bh!M(UoEn1;Iz&5>)6?!Txms7PNDMe!y1{iLU zbV9na=(WACV6|^ZeMvC4XQoS=}yI%$MY*r-o%7x%8XI5A~tFJGGy6^$v< zm&i=9bcyA^w0h#OK*x#+b!~R&4|N`Sa;jYC@cH7^E9|1rB diff --git a/core/build/classes/main/com/mygdx/overstory/Enemy.class b/core/build/classes/main/com/mygdx/overstory/Enemy.class index ea75d267e2c41f440ca628815d239b00f100ecb1..9b186c4b0208e9ff46d0b5639f568346bcf7aaf1 100644 GIT binary patch literal 2628 zcma)7+jA3D9R5y|W}9SbAe2kFl$KIRQzZ(bVv*8Pdcg$HR*-t*bh9K2xv|-l25)#n zg&9X@7~gdC$r+t-Mh9Z$!3SrYVH|z(UH%it@9c&alQ6KEvwP0@o!{;Ie&?4z{=M}p zfIYYt!ZsWUq6ZV|H5tSdrbC<^?Z9(kB#~0v$3i%c6KeK+2rpnp9hg{^<-nmXn&smkyUo|Z<)W-KF-NiQZcwk%~W zqnya>NhfAXw&j?^6MT~Ac>&!v z^UP|h9+N*dp@0g=e6doXM}OLu7X=0%1pSzFjO?(h+di-60s{{K#8VLnm!xeLoY7n< zD+N}~IMO(ulBGHczL<(9G*hhDhB;v=vO+HQyA{Jac4C)~?daFB0|Oc|IsUw4Y63f&VrX%L1!50ZZ*Hl21KJVTOV*+ z8+9mW<4ZKTE*oaSEGOI#n;I`R`7I|#y)O-@`#Q#sF&tx~Ymwl645VB&&kS=8%5>UW z2n@A=yTM9bPa)n`Wc2+lJInFA{V^piRg*5Tjkn={hZqPMJCT!B(`J#^32RjG^0O@Gd2e|rj2-< zGi7Nb|Bd??jhgMn69`aeAD*noHObRTGx8Js@fzBrfnT8cuo6zl75AW%X{s>Rd&if< zh~OzaO=Ci}q`J|$y3wBa=^NQ^$@3+$e1$xJ zPJ*tJqOW=4ds6fRfxJZ!e`kufaS(rF1pi>%1-;jUa~bqIl#jTu+`%Ej--c284?^o5 x>E^SJqJ0?i*r2&K_h=+eR5#VI`3APsu(h$2rdUeTt~cE~UiT(&n6}$6{vW6dY9{~y delta 648 zcmZ9JPfrt36vcmUrk$bFv4dEtWne5)q#YEc{udPy3p8Pek-)BzF~ML>D3ZA9!j%+0yyy>rjK?|sYva8|$n{&EP^s5`h+Y^n|hp+lC* z3>Ubl(NrIovRr05BT3ES3Ri8e*<4q+jaDn#p5JP=+fiF#E-pV*sD-`5jw(4TFJ5jx zi551uB85|LMbBSNJ!|eZUHUnx@Z)z@em0@Y)0(^Ca+6y&w_Rqq<8qgK3ahbFT53G9 znRU6(oJ$eU=7GyR;#AZ%;@9Sc5me$i<>#x971`#-#`0!+Cz8$-wMzUmJ=$O2jaoZL z>`Zk%erx{fFe(GNGQW~PhbPe#EbU1gkn9b%Ebzn0@^~RtNEfXGRQMHREj+;7C$+jK z+Xkm3=0uF36AUuMFnP(Ax^hknr$3(pXA(P~Vn-Z}gd7s2#l9?$RDy;Dr4uwlfF+`{ zlzM$F%4x0i-jfdZu?FnV^qKtaMZY2<$jOMhkHPNo<32p$&vm4lVvKUH>Uytg5Uzb7 wGxqc&nO^-+@=rMbnREv(<1o$$=l?MZj*SA@^Q68Z`}(3L time) { + rando = (int)(Math.random() * 5 + 1); + switch (rando){ + case 1: addAction(Actions.moveBy(100f, 0f, .2f)); + time = System.currentTimeMillis() + 400; + break; + case 2: addAction(Actions.moveBy(-100f, 0f, .2f)); + time = System.currentTimeMillis() + 400; + break; + case 3: addAction(Actions.moveBy(0f, 100f, .2f)); + time = System.currentTimeMillis() + 400; + break; + case 4: addAction(Actions.moveBy(0f, -100f, .2f)); + time = System.currentTimeMillis() + 400; + break; + case 5: addAction(Actions.moveBy(0f, 0f, .2f)); + time = System.currentTimeMillis() + 400; + break; + } + + } + } + + @Override + public void isHit() { + removeHealth(om.getPlayer().DMG); + } + } From 17ff41552fbff77a4e32f652fbfb429173e2b8a8 Mon Sep 17 00:00:00 2001 From: RyanK Date: Thu, 19 Jan 2017 14:09:22 -0600 Subject: [PATCH 4/8] Enemy DMG tweaks Added random modifier to amount of damage enemy takes and changed a variable name --- .../main/com/mygdx/overstory/Enemy.class | Bin 2628 -> 2665 bytes core/src/com/mygdx/overstory/Enemy.java | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/build/classes/main/com/mygdx/overstory/Enemy.class b/core/build/classes/main/com/mygdx/overstory/Enemy.class index 9b186c4b0208e9ff46d0b5639f568346bcf7aaf1..c5f50fd0dd76e3afac6d88dbfa82824d25384d2e 100644 GIT binary patch delta 781 zcmYL_?Nf|l6vltg?zVUPbWhQ&+NeCsieAWDl$Y8fc8O5rC6bDi7D?W%L|(#V`s`mY z8ck#R;DhnO82*Mn`{pk&&VAR^J@cIVJmCxM&2O8S{`c5vceksA+e}rHk$mJzNgPOXl%Fy$42cMbWFc`u;`ZkJ z3=a%V&BlD`Qpz;zDABBEgQ8E<&o#{eDTiRP#Y-ex71uR4xT(cuOfjgr#gJw*TNJl7 zbqs6na94AW`-%sehcqf4X&#eSJkgBsR57Y~#&gXWFElTCrFg9w&*hEct!5iB%^vnT z6ij{!hCh$`d;R56c~S7ox0aYh%%b*|UFFWeLH3teKAERVor=l0%5U2!NCG7>!X_#$ zKVr5Oo~elmd^VGzwtIx_k_Bw7N;31j5q7YXplGV8u@gQjuc|^2*Q$%j#>33Yv;R4Z zvvSzQZc#YKk5&3JD{G80d%=qXiPFb@$wMfwu0YNTfvRaVjilUc4MDW5Y?_rbteU3q3(LY3^@myBHPM&5 gIyF8vgEu8)A4_f%GB;Uh7uI%IbYTI91D1O5KXO-NKmY&$ delta 774 zcmYL`Sx-|@6otRr>9p4)O|)VasjbwZMa8KqGFlN@tRpxNh=Pg=Rm54j&f|*-zl2D5 z@WDjmgE8_Oc=pX-VBF_4DL1+Mth4u8d+mMipV*I>_v_!6ufR4wx~yh@gaq9t^h797 zbOrT>Ik1Ql2Tl5r%VCZfbkyY-eTL9)&~cX&oOC(GX_qsc4Ryw(tvrGJPYLa%-*YbK zIBx_Of|Ziot>UWY8Y7zP+;9jL`;vuXzv8B5lrc>cDMeXxi`$w_Y*vhGTDhZ{ z;I8H#_Z1H`56LSYX&&=L@l-R3r+B7$&I`>;UTI$QM)6kjF3Nkw2hA2znr8NV_WYi| zF(IE4{PHGA* time) { - rando = (int)(Math.random() * 5 + 1); - switch (rando){ + enrandmvmt = (int)(Math.random() * 5 + 1); + switch (enrandmvmt){ case 1: addAction(Actions.moveBy(100f, 0f, .2f)); time = System.currentTimeMillis() + 400; break; @@ -68,8 +68,9 @@ public void draw(Batch batch, float parentAlpha) { } @Override - public void isHit() { - removeHealth(om.getPlayer().DMG); + public void isHit() { //Currently damages enemy for 50% to 150% of DMG (FEEL FREE TO MODIFY) + removeHealth((float)(int)(om.getPlayer().DMG * (float)(Math.random() * 11 + 5)/10)); + //removeHealth((om.getPlayer().DMG); } From e90a368cf2c12d2bfaa78cf91f0946ed10c4c2d9 Mon Sep 17 00:00:00 2001 From: DLGesus Date: Thu, 19 Jan 2017 14:10:47 -0600 Subject: [PATCH 5/8] Added thor --- .gitignore | 1 + core/assets/thor.png | Bin 0 -> 10178 bytes core/src/com/mygdx/overstory/Enemy.java | 1 + core/src/com/mygdx/overstory/OverstoryMain.java | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 core/assets/thor.png diff --git a/.gitignore b/.gitignore index c3c2489..92a2804 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ *.iws *.iws *.iws +*.iws *.iws \ No newline at end of file diff --git a/core/assets/thor.png b/core/assets/thor.png new file mode 100644 index 0000000000000000000000000000000000000000..83e4edb41c850769b983eebea15d742eb3f13793 GIT binary patch literal 10178 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 Date: Thu, 19 Jan 2017 14:25:20 -0600 Subject: [PATCH 6/8] Added xp m8 --- .gitignore | 1 + .../main/com/mygdx/overstory/Enemy.class | Bin 2665 -> 2765 bytes .../com/mygdx/overstory/OverstoryMain.class | Bin 4818 -> 4814 bytes core/src/com/mygdx/overstory/Enemy.java | 2 ++ 4 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 92a2804..a9da254 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ *.iws *.iws *.iws +*.iws *.iws \ No newline at end of file diff --git a/core/build/classes/main/com/mygdx/overstory/Enemy.class b/core/build/classes/main/com/mygdx/overstory/Enemy.class index c5f50fd0dd76e3afac6d88dbfa82824d25384d2e..ef18f0dc2e3401f4c173b7ee9abbd7b45ab95e63 100644 GIT binary patch delta 1327 zcmZvbTWl0n9L9gMGu`RV9=ft_Z%Egzy*kA!UeHo3v`VYgY5@@xl@>v%0)iL3ju$`? z#bS-VczJAsPe^yHJeX*FFh&x6Ht}7bd@(UGF@9%e!Am-ubLKziJOAtV?JuQsjnQ|1 zo&6HHmf3(VHst7J%x-tuZ9KDNu_XKR=UTbX)*v5UZ(C@9;@cp@fM|jkF?5RsJXU6+ls0}xr z9qdjIy|opvw;uC(+-L8}PkY_Wq5Y?StYo4qxYE$e<%Whj`X-9oPFjXBgsn!wbCV^O7OrWuI3JukxDVFh_ij8eV7A z=MBR#-t;+cc#F4vPLvGqFk?8$yM`O-F$}WyOynMPW_M;kIP;r#z=>#A>0N5Y)9R*2 zJGSKHt*Vo^3fH?12X&j!ONUuRdd*Id_{{TwIERmp^I6*n|hywkdn;cD$o za))Isp+u2Jnsu_Aa>O+{9!VpK@0I#eOxwEhSW6R82y3YW+{9WX%hub*O|op@Hg2Y$ ztbA58P^)mgZd=d7XVir;*`ogi^)CO^6p)F8x6?pJQb$vI|3V!F)^LlWId*WhsM~5$ z%i-2}avi&>FFFG)jEbGIbYqbhscK-FSab=6V0(wP&w)gna cn2!I5Qz6HwFrJiP5NjKehj+ zcmMt0%pbriu6R5~N1R4F?Xo4#R$ld_bycw~!E0={$2&Y;XQ$P6dAz}!_CmMSc6;oh z$73)1Joa;7Y_N9yTO73ZLs2ErCFq8^dav z4KK28^1JX!XY!}$fO9n-{l2Jr8wDJMB~3JI#a0`BMtr&-XK z?7br7bsGLf5#UFOh0{XSBv~ivmJCWp{8UXMm7b=yM4ew$G%<5X?ETD9Kb5_2deGA4 zCsH+YP7hjE%aVPhCF>_170mJx4(6jrzzF{pRB5;tXt?ThoYznkG!JVu5eGF5$2A8- znt-$7epsxJiT81_eqA?y6<;^R*o^r4OHJMuu6Ojc++|aMd%g_l9PYDh-HF4a0TUJl4Y^`iA6QX|%J73V~3)qDv8g8;Ezw004$93RVCB diff --git a/core/src/com/mygdx/overstory/Enemy.java b/core/src/com/mygdx/overstory/Enemy.java index 452b83d..ee38829 100644 --- a/core/src/com/mygdx/overstory/Enemy.java +++ b/core/src/com/mygdx/overstory/Enemy.java @@ -43,6 +43,8 @@ public void removeHealth(float amount) { public void draw(Batch batch, float parentAlpha) { sprite.draw(batch); if(health <= 0){ + om.getPlayer().xp += this.xp; + Gdx.app.log(om.getPlayer().getName(), String.valueOf(om.getPlayer().xp)); this.remove(); sprite.getTexture().dispose(); } From 93fbaf16b0e9f1f8080a055b805b79d0c2294d2f Mon Sep 17 00:00:00 2001 From: DLGesus Date: Thu, 19 Jan 2017 15:32:45 -0600 Subject: [PATCH 7/8] Constrained movement --- .gitignore | 1 + .../main/com/mygdx/overstory/Character.class | Bin 1898 -> 2523 bytes .../main/com/mygdx/overstory/Enemy.class | Bin 2765 -> 2821 bytes .../com/mygdx/overstory/OverstoryMain.class | Bin 4814 -> 4899 bytes .../main/com/mygdx/overstory/Player$1.class | Bin 1175 -> 1976 bytes .../main/com/mygdx/overstory/Player.class | Bin 766 -> 766 bytes core/src/com/mygdx/overstory/Character.java | 7 +++ core/src/com/mygdx/overstory/Enemy.java | 42 ++++++++----- .../com/mygdx/overstory/OverstoryMain.java | 4 ++ core/src/com/mygdx/overstory/Player.java | 55 +++++++++++------- 10 files changed, 75 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index a9da254..5578b4c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ *.iws *.iws *.iws +*.iws *.iws \ No newline at end of file diff --git a/core/build/classes/main/com/mygdx/overstory/Character.class b/core/build/classes/main/com/mygdx/overstory/Character.class index af043ec4dd8b1d7bca8df5c56fbcdc616f8cd41d..18ab8940ddcb75b906711e29f1f9a7552c95986d 100644 GIT binary patch literal 2523 zcma)7Nplld5dNMddu(~YU~B}&V9T;W5{rOr5MdKz5Cm*PV#fxujz)ttAZe7**x1>Z zbFR6ha>$)ZRZ>A&4yoKymEV*~7pJ%+VqTV)`*8&YSze9f8eSd1b=;7Hg*X`POC1%Zpb1f6$E1RY$k>(Xq;O0MxxA@eNgONM7w@&$=mPf_Ly)6eiNxS}x7FkGwd%~cx}Lt)plXP6Hb zjYb$#-E`{r82uH8djwAx3YohKeHGiAGZ|Qg!(GF@xaA+`nM?}tWoO+rt%5C2x4Zok zr{v9bOyV6K6G-Yfh*2Hy;yoP(iaHKsRD-Fb1WU&~lr>az*toCZfsQI_Ix@&=sOzi| zM@Iwi>u}N3;OSV$hK`5W)Uc)F1AM6CBb?Fkv4~GZe2Oy~KGX3zzEC(MX}UdQLKo;^ zx6`&4J9wQi&E<8prsV}WG?MO2BGDM2#x195d$v;#1J2#yjzYRxVopYl24Ce!=Tpx$ z8dcjg1cV8%F|h)x!|6*vc(+tGZ4TfqAUGkYq3{}Z)Hk@W) zh;}1RO(E5_E^hwUkQNPFUdD&to_YUMVzH4o%d$-TOgGj|)2ds|oIglY6;(pVcP038?M*P`v&Z7S81ZOdS zb`qyTYPpcwchnI#Q`@OcKSpo%V6X5?#1iEB1i>Tzm1Ib8k_1y2rl+H%KS^3b@>&4f zCYfrJOtnd-q*MANQxLjBG6kXA;C5H0Lllie0}w=gI# z6!l+dzfbTq`bcaqq4pDO0x$T6CIYaw<4HWv6Cs_%i*zl5mwX&G!Oe3xAF}v{kmCOg z?d@q{Z(w#P820U|7gNPxJ{$}q+?pyzTiE{x5=$rlL{Icl?2(TwIkeknagLVHBafGT oX4$|%o7s#XbYV8*2R%aVKI-OqS2*@T{SE#IFOcF4*AdMA3rVg#y#N3J delta 823 zcmY+C%Wl&^6o$XClelq)Hl(Gwl$y9rC~<(Mq1>Td3Z>ldDVM@?up%sY0TcFh|VxsLwHu=QzPhb8*V&G)v~H{I+`^eXdd#&Xotslrmc4MZs?qDKxsN~H->OR}uJTe>MqbG+2;+lwVz7z{dpi*`++C{Y%y z$n8s9t5J%YpHWe511Bn{W8A1-OvR-765}u>I7wQtELfrI%Tb=)6bS@jDG^~>_U0*> z`Xq&6#-3wYD9p8NMp(+SS!yC_EY$~=-bjomcfmGG^$pTdIb(bkQ^j=mKW7!2yecvw zJ~PspSs6f0%?px4Z4%#L`SQ8O5K+hFDyp(W)k$e`NN`$e0nny3v+55+;#W)Imf#W@_XI?4>| IpiqbTe~r&jjsO4v diff --git a/core/build/classes/main/com/mygdx/overstory/Enemy.class b/core/build/classes/main/com/mygdx/overstory/Enemy.class index ef18f0dc2e3401f4c173b7ee9abbd7b45ab95e63..0f4d86fb877435c7dfc005eaf9993445404cb1ba 100644 GIT binary patch delta 1332 zcmZvc&r@4f6vsa=FUbop53p$hK`l)U(DdQYR-syHDWyOu2qKD5s|Ez6Sn9$Ve=V}A zqphuIYFnLAcRHghlswTz7jASqcHFvf)jz<0K*#ZWUjj0nzRbPvd++()bIv{A^Kv6| zwyAXe-=D4ld%5D$!SOoU88Opn9ZxXk3XLatGRXu_ne9oJr+LPpDVJxNHfYA>1kcrR zl2KRFxH5lAWea<7q~F3CSpB^#QhzV^dF;XW=%i3?wsTF7P;hv| z<4xZ3*vG>TZ+rBWNA3LHA&2)o-shahc|LHs;Bk=;Jy!V0;bV_7mpnenL%G-DDA z-^xwz7#7M`^Zi<#!_g12erH>IbF?|u68{0qw<|<^uY$cQTZ9KRr-*89p`NsGhGur~ zpmv6;=XpqK>M4;m_mz7&MP<-&gLIcLsVv<>##NU6LZ<3j9_2COI&*->Yl#htZB90R zN7N69rQ$#0*!-W58=7-8a8H;=Q!)^BIqw*B zTTanWrm~@*DT6jSrLB&7WZD^$_8GKE+RAD1leddtgto)Rn^k|H4=bUz-KNHEQ{x_y zWk_mFsMk)a+m_U6E9$JzDDCGfwbPo!zb5&wOZ-1XzezuTsSy8g%!)H?r8sWo7_&MV zx4QJ_VmdijRcu38t6OJ|nnDTm@JNI6=C>4qzA;H delta 1292 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 diff --git a/core/build/classes/main/com/mygdx/overstory/Player$1.class b/core/build/classes/main/com/mygdx/overstory/Player$1.class index 760a1ff693e3b6a15b9d2507f5d237fb876e5a4c..3ff90e157846d57b32ef5666bc3816a3630e6cbe 100644 GIT binary patch literal 1976 zcmb7FL37(g6#h20qu5bfN2CQx(xx;}J8`Ncg%U_{NK(7F*rC)W(B2eTbwp*!BP*fi z#&F=yaNz>S9$*+?+E6%@8BPpS{s7EyXYwByzLnfinm8HkdD45k-+TM^y>C~){{7>9 z0JFH3#1Lju&@h|CIlPd9ju!`Teh@EVE`^uzN|Gb<@ugn?Id>tRFF*J#g;$Z6=0bu| z_!GJK&qOGAO~Il-f3R-1$EO8G%BI)Uo1I4emhNp@emn5|j(){4I+j0A+y&dUgS^1W z%znV^sz7|%t6Ks`%C>8*Y&6#_zh zyxd5_l1>7-1AQJ@LO|T26e%46rRCXCqM{^_yy1JzFuuT<1A|71Fvd-*bJ2U>6`1~C zn=NIpN6u#0k3-eKFmG0jR=4n}s<+{rR?(KN8H^fz_B~_MVCxF5>3D71ZB(pa-K#5D zQgIZ^DxScw)GjJ0s3_u+ir2x7DTS3<;c9`ymsPxhvVw|=6}+k93f@w26;%Z_6>noz z#XESHZ0k+7@fm?BIlW(#!h)CWcEC=P1;=}b6Ij@zY7O6Lt=nc>Z;&9>mTw0Z$x$qp zWdU@@a2t9x@L7P62(gT$!|<-8F4fuUn9*uIBhR(XNY3V)jHH_mq#6#_QoI!%f46@Ps!lf-y+xMWz z_3vQd)6ene$d?@Zog)24DIZbBDBnNrCaf?2t@gZjL3C`mSeki{t;wOF*AF%y@U;%#-Et@vDdrPz-lzWMtHPJ`as delta 493 zcmX|7%TB^T6g|@xM%p3;-w0X}5DG$+g^3YO+!$jtaqnZHY(&$walto`E{tEGiEd1M z5Ed?689%|l@CS@%KxuOB+yN*;of4Xk~mQjg7V%EeETx0VCFfoUWi8SVo zca{=aiCp`z8)#ZRxDqS2Y&I@W{L_Yj*bcU|4L5JY!h($mOqCTRiZ(oyY?QGmkZPYL zgKzCdRD*rt26sl#lKdMW97nxjrV$ow2t=8!vsR4hm7XEIS7?tt%`jt_8ejr3#__%i z4ic=?XQs9wdGh-O5K1?W diff --git a/core/build/classes/main/com/mygdx/overstory/Player.class b/core/build/classes/main/com/mygdx/overstory/Player.class index 5372474ce34121858f379a30ad11e5c84982ca45..da6c7e7b01565836300e7264ddb27db997abab1e 100644 GIT binary patch delta 21 ccmeyz`j2%(FB7L2122OFgA{}3 time) { enrandmvmt = (int)(Math.random() * 5 + 1); switch (enrandmvmt){ - case 1: addAction(Actions.moveBy(100f, 0f, .2f)); - time = System.currentTimeMillis() + 400; - break; - case 2: addAction(Actions.moveBy(-100f, 0f, .2f)); - time = System.currentTimeMillis() + 400; - break; - case 3: addAction(Actions.moveBy(0f, 100f, .2f)); - time = System.currentTimeMillis() + 400; - break; - case 4: addAction(Actions.moveBy(0f, -100f, .2f)); - time = System.currentTimeMillis() + 400; - break; - case 5: addAction(Actions.moveBy(0f, 0f, .2f)); + case 1: + if(confineToMap(100f,0f)) { + addAction(Actions.moveBy(100f, 0f, .2f)); + time = System.currentTimeMillis() + 400; + } + break; + case 2: + if(confineToMap(-100f,0f)) { + addAction(Actions.moveBy(-100f, 0f, .2f)); + time = System.currentTimeMillis() + 400; + } + break; + case 3: + if(confineToMap(0f,100f)) { + addAction(Actions.moveBy(0f, 100f, .2f)); + time = System.currentTimeMillis() + 400; + } + break; + case 4: + if(confineToMap(0f,-100f)) { + addAction(Actions.moveBy(0f, -100f, .2f)); + time = System.currentTimeMillis() + 400; + } + break; + case 5: + addAction(Actions.moveBy(0f, 0f, .2f)); time = System.currentTimeMillis() + 400; break; } @@ -79,4 +91,6 @@ public void isHit() { //Currently damages enemy for 50% to 150% of DMG (FEEL FRE } + + } diff --git a/core/src/com/mygdx/overstory/OverstoryMain.java b/core/src/com/mygdx/overstory/OverstoryMain.java index 7933d7e..493d8bf 100644 --- a/core/src/com/mygdx/overstory/OverstoryMain.java +++ b/core/src/com/mygdx/overstory/OverstoryMain.java @@ -14,6 +14,9 @@ public class OverstoryMain extends ApplicationAdapter implements InputProcessor{ private static Stage stage; + + + private static MyActor map; public Player getPlayer() { @@ -64,6 +67,7 @@ public void dispose () { public Stage getStage() { return stage; } + public static MyActor getMap() { return map; } public void spawnEnemy(Texture texture, float health, float DMG, float x, float y, String Name){ stage.addActor(new Enemy(new Sprite(texture), health, DMG, x, y, Name)); diff --git a/core/src/com/mygdx/overstory/Player.java b/core/src/com/mygdx/overstory/Player.java index ca2980b..4e414ac 100644 --- a/core/src/com/mygdx/overstory/Player.java +++ b/core/src/com/mygdx/overstory/Player.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.math.Vector2; +import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; import com.badlogic.gdx.scenes.scene2d.actions.Actions; @@ -24,29 +25,43 @@ public Player(Sprite sprite, float health, float DMG, float x, float y, String N @Override public boolean keyDown(InputEvent event, int keycode) { - switch (keycode) { - - //Ill constrain movement later, just setting up classes. - - case Input.Keys.W: - addAction(Actions.moveBy(0f, 100f, 1f)); - break; - - case Input.Keys.S: - addAction(Actions.moveBy(0f, -100f, 1f)); - break; - - case Input.Keys.A: - addAction(Actions.moveBy(-100f, 0f, 1f)); - break; - - case Input.Keys.D: - addAction(Actions.moveBy(100f, 0f, 1f)); - break; + //Ill constrain movement later, just setting up classes. + if(System.currentTimeMillis() > time) { + switch (keycode) { + + case Input.Keys.W: + if (confineToMap(0f, 100f)) { + addAction(Actions.moveBy(0f, 100f, .2f)); + time = System.currentTimeMillis() + 300; + + } + break; + + case Input.Keys.S: + if (confineToMap(0f, -100f)) { + addAction(Actions.moveBy(0f, -100f, .2f)); + time = System.currentTimeMillis() + 300; + } + break; + + case Input.Keys.A: + if (confineToMap(-100f, 0f)) { + addAction(Actions.moveBy(-100f, 0f, .2f)); + time = System.currentTimeMillis() + 300; + } + break; + + case Input.Keys.D: + if (confineToMap(100f, 0f)) { + addAction(Actions.moveBy(100f, 0f, .2f)); + time = System.currentTimeMillis() + 300; + } + break; } - return false; + } + return false; } }); From 37380418b521174d66cc5a161ec131a800df5876 Mon Sep 17 00:00:00 2001 From: DLGesus Date: Thu, 19 Jan 2017 17:50:54 -0600 Subject: [PATCH 8/8] asdf --- OVERSTORY.iws | 205 +++++++----------- .../main/com/mygdx/overstory/Enemy.class | Bin 2821 -> 2821 bytes .../com/mygdx/overstory/OverstoryMain.class | Bin 4899 -> 4899 bytes .../main/com/mygdx/overstory/Player$1.class | Bin 1976 -> 1449 bytes .../main/com/mygdx/overstory/Player.class | Bin 766 -> 766 bytes core/src/com/mygdx/overstory/Enemy.java | 10 +- .../com/mygdx/overstory/OverstoryMain.java | 3 - core/src/com/mygdx/overstory/Player.java | 8 +- 8 files changed, 83 insertions(+), 143 deletions(-) diff --git a/OVERSTORY.iws b/OVERSTORY.iws index 3ddb3b0..f850469 100644 --- a/OVERSTORY.iws +++ b/OVERSTORY.iws @@ -2,16 +2,14 @@ - - - + + - - + @@ -43,24 +41,19 @@ - + - + - - - - - - - - + + + @@ -68,8 +61,8 @@ - - + + @@ -77,11 +70,11 @@ - + - - + + @@ -89,26 +82,24 @@ - - + + - - - - - - - + + + - - + + - - - + + + + + @@ -126,11 +117,11 @@ @@ -155,7 +146,9 @@ + + @@ -288,10 +281,11 @@ - - + + + @@ -576,26 +570,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -608,12 +582,7 @@ - - - - - - + @@ -643,8 +612,6 @@ - - @@ -669,12 +636,7 @@ - - - - - - + @@ -704,8 +666,6 @@ - - @@ -730,12 +690,7 @@ - - - - - - + @@ -765,8 +720,6 @@ - - @@ -791,12 +744,7 @@ - - - - - - + @@ -826,8 +774,6 @@ - - @@ -880,12 +826,7 @@ - - - - - - + @@ -919,12 +860,7 @@ - - - - - - + @@ -1004,70 +940,77 @@ - - + - - + + - + - - - - - - - + + - + - - + + - + - - + + - - - - + - + - - + + - + - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/build/classes/main/com/mygdx/overstory/Enemy.class b/core/build/classes/main/com/mygdx/overstory/Enemy.class index 0f4d86fb877435c7dfc005eaf9993445404cb1ba..4c793eae2900d50042d35e38568143b1013f914a 100644 GIT binary patch delta 12 TcmZn_YZaR?n^9-uoJ=kN97P0A delta 12 TcmZn_YZaR?n{mR%IhkAl9ytWF diff --git a/core/build/classes/main/com/mygdx/overstory/OverstoryMain.class b/core/build/classes/main/com/mygdx/overstory/OverstoryMain.class index e9340c858e41be0fbcbfe23a529a13d07bae7853..0a2039cbc229c09a4958921f884aae0274c6e454 100644 GIT binary patch delta 238 zcmWlTOG`ol5QV=H1f{F@dI>Dd+}I6^$S5n&B)M3S1QLXcNDGWY5F&^+J$43dXBo6{ z(X!VssD*9&M>R1p9L}7_41;0t`sv8{$Cne6Qic>+=9y-h92N4kncr`KHJZOZuBQPLvp9l}Xmjx32wUGhV@Ag9)lSN|vRj5w|R%R^2eVWgXi(a4)5y zn_f;cUS67pLfN;S)<^F>d%zTj*3qU;haHaCqif6w1J1OUdWiRF04qeb;}}t;_u4!f0BD+zl+VSDI?td0fU7w_W%F@ delta 238 zcmWlTJxfAy7{z~&AShkE*SlDxX%V;glr+e0q+taaMbuzRmNgVc;Nl{fn?dU{3M~$e zy?ufja_t+{KMowu@H>Yy@CM%NrzP=^FDoRg6U0cfz$7`Q*kFblvs^PzlSLj_;)!LR z$@0buLqq+L*WXAzvc?Dn##kqXuXoX-a1o0VqipGS)R%1y*uL!Qrd@nPAAIKBbb9YWXH!Cfz Xx>afGi+dp5|0TO)I%0Hh$N=3x#HTTG diff --git a/core/build/classes/main/com/mygdx/overstory/Player$1.class b/core/build/classes/main/com/mygdx/overstory/Player$1.class index 3ff90e157846d57b32ef5666bc3816a3630e6cbe..e64b4db74eeeb131847c3e5dba14c965aa137413 100644 GIT binary patch delta 638 zcmZ{iO=}ZD9L9gM+0B~G#HO)otyQDemu|OeQ?+TdsR$zC%gK}AK{OWy1#jvhc=BA= zOD}pXf(WHAh8`3=6{(-VParw@1;l4Ip(i^qGyiAiH~*P=W;z2Oi#LD#-S`UBm@iP` zM8s}RMx5ewf#Zz(S2rP26#LCvTR$TvNSvGuw8oW9|GS8gGa+Xe?r)@?HAr{jij~naid# za)6OuF7uRtoaVY6a`7r=760A)w2`m1gLU$YEV;pAC8&fQcCAxzQs@xTgEjmm-t^{e z2EXi!o#1ob6pNHnmOC$kdk{!?*2hgPm*L@ XbXC&hsP+S2JC3nmQKTg$^(y}WUs+wv literal 1976 zcmb7FL37(g6#h20qu5bfN2CQx(xx;}J8`Ncg%U_{NK(7F*rC)W(B2eTbwp*!BP*fi z#&F=yaNz>S9$*+?+E6%@8BPpS{s7EyXYwByzLnfinm8HkdD45k-+TM^y>C~){{7>9 z0JFH3#1Lju&@h|CIlPd9ju!`Teh@EVE`^uzN|Gb<@ugn?Id>tRFF*J#g;$Z6=0bu| z_!GJK&qOGAO~Il-f3R-1$EO8G%BI)Uo1I4emhNp@emn5|j(){4I+j0A+y&dUgS^1W z%znV^sz7|%t6Ks`%C>8*Y&6#_zh zyxd5_l1>7-1AQJ@LO|T26e%46rRCXCqM{^_yy1JzFuuT<1A|71Fvd-*bJ2U>6`1~C zn=NIpN6u#0k3-eKFmG0jR=4n}s<+{rR?(KN8H^fz_B~_MVCxF5>3D71ZB(pa-K#5D zQgIZ^DxScw)GjJ0s3_u+ir2x7DTS3<;c9`ymsPxhvVw|=6}+k93f@w26;%Z_6>noz z#XESHZ0k+7@fm?BIlW(#!h)CWcEC=P1;=}b6Ij@zY7O6Lt=nc>Z;&9>mTw0Z$x$qp zWdU@@a2t9x@L7P62(gT$!|<-8F4fuUn9*uIBhR(XNY3V)jHH_mq#6#_QoI!%f46@Ps!lf-y+xMWz z_3vQd)6ene$d?@Zog)24DIZbBDBnNrCaf?2t@gZjL3C`mSeki{t;wOF*AF%y@U;%#-Et@vDdrPz-lzWMtHPJ`as diff --git a/core/build/classes/main/com/mygdx/overstory/Player.class b/core/build/classes/main/com/mygdx/overstory/Player.class index da6c7e7b01565836300e7264ddb27db997abab1e..7cf5f1bd6374a29c00e92d447f5661018a79c324 100644 GIT binary patch delta 13 Ucmeyz`j2(PR3=83$