From 690fcb36e0fe2ed0d4f66704dc09f2611072ef68 Mon Sep 17 00:00:00 2001 From: kriskapa88057 Date: Wed, 2 Nov 2022 15:48:24 +0100 Subject: [PATCH] git test --- .../Interaktion Projekt/GameClass.class | Bin 483 -> 485 bytes .../RockPaperScissors.class | Bin 2482 -> 2717 bytes src/GameClass.java | 2 +- src/RockPaperScissors.java | 10 +++++++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/out/production/Interaktion Projekt/GameClass.class b/out/production/Interaktion Projekt/GameClass.class index 50e79d6e482901e2647829055cec450031ea266d..58b49372050530ef39d2babc6e69f063a19c3e56 100644 GIT binary patch delta 248 zcmaFN{FIsN)W2Q(7#JAr8RRB%>3eZ9a4>MPGjQ=Ra5L~QG6)9cCuavF7NiyhCubHH z=NA<-GH@50cE9um<6bU7igRekj=y( F3ji$ZB254Q delta 263 zcmXAiJ5Iw;5Jk_}#1B6ViOrv|0t(VnAf-e!2th>|MJXZ#0bA4*umNv@hMEeLf(5V* z#0F3*gn;`@G55~*%t!nl`?sIzE6``V_Pt%tJgLKHERY!a$z*tbJh&Q_r^9hoP0Gq} z<;~^6;9}%htnaQ98yj|5e;(atL;@i-S|rjXRXw@MTRYF#Q!{Q$!x%+Jn*A@3Q>aQ= zW<{NFd?r|c7V&g(n5;Y{)kiDbY8P MeTi;tsS(lr10{xs$piN7SCe>O*nvfDeAbs-% z-!7b1XB_uhn;WM$&S>LIGNv!Eqe_XJKfSnLYcQbDo#q^FL?V-v4#K z@!LOpKLeP>rw@!f;*t&xQ7>W`7x2`|`CG+$u28KP1w=+eTtHi{Zia7^Dx=c#h!@XF z&z?ecqqf=X_-Z&R;G6F(N$19>hNShA7%@!NI_|~un6yS5Lze@GGMPwrJ%2r)DCaAy ziCnW@s;o|Hm=<9E69USGYT=rOSpju1Un|x%%n>42C^Z_@dPBoJOXb5?^W{b{T&*=r z)rtv$)3U@FYtj)LbKtZa8G&BA%4V}vPUH&tN~KuWF@yy#vUth*%rT;+an1`Bi`Ms! zC&UHocSpQGjf-Bq0$^{sPGtXY3L z3%ZsnluMOTbH++5DPO}t6Ps>amsmHfuasXSw@7qxtr%`db;G5`R9H+24ewHRsc>Pf z%7(b`zO|-~i4UzW)Tr{Yz_9hDI&A%+nkx?KL-DDnCXdU0QzW?9{_C72_@;FQe9-afZAX|6Zt;g8{u%8$+~r$4!k)CU1BB z4SSYdC(Ws>#MaGJ_CAJWSGqYvvsbpIx6G5YUFNAQv15C9!6uIVz{oaolv#lYXEC0@ zICVeF8gViw$a{pG6L<#4a1_bMXp=Uh%rSu?u98X8dZ7FbpBt-&;ouPkn5fmJwK}wk z|Ih{=(Rw7Ui?D6X7ypm>H1h$IEI3Wf6fsXQ`wTH>iFp#EI7RUJ#}E^?pe@Nbj#8J= zfV0EsX3Bl`4V9O9g?>`c;6tRBw{dnCFH08lJP$awgWPoRJMOk`xXC*Sq}gwV5N9!f zg>K;i`pEN>YV5;$3)k%H>gg8BcBJq>#M1IEUR#K&J6KMI9;NpY1vtk(7uo0eZfcDy zWo&TI#~kvL;QtgV-S6=r=kljJd2#tfcrnj#O@3$wBlx8f+{Nrw+78t44&Qy8*XecB U9&g*@d-%YP5oqBfe1gG$0eOq$OaK4? delta 1270 zcmZ9L$x{41rSu+qHzN^aE&o)STZq-dNOw}9>%N6 z&9cgaa=dX4b@jK;U$` zkS&_nNs-A+u2gc0B@??Tl5V|~o-1WrokBV1T3MjO-L9{<+Eb1*TPYa0=l1FSb$|gDfX;Qo zeW*8Wo@CR~12mlF8ush}&fz@0ATIc^%X(K;#>VJN6^*xS^1KcfY=p3enKHi#3eQ&I zBBtn>Xuvcr!N|4DWmWEeVvNG?Y%IQj$Rgr)+Y&atz?GP`05cwVjy17>wDjkwi|Gr9 z#(5B_%E&G+a$x0LlaW04a_VGuG)~u(?C}CaGN+g38`e`HJJ?7nkSl;jt~UCx8hglp zfqXaksxw$$>x7JcC$y@5E0>rahSd-Z1}*tByeo+M%{}v*8?+NCNfflVr(U2%0tfAW znvIe;Xb;lV?OiDX_Piqi2-)+R(kqnR6qT$h+R5922s*2XVl%IC3jw>h-9xVz{cPa( z#RG#LqZHYJ%eX=&NgIOp0}%sPElc4`G*M{fC0rji@egd%AJ~wD)d@??DmnN5&)G>m zu$YPgat@MnC)IZmb2l;fppB#2i;=$&6aI~=*ox~lL<_2qXi%}*p&p$ydu zo$w1aE+aMd7AKE)Yx)vSjl^s6(`-&<{!uoXq{gwDw)`VxaFb{CtRhEWFfvPD!7be8 XH$v+Uck|v_K#_YE{Sqp;kF~!58)CcN diff --git a/src/GameClass.java b/src/GameClass.java index 376fa1e..3c7d2f4 100644 --- a/src/GameClass.java +++ b/src/GameClass.java @@ -1,6 +1,6 @@ public class GameClass { public static void main(String[] args){ - for (int i = 0; i < 7; i++) RockPaperScissors.runGame(); + while (RockPaperScissors.playerScore < 7 ) RockPaperScissors.runGame(); } } diff --git a/src/RockPaperScissors.java b/src/RockPaperScissors.java index a9fb9ef..a720eaf 100644 --- a/src/RockPaperScissors.java +++ b/src/RockPaperScissors.java @@ -2,6 +2,8 @@ import java.util.Scanner; import java.util.Random; public class RockPaperScissors { + static int computerScore = 0; + static int playerScore = 0; public static void runGame() { int computerInput = letComputerChoose(); @@ -13,20 +15,25 @@ public class RockPaperScissors { public static void checkResults(int computerInput, int userInput) { + if (computerInput == userInput) { System.out.println("Draw!"); } else if (computerInput == 1 && userInput == 2 || computerInput == 2 && userInput == 3 || computerInput == 3 && userInput == 1) { + playerScore = playerScore + 1; System.out.println("You win!"); } else if (computerInput == 2 && userInput == 1 || computerInput == 3 && userInput == 2 || computerInput == 1 && userInput == 3) { + computerScore = computerScore + 1; System.out.println("Computer wins!"); + } else { System.out.println("Incorrect inputs: round void"); } + System.out.println("The score is: " + playerScore + ":" + computerScore); } private static String convertToWordUser(int userInput) { @@ -70,7 +77,8 @@ public class RockPaperScissors { public static int letComputerChoose() { Random rgen = new Random(); - int computerInput = rgen.nextInt(1, 3); + int computerInput = rgen.nextInt(1,3); return computerInput; } + }