From 85c042b8b78ac17d0960fdbae1042f721a54512e Mon Sep 17 00:00:00 2001 From: kriskapa88057 Date: Wed, 16 Nov 2022 14:55:20 +0100 Subject: [PATCH] removed static --- .../Interaktion Projekt/GameClass.class | Bin 485 -> 584 bytes .../RockPaperScissors.class | Bin 2717 -> 2735 bytes src/GameClass.java | 4 +++- src/RockPaperScissors.java | 17 ++++++++--------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/out/production/Interaktion Projekt/GameClass.class b/out/production/Interaktion Projekt/GameClass.class index 58b49372050530ef39d2babc6e69f063a19c3e56..5f13dd72fe3a78a6655a21c420f777a4021c7283 100644 GIT binary patch delta 386 zcmZXOy-osA5QV?X-`!o7KT$+c5wwzm#22ujFeVg6E6dGFqLFpUE+ks<48+RT#+t-P zqKUQfJ#2giqs|pOi+g6yoIB^td-65qynQ{r0DEjtoc35_DN0A7e{tvydeO0e9>-x6 zJ7|)&K-R@2r^pWa-nG%gsHac|Mk}}!jh6GnU@#i~sb+P-rA$VlqtWHQ7xXks3fpv@ zz8A-eR3|(YpTgw!s+JDCp?{_*cmJJnlUKXrMG|r^f{HX5!HTf9R3$aNGeb>(dmKHb>#Mm7a(jd3XAD5}$7zLJ>6lkDww)Ua+>^sMcp)v}8l3A?Tz$ zN0XLpHV-@|x55W$7Tg26qIcLol)nEjd$F=4H70#wQI-eyDwijo#cj)2a#51Hj_?dG EHzXP&FaQ7m diff --git a/out/production/Interaktion Projekt/RockPaperScissors.class b/out/production/Interaktion Projekt/RockPaperScissors.class index 16730657e9940eb49616d775264204dc65308e10..91d512b0fc635dcbedda3b3f9c090037acc0953e 100644 GIT binary patch delta 1353 zcmYjRSx*yD6#g#LcG~H*K+E2tmPN#ArJ|^$0*aa_1YCj}1{cJtC{k=e-0SiKOqmCt zjJz2W6Zc{;@yRC>-;EFc1>?Ihes?;8oy?hY?>)zogJ8F6lqeYqaF=~#~VF{jz(%<4bK`KF*Fr^*85w~s$#88CzSWXreo6MzRA|<@I$*N?~iHn(BI>wFL)(>~9 zD=)Ct>hwgl)}c)1^4yGy`&Nf%OCIn;Cufj^P^utecqqrX>PHzho|#J!rt%)D6oJ>= zD#J<2AQVakE_o9rFei~4wK!`h*Vx1fY7#s9LdjZ$<|JQ;7>fwLL360R zh`jj>S0k=Pcn$Yc)JEJ=^E^c$;#owa!Gk)}e20MR49k{28;hVzU&+uVU1(@K2V|H= zgG<{*l`g7u*<`!;rP@W6Um20Fx{Ul*fP1oL#U`|aHG=rv2%`d3oR(U4ybin3Kq4D) z8BttgO?T0P0$Ts$VZq@6Sa5idT8W2qjHyGb@cDdI@>R(urx?OYdbb^HjxS@6jU)bQ z1&B!#pq;Qxwjj<8n z$VWe+?fQ?6d~$`3q(g_o3MO%$SR@@Bhu;XQxS+|A=UsQOo?{Y;wc#W7jlRL)681|} zp+js_qKJ{6$P1p9ra#1~2hsYmkNyK})8Ib{yjU#1bOq{YF8jcn$r--H9?Hq&AB~gp zn3J;dBaV(P;rLM8r4}*TYpiA}-Lw5H{s2Q9{FjAEDxD-=QZ$7t3|Y?bXS?nBS1@gZ e&0vP#D(1OLgLzxtu;ne>;fcoGySRr3sQ(LStihlF delta 1373 zcmZ8hO>Y}j6g|%#+cT4~<4$ZRnF+2FniAV>oPMD;F=?Se)UAP*l!l-J3GUFCI(D#~ zhL#UgU`H3Ev#y$5H%LGtB~dD|Vui$x1w!ok4WJ5f-q@Imk>zM^3WPlb>) zupcS6AdV$Qcr;UATpQML0HYxsH1G_@+B%np!JYho$F)fg{p0T1@@5^L@s%8%(=0{bp6IjM%snJPCXQ({u6_=sd=-qKR7;iS0niTg|7 zfcVV)Gmud}7f8B~14;MAV63G|LR49mC3rJyMGyj4xyo@CoCBF1i0^6m@D@jT3@CV; zqtSN2J6PaK!(umhf!;pu4eTN`wTp1x-bHlI+C^;6qS-I;T5Uj!K{8l@yqz9|32Sof zN5o5#AdrF>-tBOVqC`tDg4f7da{UW_FWp_s-aup%wmH0wrypY3QZ}I4fd}Zf0@4aT zK-dayz_yi*7809CD+^ml%ZS5XM855($O!s*v0;f~+gvgrCj)Xa;HVeSBhBM9ITMZ! zdw3S$hOE)=X*SNXfIf;FLlkk0V}L#{58`>)6fcSEY_~c_aGO2$6-K*t19v-hORHV? zH9{HCqnf6f@(ocpHorTop1Npf_b}rn&wkgd4qIf74<%xRK2gJHZtdS{;?(#mxt@RNHP?~#d=K!^V^A|YJYLxkjS zp~LXaPAgcCaBhAR=XdamK;K=Xom^x`_wqBLzo` z$GvzTH<&=9{coaTM~dhpT$$g&8y7NxZOrHG|KKB}0=&vPFS5={U1*g%6)f{CLJZm0 z{8gaZ{dh*XmXGFVr}>NQPuWVsYbBi#{3b~}Nc0+QA6D=I=NQ*@dVT1Px4rRWe99A@ LyDi+o7a05pOA5}I diff --git a/src/GameClass.java b/src/GameClass.java index 6b51219..e4ec52b 100644 --- a/src/GameClass.java +++ b/src/GameClass.java @@ -1,6 +1,8 @@ public class GameClass { public static void main(String[] args){ - while (RockPaperScissors.playerScore < 7 && RockPaperScissors.computerScore < 7) RockPaperScissors.runGame(); + RockPaperScissors match = new RockPaperScissors(); + while (match.playerScore < 7 && match.computerScore < 7) match.runGame(); } + } diff --git a/src/RockPaperScissors.java b/src/RockPaperScissors.java index cbfa671..9c052a9 100644 --- a/src/RockPaperScissors.java +++ b/src/RockPaperScissors.java @@ -1,11 +1,10 @@ -import java.util.Scanner; -import java.util.Random; +import java.util.*; public class RockPaperScissors { - static int computerScore = 0; - static int playerScore = 0; + int computerScore = 0; + int playerScore = 0; - public static void runGame() { + public void runGame() { int computerInput = letComputerChoose(); int userInput = letUserInput(); convertToWordUser(userInput); @@ -13,7 +12,7 @@ public class RockPaperScissors { checkResults(computerInput, userInput); } - public static void checkResults(int computerInput, int userInput) { + public void checkResults(int computerInput, int userInput) { if (computerInput == userInput) { @@ -53,7 +52,7 @@ public class RockPaperScissors { return userInputWord; } - public static String convertToWordComputer(int computerInput) { + public String convertToWordComputer(int computerInput) { String computerInputWord = ""; if (computerInput == 1) { @@ -67,7 +66,7 @@ public class RockPaperScissors { return computerInputWord; } - public static int letUserInput() { + public int letUserInput() { int userInput; Scanner input = new Scanner (System.in); System.out.println("1 for Rock, 2 for Paper, 3 for Scissors: "); @@ -75,7 +74,7 @@ public class RockPaperScissors { return userInput; } - public static int letComputerChoose() { + public int letComputerChoose() { Random rgen = new Random(); int computerInput = rgen.nextInt(1,4); return computerInput;