From 822f6d8cf5b0a1038603c606400364c595538879 Mon Sep 17 00:00:00 2001
From: "artem.didytschuk" <artem.didytschuk>
Date: Thu, 3 Sep 2020 19:10:35 +0200
Subject: [PATCH] SpielErstellen() entfernt

---
 Tic-Tac-Toe/Spieler.class   | Bin 1629 -> 2514 bytes
 Tic-Tac-Toe/Spieler.ctxt    |  30 +++++++++++++++++-------------
 Tic-Tac-Toe/TicTacToe.class | Bin 1393 -> 3238 bytes
 Tic-Tac-Toe/TicTacToe.ctxt  |  12 ++++++------
 Tic-Tac-Toe/TicTacToe.java  |  22 ++++++++++++++--------
 5 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/Tic-Tac-Toe/Spieler.class b/Tic-Tac-Toe/Spieler.class
index 3820a08fdbb71db0aaad74644410dd0ece75d8c9..4f1d6094b797fe016f6546373b1277fc4e359e66 100644
GIT binary patch
literal 2514
zcmaJ?{c;mk96h)B-Y#jIQYf@QP(IR7sGtJ21%+ZIHnd185D{gYT$81n-Ar}^wlCl-
z_z=!0jD?x%_y9hX<GH&lN!qP{<bMCo`JLZAck}l@yMF<=hL(mg+(_YO2A|?H4MVt<
z!6<I4W=T!&sL|)DSys&#>fGHNW6K)uVO6cI<sk4?3J+4K2*hopB?WTj=f(?T&NA%A
zT*d2{c4I*x;hM6+O;HjUwoO@=9m{A)TR`u0?YgvY+1p0b643mEZpZM{={o|cO~-Z}
zi?i_nxa*nLT%~5%w(Jl&xoFy^cT-@Zu%CG5A=6rN>Wm&Ko3>o-wl-vE-Pllgxw2C;
ztcOO&RP%5#?lnzUAXBciO=<ZIiT0{5EbXeL?QVmZg_$Q*l59U-aXNK1s0M@aUi!DC
z>zS>V(ikhuP|4`_OVh12CG&2`4O`K~)p38HiE6#N2&7%<Rf3wu3nir^*$(GfZmkZK
zustvx;r@exq8@4w&QlE{_?iwEX7*Q&>^u;%F?TA>s)&Bh5iSgZY89v3smWzi)m9J7
zcS(6c$24XI#(ZD&UtbFAI=;q3b>NYX<CxNs!?=#exUS<UCUhKD%_NTLsNx&e@V4W4
zuGcZz_oUZ!>h4GqPty2S$5VWl!uL9!;e?JOm`H=XPq9G<g}E@g=ghT@=d$JvELFB#
zPqqYxOkUYUP!`jfE7|R?M<Yw4MY~OgF59!AE+}QoAH9-I(3sO@+k?2zSMVQ%h8pOY
ztjISFFW-<a9U7U0M_b0GTypH1;XN|FCP%Jk*d9%CF3Q+Zw>Iv}V`hDPOslQfE%nsI
ze7-WD7x`5-0)+_NQYpd@DM(dHQ{YUmfTsPz*_7c65At3%YM#^CN@0_3Ej!L;w@uQL
zdZ<g5;kuGye(om?F@meSYuI&5x@UsGh5Z8iRt5ssx7sq|_>;c#!EG<}YYQQk49lvR
zo?J+QU!Sx4^hM<+aPt4p;WR&vWBgPm`J<uPLOI#*=}o_<z5Sl%_ItXYz0NP{G)}NR
z$=PGX`6UJ>i*F%{e_*Kk8nL&C?;ugUu!H0)?hWA-+Z;~<8rw9-!+bnC@?1F*#51G!
zI3p6?XFmM2;tbA)EE|l9ac{c#I}&e@S`7Oei9fY!Y-+6<pI-Zo`vFtdKRZgEF{;e@
zEcqZlWJy!&IjZC9VixB)8sfNsnUHUtr+rnUbuy)`#o`qEO!KE5XdGz2?%|pw*D+>&
zJVH^L97Uf?-~whthAtHeqAV1v1dc!3K}L<zYLtGBVX`E5nH%2VP&ic?@R!}ih`-z`
z?GYphb&|zBMPYds@HFOG&OBGub&)0%E^zT(3aY4TZ&nd!6>)Z73I}rr*Ljwl=g4`U
z(h7Ziv+wvWVJ?(>lO<I}O%|u9wwJy7D`yteaM4Ey43P{Gltn)X%Xc{%E4vr#GO?~4
zfORFr`Y;-6UtU*<b?pGGk3y`EaW&Mav<j+8sQc?VGU+ca`Y^$TB;FP18m>nKXMQ0{
zVCNwCR%Gxek-^!$!OM}s^O3>ny}>IH!7(~Y<+q3?dyN8qz;iVC2uhr1x$`C0R{Zw<
Ezlu-fYybcN

literal 1629
zcmZ`(X;TwH5Pchx&B1boLj=69Bq$LtR1ohYN<o#eC@4Q|lBuwmOj5fW5B`9E#ww2z
zsZz@y;E%F=GrMI-h#xXNGu{1O_v_jG{`378fCW5FVF1_SSV-bJZln;w%_J-=s%1$X
zZ>im~T5hZ5j#}=<aW9Vh2BOlg3j^tuZTq#Iui3JiFZ!+{tBVF=o+GMs8U+LW(h(Km
z*6gZ~1}wKFD?;9tJN8!1KuQOCuI;Pn2L|G=8q#ajcp43WTfS4v7t6Mk!X>h~<VeR~
zHZYz!NSs|~S@#<iW)H16QmnS>CE>oXOA0T&(kR=tb=!5+IlPSeTaITSxl(L8qNW*Q
z%~jo4!c$i}ttv4y*_Z6ZY;HVjxD~b83^t?f^6v@Hcj|T3V_zoAPKI~hI9_>6u<oiT
zNkx<JgkKDliDn9_TC*9R2kBbv5USa69HReuhjatY&U3s<1YP-9CVNmDvNIrLV}<Nz
zP-X1r9O6YMXsXy~xn=RlQ3_h2NONl97AC<iNA&df4=Ij^79QcT3V32+0*5RNV#q=P
z^A<)iVqsV<V;HxP#t3H~;!?BrTUsk^i?Xl9q)z)B#dn@B>INbXr5+C&bsG7CY_@zp
zKw;PUOeVwE(dAH*$EA4d7o?99e9Z&=5KR79AXli$v}Ik|vRrLhthVfiHU%=^FxM%b
zHW1~v0!-%iVB~%vviSvldx-8LmYdy$`I){5rn#mWsj{O;aNkcX3p2c#2=Z|RM|mO=
zj<Fto5ID{%1C|oA`ska<eMRgW;!B~u75kam?3-TOjLximqCa37)Um_l8DURp&2l`*
z4_Oi%z)5<kEvq=iU4;A7I1}={V6^UPxI(5xZ7DZRo7{T8ixfAhk6m1o<T}jpPW9+0
zL5{PU%fLBgLWX7HD+V(+y^Ca9CH2n(DiCA$ZFS6l>X^ueSh?O<{oPoniFM{bShFG4
z`QBIu>dF!;_aCeaA=Vu7VUNlh>?TIZ%=UOpeVNxVRuB-jXW$~{d7~cI{^aBbUIeoZ
glCShkzSJ|hzdQLx&*aNJlM~&^%RQ5?==!ey1+NVO>Hq)$

diff --git a/Tic-Tac-Toe/Spieler.ctxt b/Tic-Tac-Toe/Spieler.ctxt
index 7811ac9..ab29caf 100644
--- a/Tic-Tac-Toe/Spieler.ctxt
+++ b/Tic-Tac-Toe/Spieler.ctxt
@@ -3,21 +3,25 @@ comment0.target=Spieler
 comment1.params=pName
 comment1.target=Spieler(java.lang.String)
 comment10.params=
-comment10.target=int\ getRundenAnzahl()
+comment10.target=int\ getSiege()
+comment11.params=
+comment11.target=int\ getNiederlagen()
+comment12.params=
+comment12.target=int\ getRundenAnzahl()
 comment2.params=
 comment2.target=int[]\ spielzug()
 comment3.params=
 comment3.target=double\ siegesrateBestimmen()
-comment4.params=pSiege
-comment4.target=void\ setSiege(int)
-comment5.params=pNiederlagen
-comment5.target=void\ setNiederlagen(int)
-comment6.params=pRundenAnzahl
-comment6.target=void\ setRundenAnzahl(int)
-comment7.params=
-comment7.target=java.lang.String\ getName()
-comment8.params=
-comment8.target=int\ getSiege()
+comment4.params=
+comment4.target=void\ sieg()
+comment5.params=
+comment5.target=void\ niederlage()
+comment6.params=pSiege
+comment6.target=void\ setSiege(int)
+comment7.params=pNiederlagen
+comment7.target=void\ setNiederlagen(int)
+comment8.params=pRundenAnzahl
+comment8.target=void\ setRundenAnzahl(int)
 comment9.params=
-comment9.target=int\ getNiederlagen()
-numComments=11
+comment9.target=java.lang.String\ getName()
+numComments=13
diff --git a/Tic-Tac-Toe/TicTacToe.class b/Tic-Tac-Toe/TicTacToe.class
index 1f2eff9824b9a9318ffb50afe98bb6745d601f16..b7bedb34291d81889aaf7d542f92f3ccf44baadd 100644
GIT binary patch
literal 3238
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
W5*FFC*5e52mE3uf*>E%%kNpE32-`mZ

literal 1393
zcmZuwTTc@~7(KJQZJ}LCh2jnHuC%36DR>3(f}$i96G0U5Who;rlr34dYV=L{6+Zgn
zi!UY$i6*@H;<LZO|KKI+ndw@Inr3I_yPor%nST87ZWF*sT#aKJ24grLhk?Onq;MjJ
zcD0{W%c&Sn$I*l{Dm)aYXIQz<D&L4Q&nfeK3>RX!DA2sR;>yZBS(z6wXJ<zRVt&o@
zTyH@@+!3&R$786iwCFr=3bnwk6mHN{T^<r>(zVj>XPeTb>LdLv?xH|+*!A3Cgsn5#
zX*L_J&P##TlIzKd+VY(Ar<}P8J#D3G*{MuBzN_reX$AM)Re?ll$}LYh<*BM<^Q6YS
z?5_s0QjwlOPo_?-;&=;%$-pP`p?^IJJ+`{i?>WmFPEWJ7M2Cy@aO=EZD=$esQC%5Z
zqfQ2nA1F+*$ZwpV%bAv{J_RynX*Vs%hgHv0DJ@JcFI{t1!eJ7+!*tc3lPsbf)HXg@
zt@&j+<|+x2jVb#SIUAkm5=i|myN&JGVWSQ0Hqz)IZB0}9s$kT{C0w@AgDx98vCGC7
zuGlz+ejB^7i`Ucu`Q2J;aD8r3mIHx~|7fX|^W>vo++&878PBRg^)!!bd?Z#TJ3Eg3
zd{f)_JR|(bjVlyAy_2xsNl5Qx!aV|^M&#N}YX&Ayz~0;jMD9I|nGKk4VdbLH4~Q6V
z5zWzzy=IDmJzTeIs01uN>sHuo*+PF3dl|Fqt+0=@!1Dnd3}HOND2nO#XqxHWK=Xt;
z<asz_{pp=#7C26`9wn`N4%X|!o@%&5IIMBfIKq>`?1a*swe9q)AuW1&6(M%7=0ZMy
zfTFs=&Ml-xgLLM1p(uu=*UVvaq&xQp(ajggnkTFdOBvlon(6wf!%FSDxn_x%KR>UT
zTtCrmMb;62j;o!|aVfWs1YPzzTCS;zyxCXGTYah9HyKIZ3d5~`hp*SeFMn<-?xwzg
zF@4{i9I;zV-^D3<7&%INfRc|;^otZ}jN(jCqPvVb$Uq{CW#sS#y?BN~L);YWvh-X0
z6&TAAX9CBOXGepmYoRg*o}!O0OE614gXj-f{3m`#LVQKn7ewOU_$M&bqYs78a~I4t
W%vWmF?CZ)8Y*F55C|}fB1HS->7x23P

diff --git a/Tic-Tac-Toe/TicTacToe.ctxt b/Tic-Tac-Toe/TicTacToe.ctxt
index e0bf78d..ce818fa 100644
--- a/Tic-Tac-Toe/TicTacToe.ctxt
+++ b/Tic-Tac-Toe/TicTacToe.ctxt
@@ -1,11 +1,11 @@
 #BlueJ class context
 comment0.target=TicTacToe
-comment1.params=
-comment1.target=TicTacToe()
-comment2.params=sp1name\ sp2name
-comment2.target=void\ spielErstellen(java.lang.String,\ java.lang.String)
+comment1.params=sp1name\ sp2name
+comment1.target=TicTacToe(java.lang.String,\ java.lang.String)
+comment2.params=
+comment2.target=void\ druckeSpielfeld()
 comment3.params=
-comment3.target=void\ druckeSpielfeld()
+comment3.target=void\ spielStarten()
 comment4.params=
-comment4.target=void\ spielStarten()
+comment4.target=boolean\ spielVorbei()
 numComments=5
diff --git a/Tic-Tac-Toe/TicTacToe.java b/Tic-Tac-Toe/TicTacToe.java
index f626a13..4289a10 100644
--- a/Tic-Tac-Toe/TicTacToe.java
+++ b/Tic-Tac-Toe/TicTacToe.java
@@ -8,16 +8,14 @@ public class TicTacToe {
     Random rand = new Random();
     Spieler spieler1;
     Spieler spieler2;
-    public TicTacToe() {
+    public TicTacToe(String sp1name, String sp2name) {
         spielfeld = new String[3][3];
         running = false;
+        spieler1 = new Spieler(sp1name);
+        spieler2 = new Spieler(sp2name);
     }
 
-    public void spielErstellen(String sp1name,String sp2name){
-        Spieler spieler1 = new Spieler(sp1name);
-        Spieler spieler2 = new Spieler(sp2name);
-        
-    }
+   
     
     public void druckeSpielfeld(){
         System.out.println ("           ");
@@ -62,14 +60,22 @@ public class TicTacToe {
                System.out.println("Tippe zuerst X Koordinate, dann Y Koordinate von unten links!");
                kord=spieler2.spielzug();
                spielfeld[kord[0]-1][kord[1]-1]="X";
-               spielVorbei();
+               if(spielVorbei()){
+                   spieler1.sieg();
+                   spieler2.niederlage();
+                   return;
+               }
                //Spieler1 am Zug
                druckeSpielfeld();
                System.out.println(spieler1.getName()+" ist an der Reihe!");
                System.out.println("Tippe zuerst X Koordinate, dann Y Koordinate von unten links!");
                kord=spieler1.spielzug();
                spielfeld[kord[0]-1][kord[1]-1]="O";
-               spielVorbei();
+               if(spielVorbei()){
+                   spieler2.sieg();
+                   spieler1.niederlage();
+                   return;
+               }
            }
         }