From 0f471f891942eda5aaf3cb21f1649d4578aec8d5 Mon Sep 17 00:00:00 2001 From: Davy Ling Date: Sun, 22 May 2022 20:21:33 -0400 Subject: [PATCH] Version Alpha v0.2.2 --- out/production/Threnody/core/Constants.class | Bin 586 -> 586 bytes .../Threnody/entities/units/Unit.class | Bin 2982 -> 3090 bytes .../entities/units/player/Player.class | Bin 7877 -> 8291 bytes .../Threnody/gamestates/BattleState.class | Bin 6034 -> 5932 bytes out/production/Threnody/gamestates/Game.class | Bin 10399 -> 11250 bytes .../Threnody/gamestates/LoadingScreen.class | Bin 5877 -> 5874 bytes src/combat/artes/elemental/AquaLimit.java | 7 +++---- src/combat/artes/elemental/DualTheSol.java | 7 +++---- src/combat/artes/elemental/RendingGale.java | 6 +++--- src/combat/artes/martial/DragonFang.java | 4 ++-- src/combat/artes/martial/ImpactCross.java | 4 ++-- src/combat/artes/mystic/Expiation.java | 4 ++-- .../artes/mystic/InnumerableWounds.java | 4 ++-- src/combat/artes/mystic/TrillionDrive.java | 4 ++-- src/core/Constants.java | 2 +- src/entities/units/player/Player.java | 2 -- src/gamestates/BattleState.java | 2 +- 17 files changed, 21 insertions(+), 25 deletions(-) diff --git a/out/production/Threnody/core/Constants.class b/out/production/Threnody/core/Constants.class index 7cff38c1ea73748a57887f1942a6b0c20e4d3946..02a0384c39f10dcbe4925556d8e498b62c52d90c 100644 GIT binary patch delta 12 TcmX@ba*Aa_FQd`MzCDZpAo>L9 delta 12 TcmX@ba*Aa_FQdW6zCDZpAn*j| diff --git a/out/production/Threnody/entities/units/Unit.class b/out/production/Threnody/entities/units/Unit.class index 0fdec1d17b8dd5e65d4ef8fff636b08e965022b3..b438069447b0f81e276a26e2f39c10a953ad1d14 100644 GIT binary patch delta 252 zcmZ1`K1qV>)W2Q(7#J9A8QL~-onmE{)$o~Y$RfdRtr^D1z?eMw66n^vMgj zL^oe%(_+>vW2gcOWCAr=F)#rk0|T3u_Ev_(jX)L?Ll%e+lxJXYpWMJL&RorqGTD<$ zZn7Ac2&)$Z7lZfY1}<^VTCf^MhPuiATso|NKyiN*@p_0O=jd4Wo!aDY_blwpm-Ek)yE% delta 196 zcmbOvu}qxn)W2Q(7#J9A8Co`SonoE*gY_vR&*pn<&diKeljYgPCO2@2v3fFaF?dZ5 zU>E1CW?*Ar1i~7y+(n?AFHp`8MXq)-54W0RAVW6LSRSBS1_oA!9EMyV&B##4P(Rt5 uTTwg|NtOvN+c3GATTMI?Ne-d2aqBwytBban2z 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 literal 7877 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 diff --git a/out/production/Threnody/gamestates/BattleState.class b/out/production/Threnody/gamestates/BattleState.class index 594701341eaeeec2e178c0b085ace94e9d4d9133..867285ab1e1ede6ab6a6f82156a120dc4572f034 100644 GIT binary patch delta 2631 zcmah~33yc175?wMnRzpBZjwn@LXaV$G$AGvMj#3jmI@LKWeaF*K&j(o2%}*potX%x z$W)D5m)h#>Moq2QB^2obfr%1ofhx7GZLQiJTdSq5LidHH#{a$v)9}%Le(!tlo_p`P z=bU@~|D1P!XwP)(>9-F)4q(1GZ?CmeG>s83qgy+dhGTIrdfppd6=&% z9OFtCO1uw6w9?s;Oj$6oNMbQARm&Y!zD6uHahXIDmZ_T@(>#q>F0leD)gDKMSgoFO zOb~0-8;&WSW?U|D1zJ>*F?-AhBwDpaGa8R>jzv=@)~i;dyks4&)^1z$r9LQe4Z`X! zqskXSn~A8NZ&ZWEHRCr)#BiN}I~h%Nb)v;!%Zf(OJwj7Rp@H;%)%`ax1vW~<(lBW zUE&UWRCT+0+;>UbjeC^SJ;Qyk#K-Xo)!+`6-Y=oFb!RHp9o6~yl*Fg;8MWPAF>e)i zNPLdK!Iz4rS0_@jbS%LHH=|eL^Kk3+bU2w_6i%l*csPPDNVxEjKwb5HJIAS0?y~X- z9+vo`*0qv4__g|gg$jIG;w$J=)65y-tE$zU8hk{c;JWY);ZS%>I@Fkmr#<)@JuC`u zil-u*lCh0Ewj1Bj9=@q|nUg%buuo6=)wAXV&o&&8$YMafY1YhnOrSK8Y!AhwTiU`~ z;-OSWEOLElaiSxUwD2ef^|3>Qpt`B4>HHQ8+wi!=w{cjl^o0Btj^aBeo{)GF#{|mN zk)m?t_s;Yj#ZwyK@2SZ~#d~uHkK!4LXR(X~jHQ-r?TjU(Z90k1OT2*Zs}r8ds>l11 z_*wrttH{xRo17vFVF@7|rZ9-0aH{$@1Tfj&BT?;H8-1w1t%3rniB_1k) zliw-)mQ(pXtjwu+nJeR|1&qTh_%TN<>7WIELfOgjr+j~oUuaug*~&G8W0kt3IFK>= zQO&n@FIODUUM9lLZ#4>VKJC=-Vzu-cL?s)G_EwQQo%dFSU*b4D&>~*NuV`ho-+B0T z&aXI5zuNMteVA^A`!PM3#mtQRAsnmOkMoL+6UD=GvY5LM3$nOmuCvVf7?ud^KtN0H z7dVVnb6sVw!)UJa`LbBsH+*~_u6!5Wb++zR)UBbH4Ry6yTzdfReXz8LEHa5Yy`Dw- zAhrP7@Q1n3{s;rLfzz4o;2Y#i1x)l?%$WYv23=X)+y_sPc5ddO%9`4`gSZW>n>+34 zepp$2?8?1NKo@S|&h;bXW~NZ5dIK`094>%|zWnUR0o0=b7ow3pxe2q;jyXu;VjgRt zfdw=%j}2%(?!iJlNJ<{UA{=1@K88#243^+|EX9jh&YU;nB-Yq?UB&`xU=w`}zhRxW zQ+nN&?%?e84Bj9t1SJpWsXUygM&Q)Dzr_j0{5xt+f_Dg&CK^v;>JZGFu*yWIJ5=mE z3;HMV`yBMViY6i;{>w7A&6t*q9b!#xHy?w@#~|`C2>gMhHqP?!<{46pdZti&==G9V z#)5#&qWd03C51p1pCow9-|#E8I*CN}GBRpJ-QTPAsnR$6TFoFL ztvt%z0X%pB8*-f4Nj80H5W89jvAeZokKrFXfUi3Tus4hSxvfWA{cZXgz`-oOrEi}D z{vuWv*g~8ctS9hSv!FMSV(T%JKeh$97ArYkjwqjvq+dHh--HK{u(MT9;M~-H%g#qV z3o5EJ5Hl^h%NFoy=F$&>Peu}euw^bj2!MJ`853ky1^W&3u>-? zw=RpPcRk=jmQ7HUkj2Opt{!zquF+og3**lQH6%GIZ delta 2850 zcmai03wTsV75*pp?%v(Imt?acN%Pnw$QMYHEZY_I$Rb7Ouqt zd27}*&mz3Tz+wwaaGiWOYr1O@mRWcwmdjIF75WN+Jh{)4rx{o&^Ry|hMy#^18f)Zy zZBE`=3+t3wBODF)M8bUrZj^hpa$gf#6qYs0b(@8oaI+lIrg_@2-oPztzCoVVHWa+u z!bWu1fcyHpI7V!;rQC#{%D7f z(TZ8V=%;c*<3J6*vk z2967OZ4CYKNOy2;DB986V`3B})Yk>d<*QbCjha7U;T!lS-9^LO;|xWvcsUll9g+n+EVUS|NCGVVcvcM!u zMUGQgrkEtM4UuCBugD$Rn5_$uC)?eHzUCZ<$T#5;1s2Bfnpa#Q_vOshO9U$Ax$Huj z<2B?fId0uAP?laOO1Rtvg%PxZu1q4;EG|C)aXf+bH!*IfqNL0N2rm7jMoGz zF$vRXcsj3GWxK6NnaQ{{mbx>68-gO_-GB7oWWZ3=*RmH?d8Ix~nWGc<&%+9Yb7 z58!z9QIzCrXLB#iO=8v{_**|uFVY{!LXp6J_?5U+-~<}xIf@)7&=~M|lDK~0!i$5r zVS@4-={DKA&D5=?o7O;067L#DXaJ^ikwhe*mXnAc!+QZ`x1S54!^FueBSGvyH@~;> z+s3cB){(@{0k~>;dM9-&t7`(ssE8y!U{8<2Ok!`#5gzTwF1D_4dhBH2RAif(DUcT~ z)WVAy3~Uhfd_tC?4h^^(otTLjX7SYQ1Pxq66LYW^b8#1Gct2H-^PPAC3vd#P@D!FZ zD=Qe~MmsypS(f!|@n`TmQmT{E%eJ(avzKv}Iba4dxjU1|-I;Xm)b8)`2SR;?nu$`l z$5Clu(RoZAhmjIi8`$g&8u}%Peg=O`C7O3o`~$@Q$>g;8vD!vho!ZP`5E%?2gF)a= zq_T#@L@NFHBA3Mh#?Cg%@mX zvWD74q)%Ggd!JIbHC|#hw72mjcSjQV%rIJ06uFn&xqlP~+eYzVo9`jbJ9z|O)JJeQ zi7%(N2HU(H>Td)`lNcGrD2wWAtF+mAzV7Wfh^rJmMlseF&~iPGC2@kIaYt&@$@&u` zIGMzgExUCBeNF{WOW1^2hFnh8GHy*IOfy?R3#rpYs>H)9pYCafpXZXs7UkSihF z%V+!$S02SCHmopPL|29%PM-dY9p71OB`N745>81fai=r6Vf-%^_vv(U4v~m|#kn*= zis2mR8+jfz}!{7M;cM->lpew9ARRm>o-Xwry|1-2Y^({g;yJ6$0leX&hf= zIn%COSWsZM@sy?8Y)h7H)secTH%q-qN|)z%Fas(Fe$}d;3e+kdKO0Em`}<*$KPJT| z*;`Z$GhLdU!@>U!EiC5?(J%q3KOM$a+RG%;Z`ZfN>c{K2kWM5KmqJr_MV1gkZTl#3 ZS-6FVJ3cX46pA9Q^R*JiqEwWj=zlFlQKbL? diff --git a/out/production/Threnody/gamestates/Game.class b/out/production/Threnody/gamestates/Game.class index b87fa6c25702cf48db4ede0a53c1fbaf9a05109a..fe665cba5245544244226fa83a011f279dd3b71e 100644 GIT binary patch delta 4922 zcmb_fd3;pW75=`P$-J4#%{GZ7AqxQsWHE%Lf(CH`0z@JpTZ}^MkUT>mBFz>d+yop z`OZ1_=FW?c)&?H?q-P(1DeB?}0Hw(x?fHC0L2jXf6jYV5;)=i0PeCgCBC#dw$q z7T2r@tqxUmM4Fl_E(*0xE?Mk{!Xp~Lf|p2YvDZ|!M4BQ^cDsc~or1uylmHImH%9z1 zBEQ%o_Cfek4y03Pfla{ zaQ{nq*}|VS{^IOO9uWv26R#S@uQ}gJAE)q!b0EFQcMyNoIE2GaZBm7A65iJM8{Tn_ zq>s1oo?-sGQxcq`@V>JySRBMZ2sL(m03YI?7XGF2Z>K9bPUAQ}vhcCS34G$L@l8r4 zNQ+7{fgTgpwydGfbG{NyFD;8cO+N#U_Mhh$My;956lbBoY@%$ZiA|;x-s0-&>XO9* z4Kp+|nL;GD+mWfE`jw60){d5j02(<&GfN=s_LsFt)HqZ#mw5taqaC?~NGL9u;n}|) z2;ew}X%?c2NRhn-^!e}49i8HO6>Q1dAY zU=z$lB!L(sx)VCrlWO9^f;?EFXU`7 z)gB2&+KKF%w&u_}JKPY8gevB_(*Wl}^Kcn4Gi?aq7j#x=u4JYL%-s*SN+aO{?rcwNTb+UWr;sn3eXr>Xx<+ zL0$2ynqM=-r239nP%x578!r~^)8+fC0IC+eBv*x$>Z6_~fRFcE*TD)2Fd;Gq0 zQOcC0Exgs@ZJM|94(H~S(Y`IbQ}Zs~?L3k)!V=aW6PeNnGgAZn5u*VlbF1dhc#o5o zS|MG-$6sjP%U?R7)M2x>8Qu3wF%Gn~1-1krnVp(l<|v8v&2}j4W4AC#Z?jFl6gGxd z*?#WePK&!VdvKX^B$yku1o4@nCbxL^Xzt}c!fF(Pz%J-Y<}Eft4{APS5YQ6Zu-#I> z&XtioIH386k?|RsnUV`W9+b0Owzz8k)VT|)mKH7)$O^-@G!7H@Uu*uxbk!tT&ueXO znjL9sb!|Vc`CAt|msRp(S?gM3_zBG?5fx9`n#1je@CVJO48gKn>{ZgUjn-#0|Hx;Z zF&SmaJ}xtq7c~FG7oBS|CU{=f{Bzgtj14L!P_?$+ZZj6!EgtJyFl4z>N;`YAUr$xT z18Rgi-BKg9DpI4mw&f(SOck5j8wC5@Wh*2lje>s@+{pk(ESU z<`uGco*dD{)7`p2N|S|5!&72;y5xwe(rO0p5Q(Pti$dX*c0-z)<)r5o@Iq&7o|Lq+ zG_TY%mnd*9&ns~5$r}}w3X=Be=U@1W8F90_1`^?wtKwCmDZVCOxfKVkiK`LqU%w9G z>!++0hGT?C5$EDOqXX-3r8~++>5kXqn`U(8q6iggFVCU>Xz7_S^q3Js=@2v$Bc*uF8AnR;% zf>LYp-85b9#?bI(;UEO)N4mm*YPy6C79xMmDG zU!ebd0bD9DlK&D;kBtA8-*J8v4>Eh>I%qrB4RfNUyWy+r#C^MwT(<*X>BRQ_*^a*1 zPW0@+gWceN!Fxb>57r5cYj)t*-FRGP>*e=&3{Tc};_2WEF}x@&8=MbDX4D8x=9zV6 zF-$DofmgaQ%<#M(=b2eo8kc-i_TSopce`r1IVL)}>=>Iu50ycL!5r49ZDXl*f3Q zjP>rRn3KW$6+2mw*nI7>IAwTp%N3jA(~&o3a`eibEJ<9xu`y0ML$A28@unCnWVx|C zPRr@zj&Z!qHb=|kyC%jn>3$(*RM3S;Ydd6xgk1MeX>#+e>VT<&cyJfZu*GS*^2HwK8_yim2!FANQ zo|*Wjpt^}8vDrn?EiD#B`ynjqhp;FPp@E6L(hd@o=_!feM;v(yuIrVG)za3kbjmKS>{9k0?O ze2np?UHlGFnV6Hfi?>kDd7hd5fOrtemEIh0j6bZja;(11EHg8k{86PZ#~0&Iw)Vc6 zWzOV*~FBT=GNZl zPnCUOYww)~LywE$9AwD+yYS%_Y0kGI4R=J5g}X3Ppew@ha)|`~1|+Hk4OtUB{O=m)kfqW6VtAbN?K%ayXj|=Go6gZ zxLc~KllxTOM&+hWxeMvi|89ll*$R(f+LW6XybCEN z*z(&PyKxIm~ z#Lv1?yfBZ7V6N1k;F_1;!{^+t^J$y!3g3HjrXvIW5>h@<^O`aW)MVifQ59;8k`Sn~)cA=qRJx0E-0!*W_k5Re Xs+y)|y6b8+TT}&vw?@rT^N{l&1m1u8 delta 4198 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 for(int i = 0; i < 20; i++) { arteDeck.add(new SonicSlash(character)); @@ -97,7 +96,6 @@ public void update(StateBasedGame sbg, Unit u, Game g) throws SlickException { this.position.updatePosition(dx,dy); this.dx = 0; this.dy = 0; - this.stats.level=this.character.getLevel(); if(getHitBox().intersects(u.getHitBox()) && Game.time >= Game.battleCooldown) { sbg.enterState(Main.BATTLE_ID); } diff --git a/src/gamestates/BattleState.java b/src/gamestates/BattleState.java index 38ae879..df70eda 100644 --- a/src/gamestates/BattleState.java +++ b/src/gamestates/BattleState.java @@ -103,7 +103,7 @@ public void enter(GameContainer gc, StateBasedGame sbg) throws SlickException { gc.getGraphics().setFont(new TrueTypeFont(new java.awt.Font("Bahnschrift", java.awt.Font.PLAIN, 20), true)); gc.getGraphics().setBackground(new Color(100, 100, 100)); - //Random temp = new Random(); + //var temp = new Random(); /*for (var i = 0; i < 100; i++) { damageNumbers.add(new DamageNumber(temp.nextInt(0, 3000), temp.nextInt(0, 1920), temp.nextInt(0, 1080)));