From d7cb32db60439b5f1bc1e78abc9be3e19889dfcd Mon Sep 17 00:00:00 2001 From: gaaaron Date: Tue, 22 Apr 2014 10:58:02 +0200 Subject: [PATCH 1/3] =?UTF-8?q?M=C3=B3dos=C3=ADt=C3=A1sok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sok... sokk --- bin/szoftlab4/Application.class | Bin 14874 -> 15407 bytes src/szoftlab4/Application.java | 582 +++++++++++++++++--------------- 2 files changed, 311 insertions(+), 271 deletions(-) diff --git a/bin/szoftlab4/Application.class b/bin/szoftlab4/Application.class index c43c9448e61eb929f19ddabae4eb015d0566e739..6e676dfde06c1298df766fd080234a4aebbcac53 100644 GIT binary patch delta 5943 zcmbtY3wTu3wf_H=$;@OpAx{EBf(!&gNC+U005Qlz-j5i0g&)XZvLm)kTj|EWmUZ} zSXNe1>*g^cHn613a>0MAxb~*1a*KXV#kIler2!9pJZ>P7zax^er(7_6X6+TdXT|B$ zG!Ne49}NDHC(ZH6J^7}&B)M~!<8kbzkC;oPaxJQ#MfGEvn;)1B$!j~GHuyJevYfdz zuwZF*a8Y1EZAE3k&Ckq9DL#H~E>7u^_m#mj@MsJc2g`#s)`rijUnd94eJz%IaGc*7 zJjd_MeJPne1q6%SB05ZWi$jO8ZgJ{R62~6mHY83w=DC!vgAGICp@w?Ys3kRZf%4#D zw4s!T7qdBaaxb5{ zYkFOUzncgBq`QF)cs34{9tK=+dr%@-hV+tbvww$vaXAKVms}#l9MQoS$}@16Xhl_k53%P+Noi zs^#8`Xu&aC%YEOYrLB^HDlspnWR0!l{?(~Pu*c10L3tQO>Pca)u*&8o12d^?0ud@$MFc0rB)EA#C zsI+5$w&&&S$N}_nATv0K*&NJa%x5u&aJoY1T;+bm0{VFcm#~nxaX25~mE6P;+{Tf7 zl%x0t9c#4))@lCVt2uw4=C;YJc|T`sO3EaxUW z@`J(=h(zA4)zs0ByoW`0x{Gdg3ioQ1W00DFX_3%dHP9XL=aFn)mg6lv13T;MqOs*n zo$k;%k6S$hTVe`hhDR{Cs3n+?eReBrm&!@1Zio5YJ_h2XY+Rn=f+Zc78M(Wo# zLU=T8FWP03j5YiX|4Y4Lc`O;O@AQpyv7%5CQ_mpLs)*a8UXw3$UYxbnoMu-8*PHj` z_6ZfoDqHf~u*6|WF1IDGge9?-q^m7?H7s#jl6c!$wr@H(p3wc^ zW9v)*V)S#Fey-8aD*fy~NMC8*VVv3@;_C&m-dL^1eLRupjcwxZ?KpL@$kipb#y9NL zKXQ=0!fW_efz#`>m%N?lbzWGaWSb=$4l*~gBL}vR`D) zp9D^*?G-2NV{}ZMe{WJ@&f=f6(Y?oo ze4jV+1J?4-T+Y96g|@Ht{HqrGY1Z@ac6QDU=Ta2ZxiSjstc!qpAC}p$9iv8#=P4W1 z_aRGleyFhUq2_Flx%^1okgmdy`4_mfH)iRpK84#(Xd411M3CO4_XHp*DJib&0R20Q zc98^M9Zhgp32x#sCWXD~>|F+8im`9?e7x0uCq+6BMUqc8P}S~5q?QVxujr;q_#4rs>PhrG5>@)zKA(%qvph( zR&x}8oL5?op)mm%{U{kf_j-h+cd3 zf)HmTQI0K95Vs^Y5_PgAiXfK6Wnq(3aV-o=lA{S?{b~P@oS{l|*H43nS|OA>_3e3$ zqNw0%WV`&>)@)+FbCvVF^|VpinFj_8o2XbdE=Af~Y2$TAY&c}g60Ml9vGwwcY2y#k zHsBK4Vt>fquuHZl^Jh59(lhc)g5HI2O7B9_`C@mWHt7lbE+i{7Jy$AR{u@%|cBIK2$dJ{@ zmpd_3>501asdBgadaY*XI@~7f_1BjT*ev&8i`$;WE0|KvszbgHVyHGGE0xbv8&{O^lX0C zGdX9E^lrl3MC0lmaFi(5$Ku*YxxNaZzrl#kC7_ zp*>PyvCinjLW@g?a#vbha+DioaY<2bjKw8JxpB%lqRa$kT3$X$nU;M`Q6@Gzt*8m1 zxsf-Q?v>14dY(>1XLONbJ-lWkSI0j3tHdxJ3ou53sTdP5O`B#hW??=S=va;_{Uxm! z)%XcQI~k-wDX!sbjdX9s~A)Mg|Erh+KYYZ?-A3jOpzHfQ^#b@nG!3P NMs}vlfFZNM{{>TDTLl0B delta 5335 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 diff --git a/src/szoftlab4/Application.java b/src/szoftlab4/Application.java index e2b5abc..7957590 100644 --- a/src/szoftlab4/Application.java +++ b/src/szoftlab4/Application.java @@ -276,348 +276,388 @@ public static void printgems() { public static void buygem(String args[]) { boolean success = false; - if (args[0].matches("barna") - && game.jatekter.felhasznalo.varazsero > 50) { - game.jatekter.felhasznalo.varazskovek.add(new Barnavarazsko()); + if(args.length > 1){ + if (args[1].matches("barna")){ + if(game.jatekter.felhasznalo.varazsero >= 50){ + game.jatekter.felhasznalo.varazskovek.add(new Barnavarazsko()); + } + else System.out.println("Nincs eleg varazsero"); success = true; } - if (args[0].matches("kek") && game.jatekter.felhasznalo.varazsero > 50) { - game.jatekter.felhasznalo.varazskovek.add(new Kekvarazsko()); + else if (args[1].matches("kek")){ + if(game.jatekter.felhasznalo.varazsero >= 50){ + game.jatekter.felhasznalo.varazskovek.add(new Kekvarazsko()); + } + else System.out.println("Nincs eleg varazsero"); success = true; } - if (args[0].matches("lila") && game.jatekter.felhasznalo.varazsero > 50) { - game.jatekter.felhasznalo.varazskovek.add(new Lilavarazsko()); + else if (args[1].matches("lila")){ + if(game.jatekter.felhasznalo.varazsero >= 50){ + game.jatekter.felhasznalo.varazskovek.add(new Lilavarazsko()); + } + else System.out.println("Nincs eleg varazsero"); success = true; } - if (args[0].matches("narancs") - && game.jatekter.felhasznalo.varazsero > 50) { - game.jatekter.felhasznalo.varazskovek.add(new Narancsvarazsko()); + else if (args[1].matches("narancs")){ + if(game.jatekter.felhasznalo.varazsero >= 50){ + game.jatekter.felhasznalo.varazskovek.add(new Narancsvarazsko()); + } + else System.out.println("Nincs eleg varazsero"); success = true; } - if (args[0].matches("piros") - && game.jatekter.felhasznalo.varazsero > 50) { - game.jatekter.felhasznalo.varazskovek.add(new Pirosvarazsko()); + else if (args[1].matches("piros")){ + if(game.jatekter.felhasznalo.varazsero >= 50){ + game.jatekter.felhasznalo.varazskovek.add(new Pirosvarazsko()); + } + else System.out.println("Nincs eleg varazsero"); success = true; } - if (args[0].matches("sarga") - && game.jatekter.felhasznalo.varazsero > 50) { - game.jatekter.felhasznalo.varazskovek.add(new Sargavarazsko()); + else if (args[1].matches("sarga")){ + if(game.jatekter.felhasznalo.varazsero >= 50){ + game.jatekter.felhasznalo.varazskovek.add(new Sargavarazsko()); + } + else System.out.println("Nincs eleg varazsero"); success = true; } - if (args[0].matches("zold") && game.jatekter.felhasznalo.varazsero > 50) { - game.jatekter.felhasznalo.varazskovek.add(new Zoldvarazsko()); + else if (args[1].matches("zold")){ + if(game.jatekter.felhasznalo.varazsero >= 50){ + game.jatekter.felhasznalo.varazskovek.add(new Zoldvarazsko()); + } + else System.out.println("Nincs eleg varazsero"); success = true; } - + } if (!success) System.out.println("Bad parameter"); + else System.out.println("Varazsko megvasarolva"); } public static void addtower(String args[]) { - int sor = Integer.parseInt(args[2]); - int oszlop = Integer.parseInt(args[3]); - boolean joid = true; - - for (int i = 0; i < game.toronylista.size(); i++) { - if (game.toronylista.get(i).id.matches(args[1])) - joid = false; - } - - if (joid) { - Torony uj = new Torony(args[1]); - game.toronylista.add(uj); - Cella valasztott = game.jatekter.cellak.get(sor).get(oszlop); - if (valasztott.mezovagyok()) - game.jatekter.felhasznalo.ujTorony((Mezo) valasztott, uj); - } else { - System.out.println("Mar letezo ID"); + if(args.length > 3){ + int sor = Integer.parseInt(args[2]); + int oszlop = Integer.parseInt(args[3]); + boolean joid = true; + + for (int i = 0; i < game.toronylista.size(); i++) { + if (game.toronylista.get(i).id.matches(args[1])) + joid = false; + } + + if (joid) { + Torony uj = new Torony(args[1]); + game.toronylista.add(uj); + Cella valasztott = game.jatekter.cellak.get(sor).get(oszlop); + if (valasztott.mezovagyok()) + game.jatekter.felhasznalo.ujTorony((Mezo) valasztott, uj); + } else { + System.out.println("Mar letezo ID"); + } } + else System.out.println("Bad parameter"); } public static void addtowergem(String args[]) { - int id = 0; - boolean success = false; - Torony erre = null; - for (int i = 0; i < game.toronylista.size(); i++) { - if (game.toronylista.get(i).id.matches(args[1])) - id = Integer.parseInt(game.toronylista.get(i).id); - erre = game.toronylista.get(i); - } - if (id == 0) { - System.out.println("Nem letezo ID"); - } - - if (erre != null) { - if (args[2].matches("barna")) { - game.jatekter.felhasznalo.fejleszt(erre, new Barnavarazsko()); - success = true; - } - if (args[2].matches("kek")) { - game.jatekter.felhasznalo.fejleszt(erre, new Kekvarazsko()); - success = true; - } - if (args[2].matches("narancs")) { - game.jatekter.felhasznalo.fejleszt(erre, new Narancsvarazsko()); - success = true; - } - if (args[2].matches("piros")) { - game.jatekter.felhasznalo.fejleszt(erre, new Pirosvarazsko()); - success = true; + if(args.length > 2){ + int id = 0; + boolean success = false; + Torony erre = null; + for (int i = 0; i < game.toronylista.size(); i++) { + if (game.toronylista.get(i).id.matches(args[1])) + id = Integer.parseInt(game.toronylista.get(i).id); + erre = game.toronylista.get(i); } - if (args[2].matches("sarga")) { - game.jatekter.felhasznalo.fejleszt(erre, new Sargavarazsko()); - success = true; + if (id == 0) { + System.out.println("Nem letezo ID"); } - if (args[2].matches("zold")) { - game.jatekter.felhasznalo.fejleszt(erre, new Zoldvarazsko()); - success = true; + + if (erre != null) { + if (args[2].matches("barna")) { + game.jatekter.felhasznalo.fejleszt(erre, new Barnavarazsko()); + success = true; + } + if (args[2].matches("kek")) { + game.jatekter.felhasznalo.fejleszt(erre, new Kekvarazsko()); + success = true; + } + if (args[2].matches("narancs")) { + game.jatekter.felhasznalo.fejleszt(erre, new Narancsvarazsko()); + success = true; + } + if (args[2].matches("piros")) { + game.jatekter.felhasznalo.fejleszt(erre, new Pirosvarazsko()); + success = true; + } + if (args[2].matches("sarga")) { + game.jatekter.felhasznalo.fejleszt(erre, new Sargavarazsko()); + success = true; + } + if (args[2].matches("zold")) { + game.jatekter.felhasznalo.fejleszt(erre, new Zoldvarazsko()); + success = true; + } } + + if (!success) + System.out.println("Bad parameter"); + if (success) + System.out.println("Varazsko hozzaadva"); } - - if (!success) - System.out.println("Bad parameter"); - if (success) - System.out.println("Varazsko hozzaadva"); + else System.out.println("Bad parameter"); } public static void addtrapgem(String args[]) { - boolean megvan = false; - int index = 0; - Lilavarazsko l = new Lilavarazsko(); - if (game.jatekter.felhasznalo.varazskovek.contains(l)) { - - while (megvan == false && index < game.akadalylista.size()) { - if (game.akadalylista.get(index).id.equals(args[1])) { - game.akadalylista.get(index).addko(l); - System.out.printf("Varazsko hozzaadva \n"); - megvan = true; - - } else { - index++; + if(args.length > 1){ + boolean megvan = false; + int index = 0; + Lilavarazsko l = new Lilavarazsko(); + if (game.jatekter.felhasznalo.varazskovek.contains(l)) { + + while (megvan == false && index < game.akadalylista.size()) { + if (game.akadalylista.get(index).id.equals(args[1])) { + game.akadalylista.get(index).addko(l); + System.out.printf("Varazsko hozzaadva \n"); + megvan = true; + + } else { + index++; + } } + if (megvan == false) { + System.out.printf("Nem letezo ID \n"); + } + } else { + System.out.printf("Nem letezo varazsko \n"); } - if (megvan == false) { - System.out.printf("Nem letezo ID \n"); - } - } else { - System.out.printf("Nem letezo varazsko \n"); } + else System.out.println("Bad parameter"); } public static void addenemy(String args[]) { - int sor = Integer.parseInt(args[3]); - int oszlop = Integer.parseInt(args[4]); - Cella valasztott = (Ut)game.jatekter.cellak.get(sor).get(oszlop); - if (!valasztott.mezovagyok()) { - int type = 0; - if (args[1].matches("hobbit")) - type = 0; - else if (args[1].matches("ember")) - type = 1; - else if (args[1].matches("tunder")) - type = 2; - else if (args[1].matches("torpe")) - type = 3; - else{ - System.out.println("Bad parameter"); - return; - } - - switch (type) { - case 0: - Hobbit h = new Hobbit((Ut) valasztott); - h.id = args[2]; - valasztott.ratesz(h); - game.ellenseglista.add(h); - System.out.println("Ellenseg letrehozva"); - break; - case 1: - Ember e = new Ember((Ut) valasztott); - e.id = args[2]; - valasztott.ratesz(e); - game.ellenseglista.add(e); - System.out.println("Ellenseg letrehozva"); - break; - case 2: - Tunde t = new Tunde((Ut) valasztott); - t.id = args[2]; - valasztott.ratesz(t); - game.ellenseglista.add(t); - System.out.println("Ellenseg letrehozva"); - break; - case 3: - Torpe t1 = new Torpe((Ut) valasztott); - t1.id = args[2]; - valasztott.ratesz(t1); - game.ellenseglista.add(t1); - System.out.println("Ellenseg letrehozva"); - break; - default: - System.out.println("Bad parameter"); + if(args.length > 4){ + int sor = Integer.parseInt(args[3]); + int oszlop = Integer.parseInt(args[4]); + Cella valasztott = (Ut)game.jatekter.cellak.get(sor).get(oszlop); + if (!valasztott.mezovagyok()) { + int type = 0; + if (args[1].matches("hobbit")) + type = 0; + else if (args[1].matches("ember")) + type = 1; + else if (args[1].matches("tunder")) + type = 2; + else if (args[1].matches("torpe")) + type = 3; + else{ + System.out.println("Bad parameter"); + return; + } + + switch (type) { + case 0: + Hobbit h = new Hobbit((Ut) valasztott); + h.id = args[2]; + valasztott.ratesz(h); + game.ellenseglista.add(h); + System.out.println("Ellenseg letrehozva"); + break; + case 1: + Ember e = new Ember((Ut) valasztott); + e.id = args[2]; + valasztott.ratesz(e); + game.ellenseglista.add(e); + System.out.println("Ellenseg letrehozva"); + break; + case 2: + Tunde t = new Tunde((Ut) valasztott); + t.id = args[2]; + valasztott.ratesz(t); + game.ellenseglista.add(t); + System.out.println("Ellenseg letrehozva"); + break; + case 3: + Torpe t1 = new Torpe((Ut) valasztott); + t1.id = args[2]; + valasztott.ratesz(t1); + game.ellenseglista.add(t1); + System.out.println("Ellenseg letrehozva"); + break; + default: + System.out.println("Bad parameter"); + } + + + } else { + System.out.printf(" Nem mezo, vagy valami baj van \n"); } - - - } else { - System.out.printf(" Nem mezo, vagy valami baj van \n"); } + else System.out.println("Bad parameter"); } public static void addspecialprojectile(String args[]) { - if (args.length == 1) { + if (args.length > 1) { Torony ebben = null; for (int i = 0; i < game.toronylista.size(); i++) { - if (args[1].matches(game.toronylista.get(i).id)) - ; - ebben = game.toronylista.get(i); + if (args[1].matches(game.toronylista.get(i).id)) ebben = game.toronylista.get(i); + } + if(ebben != null){ + ebben.specprojectile = true; + System.out.println("Specialis lovedek hozzaadva"); } - ebben.specprojectile = true; - System.out.println("Specialis lovedek hozzaadva"); + else System.out.println("Bad parameters"); + - } else - System.out.println("Bad parameters"); + } + else System.out.println("Bad parameters"); } public static void addfog(String args[]) { - boolean megvan = false; - int index = 0; - while (megvan == false && index < game.toronylista.size()) { - if (game.toronylista.get(index).id == args[0]) { - game.toronylista.get(index).kodosit(); - megvan = true; + if(args.length > 1){ + Torony ebben = null; + for (int i = 0; i < game.toronylista.size(); i++) { + if (args[1].matches(game.toronylista.get(i).id)) ebben = game.toronylista.get(i); + } + if(ebben != null){ + ebben.kodosit(); System.out.println("Kod hozzaadva"); - } else { - index++; } + else System.out.println("Bad parameters"); + } - if (!megvan) - System.out.println("Nem letezo ID"); + else System.out.println("Bad parameters"); } public static void enemydirection(String args[]) { - boolean megvan = false; - int index = 0; - for (Ellenseg ell : game.ellenseglista) { - if (ell.id.matches(args[1])) { - index = game.ellenseglista.indexOf(ell); - megvan = true; + if(args.length > 2){ + boolean megvan = false; + int index = 0; + for (Ellenseg ell : game.ellenseglista) { + if (ell.id.matches(args[1])) { + index = game.ellenseglista.indexOf(ell); + megvan = true; + } } - } - - - - if (megvan) { - Ellenseg temp = game.ellenseglista.get(index); - int irany; - if (args[2].matches("N")) - irany = 1; - else if (args[2].matches("S")) - irany = 2; - else if (args[2].matches("E")) - irany = 3; - else if (args[2].matches("W")) - irany = 4; - else - irany = 0; - int x, y; - switch (irany) { - case 1: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - y--; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; + + + + if (megvan) { + Ellenseg temp = game.ellenseglista.get(index); + int irany; + if (args[2].matches("N")) + irany = 1; + else if (args[2].matches("S")) + irany = 2; + else if (args[2].matches("E")) + irany = 3; + else if (args[2].matches("W")) + irany = 4; + else + irany = 0; + int x, y; + switch (irany) { + case 1: + x = Application.game.getCoord(temp.sajatUt).x; + y = Application.game.getCoord(temp.sajatUt).y; + y--; + + for (Cella sj : temp.sajatUt.szomszedok) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(temp); + System.out.println("Ellenseg iranya beallitva"); + return; + } } - } - System.out.println("Invalid Parameter"); - break; - - case 2: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - y++; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; + System.out.println("Invalid Parameter"); + break; + + case 2: + x = Application.game.getCoord(temp.sajatUt).x; + y = Application.game.getCoord(temp.sajatUt).y; + y++; + + for (Cella sj : temp.sajatUt.szomszedok) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(temp); + System.out.println("Ellenseg iranya beallitva"); + return; + } } - } - System.out.println("Invalid Parameter"); - break; - - case 3: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - x--; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; + System.out.println("Invalid Parameter"); + break; + + case 3: + x = Application.game.getCoord(temp.sajatUt).x; + y = Application.game.getCoord(temp.sajatUt).y; + x--; + + for (Cella sj : temp.sajatUt.szomszedok) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(temp); + System.out.println("Ellenseg iranya beallitva"); + return; + } } - } - System.out.println("Invalid Parameter"); - break; - - case 4: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - x++; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; + System.out.println("Invalid Parameter"); + break; + + case 4: + x = Application.game.getCoord(temp.sajatUt).x; + y = Application.game.getCoord(temp.sajatUt).y; + x++; + + for (Cella sj : temp.sajatUt.szomszedok) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(temp); + System.out.println("Ellenseg iranya beallitva"); + return; + } } + System.out.println("Invalid Parameter"); + break; + case 0: + default: + System.out.printf("Invalid Parameter \n"); + break; + } - System.out.println("Invalid Parameter"); - break; - case 0: - default: + } else System.out.printf("Invalid Parameter \n"); - break; - - } - } else - System.out.printf("Invalid Parameter \n"); + + } + else System.out.println("Bad parameters"); } public static void addtrap(String[] args) { - int sor = Integer.parseInt(args[2]); - int oszlop = Integer.parseInt(args[3]); - boolean joid = true; - - for (int i = 0; i < game.akadalylista.size(); i++) { - if (game.akadalylista.get(i).id.matches(args[1])) - joid = false; - } - - if (joid) { - Akadaly uj = new Akadaly(args[1]); - game.akadalylista.add(uj); - Cella valasztott = game.jatekter.cellak.get(sor).get(oszlop); - if (!valasztott.mezovagyok()) - game.jatekter.felhasznalo.ujAkadaly((Ut) valasztott, uj); - } else { - System.out.println("Mar letezo ID"); + if(args.length > 3){ + int sor = Integer.parseInt(args[2]); + int oszlop = Integer.parseInt(args[3]); + boolean joid = true; + + for (int i = 0; i < game.akadalylista.size(); i++) { + if (game.akadalylista.get(i).id.matches(args[1])) + joid = false; + } + + if (joid) { + Akadaly uj = new Akadaly(args[1]); + game.akadalylista.add(uj); + Cella valasztott = game.jatekter.cellak.get(sor).get(oszlop); + if (!valasztott.mezovagyok()) + game.jatekter.felhasznalo.ujAkadaly((Ut) valasztott, uj); + } else { + System.out.println("Mar letezo ID"); + } } + else System.out.println("Bad parameters"); } public static void exit() { From 36b5e2c1d8c09a0d9713816e6497d9ec8f6dfd0b Mon Sep 17 00:00:00 2001 From: gaaaron Date: Tue, 22 Apr 2014 12:43:58 +0200 Subject: [PATCH 2/3] =?UTF-8?q?M=C3=B3dos=C3=ADt=C3=A1sok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/szoftlab4/Application.class | Bin 15407 -> 14533 bytes bin/szoftlab4/Ellenseg.class | Bin 1959 -> 3315 bytes src/szoftlab4/Application.java | 156 +++++++++----------------------- src/szoftlab4/Ellenseg.java | 75 +++++++++++++-- 4 files changed, 114 insertions(+), 117 deletions(-) diff --git a/bin/szoftlab4/Application.class b/bin/szoftlab4/Application.class index 6e676dfde06c1298df766fd080234a4aebbcac53..e3753eb73fac11ebad949f7b804096853e1db346 100644 GIT binary patch delta 7260 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 XPK}o_NqlCGM0xD!bh-=}Y6AG5KmHxf literal 15407 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 H@G-={eyYJF literal 1959 zcma)6Yfl?T6g}hDVrN4jU>8W!2W=XIY22oykC@O>l7JJF7r{;XUfUD1c)g3(V-)xy z{U5CoM{1?2pZlY#o*83%QBYM`-p9O}O83K`)A7RCh5jZoHF$~_Q>xebO_Mkw1V zbp2*Y!0I@Aj@nTI-RbVoIGJ2uP`1PP6Gl*l_ z#ssng@%%zH4S_dooPn*MW^J6sxPH1|;~d7xwc`5nUbkJ7;bW)fNli1TJ6_cZUHyK% zm{7ZJM_@Wqbzl&gCXEO(P;Q+plgep36g(FtS(VKrsWxTvP?ikaT|Saq1Th*yt!>%d zb-WDnShTPpU`PG2QNR*|Jb55HN5qNN8k`0TrEvuxSttr*N9k+(`<`2OlpFXqKE_ot zZ#r#ipNO#8;7TctWqfMk8joj`u6JyFhR+2u^}ttQz+MRja*^!y;d&{9>sYZspQc9` zqkS7Uz!OdP<azJ$!&V~D?ABGLS-3Np6a)Fl z@f$%qgEFQw*us4a_ejaiz{!#}9^fJMb=)J?W7n2-(zcDq*x`iu^0_MeRIY8|))v08 z@dQs9+SCJ*<#J@S`U6VW^Z3rj_ohoiN0}~3bd^Kp*;9pc7(zpNL;8{#0gv=}W+QrZ zySsivJ{LICqS2})kAf~~)cy=&lSF~?< zmy;Vu3`y{_#OE|J{CbfIY~B-kxXqoT&HEU4CNRnCdA>biUX1tY#aEbGEWAW+G5!)W z`ZD(`*JF5-*Br5d8Dh;6eU3O6FvXpVX3yl~ExgS)BHwrFlz&zgLo2GY-e+~ay;!>pcAW=iSk4wA?d@!uNNdOI>TYSNP50`(#hcEC6 z-{yMwVnk@19)fc}#_xWXg|)UmvD}c@mqXuHiK>aEjAtX1j9D$wuNx7Dsi8Y5e0A*3 z8onm4{}g#M0udFtj+;j0E!<|g4bq5V(?I>gCw)}&f1v#I74B{=6?&-j@MyJgv4`qk z$X`#)Cg{SqnsPjHxSJGSro1~m+PgfuimAQaM;p?g#}D|Cwa3^5KjCLqo8-@7L&TY9 jp+<2D)QR1-d% diff --git a/src/szoftlab4/Application.java b/src/szoftlab4/Application.java index 7957590..f74e8d4 100644 --- a/src/szoftlab4/Application.java +++ b/src/szoftlab4/Application.java @@ -194,13 +194,13 @@ public static void printstate() { for (int i = 0; i < game.ellenseglista.size(); i++) { if (game.ellenseglista.get(i) instanceof Hobbit) - System.out.println("Hobbit " + game.ellenseglista.get(i).id); + System.out.println("Hobbit " + game.ellenseglista.get(i).id + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).x + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).y); if (game.ellenseglista.get(i) instanceof Ember) - System.out.println("Ember " + game.ellenseglista.get(i).id); + System.out.println("Ember " + game.ellenseglista.get(i).id + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).x + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).y); if (game.ellenseglista.get(i) instanceof Tunde) - System.out.println("Tunde " + game.ellenseglista.get(i).id); + System.out.println("Tunde " + game.ellenseglista.get(i).id + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).x + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).y); if (game.ellenseglista.get(i) instanceof Torpe) - System.out.println("Torpe " + game.ellenseglista.get(i).id); + System.out.println("Torpe " + game.ellenseglista.get(i).id + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).x + " " + Application.game.getCoord(game.ellenseglista.get(i).sajatUt).y ); } for (int i = 0; i < game.akadalylista.size(); i++) { @@ -215,7 +215,8 @@ public static void tick(String args[]) { count = Integer.parseInt(args[1]); else count = 1; - int i = 0; + + int i=0; for (i = 0; i < count; i++) { for (int j = 0; j < game.controller.aktiv.size(); j++) { game.controller.aktiv.get(j).tick(); @@ -345,11 +346,14 @@ public static void addtower(String args[]) { } if (joid) { - Torony uj = new Torony(args[1]); + Torony uj = new Torony(); game.toronylista.add(uj); + game.controller.addAktiv(uj); Cella valasztott = game.jatekter.cellak.get(sor).get(oszlop); - if (valasztott.mezovagyok()) + if (valasztott.mezovagyok()){ game.jatekter.felhasznalo.ujTorony((Mezo) valasztott, uj); + uj.id =args[1]; + } } else { System.out.println("Mar letezo ID"); } @@ -363,13 +367,9 @@ public static void addtowergem(String args[]) { boolean success = false; Torony erre = null; for (int i = 0; i < game.toronylista.size(); i++) { - if (game.toronylista.get(i).id.matches(args[1])) - id = Integer.parseInt(game.toronylista.get(i).id); - erre = game.toronylista.get(i); - } - if (id == 0) { - System.out.println("Nem letezo ID"); + if(game.toronylista.get(i).id.matches(args[1])) erre = game.toronylista.get(i); } + if(erre == null) System.out.println("Bad parameter"); if (erre != null) { if (args[2].matches("barna")) { @@ -408,28 +408,26 @@ public static void addtowergem(String args[]) { } public static void addtrapgem(String args[]) { - if(args.length > 1){ - boolean megvan = false; - int index = 0; - Lilavarazsko l = new Lilavarazsko(); - if (game.jatekter.felhasznalo.varazskovek.contains(l)) { - - while (megvan == false && index < game.akadalylista.size()) { - if (game.akadalylista.get(index).id.equals(args[1])) { - game.akadalylista.get(index).addko(l); - System.out.printf("Varazsko hozzaadva \n"); - megvan = true; + if(args.length > 2){ + int id = 0; + boolean success = false; + Akadaly erre = null; + for (int i = 0; i < game.akadalylista.size(); i++) { + if(game.akadalylista.get(i).id.matches(args[1])) erre = game.akadalylista.get(i); + } + if(erre == null) System.out.println("Bad parameter"); - } else { - index++; - } - } - if (megvan == false) { - System.out.printf("Nem letezo ID \n"); + if (erre != null) { + if (args[2].matches("lila")) { + game.jatekter.felhasznalo.fejleszt(erre, new Lilavarazsko()); + success = true; } - } else { - System.out.printf("Nem letezo varazsko \n"); } + + if (!success) + System.out.println("Bad parameter"); + if (success) + System.out.println("Varazsko hozzaadva"); } else System.out.println("Bad parameter"); } @@ -460,6 +458,7 @@ else if (args[1].matches("torpe")) h.id = args[2]; valasztott.ratesz(h); game.ellenseglista.add(h); + game.controller.addAktiv(h); System.out.println("Ellenseg letrehozva"); break; case 1: @@ -467,6 +466,7 @@ else if (args[1].matches("torpe")) e.id = args[2]; valasztott.ratesz(e); game.ellenseglista.add(e); + game.controller.addAktiv(e); System.out.println("Ellenseg letrehozva"); break; case 2: @@ -474,6 +474,7 @@ else if (args[1].matches("torpe")) t.id = args[2]; valasztott.ratesz(t); game.ellenseglista.add(t); + game.controller.addAktiv(t); System.out.println("Ellenseg letrehozva"); break; case 3: @@ -481,6 +482,7 @@ else if (args[1].matches("torpe")) t1.id = args[2]; valasztott.ratesz(t1); game.ellenseglista.add(t1); + game.controller.addAktiv(t1); System.out.println("Ellenseg letrehozva"); break; default: @@ -546,88 +548,18 @@ public static void enemydirection(String args[]) { if (megvan) { Ellenseg temp = game.ellenseglista.get(index); - int irany; if (args[2].matches("N")) - irany = 1; + temp.irany = 1; else if (args[2].matches("S")) - irany = 2; + temp.irany = 2; else if (args[2].matches("E")) - irany = 3; + temp.irany = 3; else if (args[2].matches("W")) - irany = 4; + temp.irany = 4; else - irany = 0; - int x, y; - switch (irany) { - case 1: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - y--; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; - } - } - System.out.println("Invalid Parameter"); - break; - - case 2: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - y++; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; - } - } - System.out.println("Invalid Parameter"); - break; - - case 3: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - x--; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; - } - } - System.out.println("Invalid Parameter"); - break; - - case 4: - x = Application.game.getCoord(temp.sajatUt).x; - y = Application.game.getCoord(temp.sajatUt).y; - x++; - - for (Cella sj : temp.sajatUt.szomszedok) { - if (Application.game.getCoord(sj).x == x - && Application.game.getCoord(sj).y == y) { - sj.ratesz(temp); - System.out.println("Ellenseg iranya beallitva"); - return; - } - } - System.out.println("Invalid Parameter"); - break; - case 0: - default: - System.out.printf("Invalid Parameter \n"); - break; - - } + temp.irany = 0; + + System.out.println("Ellenseg iranyba alltiva"); } else System.out.printf("Invalid Parameter \n"); @@ -648,11 +580,13 @@ public static void addtrap(String[] args) { } if (joid) { - Akadaly uj = new Akadaly(args[1]); + Akadaly uj = new Akadaly(); game.akadalylista.add(uj); Cella valasztott = game.jatekter.cellak.get(sor).get(oszlop); - if (!valasztott.mezovagyok()) + if (!valasztott.mezovagyok()){ game.jatekter.felhasznalo.ujAkadaly((Ut) valasztott, uj); + uj.id =args[1]; + } } else { System.out.println("Mar letezo ID"); } diff --git a/src/szoftlab4/Ellenseg.java b/src/szoftlab4/Ellenseg.java index 2796c4f..5c9fc24 100644 --- a/src/szoftlab4/Ellenseg.java +++ b/src/szoftlab4/Ellenseg.java @@ -7,6 +7,8 @@ public class Ellenseg implements Utravalo, Aktiv { public String id; + public int irany=0; + public int count=0; //Tartalmazza hogy az Elenség éppen melyik mezőn van rajta public Ut sajatUt; @@ -31,10 +33,12 @@ public Ellenseg(Ut sajat){ //Leszármazott osztályban felülírni! public void tick(){ - if(false){ + if(count%4 == 0){ ArrayList lehetsegesutak = sajatUt.lepnek(); lepek(lehetsegesutak); - } + System.out.println(lehetsegesutak.size()); + count = 0; + } else count++; } @@ -69,10 +73,69 @@ public void sebez(Lovedek lovedek){ //Kiválaszt egy utat ahova lépni szeretne public void lepek(ArrayList utak){ - Random randomGenerator = new Random(); - int index = randomGenerator.nextInt(utak.size()); - Ut kovetkezout = utak.get(index); - kovetkezout.ratesz(this); + int x,y; + switch (irany) { + case 1: + x = Application.game.getCoord(sajatUt).x; + y = Application.game.getCoord(sajatUt).y; + y--; + + for (Cella sj : utak) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(this); + return; + } + } + break; + + case 2: + x = Application.game.getCoord(sajatUt).x; + y = Application.game.getCoord(sajatUt).y; + y++; + + for (Cella sj : utak) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(this); + return; + } + } + break; + + case 3: + x = Application.game.getCoord(sajatUt).x; + y = Application.game.getCoord(sajatUt).y; + x--; + + for (Cella sj : utak) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(this); + return; + } + } + break; + + case 4: + x = Application.game.getCoord(sajatUt).x; + y = Application.game.getCoord(sajatUt).y; + x++; + + for (Cella sj : utak) { + if (Application.game.getCoord(sj).x == x + && Application.game.getCoord(sj).y == y) { + sj.ratesz(this); + return; + } + } + break; + case 0: + default: + break; + + } + } //A sajatUt attribútumot inicializálja From 1fbcf9d12cf39dc78a0e986e366c7645670869af Mon Sep 17 00:00:00 2001 From: gaaaron Date: Tue, 22 Apr 2014 13:04:52 +0200 Subject: [PATCH 3/3] =?UTF-8?q?m=C3=B3dos=C3=AD=C3=A1s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/szoftlab4/Ellenseg.class | Bin 3315 -> 3315 bytes src/szoftlab4/Ellenseg.java | 2 -- 2 files changed, 2 deletions(-) diff --git a/bin/szoftlab4/Ellenseg.class b/bin/szoftlab4/Ellenseg.class index 55b4a6b5e9eb10996cbe18215c4e40bf0a897a58..4ef8df85c6884886f9101062818efd92a0da5abf 100644 GIT binary patch delta 290 zcmWO1IZFd!6oujU1}B-Qh!WI{3y8}Y5iC@aD%eOYG>RLMsEG@>1vdz4+(zw0oaSrw z54eChbwDlbZLO@dmiPnwIB<&Ra*I>4O4ie>-wIQPNl>Q>ix3TjX{4DZ_36)Bt=ikD zp`AK9Xu;OqNiSV$HIR`W^&UtC`}BW5wZxQd#*H`z1FBeAuN<>m65hR8?sJBTkR-|| zgN!l6ICD&pW0FIrIAfY~ZCA|TGRuv=-Z9T3S>9OSgGIhr;+tiDwEeQeAM4^{L#oM1 zh)s#GB{8-o!H$fuD@koB@{(p>)@%-BkAf695|?ASeWdf zP1v;1PY-eJ1{fltc0-;Fs`ro+9>yd|Go#8j$Bc0dCRDY)RTa#H%=q_aBv44{;hZkb zGsyzeEV9ZH8J5YjLJ^0OW@TI|tZ{?K9qT-@!5f==u*DbKe6z!kX1}EQBO?L!q>+7z zaUgLHWrQP{;#g)mk(6c*S#ilp+9oeq&LqdVRJf2^3i3cvo+*j1S(Qt9q3pX+PmC*l J;94I@{sR*lJrw`| diff --git a/src/szoftlab4/Ellenseg.java b/src/szoftlab4/Ellenseg.java index 5c9fc24..cd9fb51 100644 --- a/src/szoftlab4/Ellenseg.java +++ b/src/szoftlab4/Ellenseg.java @@ -1,7 +1,5 @@ package szoftlab4; -import java.io.IOException; -import java.util.Random; import java.util.ArrayList; public class Ellenseg implements Utravalo, Aktiv {