From 0abfc905e604bcecff338f9fdbf3e304ee8afb87 Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Sat, 14 Feb 2015 17:48:55 -0500 Subject: [PATCH] fix of git(hopefully) --- millennium-legacy/.classpath | 10 +++ millennium-legacy/.project | 21 +++++ .../.settings/org.eclipse.jdt.core.prefs | 21 +++++ millennium-legacy/README.md | 1 + millennium-legacy/bin/map.txt | 16 ++++ .../bin/milleniumlegacy/Algorithm.class | Bin 0 -> 1487 bytes .../bin/milleniumlegacy/GUI.class | Bin 0 -> 922 bytes .../bin/milleniumlegacy/ImageLoader.class | Bin 0 -> 1033 bytes .../bin/milleniumlegacy/Item.class | Bin 0 -> 877 bytes .../bin/milleniumlegacy/KeyManager.class | Bin 0 -> 997 bytes .../bin/milleniumlegacy/MainGame.class | Bin 0 -> 3145 bytes .../bin/milleniumlegacy/Map.class | Bin 0 -> 1373 bytes .../bin/milleniumlegacy/MapLoader.class | Bin 0 -> 2649 bytes .../bin/milleniumlegacy/OptionsPane.class | Bin 0 -> 290 bytes .../bin/milleniumlegacy/Tile.class | Bin 0 -> 936 bytes .../bin/milleniumlegacy/player.class | Bin 0 -> 897 bytes .../resources/sprites/player.png | Bin 0 -> 440 bytes .../resources/textures/grass.png | Bin 0 -> 179 bytes millennium-legacy/src/map.txt | 16 ++++ .../src/milleniumlegacy/Algorithm.java | 35 ++++++++ .../src/milleniumlegacy/GUI.java | 52 +++++++++++ .../src/milleniumlegacy/ImageLoader.java | 21 +++++ .../src/milleniumlegacy/Item.java | 16 ++++ .../src/milleniumlegacy/KeyManager.java | 58 +++++++++++++ .../src/milleniumlegacy/MainGame.java | 82 ++++++++++++++++++ .../src/milleniumlegacy/Map.java | 26 ++++++ .../src/milleniumlegacy/MapLoader.java | 64 ++++++++++++++ .../src/milleniumlegacy/OptionsPane.java | 5 ++ .../src/milleniumlegacy/Tile.java | 31 +++++++ .../src/milleniumlegacy/player.java | 20 +++++ 30 files changed, 495 insertions(+) create mode 100644 millennium-legacy/.classpath create mode 100644 millennium-legacy/.project create mode 100644 millennium-legacy/.settings/org.eclipse.jdt.core.prefs create mode 100644 millennium-legacy/README.md create mode 100644 millennium-legacy/bin/map.txt create mode 100644 millennium-legacy/bin/milleniumlegacy/Algorithm.class create mode 100644 millennium-legacy/bin/milleniumlegacy/GUI.class create mode 100644 millennium-legacy/bin/milleniumlegacy/ImageLoader.class create mode 100644 millennium-legacy/bin/milleniumlegacy/Item.class create mode 100644 millennium-legacy/bin/milleniumlegacy/KeyManager.class create mode 100644 millennium-legacy/bin/milleniumlegacy/MainGame.class create mode 100644 millennium-legacy/bin/milleniumlegacy/Map.class create mode 100644 millennium-legacy/bin/milleniumlegacy/MapLoader.class create mode 100644 millennium-legacy/bin/milleniumlegacy/OptionsPane.class create mode 100644 millennium-legacy/bin/milleniumlegacy/Tile.class create mode 100644 millennium-legacy/bin/milleniumlegacy/player.class create mode 100644 millennium-legacy/resources/sprites/player.png create mode 100644 millennium-legacy/resources/textures/grass.png create mode 100644 millennium-legacy/src/map.txt create mode 100644 millennium-legacy/src/milleniumlegacy/Algorithm.java create mode 100644 millennium-legacy/src/milleniumlegacy/GUI.java create mode 100644 millennium-legacy/src/milleniumlegacy/ImageLoader.java create mode 100644 millennium-legacy/src/milleniumlegacy/Item.java create mode 100644 millennium-legacy/src/milleniumlegacy/KeyManager.java create mode 100644 millennium-legacy/src/milleniumlegacy/MainGame.java create mode 100644 millennium-legacy/src/milleniumlegacy/Map.java create mode 100644 millennium-legacy/src/milleniumlegacy/MapLoader.java create mode 100644 millennium-legacy/src/milleniumlegacy/OptionsPane.java create mode 100644 millennium-legacy/src/milleniumlegacy/Tile.java create mode 100644 millennium-legacy/src/milleniumlegacy/player.java diff --git a/millennium-legacy/.classpath b/millennium-legacy/.classpath new file mode 100644 index 0000000..6c614bc --- /dev/null +++ b/millennium-legacy/.classpath @@ -0,0 +1,10 @@ + + + +<<<<<<< HEAD + +======= + +>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef + + diff --git a/millennium-legacy/.project b/millennium-legacy/.project new file mode 100644 index 0000000..b29e032 --- /dev/null +++ b/millennium-legacy/.project @@ -0,0 +1,21 @@ + + +<<<<<<< HEAD + EYS +======= + Millenium Legacy +>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/millennium-legacy/.settings/org.eclipse.jdt.core.prefs b/millennium-legacy/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..acfe6af --- /dev/null +++ b/millennium-legacy/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,21 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +<<<<<<< HEAD +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +======= +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +<<<<<<< HEAD +org.eclipse.jdt.core.compiler.source=1.8 +======= +org.eclipse.jdt.core.compiler.source=1.7 +>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef diff --git a/millennium-legacy/README.md b/millennium-legacy/README.md new file mode 100644 index 0000000..45b983b --- /dev/null +++ b/millennium-legacy/README.md @@ -0,0 +1 @@ +hi diff --git a/millennium-legacy/bin/map.txt b/millennium-legacy/bin/map.txt new file mode 100644 index 0000000..ec336db --- /dev/null +++ b/millennium-legacy/bin/map.txt @@ -0,0 +1,16 @@ +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww diff --git a/millennium-legacy/bin/milleniumlegacy/Algorithm.class b/millennium-legacy/bin/milleniumlegacy/Algorithm.class new file mode 100644 index 0000000000000000000000000000000000000000..05cac0e424d9aec7090aaa750df0214ede7d7b15 GIT binary patch literal 1487 zcmZ`&+m91f82_Dirqh|u-nWb6B61VkE^cAaqAkMKMYPbpKnaPEn4B$#?y%DqhbhUv z_<|3<=z|X`zL}61-@HXx6Nn@}`4{;F{$^U-E|;b~=ez#C@B8&T|2+Eh0f1w;U?3sj zv_0Qf9k18+RZBKEi&ekX4ZLu@Z9o$kzby}})eHqvC%ldqo)k#t@|Og( z#qL#QAqmrlj+DSy-Rr33UVBXi7v-9-1SadD;OQ480-n*y`-7dB84NC)bs zl0kD_U^=77=F`j_i*o%GSsHI5R zq1;gGeI6^rU;~qZ0|HZ5hGGX}Mnzt;aR{%I{tdO+h(ITv5E7T9iM`}8XP~g77dmVl z#v7a^>{f$7ZVF^``Qa*q@)n9XYT(F@f4$#<4Hw5)TYb`#KAFruZ=lN--okMMC4tdx zK9^*;ZsTpd!}LIQu6En;=A2F~e8e^6hyU`8hVr>vN4G_nA_pDxyMvQKx7<7~8B->o z<*V-_hQ2J@iZSs`J$Z4J8c)i?i*x%GtEHk7pFiMMh=CvAh*T`!ll+6w9 zPQ1hhP6=3zZZBx6GhVdmqyN92`G^7R<8;Y*$^<1o51t0~B5%Q4FZ_Y@&lD1{ct&nO zLx!i_58ypQ&BQ3iXkl_9!H7}X{{98y+C9u{VRr(5VgEVm`jB3yzJ-GVTgVA46_W1q zT+%IT1`A!`mHlr6_H+;YaT(r(#yGLHT`=D)*;V>>BI zcaWzolKQsDdk5KPP)0s8Mb3xM0^ce)-#F5I zIwt06b;-nWGH`+%R5|k*a&V3j=lSfLn1qKZbeVS>S$u;T{7B!gn8khU#zX9hdHj|+ z$8ir?XNi)e83PjOLYdV?7b5@qDUHuVT>VFm9BW!?KFh{k~bW| zkga-6?$o(2m3`*a!nO<;^3@Tkw~4mHrOQw--&W5h)Iwjnt?g1hjttQ%;FBF3lh1y# z>+_CCAV->?{wZdzI;ciR8hNFzK>5s3eCoxdfhkNgOa>x+Bo27j3CoTbh`l4>^H6%E zMl&la_a&kkp?Yym#|)B+Yu3OV<{8F`tL(XhJN;T=kmQ^_yZ>s>MjqnysoSQqdKcI#G6b5QqTtp!K5t1S0fDYei?AESqjdcWk+j z#Mc3=)2U!U#|1i#;RCual9j|bQshy=Ux+e7_vR_m``K)tBwAxV6s=Rt?DuiGhbvaJ zhpSc(OI9Yjm5F@lp=4=2tbD`G*XQY$h!#Yz56DxP#sp@O#{vpiK@sbi#2s2DC8sb< cN%kgLI^lP*MS>!@M|K3;*ctd4t44Qz(RjQ{`u literal 0 HcmV?d00001 diff --git a/millennium-legacy/bin/milleniumlegacy/ImageLoader.class b/millennium-legacy/bin/milleniumlegacy/ImageLoader.class new file mode 100644 index 0000000000000000000000000000000000000000..f848d1d0a55e7bebfde7f5d093a2ab563c0ca968 GIT binary patch literal 1033 zcmah|T~8B16g^W4Tk2wKu^=K)zuSVWBKVOS6D625X~9_2_h}i*;C8p!ZWVrj{|9|Q zncwVx~}TT_K{QV%8sh} za#sZwk^p-%PE3?Hmaefk~HQB2@xw#o9hq+PuA(;FfXbsx@2e`vleDp!H6Y#vT+4-Ok(~U z)%OQMTfOL$U&*dO>EEKX?^M0sAdEvvFpmWb*97v0;4l_!f{gI$j*Ueu(NN;<3TzB< z{{Z<0INeAF8g6Te!`x`2#jFAKOOo*R=7s!W8bZ%&j2sgM#s$1{Wf6 zX_T;Rq0HCFo3nW~R&YKQ24Bl_PwX3K88n7Xe`MQq>M6gM-hKF1;l(dcw Tem!C&MQ&R}7I@540#AMcQ4aXp literal 0 HcmV?d00001 diff --git a/millennium-legacy/bin/milleniumlegacy/Item.class b/millennium-legacy/bin/milleniumlegacy/Item.class new file mode 100644 index 0000000000000000000000000000000000000000..d04d6d78be096cd14975db05872e77c7f43ed045 GIT binary patch literal 877 zcmZuv+iuf95Ivil9oK0ZQv&7Qa!Uf#v;|5?)E5vUC~Y4Mts5^`>aU#c#)W6{u zfQNDsd;lMXm~~Pm1uR*sJ!fa;%$)i4``b?d8+c|Q!LZnqN(o;^JtexlbL=)k(KC=@ zSUBP%?ketg-QD()=!6VuN#u|r-;B8^l*--agBnBDlU<*OQ6LyL&$9LLHBQvoULx-0xmKbBd#K``<|g#YLsULor*MY>C6k-Qf& z2u<9e{@?m?B!VGVb6CMG12-9RQ^_RP#%HlSd{>RDIn< zh1}TZp$JUeCuGCKsvei($0i=qB)7$Z6x5-Kb%sQ>s!fx=*ok^=5xn7TMMgQzeut|) z9!PzUK?_ObDN%SR$>(D8f7?MuSzbR1I^w0&X|j4{R&}#jCIgbRT?|Xw1v(A7C1A#X z78W6MgnS@Qe}nI^TPK+RjKU`rQeSW`^8-t*q;uJ8rJSo?EA3qOzG69ved5zo{;uZB zfAJaOjdA=v%|Fn*>$Nh@+9b(Gs+pkO2a2Q*q{kvX722fN$f1vUJc?iF4rs9^YF#=R c;pxf=9#2!~_JC9zVvir-2{s8MgX1*SKQPO_g#Z8m literal 0 HcmV?d00001 diff --git a/millennium-legacy/bin/milleniumlegacy/KeyManager.class b/millennium-legacy/bin/milleniumlegacy/KeyManager.class new file mode 100644 index 0000000000000000000000000000000000000000..922a2b67cb820ef24eb4a1e250a652f0c9eea918 GIT binary patch literal 997 zcmb7?-)<5?6vn@Sg>C6l5G$ov{~)$P(Qaef#H7Z=_%EiQMjA}K8(`dSyDVf`+VCLW z`wGTH6EA!KAIkX6LfWPcCSL5!erL~_^ZU;1?>|3(0oaCZA|_Dmxt^zdchvKgBRgYz zPmLSWmyQZd7y{Wtc`R*D`i}j!eW*I2i6pC{s5}X6b*%hQ7uDTisC*R&Bpn^CW=f_>Tclt8ZD??|sD16S*5&PU^>1!_1{UFKHmm%(0W!rf{sg{!z`Vo6|mMv{d*mU*P3LK@Q8k%!mwSiyA@MS;Ra zmWFiwSF)!ptm1}1Y%~xMA9cYk3%7O1==M*19k^qm90fe}Db#^A3+p%;xF(}u5^26$lLRaxL&d)YSGelp&&-Z-->H2^ zF8kpNOye60k!ViD%}6|*h*Bh;PsCl_EFLvmj}EiAF0x^k7n4H~OPpXH_fWtV)i!6Y zVe*rPQy8{pMuj+4eoMkgTb9P%_y=PAJR-#zBE=aZ#U;cN5zE9_i@=I(T1Jfk4~S?J i@!@|U)=m+3h_0t7E{^}vx#PsCV}bjTW5Kq%aPu$ONwZY| literal 0 HcmV?d00001 diff --git a/millennium-legacy/bin/milleniumlegacy/MainGame.class b/millennium-legacy/bin/milleniumlegacy/MainGame.class new file mode 100644 index 0000000000000000000000000000000000000000..863932bc2ce3a4618b2357f99803d5ec84681de7 GIT binary patch literal 3145 zcmaJ@`+HQy8Ga|(@~IJbN}F zUa=RgrS{%h(NSzD#eX*mbYtTGT1Xgg`nngiyXKM*sWSu3e*k91=h!x?mnC~(<<(oDdj~48fR>CUU>o=;uS|MZ85MvKQ*O1l?v=>SvQ>( zSa%KFh?*ZY9WKyl^;vU9U}X_1?_2i3py!$MaVzI@wkcty9n;Ty3})-~Z1!A(K5p46 zx|eH1S&~L#ipv6K#xtHWQ`)mUHx&=iDCN%4C}gWCU!cLW(iygfM+z+`&7M0ol~evH zS`Syg=1IaH%dz~u^uM=ng6m^$N`+C6O%gYu$G|NDYrllXFg9aT69gg>5-rQnFCdRO zzUA90wQa^pYlCeP1K3UyY*HU^DzKxsCY*%t(aC6EaYzf|dU?>>?2u?hTbKgdW#D#! z6-#{^HD@I5z?}liG(}7h3A&-T1id6L8gaKo2Ubvwam!I-`Rt_f#*3osh`UK@&ZP1v z!qQ;K&saHuHP@u8tZbbyO{sxFnk{v&Dw#0$6`327SdR8ET{$3e5ML2!HB%`XYUwCP z3$(jLmS#rHD#stFnU3nbwa!o@e$36zxDMwv+K5CPqXO+|ge>K{ zY!cN7hb8XA5rNJmsr1!SkWlY%-$WP*95XP^<96LcR0foo!2M*I&J20x+(FNr$yiA; zxw6)k@^G{X$MH1-6n1L`Hs;!{C-HTBgA`Blz_Tt?6%)+T?Qg;~@F2sktSf^`Od?5L z@E8QfR8I}B#q~NMg|vYwf>#j6UDuwre2EOKBB4WS%FNq-X@V5hMo}82GYZoZHdsAc z7<=BxLrJCfSN7VL7ktHJ@iv0i;VB%Z{# zh-CSSx^bz)iqnDNaA`c+jPKwn1K%w>ebubQ)A$|}=BQKjrNUEC#tu)Oq=!)h-{;KI zqoV7dKA=C4*nn=``=P{*=nmr<{8-{A_$dQFsvH(`UNkkCEay9_gVw(NT;dn_C5gzG zxv{_v7P|*DTfdTc9%osZQq*LrGVQE^3WkVNm07Vc1>=V&c`MDb_!qHWl=wAzxJ$~) z&A2&M(F9(Scv+8yav67y)q0YG?_LUa^|@mG5UkfLs#cYFI714%t|>jiO+kqzd^0)C zf>$Y3R&rYN_9ux|Sgm`1kyumgy&T+^w?h|)@%HF-bK2q{9WQ6^yuCP62rybM-s1Tp27(? z?QO-Rs^j-VwOK}#xvmM*h}mR`_Ocx)Sq#cPr8oB4Gj@CVo!xya`-HXpx;-bM69 zA{Wrtv88~mi?}s%2|E{Y*Lm94AVOq zV_W+0ttIrd~He^MMlFX`XRf*fJJ+rpyOkJH#11RNo?45}1x1LuB=-!bG) zWbq1q&omsNSpI-lx#u}ru1Ec6Xfu$wf?a4ZAlNln91NBYaw)VlOIdiXl!d_s{PB6T zM2<7U(1VM3b^(8`e5Zo%*Gu1L^!%9xyjl6?{F!RRn*$MVr?htPcff6w$1cWvCu7@< z?Tlv^rLd3x)l?3aBGbM%BDB1%t&Q&Sw3VD3WBgi1t0QnN!>O(Y@I8RQ=S;JP~e^9%i@xGG6LzPI6Mm?Fp)x9V5H`^y{FyQwimvT+kq!AR_nMj z*pQ*G?D*1vhCItfJN}-4H4LPJ7kaYMBSnELMY|SL>_&dztc0QL)%?APPT9KOY|E${ zvXV30Yw5lGFZ{qOSIRo3sOgZr1}2fu;3EOOC3oke*O6j<&BP~|;hhrjEvx~mSonGr z`t4@f-r8Et;s$Q&`1D+3>bI(4LG=~`t=3-RjgK5?F~imOA{r0MIf@#Aduq! zhzusEZ2usTqTF8Gq9H0#eU0*PC1tkD?R49b7xn~1^*{49vAR1llwruBRF1;s$9>}b zVDxqe!y#~ISg$YaqCmbLN%s{y5)YRSHuk=NQSWp^*IOe4qT%bj;=mRXF#jpusfp!D z<4NboVWKsM1Xmz;0%P+S=IVBsUjxrzJxxW#8adA!lV5N|}949O61d?b#DJn^&i;%rQPc!ov6aSz%=@ z2LyTjcB(`XKB+=yi z&!nMLsgOVhukba#p>+w{SVWn$$MF-EuuQrZex%njWw*KC!+lm=;Y6V+I)=lRDM}g%;d_J_R(-E_FN_T&wjFaJ^6b?}ae;V`faC`Y-CdAG-hm literal 0 HcmV?d00001 diff --git a/millennium-legacy/bin/milleniumlegacy/MapLoader.class b/millennium-legacy/bin/milleniumlegacy/MapLoader.class new file mode 100644 index 0000000000000000000000000000000000000000..d3266780de7afcd0fa80d4a866450fb447207475 GIT binary patch literal 2649 zcmZ`*TXR!Y6#jN{l6`szQrf08mU2^Q3x!I700~qmf)rAqv{2IGV_5^0 zsF0`;@HtjH)w<7)Gt+9+s!W#%_#fo+xI};{mtu}uiVp*Is8`6P0*i~tqSJ6QQOg8s zXHgxw;bALd4b37OutFhMGSzux!APu1^${N)#cGmj4h`LtS%LU)bH9NGH2TnlW&u6J zq!iNvHBHU;bEAB&^PvUnDbbjHp8Kd*r&@0H;W2FFe8i%h{-(}Scrlp7rZVvhj2mdf z79WDxDzG4%+B0fq9KIQ%saa{Uon9$Q1;W@Vv7_9@_*m9T_|T5Wxhs`Zu?u;V#Um6n z%OIAS2utjy-VT*c;T2+cWCI#SFqK=wTm@I5K2Yv(y|#uSCymF_xdnhhwVXWLh0Fo>W5i z`EWwDizgOOjj=5IaZ+NS1m1ag@41+j&f2M@4^KIr<-mKgX6$rt#*9%?Ep28;RfFBj z7JJ7NXLYc{iX@kJ2koxGj6mI-0_7!3yE~!!?xDF2s(Tb{n6R3%)nXwt9Tk#F5NT$( zO^oyD5TuKHN7if5}-HqPG0L7*EgM8O1^^Kgy2#58qBF3mu+#cR2Tr zL_)xbrEjiKX(q^}OI@ZVgwEs1 zg@|#(K!++e#ehJCa;DmsAdi(uXO&R>d~AtJ5|?K)ar&=!G?O}8xXF#4R4x;Su1}9e?4obpx@w&3kFAJ27FlHjLrtm7IH?{Sj3TF zR~s~E$DL_ZMyF8KHI3@%x+(ZW+BE8-0c{Eohdk40hz2}USbk^{MoYk($Ev>dd8~P3Xd}s}$7iGP61!kk><= zfG3ZrxXxo%;V1me{?{B@j-rMXEP{^3wAApX@S_n+uoeMqgcsXzrTEs33$U@BmR^kE6m!vu>O~w0RB%r>l3X*GhX*O7 zIX+huyAUZGX(>NbxIleH33z5YdzSXLGL80TKwKkmBuxAC){GfEBs!+_UX(Y>nP^S(V*tKHuHPKRrvg#tB~3xw1%L* zE|1s!`WGRoUIOwvMz6$4lB$|QRs8{y3#?b4Vbt z9{cew-!w+si}&z88EIr$eZV!ZBg97NGfczlaD7qYLm}9h|3DWDTvVZMmzbf%u7X*S N{SiZb%)l;u@*kewT0{T< literal 0 HcmV?d00001 diff --git a/millennium-legacy/bin/milleniumlegacy/OptionsPane.class b/millennium-legacy/bin/milleniumlegacy/OptionsPane.class new file mode 100644 index 0000000000000000000000000000000000000000..cab53bcdd1c5bcb04cdca8ff4a712ae5f36fc980 GIT binary patch literal 290 zcmaJ+u};HK3_PbvL(@VdR>Z(oIy4I#s0$KPL@R;1zXYqedU-)S6N=0@*`WkwNkt7(m0M064H%%H<>kVoh^zD zmo1@xCr;Wqp*Oi+5yJcWg%k8J7$HKRFwVvCV^Fx0_J{j%sbPUEe4E) zUb{nU1+CVRj2IpxCP+T_dS3K`pirw-mv~yne2vQN$e! zD*_YefoGX*+{LQED4V051+xF}595c__iWr(H0I0t+jW)lq0J$d8QbCn8+tw#JE^2{ z6m4d@5OPMxLNi;D+kF4pJ&YTZ-U|9*Q@-NZ1yXAIt4bx7*zE*=loS`6&mF4u+OqN5 zrg2GIJGPnFj>UF7_II>3m~jG=+_Q}GVZfxFD*oWg4=__)7+|irI6(d@?+q++&ygF* z&~u!e4#t=v%N&<^TO7vY3a;|ROj@VVNGUZmQd$$_T*9@O`4jyVbGi5(d8hpunU!z2 zev0KUNE4NaR`@jIIGu%Ef;oc4U5DQ(9w=!EEp1*GHO=%h6gEp)dCc==jp8okmCxms f@d%G8fy69kD6h=OB=bGttqCKWk7WxFl7D1u;X>lbV-Yt%Q451MF*8~aejq;CUEx6>>O4ofRP%S3A8 zgFnC@WxO*>X=9V_=FZ2RbMKjZ?)>@t>oh9cnonKuskOsE_( z48>!9!o843fw$K?7X6rkeIx6T%^0!?lwrd+KzxVWy_p^!3MB>|y=xQlm5gNk znqj-q>G=OM8k9fc1EJc@E<@(+Xdo=4v2Mdcfg#;!cJpAkY2ya6dR4NKLv{tX8SKwd zEaOlNTH`3Na0k^KDh#!2SZv%yjUgWrry*x}-biXN#qP&SMnSuIeOdY*_iU^n&rtAX zBtA}uJ)u7FUMLtGf7It;mn*6F3uh)ik`so?6$uh0NvTxFr>s}bFH1ynDiM)b)V#&5 zwes&3A0Ns7ge0`^1kD^8q}Z}C=f^f&>`?6k#ZMQtzqpjexZ2dDWuP=2HU7QcM5q(p zr2~2a0kz=*cAlSVu=Yn&)fexi)?qa%t)=r}izG|aWi;G?pnLC^SQXd8}cb{t61%B(Iw!!F{@b z{;GzYnU$tbnbkHP5FNuqJX+9yAe=rc?YKWsCo7UU>2=C0Pki Nu}cXVT9hgU?;nP6#kl|g literal 0 HcmV?d00001 diff --git a/millennium-legacy/resources/sprites/player.png b/millennium-legacy/resources/sprites/player.png new file mode 100644 index 0000000000000000000000000000000000000000..18e68e8b71206d0f81de302d8709d3a86101ed98 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o z>FdgVpNUVD*XqujXSqNj+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g zoq>T-&(p;*B;xSfX$y;(3`Jc1yCT_}(^d)0SiAnttI`_A`;E`6f3aGWgkRgt)|hmG z=e2=PmY(rUS+B`c=3bf^BRp}>bmNn!Ya5p=v7g4tdxHBm`>z8MGc1Co6Sz%EQ)l@x zd^%*utZKmOcHqKHJBI26&NZ)2y?MtqLHrx<3}*cU3@>6M%h>u3NJU(k`f~?&!{(pb z6Yh3wmGVEZoWJFx&A0OYv-_K8+}+iu-ruBM`evs3msGppn3XmU8CHE;`OaoZn%--+ zu6{O&)wikz{jX`{EwKq?n0zg``{IVD;*Jb+Uq56tE821Y#R8yk^v%~dEAQ{y)OB0i zU&KK<-+r6VvGih*?IH6D7)rNJ-ShVe=R>Q9QN1fW^_*_LaN71u_{i3{4Zr{2{h;`d gIreYIBp}$w(Elj6-~a8D8c>jWy85}Sb4q9e0IX`Xi~s-t literal 0 HcmV?d00001 diff --git a/millennium-legacy/resources/textures/grass.png b/millennium-legacy/resources/textures/grass.png new file mode 100644 index 0000000000000000000000000000000000000000..ae1fab03374608e54e888e17bb2b29ff9a04d014 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8pdfpR zr>`sfeI`B;E!D2a#;1TnvY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=} zJ5XHH)5S5w=W^FRTCn literal 0 HcmV?d00001 diff --git a/millennium-legacy/src/map.txt b/millennium-legacy/src/map.txt new file mode 100644 index 0000000..ec336db --- /dev/null +++ b/millennium-legacy/src/map.txt @@ -0,0 +1,16 @@ +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww +ggggggggggggggggggggggg +wwwwwwwwwwwwwwwwwwwwwww diff --git a/millennium-legacy/src/milleniumlegacy/Algorithm.java b/millennium-legacy/src/milleniumlegacy/Algorithm.java new file mode 100644 index 0000000..d469134 --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/Algorithm.java @@ -0,0 +1,35 @@ +package milleniumlegacy; + + +public class Algorithm { + + public static String research() { + String[] pSelect1 = Item.items.get(1); //1 = player input + String[] pSelect2 = Item.items.get(2); //2 = second player input + Object[] keyArray = Item.items.keySet().toArray(); + String Num1 = pSelect1[0]; + String Num2 = pSelect2[0]; + String Name1 = pSelect1[1]; + String Name2 = pSelect2[1]; + String TP1 = pSelect1[2]; + String TP2 = pSelect2[2]; + for(int i = 1; i <= keyArray.length;i++) { + String[] Craftable = Item.items.get(i); + String Craft1 = Craftable[4]; + String Craft2 = Craftable[5]; + if ((Craft1.equals(Name1) || Craft2.equals(Name2)) && + (Craft1.equals(Name2) || Craft2.equals(Name1))) { + String[] getNewItem = Item.items.get(i); + //TODO + + } + } + int rand = (int)(Math.random() * (100)); + int Prob = rand; + + return Name2; + } + + + +} diff --git a/millennium-legacy/src/milleniumlegacy/GUI.java b/millennium-legacy/src/milleniumlegacy/GUI.java new file mode 100644 index 0000000..d99a58f --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/GUI.java @@ -0,0 +1,52 @@ +package milleniumlegacy; + +<<<<<<< HEAD +import java.awt.Component; +import java.awt.Graphics; +import java.util.HashMap; + +import javax.imageio.ImageIO; +======= +>>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f +import javax.swing.*; + +public class GUI { + + public static void main(String[] args) { +<<<<<<< HEAD + JFrame f = new JFrame("Millenium Legacy"); + f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + f.setContentPane(new JPanel() { + public void paintComponent(Graphics g) { + super.paintComponent(g); + } + }); + f.setResizable(false); + f.pack(); + f.setSize(825, 625); + f.setVisible(true); + Algorithm.research(); +======= + SwingUtilities.invokeLater(new Runnable() { + public void run() { + createAndShowGUI(); + } + }); + + } + public static void createAndShowGUI() + { + JFrame f = new JFrame("Millenium Legacy"); + MainGame draw = new MainGame(); + f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + f.getContentPane().add(draw); + f.setResizable(false); + f.pack(); + f.setSize(825, 625); + f.setVisible(true); + draw.start(); +>>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f + } + +} + diff --git a/millennium-legacy/src/milleniumlegacy/ImageLoader.java b/millennium-legacy/src/milleniumlegacy/ImageLoader.java new file mode 100644 index 0000000..4845cb8 --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/ImageLoader.java @@ -0,0 +1,21 @@ +package milleniumlegacy; + +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.imageio.ImageIO; + +public class ImageLoader +{ + public BufferedImage loadImage (String path) + { + try { + BufferedImage bi = ImageIO.read(getClass().getResourceAsStream(path)); + return bi; + } catch (IOException e) { + System.out.println("Error loading Image"); + } + return null; + + } +} diff --git a/millennium-legacy/src/milleniumlegacy/Item.java b/millennium-legacy/src/milleniumlegacy/Item.java new file mode 100644 index 0000000..89d827f --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/Item.java @@ -0,0 +1,16 @@ +package milleniumlegacy; +import java.util.*; + +public class Item { + + public static final Map items; + static + { + //Putting items + items = new HashMap(); + items.put(1, new String[] {"1","Dirt", "Universal"}); + items.put(2, new String[] {"2","Water","Universal"}); + items.put(3, new String[] {"3","Clay","Medieval", "99"}); + } + +} diff --git a/millennium-legacy/src/milleniumlegacy/KeyManager.java b/millennium-legacy/src/milleniumlegacy/KeyManager.java new file mode 100644 index 0000000..afcd42b --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/KeyManager.java @@ -0,0 +1,58 @@ +package milleniumlegacy; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; + +public class KeyManager implements KeyListener +{ + + @Override + public void keyPressed(KeyEvent e) + { + if (e.getKeyCode() == KeyEvent.VK_W) + { + MainGame.up = true; + } + if (e.getKeyCode() == KeyEvent.VK_S) + { + MainGame.down = true; + } + if (e.getKeyCode() == KeyEvent.VK_A) + { + MainGame.left = true; + } + if (e.getKeyCode() == KeyEvent.VK_D) + { + MainGame.right = true; + } + } + + @Override + public void keyReleased(KeyEvent e) + { + if (e.getKeyCode() == KeyEvent.VK_W) + { + MainGame.up = false; + } + if (e.getKeyCode() == KeyEvent.VK_S) + { + MainGame.down = false; + } + if (e.getKeyCode() == KeyEvent.VK_A) + { + MainGame.left = false; + } + if (e.getKeyCode() == KeyEvent.VK_D) + { + MainGame.right = false; + } + + } + + @Override + public void keyTyped(KeyEvent arg0) { + + + } + +} diff --git a/millennium-legacy/src/milleniumlegacy/MainGame.java b/millennium-legacy/src/milleniumlegacy/MainGame.java new file mode 100644 index 0000000..00bdb18 --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/MainGame.java @@ -0,0 +1,82 @@ +package milleniumlegacy; + +import java.awt.Canvas; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Toolkit; +import java.awt.image.BufferStrategy; +import java.awt.image.BufferedImage; +import java.util.ArrayList; + +public class MainGame extends Canvas implements Runnable +{ + private static final long serialVersionUID = -1902119798739765822L; + ImageLoader IL = new ImageLoader(); + BufferedImage player = IL.loadImage("Untitled.png"); + KeyManager km; + ArrayList map = Map.readyMap(); + Thread main; + public static boolean up, down, left, right, running; + int offsetx, offsety; + public void init() + { + km = new KeyManager(); + this.addKeyListener(km); + } + public void paintComponent() + { + BufferStrategy bs = this.getBufferStrategy(); + if (bs == null) + { + createBufferStrategy(3); + return; + } + Graphics g = bs.getDrawGraphics(); + g.setColor(Color.blue); + g.fillRect(0, 0, Toolkit.getDefaultToolkit().getScreenSize().width, Toolkit.getDefaultToolkit().getScreenSize().height); + g.setColor( Color.BLACK ); + for (Tile t : map) + { + t.Render(g, offsetx, offsety); + } + g.drawImage(player, 200,300, null); + g.dispose(); + bs.show(); + } + public void tick() + { + if (up) + { + offsety++; + } + if (down) + { + offsety--; + } + if (left) + { + offsetx++; + } + if (right) + { + offsetx--; + } + } + public void start() + { + main = new Thread(this); + main.start(); + running = true; + + } + @Override + public void run() { + init(); + while (running) + { + paintComponent(); + tick(); + } + + } +} diff --git a/millennium-legacy/src/milleniumlegacy/Map.java b/millennium-legacy/src/milleniumlegacy/Map.java new file mode 100644 index 0000000..81bf414 --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/Map.java @@ -0,0 +1,26 @@ +package milleniumlegacy; + +import java.util.ArrayList; + +public class Map +{ + static MapLoader ml = new MapLoader(); + public static ArrayList readyMap() + { + ArrayList tiles = new ArrayList(); + char[][] map = ml.LoadMap("map.txt"); + int countery = 0, counterx = 0; + for (char[] chararr : map) + { + countery++; + for (char c: chararr) + { + counterx++; + System.out.println(counterx); + tiles.add(new Tile(counterx, countery, c)); + } + counterx = 0; + } + return tiles; + } +} diff --git a/millennium-legacy/src/milleniumlegacy/MapLoader.java b/millennium-legacy/src/milleniumlegacy/MapLoader.java new file mode 100644 index 0000000..9ee45d0 --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/MapLoader.java @@ -0,0 +1,64 @@ +package milleniumlegacy; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; + +public class MapLoader { + + public char[][] LoadMap(String path) { + ArrayList lines = new ArrayList(); + BufferedReader br; + File map = new File(path); + + try { + FileReader fr = new FileReader(map); + br = new BufferedReader(fr); + String line; + while ((line = br.readLine()) != null) + { + lines.add(line); + } + char[][] maparr = new char[lines.size()][lines.get(0).toCharArray().length]; + for (int y = 0; y <= lines.size() - 1; y++) + { + char[] chararr = lines.get(y).toCharArray(); + for (int x = 0; x <= lines.get(0).toCharArray().length - 1; x++) + { + System.out.println("X: " + x + "Y: " + y); + maparr[y][x] = lines.get(y).toCharArray()[x]; + } + } + br.close(); + return maparr; + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + public static int countLines(String filename) throws IOException { + InputStream is = new BufferedInputStream(new FileInputStream(filename)); + try { + byte[] c = new byte[1024]; + int count = 0; + int readChars = 0; + boolean empty = true; + while ((readChars = is.read(c)) != -1) { + empty = false; + for (int i = 0; i < readChars; ++i) { + if (c[i] == '\n') { + ++count; + } + } + } + return (count == 0 && !empty) ? 1 : count; + } finally { + is.close(); + } + } // Thank you google +} diff --git a/millennium-legacy/src/milleniumlegacy/OptionsPane.java b/millennium-legacy/src/milleniumlegacy/OptionsPane.java new file mode 100644 index 0000000..9cbffaf --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/OptionsPane.java @@ -0,0 +1,5 @@ +package milleniumlegacy; + +public class OptionsPane { + +} diff --git a/millennium-legacy/src/milleniumlegacy/Tile.java b/millennium-legacy/src/milleniumlegacy/Tile.java new file mode 100644 index 0000000..91f941c --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/Tile.java @@ -0,0 +1,31 @@ +package milleniumlegacy; + +import java.awt.Color; +import java.awt.Graphics; + +public class Tile +{ + int x,y; + char terrain; + boolean up, down, left, right; + int offsetx; + int offsety; + public Tile(int x, int y, char terrain) + { + this.x = x; + this.y = y; + this.terrain = terrain; + } + public void Render(Graphics g, int offsetx, int offsety) + { + if (terrain == 'g') + { + g.setColor(Color.GREEN); + } + else + { + g.setColor(Color.BLUE); + } + g.fillRect(x*16 + offsetx, y*16 + offsety, 16,16); + } +} diff --git a/millennium-legacy/src/milleniumlegacy/player.java b/millennium-legacy/src/milleniumlegacy/player.java new file mode 100644 index 0000000..0234242 --- /dev/null +++ b/millennium-legacy/src/milleniumlegacy/player.java @@ -0,0 +1,20 @@ +package milleniumlegacy; + +import java.awt.Graphics; +import java.awt.image.BufferedImage; + +public class player +{ + int x, y; + BufferedImage player; + public player(int x, int y, ImageLoader IL) + { + this.x = x; + this.y = y; + player = IL.loadImage("Untitled.png"); + } + public void render(Graphics g) + { + g.drawImage(player, x, y, null); + } +}