From 8e60917fffa80cd202d2bc489ae7405c694b5aca Mon Sep 17 00:00:00 2001
From: jnnsrctr <99033602+jnnsrctr@users.noreply.github.com>
Date: Tue, 9 Aug 2022 09:25:20 +0200
Subject: [PATCH] hotfile-v1.3

---
 Archer.class   | Bin 1702 -> 1672 bytes
 Archer.ctxt    |  10 +-
 Archer.java    |  69 +++++++-----
 Arrow.class    | Bin 1930 -> 1930 bytes
 Arrow.ctxt     |   4 +-
 Arrow.java     |  33 +++---
 CanvasBG.class | Bin 4624 -> 4789 bytes
 CanvasBG.ctxt  |  58 +++++++----
 CanvasBG.java  | 277 +++++++++++++++++++++++++++++++------------------
 Game.class     | Bin 1573 -> 1573 bytes
 Game.ctxt      |   2 +-
 Game.java      |   4 +-
 Points.class   | Bin 1394 -> 1394 bytes
 Points.ctxt    |   6 +-
 Points.java    |  31 ++++--
 Terminal.class | Bin 5362 -> 5396 bytes
 Terminal.ctxt  |  33 +++---
 Terminal.java  | 223 ++++++++++++++++++++++++++-------------
 package.bluej  |  48 ++++-----
 19 files changed, 503 insertions(+), 295 deletions(-)

diff --git a/Archer.class b/Archer.class
index f36f61330d9ce04605514a443d3b84815a3a20c9..c27cbc66b2b96f383015d6c1a60649a58753385b 100644
GIT binary patch
delta 210
zcmZ3++rhiRkCBZvwJ5PTb#oNsWJbou$?uqCB^4N07!(;e8I%~L7?go56$Uj1RR(Pa
zwaqHbYK)4y4BQNQ48jZs4C)L<3|<T-3|S1O4808I3~L!I7%nhaPR?eL=j3BxV_;-p
zU^p>(Ba86lWh^3-XECqRS7P7*ia9WdFgP;EF*pNBSB69eH-;7l4~8WSo(#u<=E(w8
x@IdvhX0_uD0y-y@fsY}AL5Lx8@;6p5-bA2C3Q!~+D3USRm(7MTe{vU_3;@ajCH?>a

delta 214
zcmeC+UB<h?kCBHvwJ5PT)v+i!BeiIA2;*c%#)`==m}Dh|8CV!Z7&sY38KfA*7!(=A
z8Ppgg7_=EAH_I`rF)AuEa5Jbd2m=Mx88jHY7_=C&fReoox(sU>^cXHM=ub{%k>^xn
zU}IopU|_g2xtB$Kas%@bU1Ol3CJb^6W(-CQ77U>bRt%*K)(kTkY#DYi*fHE@uxF43
zs^@{}VzuLS0XoE;fe&bh5QFz*eKyg_Z&^)w1AwBzK+!OuXgE;RhB0n(4x0=B-SZ}d

diff --git a/Archer.ctxt b/Archer.ctxt
index 7371f26..bb353e9 100644
--- a/Archer.ctxt
+++ b/Archer.ctxt
@@ -1,17 +1,21 @@
 #BlueJ class context
 comment0.target=Archer
-comment0.text=\r\n\ Beschreiben\ Sie\ hier\ die\ Klasse\ Archer.\r\n\ \r\n\ @author\ (Ihr\ Name)\ \r\n\ @version\ v1.2\ (02.06.2022\ 15\:35)\r\n
+comment0.text=\r\n\ Class\ Archer\ creates\ and\ draws\ the\ archers\ on\ the\ Canvas.\r\n\ This\ class\ is\ able\ to\ move\ the\ archers\ from\ right\ to\ left\ /\ left\ to\ right.\r\n\r\n\ \r\n\ @author\ \ Johannes\ Richter\r\n\ \ \ \ \ \ \ \ \ \ Simon\ Cirdei\r\n\ \ \ \ \ \ \ \ \ \ Christoph\ Schramm\r\n\ \ \ \ \ \ \ \ \ \ \r\n\ @version\ v1.3\ (02.06.2022\ 16\:45)\r\n
 comment1.params=inputplayer\ archercolor\ usedcanvas
 comment1.target=Archer(int,\ java.awt.Color,\ Canvas)
+comment1.text=\r\n\ Constructor\ for\ instances\ of\ Archer\r\n\r\n\ @param\ inputplayer\ \ \ \ current\ player\r\n\ @param\ archercolor\ \ \ color\ of\ the\ archer\r\n\ @param\ usedcanvas\ \ canvas\ where\ to\ plot\ the\ arrow\r\n
 comment2.params=
 comment2.target=void\ draw()
-comment2.text=\r\n\ Es\ wird\ ein\ Archer\ an\ der\ von\ CanvasBG\ vorgegebenen\ Stelle\ und\ Farbe\r\n\ gezeichnet\r\n\ \r\n
+comment2.text=\r\n\ The\ archer\ will\ be\ painted\ at\ the\ pre-set-position\ on\ the\ Canvas\r\n
 comment3.params=
-comment3.target=void\ eraseArcher()
+comment3.target=void\ erase()
+comment3.text=\r\n\ The\ archer\ will\ be\ erased\r\n
 comment4.params=
 comment4.target=void\ stepRight()
+comment4.text=\r\n\ The\ archer\ moves\ to\ the\ right\r\n
 comment5.params=
 comment5.target=void\ stepLeft()
+comment5.text=\r\n\ The\ archer\ moves\ to\ the\ right\r\n
 comment6.params=
 comment6.target=int\ giveXposition()
 comment6.text=\r\n\ Supply\ other\ classes\ with\ the\ current\ X\ position\ of\ the\ Archer\r\n
diff --git a/Archer.java b/Archer.java
index dd560ce..65bd06d 100644
--- a/Archer.java
+++ b/Archer.java
@@ -3,33 +3,43 @@
 import java.lang.*;
 
 /**
- * Beschreiben Sie hier die Klasse Archer.
+ * Class Archer creates and draws the archers on the Canvas.
+ * This class is able to move the archers from right to left / left to right.
+ *
  * 
- * @author (Ihr Name) 
- * @version v1.2 (02.06.2022 15:35)
+ * @author  Johannes Richter
+ *          Simon Cirdei
+ *          Christoph Schramm
+ *          
+ * @version v1.3 (02.06.2022 16:45)
  */
 public class Archer extends Game
 {   
-    private Color color;                 // color of the arrow
-    private Canvas screenbg;             // canvas where to plot the arrow
-    private int xPosition, yPosition;    //position at the start
+    private Color color;                 // color of the archer
+    private Canvas screenbg;             // canvas where to plot the archer
+    private int xPosition, yPosition;    //_position at the start
     private int playerno;                // number of the player
     
+    
+    /**
+     * Constructor for instances of Archer
+     *
+     * @param inputplayer    current player
+     * @param archercolor   color of the archer
+     * @param usedcanvas  canvas where to plot the arrow
+     */
     public Archer(int inputplayer, Color archercolor, Canvas usedcanvas)
     {
-        playerno = inputplayer;
-        xPosition = super.archerXpos + (playerno-1)*33;
-        yPosition = super.archerYpos;
+        playerno = inputplayer;                            
+        xPosition = super.archerXpos + (playerno-1)*33;     //x-position Archer: access from super-class
+        yPosition = super.archerYpos;                       //y-position Archer: access from super-class             
         color = archercolor;
         screenbg = usedcanvas;    
     }
 
     /**
-     * Es wird ein Archer an der von CanvasBG vorgegebenen Stelle und Farbe
-     * gezeichnet
-     * 
+     * The archer will be painted at the pre-set-position on the Canvas
      */
-    
     public void draw()
     {
         screenbg.setForegroundColor(color);
@@ -39,33 +49,37 @@ public void draw()
         // the body top to bottom
         screenbg.drawLine(xPosition+15,yPosition+13,xPosition+15,yPosition+53);
         // the arms
-        screenbg.drawLine(xPosition, yPosition+8,xPosition+15, yPosition+23); //left arm
-        screenbg.drawLine(xPosition+15,yPosition+23,xPosition+30,yPosition+8); //right arm
+        screenbg.drawLine(xPosition, yPosition+8,xPosition+15, yPosition+23);   //left arm
+        screenbg.drawLine(xPosition+15,yPosition+23,xPosition+30,yPosition+8);  //right arm
         // the legs
-        screenbg.drawLine(xPosition,yPosition+68,xPosition+15,yPosition+53); //left leg
+        screenbg.drawLine(xPosition,yPosition+68,xPosition+15,yPosition+53);    //left leg
         screenbg.drawLine(xPosition+15,yPosition+53,xPosition+30,yPosition+68); //right leg
     }
     
-    public void eraseArcher()
+    /**
+     * The archer will be erased
+     */
+    public void erase()
     {
         screenbg.eraseCircle(xPosition+8,yPosition,14);
-        screenbg.setForegroundColor(super.bgColor); //da keine Methode, um die Linien zu entfernen existiert, weiß machen
-        // the head
-        screenbg.fillCircle(xPosition+8,yPosition,14);
+        screenbg.setForegroundColor(super.bgColor); //no erase-function: redraw with canvas-backgorund-color
         // the body top to bottom
         screenbg.drawLine(xPosition+15,yPosition+13,xPosition+15,yPosition+53);
         // the arms
-        screenbg.drawLine(xPosition, yPosition+8,xPosition+15, yPosition+23); //left arm
-        screenbg.drawLine(xPosition+15,yPosition+23,xPosition+30,yPosition+8); //right arm
+        screenbg.drawLine(xPosition, yPosition+8,xPosition+15, yPosition+23);   //left arm
+        screenbg.drawLine(xPosition+15,yPosition+23,xPosition+30,yPosition+8);  //right arm
         // the legs
-        screenbg.drawLine(xPosition,yPosition+68,xPosition+15,yPosition+53); //left leg
+        screenbg.drawLine(xPosition,yPosition+68,xPosition+15,yPosition+53);    //left leg
         screenbg.drawLine(xPosition+15,yPosition+53,xPosition+30,yPosition+68); //right leg
     }
     
+    /**
+     * The archer moves to the right
+     */
     public void stepRight()
     {
         // Erase at current position
-        eraseArcher();
+        erase();
             
         // Calculate new position and decide which direction to walk
         xPosition += 1;
@@ -74,10 +88,13 @@ public void stepRight()
         draw();
     }   
     
+    /**
+     * The archer moves to the right
+     */
     public void stepLeft()
     {
         // Erase at current position
-        eraseArcher();
+        erase();
             
         // Calculate new position and decide which direction to walk
         xPosition -= 1;     
@@ -93,4 +110,4 @@ public int giveXposition()
     {
         return xPosition;
     }
-}
\ No newline at end of file
+}
diff --git a/Arrow.class b/Arrow.class
index 6a34046366fdfb72b5ab4ab228006312a8313e46..cf08137ed7a08f4ec2b0e111418160a2ee47a172 100644
GIT binary patch
delta 208
zcmeC;@8aK3#Nytvl|fibXDfq<miAT#(TxlY3``8RKvIu^8%U}$urNq4@H0p<NCBZC
zgEWH&gA9W&gBn8!gE~Vrg9bwagC;{NgVyAoESa2!Ks`nbvJA$PwOPGbtr&zDtS48o
z_H!L&OIZlCK#=L^WMQ@`wk|+J-5HdDMujr?FeEbgGvqP^FqAO_GSo2yGfV&)Jq;*x
vnIW9v7DEKX6NV^;*FdX2GQ=}{Wk{I(gw2OBeX=3D4P!o#6lM1YJJ|;S0F5YY

delta 208
zcmeC;@8aK3#NuAPl|fibXDfq<miAT#(TxlY3``8RKvIu^8%U}!urP=+@H2=pNHK^r
z7&1sOcrZvZ_%f(6gfOTvL^G%}Brs?&q%vqu-pP{5X#mt?$RNvLG+CR~i`9}rh{0-d
z6>C4&9=4Q)Knnz!_DmLLn_}w>G}MhjnZcbQl);-Jk-?84m%*Q*j3I!bjv<I)0z)vv
zG@$X98NwKDF@!TbVTfdS%@D=#ks*%ZD?|L`Cu}~9X_F1vZ5Z=_q$s;L*vUQs;87?g

diff --git a/Arrow.ctxt b/Arrow.ctxt
index 76500d0..9ddea64 100644
--- a/Arrow.ctxt
+++ b/Arrow.ctxt
@@ -1,9 +1,9 @@
 #BlueJ class context
 comment0.target=Arrow
-comment0.text=\r\n\ Arrow\r\n\ \r\n\r\n\ \r\n\ @author\ CS,\ SVC,\ JR\ \r\n\ @version\ v1.2\ (02.06.2022\ 15\:35)\r\n
+comment0.text=\r\n\ Class\ Arrow\ calculates\ the\ trajectory\ of\ the\ "arrow".\ \r\n\ This\ class\ is\ able\ to\ draw\ and\ erase\ the\ arrow.\r\n\r\n\ \r\n\ @author\ \ Johannes\ Richter\r\n\ \ \ \ \ \ \ \ \ \ Simon\ Cirdei\r\n\ \ \ \ \ \ \ \ \ \ Christoph\ Schramm\r\n\ \ \ \ \ \ \ \ \ \ \r\n\ @version\ v1.3\ (02.06.2022\ 16\:45)\r\n
 comment1.params=inputcolor\ usedcanvas
 comment1.target=Arrow(java.awt.Color,\ Canvas)
-comment1.text=\r\n\ Constructor\ for\ instances\ of\ Arrow\r\n\r\n\ @param\ xPos\ \ \ \ \ \ \ \ x-coordinate\ of\ the\ arrow\r\n\ @param\ yPos\ \ \ \ \ \ \ \ y-coordinate\ of\ the\ arrow\r\n\ @param\ ballcolor\ \ \ color\ of\ the\ arrow\r\n\ @param\ usedcanvas\ \ canvas\ where\ to\ plot\ the\ arrow\r\n
+comment1.text=\r\n\ Constructor\ for\ instances\ of\ Arrow\r\n\r\n\ @param\ inputcolor\ \ color\ of\ the\ arrow\r\n\ @param\ usedcanvas\ \ canvas\ where\ to\ plot\ the\ arrow\r\n
 comment2.params=
 comment2.target=void\ draw()
 comment2.text=\r\n\ Draw\ the\ arrow\ on\ the\ current\ position\ on\ the\ canvas\r\n
diff --git a/Arrow.java b/Arrow.java
index aad29c4..69364cd 100644
--- a/Arrow.java
+++ b/Arrow.java
@@ -4,38 +4,39 @@
 import java.util.Random;
 
 /**
- * Arrow
- * 
+ * Class Arrow calculates the trajectory of the "arrow". 
+ * This class is able to draw and erase the arrow.
  *
  * 
- * @author CS, SVC, JR 
- * @version v1.2 (02.06.2022 15:35)
+ * @author  Johannes Richter
+ *          Simon Cirdei
+ *          Christoph Schramm
+ *          
+ * @version v1.3 (02.06.2022 16:45)
  */
 
 public class Arrow extends Game
 {
-    private Color localcolor, colpl1, colpl2;      // local variant of color of the arrow
-    private Canvas screenbg;  // canvas where to plot the arrow
-    private int xPosition, yPosition;    // position at the start
-    private int localcurplay;  
-    Random r1 = new Random(); // random number between 0 and 1
-    Random r2 = new Random(); // random number between 0 and 1
+    private Color localcolor, colpl1, colpl2;       // local variant of color of the arrow
+    private Canvas screenbg;                        // canvas where to plot the arrow
+    private int xPosition, yPosition;               // position at the start
+    private int localcurplay;                       // count which players turn it is
+    Random r1 = new Random();                       // random number between 0 and 1
+    Random r2 = new Random();                       // random number between 0 and 1
     private double speed = super.speedMin + (super.speedMax-super.speedMin) * r1.nextDouble();   // may be 18-30
     private double angle = super.angleMin + (super.angleMax-super.angleMin) * r2.nextDouble();   // may be 10-60
-    private double time = 0;
+    private double time = 0;                        // time setting  
 
     /**
      * Constructor for instances of Arrow
      *
-     * @param xPos        x-coordinate of the arrow
-     * @param yPos        y-coordinate of the arrow
-     * @param ballcolor   color of the arrow
+     * @param inputcolor  color of the arrow
      * @param usedcanvas  canvas where to plot the arrow
      */
     public Arrow(Color inputcolor, Canvas usedcanvas)
     {
-        xPosition = super.arrowXpos;
-        yPosition = super.arrowYpos;
+        xPosition = super.arrowXpos;     //x-Position of the Arrow: access from super-class   
+        yPosition = super.arrowYpos;     //y-Position of the Arrow: access from super-class  
         screenbg = usedcanvas;
         localcolor = inputcolor;
     }
diff --git a/CanvasBG.class b/CanvasBG.class
index deb0aad00d06a1157f8dc6e6dd28dd6d8d35d2d7..03ea69187c4cf33289b4f79323907dea9f4b9650 100644
GIT binary patch
literal 4789
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

literal 4624
zcmai1YjjlA75>h>cV;q^2}~d;0hCvfFg$}AlvfQ{C~ZI_6bPtrGjmBsCNtyABmosc
z1yOv}BCVnzn6_!H6^JH5VztUz){3@v_4PwrS^ZOLtL<ukv};kJ-#&L<2wnV`bNAV2
zpMCc0JNwMLXOF)QU>05rU?%SHqZVlyGBRZS<h2XcAylVOn|;_)hC5|`R{(z8EzGR}
z4)@4(n=EV>-n~NI=fnL048;x^c8b6QLhX{_K^Yzr(cONG$HTJvh!2kja0MQd$>YNQ
zrVLNW@GT$q1o(Z@hrIzzz_(@CDf_=8!&5SST84cxJR};P@!{D3reVJfJAF9d!*dE{
znMm4k63s0n8y4D$4m&eP!JoC$ElxI@Oev@(oI4$MJQGQ#9R**cJ)Mf%TNJ#SQ=2Dd
zDg^9wI@uXX#*=A<P{ZwZhdtfy%uZh@9O_jze~r{ppN_OTX>KiRa7ixam{j9!l%w?O
z@?<QL6_Z>Z7ya4RSf*ai;TG;DA<J`PiCA{Nf~Tf&$)r^Z*1}|z)(&onC7fmLZOu-4
zrQIASXGlXbV#in6>6pxOOiPr~{#*zaEEbiqM5;YYi_0?%N7fAqWiqYFWHx7jSu=^@
z@panqcxx<6=ho7t=Jt3z<80wsRmBjja3Wbd(Gqv4xvWLUJh@qf<91|IvyfIancyBB
z>vlWqMCnX(JeJs`P|=vB)KWW@GuM|&Gb{@hE6@Ns>uF{b5~5AMT3fjmaf2&HciO4^
z#H!H|DrX|oP9mF%Cz9MM60QY-NZhg0i(*ckCiv->&Z>kbo|I7V44LQybfzTgOI)2g
zX8F1(FV2`aUq>tx(<!iO)@rM%EK83Ajmh?O#90)R^i;S-xM1-#sh%Jf<JKUqMO_f{
zFh7XvggPk0^)eiiVK(ZREq5P@nKv?9nIN9WT-n|g#MQVah+9O_chMHa_hey?4By9G
z+OBgcqTNCKK%{<%<{(}W>PNUah!<s;B`5t@Hob(ytfE3~7ZNKPjs$TOJwd!Ig0INX
zD@P0}NNXgBWFIYc6C$(zAij(nf~c3_n4J8o499VVVlD<mY=C*n$A<;8*luIQf;!yG
z2}zBp(y2tfxkaC;FtNt1#yHDxdSjLq)G}wul46CrAeF=fGER0?K3TztfVZf=WJ>iT
zb4rUS&)*^%gweE3m|C5-fWvA_c1VU>VjWIXDw&C8V@VdRp06p+y<41kT+ls)W-Q`G
z(2`EJC!#qohF)->9OPsDxfN(_jK$*$rDBb(cFLI}VrE*SO2bd1i>P9NWwR`gs<|K>
zrQY~6Stqq3*3wE}%7kukHj=E66AM+qIn@=nVJz?CnQSW+Fr*Mk8B)*s%c9a>R<-`J
zruCN<t-mZ%{blL%tE5Ksmt~^A3$RdsZ`5A{U%?{I%P6@RU*))jvuELh$?yDdKU8>B
zFO2ZWUYKF47gjj@3Ov2=%GcM6vhV=>O+x~e=IKh~wH}oBBiM_Ia32O8r3M3E<9HQ&
z2~Z6SBS?+JAdF(~x`Nb|Y)GSt%Q1xNSbUvQW89O`fTf(#1}x)GY3e5WXpmlxn_Wvi
z^|X|_&5^XG!s^3del6=D4d_9r7nR)@A{@^_1jrde&H#oskyR-h`gz+<?!z#1-l%<8
zBb-oGA1)*7a{h+XA#d~$0@gfpe)qYL$*K-jbz!Kih1>;;3vbK9{=C>RS>1o`sJrO}
zv(7T>Jj1MgMu#l$48zC4Y~64O+wz<;m(zu|aA;;PMp$*$Fpu~7b0@{59*pe6r~zEj
zWR~m>Rmq-yTshk-Le<_rj25C2@6ZFGdN79jF0#18qq@&MpFdl+YimyAIiVb@3rE7C
z>JoG2x@yleCnp=Ka)}EKa?SYv=1Vjxs(lwRf9w~{FY)MndF|2qy#0q1@?^;Gde?<d
z!=XUYm9uwT#FbE0PW)m{h%p5xF5>k0Zd}S~Nq9wd*+rZlccIgTIOLr!iNpCSbR5Qo
zP1n)x&mZP7BVHtQOo5?VhDOpg1p6d}5GEL>U>v4$Hk}ZhK?q*W>*88o40VLxEW+%1
zw!qoAjh!#T)pi20lM;8c=iHA4*h$IVyg;7d6|#rd$5VvtGlc5_+=MRf{uyEVK33oZ
zp8Gqj#3_6OXRu0HSgi(OjT(+7H5O~tWUN!uaEq$NZE6+Pt6Q)^t%t1~G^->c>JdcM
zUO4JGY*fe5qD~;D-p3~Od&Jc#w5d;!Q2#<oeU3W}AZ?h)8e`FJOhktfMyD|Yn~mAn
zV%&^7jkUPTh~jSJUTigX;~wKlY%>mHyKxNn8gJn~<2~GO{1!WmkFnD@jR%Z>VwZ6S
z51Jl4WR_vKS&m1|5FRrxqt|j>J%z#8!1%79k0!Phs9gnWZ-F|)_^xCOy!0rGRhl}^
z*a^=^>-w=;c(iSoUiHzkCcRoFS6uE&yx#bezO;F@8y{f}&o%Ijv7M5QykHL)Td|h;
z^I#pV8;8Lo27QiUJ`7dkhgVdbC10u9GuSZo47#p5gHr)sq<rSM*D0g#gO~f>lKPbE
zbO7U<D)B}owuf%$$Cny}PjI<V2t`9xydy)=C=s(%mZsz?x(8Cn1-z6ZYnjMREy!I8
zSC)uZ(-eKXT?$toE$yLnvH8qrhJdG8_4_cK^*M&^?P~02O&?$!pJSX3vbqnUjjzAm
ztlK?&@$Kh>?--wYZ=zdgdA=K!Tn2{op?4eGtfHRBv7R|IsHH_`&!mp)boMN22<YrF
z=B$xijENi%D*~t$TiqB>XtLO@WZsXfq$5onz=S3b8&;0Dl!2XCbZLY(=Owyym@XY*
zH$6%y_YlG_m-Nuug1OcD6`&~Nk>{fBp*EUxNl#Im7^J(67-Y`lvC>7?vALgTTQ6!f
ztHiWkOk(qVLJZZ-lSEA)<aIEq50l-`luC0)*SQa^d11aBtnPEaB3pX0tDnm9zUTEb
z9C_DW{W@5A{ZuUad5q}ir>I|EDAX^Z(sv&7bUEpMhDx&WDu(cZJOKmD(QC}$Pgnu3
zGfZy~J8v>aZ!st*a68^cnzz?ZyhD8dob~c9>)|9H_3tsjzrauNOG<t~?r%!MeKHqr
z29otu$KVF2Gpg|^SoFjCFRoLyQ){{86v|;wF8cL!g+04GhnrB98LB3@h^##5Mhl)a
z;=EA?G*lJ!mg4S<<?$iU|A=?|A9xG=k^X+n#Gfj$w?1d@2u#FA*07?CpH(c?tk8-W
zM|lkXnnmN`_f~lWdgV2!yO$J7(PW`2jn6{MX%(L!p_zS{I)G_S0$=HtEbQsai251A
z6qITmWX`q(+%t;ChiNwOXC8T))L)pePgvi7Wo`eBwfiX(_8EcpcV1fm(9T@r8dnJZ
ztxTT;p9W(SDTBL4u~{u-L9Ax1<=ty>Jx;*84%SnKeFO4VsNmyfaM756Uidew=Rf+e
V%Ur?2VSXf-U;c+jk_rr@{s%y_@@xPA

diff --git a/CanvasBG.ctxt b/CanvasBG.ctxt
index 4f9e15a..d6a1e8f 100644
--- a/CanvasBG.ctxt
+++ b/CanvasBG.ctxt
@@ -1,26 +1,46 @@
 #BlueJ class context
 comment0.target=CanvasBG
-comment0.text=\r\n\ Startet\ Canvas\r\n\ {@code\ Canvas}\r\n\ \r\n\ @author\ CS,\ SVC,\ JR\ \r\n\ @version\ v1.2\ (02.06.2022\ 15\:35)\r\n
+comment0.text=\r\n\ The\ class\ CanvasBG\ is\ one\ of\ the\ most\ important\ classes\ for\ the\ game\ 2Darts.\r\n\ The\ class\ is\ able\ to\ draw\:\ \r\n\ \ \ \ \ \ \ \ \ \ -\ the\ target\ of\ the\ dartboard\ \r\n\ \ \ \ \ \ \ \ \ \ -\ the\ two\ archers\r\n\ \ \ \ \ \ \ \ \ \ -\ the\ score\ of\ both\ players\r\n\ \ \ \ \ \ \ \ \ \ \r\n\ CanvasBG\ also\ moves\ the\ arrow\ trough\ the\ dashboard.\ Loops\ calculates\ the\ positions\ and\ points.\r\n\ The\ change\ of\ the\ players\ is\ also\ implemented\ here.\ \r\n\ \r\n\ @author\ \ \ \ \ \ Johannes\ Richter\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ Simon\ Cirdei\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ Christoph\ Schramm\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \r\n\ @version\ \ \ \ \ v1.3\ (02.06.2022\ 16\:45)\r\n
 comment1.params=inputa\ starttarget
 comment1.target=CanvasBG(short,\ int)
+comment1.text=\r\n\ Constructor\ for\ instances\ of\ the\ CanvasBG\ (dashboard)\r\n\r\n\ @param\ inputa\ \ \ \ \ \ \ \ input\ from\ user\ for\ target\ size\r\n\ @param\ startarget\ \ \ \ input\ from\ user\ for\ beginning\ of\ target\r\n
+comment10.params=
+comment10.target=void\ printArcher()
+comment10.text=\r\n\ Draw\ the\ two\ Archers\r\n
+comment11.params=currentplno
+comment11.target=void\ swapArcher(int)
+comment11.text=\r\n\ The\ method\ is\ able\ to\ switch\ the\ players.\ \r\n\ First\ the\ position\ of\ the\ archers\ will\ be\ moved.\r\n\ Methods\ from\ Archer\ are\ used.\r\n
+comment12.params=
+comment12.target=void\ clearField()
+comment12.text=\r\n\ Method\ is\ able\ to\ clear\ the\ arrow\ from\ the\ field\r\n
+comment13.params=inputscore1\ inputscore2
+comment13.target=void\ printScore(int,\ int)
+comment13.text=\r\n\ Draw\ the\ two\ Scores\r\n
+comment14.params=state
+comment14.target=void\ visible(boolean)
+comment14.text=\r\n\ Show\ the\ canvas\r\n
 comment2.params=
 comment2.target=int\ shootArrow()
-comment2.text=\r\n\ Shoot\ an\ arrow\r\n
-comment3.params=
-comment3.target=void\ printBG()
-comment3.text=\r\n\ Draw\ the\ background\r\n
-comment4.params=
-comment4.target=void\ printArcher()
-comment4.text=\r\n\ Draw\ the\ two\ Archers\r\n
-comment5.params=currentplno
-comment5.target=void\ swapArcher(int)
+comment2.text=\r\n\ The\ method\ is\ able\ to\ shoot\ an\ arrow\ on\ the\ dashboard\ with\ correct\ color\r\n
+comment3.params=thisArrow
+comment3.target=void\ fly(Arrow)
+comment3.text=\r\n\ The\ method\ is\ able\ to\ let\ the\ arrow\ fly.\r\n\ A\ loop\ checks\ the\ position\ at\ all\ times.\ \r\n\ Within\ certain\ limits\ the\ loop\ finishes.\r\n
+comment4.params=thisArrow
+comment4.target=void\ eval(Arrow)
+comment4.text=\r\n\ The\ method\ returns\ the\ final\ position\ of\ the\ arrow.\r\n\ If\ the\ position\ is\ in\ the\ defined\ area\ of\ the\ bullseye,\ \r\n\ the\ position\ blinks\ and\ the\ points\ will\ be\ set.\r\n\ \r\n\ Same\ function\ for\ the\ different\ areas.\r\n
+comment5.params=
+comment5.target=void\ printWall()
+comment5.text=\r\n\ The\ method\ draw\ the\ background\ of\ the\ dartboard\ with\ brown.\r\n
 comment6.params=
-comment6.target=void\ clearField()
-comment6.text=\r\n\ Clear\ all\ arrows\r\n
-comment7.params=inputscore1\ inputscore2
-comment7.target=void\ printScore(int,\ int)
-comment7.text=\r\n\ Draw\ the\ two\ Scores\r\n
-comment8.params=state
-comment8.target=void\ visible(boolean)
-comment8.text=\r\n\ Show\ the\ canvas\r\n
-numComments=9
+comment6.target=void\ printTarget()
+comment6.text=\r\n\ Draw\ the\ target\r\n
+comment7.params=
+comment7.target=void\ printBlack()
+comment7.text=\r\n\ Draw\ black\r\n
+comment8.params=
+comment8.target=void\ printGreen()
+comment8.text=\r\n\ Draw\ green\r\n
+comment9.params=
+comment9.target=void\ printRed()
+comment9.text=\r\n\ Draw\ red\r\n
+numComments=15
diff --git a/CanvasBG.java b/CanvasBG.java
index 6ad3bf1..f1cc936 100644
--- a/CanvasBG.java
+++ b/CanvasBG.java
@@ -2,191 +2,259 @@
 import java.awt.geom.*;
 
 /**
- * Startet Canvas
- * {@code Canvas}
+ * The class CanvasBG is one of the most important classes for the game 2Darts.
+ * The class is able to draw: 
+ *          - the target of the dartboard 
+ *          - the two archers
+ *          - the score of both players
+ *          
+ * CanvasBG also moves the arrow trough the dashboard. Loops calculates the positions and points.
+ * The change of the players is also implemented here. 
  * 
- * @author CS, SVC, JR 
- * @version v1.2 (02.06.2022 15:35)
+ * @author      Johannes Richter
+ *              Simon Cirdei
+ *              Christoph Schramm
+ *              
+ * @version     v1.3 (02.06.2022 16:45)
  */
 public class CanvasBG extends Game
 {
-    private Canvas screenbg;
-    private int targettop;
-    private int evalscore;   //score from the evaluation
-    private int curplay;   // private variant of currentplayer, the Terminal tells which archer switches
-    private int score1, score2;
-    private Color arrowcolor;
-    private short a;
-    public Archer Archer1, Archer2;     //new archers
-    public Points Score1, Score2;       //new scores
-    private Arrow thisArrow;
+    private Canvas screenbg;        //define a new Canvas
+    private int targettop;          //top of the target (dartboard)
+    private int evalscore;          //score from the evaluation
+    private int curplay;            //private variant of currentplayer, the Terminal tells which archer switches
+    private int score1, score2;     //two scores for two players
+    private Color arrowcolor;       //color of the arrow
+    private short a;                //data-input of the height of bullseye
+    public Archer Archer1, Archer2; //new archers
+    public Points Points1, Points2; //new scoretables
+    private Arrow thisArrow;        //new arrow
     
+    /**
+     * Constructor for instances of the CanvasBG (dashboard)
+     *
+     * @param inputa        input from user for target size
+     * @param startarget    input from user for beginning of target
+     */
     public CanvasBG(short inputa,int starttarget)
     {
-        targettop = starttarget;
-        a = inputa;
-        curplay = 1;     //init local player no
+        a = inputa;                     
+        targettop = starttarget;        
+        curplay = 1;                    //init local player number one
         score1 = super.scorePlayer1;
         score2 = super.scorePlayer2;
         screenbg = new Canvas("2Darts", super.canvasWidth, super.canvasHeight, super.bgColor);
-        printBG();
+        printWall();                    
+        printTarget();
     }
       
-     /**
-     * Shoot an arrow
+    /**
+     * The method is able to shoot an arrow on the dashboard with correct color
      */
     public int shootArrow()
     {
         screenbg.setVisible(true);
+        //set color of the arrow for player one
         if(curplay == 1) {
             arrowcolor = super.colorPlayer1;
         }
+        //set color of the arrow for player two
         else if(curplay == 2) {
             arrowcolor = super.colorPlayer2;
-        }        // Create and show the arrow
+        }
+        
+        // Create and show the arrow
         Arrow thisArrow = new Arrow(arrowcolor, screenbg);
         thisArrow.draw();
         
-        // Move the arrow
+        // Let the arrow fly
+        fly(thisArrow);
+        
+        // Result evaluation
+        eval(thisArrow);
+        
+        //get the score for other classes/methods
+        return evalscore;
+    }
+    
+    /**
+     * The method is able to let the arrow fly.
+     * A loop checks the position at all times. 
+     * Within certain limits the loop finishes.
+     */
+    public void fly(Arrow thisArrow)
+    {
         boolean done =  false;
-        boolean wallhit;
         while(!done) {
             screenbg.wait(20);           // kurze Pause
             thisArrow.move();
             // Stop if the arrow hits the ground
             if(thisArrow.giveYposition() >= (super.canvasHeight - super.arrowHeight)) {
                 done = true;
-                wallhit = false;
             }  // Stop if the arrow hits the target
             else if(thisArrow.giveXposition() <= super.wallThickness  && thisArrow.giveYposition() >= super.wallStart) {
                 done = true; 
-                wallhit = true;
             }  // Stop if the arrow missed the target
             else if(thisArrow.giveXposition() <= 0) {
-                done = true; 
-                wallhit = false;
+                done = true;
             }   // Stop if the arrow is in the clouds
             else if(thisArrow.giveYposition() <= 0) {
-                done = true; 
-                wallhit = false;
+                done = true;
             }
         }
-        
-        //Result evaluation.
-        
+    }
+    
+    /**
+     * The method returns the final position of the arrow.
+     * If the position is in the defined area of the bullseye, 
+     * the position blinks and the points will be set.
+     * 
+     * Same function for the different areas.
+     */
+    public void eval(Arrow thisArrow)
+    {
+        // first statement is false
         boolean evaluated =  false;
-        int blink = 0;
+        int blink = 0;              //init of first blink
+        
+        // checking of the boolean
         while(!evaluated) {
+            // will set the score to 50, if arrow hits the area of bullseye
             if(thisArrow.giveYposition() >= targettop + 4 * a && thisArrow.giveYposition() <= targettop + 5 * a) {
                 evalscore = 50;
                 evaluated = true;
+                
+                // area which has been hitted would blink for 3 times
                 while(blink < 3) {
-                    screenbg.setForegroundColor(Color.yellow);
-                    Rectangle bullseye = new Rectangle(0, targettop+4*a, super.wallThickness, a); //x, y, width, height
-                    screenbg.fill(bullseye);                                       // draw the bullseye
-                    screenbg.wait(200);
-                    screenbg.setForegroundColor(Color.red);
-                    screenbg.fill(bullseye);                                       // draw the bullseye
-                    screenbg.wait(200);
-                    blink++;
+                        screenbg.setForegroundColor(Color.yellow);
+                        Rectangle bullseye = new Rectangle(0, targettop+4*a, super.wallThickness, a);
+                        screenbg.fill(bullseye);
+                        screenbg.wait(200);         // delay for 200ms
+                        printRed();
+                        screenbg.wait(200);         // delay for 200ms
+                        blink++;
                 }
             }
+            // will set the score to 25, if arrow hits the green area
             else if(thisArrow.giveYposition() >= targettop + 3 * a && thisArrow.giveYposition() <= targettop + 6 * a) {
                 evalscore = 25;
                 evaluated = true;
                 while(blink < 3) {
-                    screenbg.setForegroundColor(Color.yellow);
-                    Rectangle greenbox = new Rectangle(0, targettop+3*a, super.wallThickness, 3*a);
-                    screenbg.fill(greenbox);
-                    screenbg.setForegroundColor(Color.red);                                         // draw the green areas
-                    Rectangle bullseye = new Rectangle(0, targettop+4*a, super.wallThickness, a); //x, y, width, height
-                    screenbg.fill(bullseye);                                       // draw the bullseye
-                    
-                    screenbg.wait(200);
-                    
-                    screenbg.setForegroundColor(Color.green);
-                    screenbg.fill(greenbox);
-                    screenbg.setForegroundColor(Color.red);
-                    screenbg.fill(bullseye);                         
-                    
-                    screenbg.wait(200);
-                    blink++;
+                        screenbg.setForegroundColor(Color.yellow);
+                        Rectangle greenbox = new Rectangle(0, targettop+3*a, super.wallThickness, 3*a);
+                        screenbg.fill(greenbox);
+                        printRed();
+                        screenbg.wait(200);     // delay for 200ms
+                        printGreen();
+                        printRed();
+                        screenbg.wait(200);     // delay for 200ms
+                        blink++;
                 }
             }
+            // will set the score to 10, if arrow hits the black area 
             else if(thisArrow.giveYposition() >= targettop && thisArrow.giveYposition() <= targettop + 9 * a) {
                 evalscore = 10;
                 evaluated = true;
                 while(blink < 3) {
-                    screenbg.setForegroundColor(Color.yellow);
-                    Rectangle blackbox = new Rectangle(0, targettop, super.wallThickness, 9*a); //x, y, width, height
-                    screenbg.fill(blackbox);                                     //  draw the black areas
-                    screenbg.setForegroundColor(Color.green); 
-                    Rectangle greenbox = new Rectangle(0, targettop+3*a, super.wallThickness, 3*a);
-                    screenbg.fill(greenbox);
-                    screenbg.setForegroundColor(Color.red);                                         // draw the green areas
-                    Rectangle bullseye = new Rectangle(0, targettop+4*a, super.wallThickness, a); //x, y, width, height
-                    screenbg.fill(bullseye);                                       // draw the bullseye
-                    screenbg.wait(200);
-                    screenbg.setForegroundColor(Color.black);
-                    screenbg.fill(blackbox);
-                    screenbg.setForegroundColor(Color.green);
-                    screenbg.fill(greenbox);
-                    screenbg.setForegroundColor(Color.red);
-                    screenbg.fill(bullseye);          
-                    screenbg.wait(200);
-                    blink++;
+                        screenbg.setForegroundColor(Color.yellow);
+                        Rectangle blackbox = new Rectangle(0, targettop, super.wallThickness, 9*a);
+                        screenbg.fill(blackbox);
+                        printGreen();
+                        printRed();
+                        screenbg.wait(200);     // delay for 200ms
+                        printTarget();        
+                        screenbg.wait(200);     // delay for 200ms
+                        blink++;
                 }
             }
+            // zero points, if previous requirements not true
             else {
                 evalscore = 0;
                 evaluated = true;
             }
-        }       
-        return evalscore;
+        } 
     }
     
-     /**
-     * Draw the background
+    /**
+     * The method draw the background of the dartboard with brown.
      */
-    public void printBG()
+    public void printWall()
     {
         screenbg.setVisible(true);
         Color brown = new Color(191, 128, 64); // Color brown
         screenbg.setForegroundColor(brown);
-        Rectangle brownbox = new Rectangle(0, super.wallStart, super.wallThickness, super.canvasHeight - super.wallStart);    //x, y, width, height
-        screenbg.fill(brownbox);                                                //draw the brown wall
+        //usage of super variables from superclass
+        Rectangle brownbox = new Rectangle(0, super.wallStart, super.wallThickness, super.canvasHeight - super.wallStart);
+        screenbg.fill(brownbox);
+    }
+    
+    /**
+     * Draw the target
+     */
+    public void printTarget()
+    {
+        printBlack();       // draw black area
+        printGreen();       // draw green area
+        printRed();         // draw red area
+    }
+    
+    /**
+     * Draw black
+     */
+    public void printBlack()
+    {
         screenbg.setForegroundColor(Color.black);        
         Rectangle blackbox = new Rectangle(0, targettop, super.wallThickness, 9*a);
-        screenbg.fill(blackbox);                                     //  draw the black areas
+        screenbg.fill(blackbox);
+    }
+    
+    /**
+     * Draw green
+     */
+    public void printGreen()
+    {
         screenbg.setForegroundColor(Color.green);
         Rectangle greenbox = new Rectangle(0, targettop+3*a, super.wallThickness, 3*a);
-        screenbg.fill(greenbox);                                         // draw the green areas
+        screenbg.fill(greenbox);
+    }
+    
+    /**
+     * Draw red
+     */
+    public void printRed()
+    {
         screenbg.setForegroundColor(Color.red);
         Rectangle bullseye = new Rectangle(0, targettop+4*a, super.wallThickness, a);
-        screenbg.fill(bullseye);                                       // draw the bullseye
+        screenbg.fill(bullseye);
     }
       
-     /**
+    /**
      * Draw the two Archers
      */
     public void printArcher()
     {
         screenbg.setVisible(true);
-        Archer Archer1 = new Archer(1, super.colorPlayer1, screenbg);
+        Archer Archer1 = new Archer(1, super.colorPlayer1, screenbg);   // init the first archer
         Archer1.draw();
-        Archer Archer2 = new Archer(2, super.colorPlayer2, screenbg);
+        Archer Archer2 = new Archer(2, super.colorPlayer2, screenbg);   // init the second archer
         Archer2.draw();
     }
     
+    /**
+     * The method is able to switch the players. 
+     * First the position of the archers will be moved.
+     * Methods from Archer are used.
+     */
     public void swapArcher(int currentplno)
     {
         screenbg.setVisible(true);
         boolean swapdone =  false;
+        // If the current player is no 1, the archer one will move to right, and the second move left
         if(curplay == 1) {     
             Archer1 = new Archer (1, super.colorPlayer1, screenbg);
             Archer2 = new Archer (2, super.colorPlayer2, screenbg);
             while(!swapdone) {
-                screenbg.wait(20);           // kurze Pause
+                screenbg.wait(20);           // short waiting time
                 Archer1.stepRight();
                 Archer2.stepLeft();
                 // Stop if the arrow hits the ground
@@ -195,11 +263,12 @@ public void swapArcher(int currentplno)
                     curplay = 2;
                 }
             }
+            // If the current player is no 2, the archer one will move to left, and the second move right
         } else if(curplay == 2) {
             Archer1 = new Archer (2, super.colorPlayer1, screenbg);
             Archer2 = new Archer (1, super.colorPlayer2, screenbg);
             while(!swapdone) {
-                screenbg.wait(20);           // kurze Pause
+                screenbg.wait(20);           // short waiting time
                 Archer2.stepRight();
                 Archer1.stepLeft();
                 // Stop if the arrow hits the ground
@@ -211,35 +280,40 @@ public void swapArcher(int currentplno)
         }
     }
     
-     /**
-     * Clear all arrows
+    /**
+     * Method is able to clear the arrow from the field
      */
     public void clearField()
     {
+
         screenbg.setForegroundColor(super.bgColor);
+        // if the arrow hit the target, it will be re painted
         Rectangle hitarrows = new Rectangle(super.wallThickness, 0, super.arrowWidth, super.canvasHeight);
         screenbg.fill(hitarrows);
-        Rectangle lostarrows = new Rectangle(super.wallThickness, super.canvasHeight - super.arrowHeight, super.archerXpos - super.wallThickness, super.arrowHeight);
+        // if the arrow did not hit the target, it will be re painted
+        Rectangle lostarrows = new Rectangle(super.wallThickness, super.canvasHeight - super.arrowHeight,
+        super.archerXpos - super.wallThickness, super.arrowHeight);
         screenbg.fill(lostarrows);
     }
     
-     /**
+    /**
      * Draw the two Scores
      */
     public void printScore(int inputscore1, int inputscore2)
     {
-        score1 = inputscore1;
-        score2 = inputscore2;
+        score1 = inputscore1;           //init of score player one
+        score2 = inputscore2;           //init of score player one
         screenbg.setVisible(true);
         screenbg.setForegroundColor(super.bgColor);
         screenbg.fillRectangle(super.scoreXpos, super.scoreYpos - 20, 200, 50);
-        Points Score1 = new Points(1, score1, screenbg);
-        Score1.draw();
-        Points Score2 = new Points(2, score2, screenbg);
-        Score2.draw();
+        // set position of the scores and draw them
+        Points Points1 = new Points(1, score1, screenbg);   
+        Points1.draw();
+        Points Points2 = new Points(2, score2, screenbg);
+        Points2.draw();
     }
     
-     /**
+    /**
      * Show the canvas
      */
     public void visible(boolean state)
@@ -247,3 +321,4 @@ public void visible(boolean state)
         screenbg.setVisible(state);
     }
 }
+
diff --git a/Game.class b/Game.class
index 42445d8a6957b077c4494913d3bae549b5d0e22c..e525fb0f3c5943ed10d87983092df5236e69549b 100644
GIT binary patch
delta 25
hcmZ3=vy^8-ALG%D{i%$Mjg!AJDl)cg7H8sP0RVp82z&ql

delta 25
hcmZ3=vy^8-ALE{l{i%$M6_dX*Dl%4Y7H8sP0RVlO2w?yK

diff --git a/Game.ctxt b/Game.ctxt
index 2f1bccf..73abad2 100644
--- a/Game.ctxt
+++ b/Game.ctxt
@@ -1,6 +1,6 @@
 #BlueJ class context
 comment0.target=Game
-comment0.text=\r\n\ \r\n\ @author\ JR,\ CS,\ SVC\r\n\ @version\ v1.2\ (02.06.2022\ 15\:35)\r\n
+comment0.text=\r\n\ \r\n\ @author\ JR,\ CS,\ SVC\r\n\ @version\ v1.3\ (02.06.2022\ 16\:45)\r\n
 comment1.params=args
 comment1.target=void\ main(java.lang.String[])
 comment2.params=
diff --git a/Game.java b/Game.java
index 2757ecf..bee8837 100644
--- a/Game.java
+++ b/Game.java
@@ -3,12 +3,12 @@
 /**
  * 
  * @author JR, CS, SVC
- * @version v1.2 (02.06.2022 15:35)
+ * @version v1.3 (02.06.2022 16:45)
  */
 public class Game
 {
     private Terminal terminal;                                 //Global terminal
-    protected static final int canvasHeight = 700;             //Height of the canvas. Default: 700
+    protected static final int canvasHeight = 709;             //Height of the canvas. Default: 700
     protected static final int canvasWidth = 1000;             //Width of the canvas. Default: 1000
     protected static final int wallStart = 100;                //Start of the wall. Default: 100
     protected static final int wallThickness = 20;             //Thickness of the wall. Default: 20
diff --git a/Points.class b/Points.class
index aa1c5924025c0ffc43eb5b525d25e60899219f65..3c15f5a190d86d26201bca917d50a6d3fb15161c 100644
GIT binary patch
delta 67
zcmeyw^@(dk7K^GZ0}F#311Ez#10RC|gD`_4gEE5(gEoUIgDHa=gDrzPgA0S^<bIYp
VyoL-M3`Rf|#teE4CX+2#tpH;73A6wJ

delta 67
zcmeyw^@(dk7K^GV0}F!~11Ezx10RC~gD`_6gEE6OgEoT<gDHb7gDry`gA0Sg<bIYp
Vyc!G~44Oa{S`2y&+LJ9<tpHR12|EA)

diff --git a/Points.ctxt b/Points.ctxt
index 863b058..ab9396b 100644
--- a/Points.ctxt
+++ b/Points.ctxt
@@ -1,10 +1,10 @@
 #BlueJ class context
 comment0.target=Points
-comment0.text=\r\n\ Beschreiben\ Sie\ hier\ die\ Klasse\ Points.\r\n\ \r\n\ @author\ (Ihr\ Name)\ \r\n\ @version\ v1.2\ (02.06.2022\ 15\:35)\r\n
+comment0.text=\r\n\ The\ class\ points\ sets\ the\ color\ of\ the\ player-scores\ \r\n\ and\ prints\ the\ scores\ on\ the\ dashboard.\r\n\ \r\n\ @author\ \ \ \ \ \ Johannes\ Richter\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ Simon\ Cirdei\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ Christoph\ Schramm\r\n\ \ \ \ \ \ \ \ \ \ \r\n\ @version\ \ \ \ \ v1.3\ (02.06.2022\ 16\:45)\r\n
 comment1.params=playerno\ playerscore\ usedcanvas
 comment1.target=Points(int,\ int,\ Canvas)
-comment1.text=\r\n\ Konstruktor\ f\u00FCr\ Objekte\ der\ Klasse\ Points\r\n
+comment1.text=\r\n\ Constructor\ for\ instances\ of\ Points\r\n\r\n\ @param\ playerno\ \ \ \ current\ player\r\n\ @param\ playerscore\ score\ of\ player\ \ \ \ \r\n\ @param\ usedcanvas\ \ canvas\ where\ to\ plot\ the\ points/score\ \r\n
 comment2.params=
 comment2.target=void\ draw()
-comment2.text=\r\n\ Mal\ den\ Score\ auf\ die\ Fl\u00E4che\r\n
+comment2.text=\r\n\ Prints\ the\ score\ on\ the\ dashboard\r\n
 numComments=3
diff --git a/Points.java b/Points.java
index 79a8127..2700e4a 100644
--- a/Points.java
+++ b/Points.java
@@ -1,29 +1,38 @@
 import java.awt.*;
 
 /**
- * Beschreiben Sie hier die Klasse Points.
+ * The class points sets the color of the player-scores 
+ * and prints the scores on the dashboard.
  * 
- * @author (Ihr Name) 
- * @version v1.2 (02.06.2022 15:35)
+ * @author      Johannes Richter
+ *              Simon Cirdei
+ *              Christoph Schramm
+ *          
+ * @version     v1.3 (02.06.2022 16:45)
  */
 public class Points extends Game
 {
-    private Color textcolor;      // color of the text
-    private Canvas screenbg;  // canvas where to plot the arrow
-    private int player;
-    private int yPosition;
-    private int score;
+    private Color textcolor;        // color of the text
+    private Canvas screenbg;        // canvas where to plot the points
+    private int player;             // player
+    private int yPosition;          // yposition of the points
+    private int score;              // score 
 
     /**
-     * Konstruktor für Objekte der Klasse Points
+     * Constructor for instances of Points
+     *
+     * @param playerno    current player
+     * @param playerscore score of player    
+     * @param usedcanvas  canvas where to plot the points/score 
      */
     public Points(int playerno, int playerscore, Canvas usedcanvas)
     {
         player = playerno;
         score = playerscore;
         screenbg = usedcanvas;
-        yPosition = super.scoreYpos + (player-1) * 20;
+        yPosition = super.scoreYpos + (player-1) * 20;  //y-Position of the score: access from super-class  
         
+        //proof of player and set the color of this score  
         if(player == 1) {
             textcolor = super.colorPlayer1;
         } else if(player == 2) {
@@ -32,7 +41,7 @@ public Points(int playerno, int playerscore, Canvas usedcanvas)
     }
     
     /**
-     * Mal den Score auf die Fläche
+     * Prints the score on the dashboard
      */
     
     public void draw()
diff --git a/Terminal.class b/Terminal.class
index 3a9cfc778a1b16f0ae7f9554348a20c10eddf1d6..f1f8f80762ac7e1a68188fde50e74cbd65916d3d 100644
GIT binary patch
literal 5396
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

literal 5362
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

diff --git a/Terminal.ctxt b/Terminal.ctxt
index 53bc9da..8c302f3 100644
--- a/Terminal.ctxt
+++ b/Terminal.ctxt
@@ -1,29 +1,34 @@
 #BlueJ class context
 comment0.target=Terminal
-comment0.text=\r\n\ \r\n\ Die\ Klasse\ game\ beinhaltet\ die\ wichtige\ Funktion,\ das\ Spielfeld\ zu\ erstellen.\r\n\ \r\n\ @author\ JR,\ CS,\ SVC\r\n\ @version\ v1.2\ (02.06.2022\ 15\:35)\r\n
+comment0.text=\r\n\ \r\n\ The\ Terminal\ creates\ the\ field/dashboard.\r\n\ It\ is\ also\ able\ to\ open\ a\ console\ for\ the\ input\ of\ the\ game\ instructions.\r\n\ Terminal\ gets\ and\ checks\ the\ user\ inputs.\r\n\ \r\n\ One\ important\ thing\ is\ to\ give\ messages\ and\ feedback\ to\ the\ user.\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ -\ game\ instruction\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ -\ hints\ for\ inputs\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ -\ help\r\n\ \r\n\ @author\ \ \ \ \ \ Johannes\ Richter\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ Simon\ Cirdei\r\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ Christoph\ Schramm\r\n\ @version\ \ \ \ \ v1.3\ (02.06.2022\ 16\:45)\r\n
 comment1.params=
 comment1.target=void\ newGame()
+comment1.text=\r\n\ The\ method\ game\ checks\ all\ the\ inputs\ of\ the\ players\ and\ runs\ selected\ loops.\r\n\ Instructions\ and\ errors/feedback\ will\ be\ given\r\n
 comment10.params=
-comment10.target=void\ returnPoints()
-comment10.text=\r\n\ \ Diese\ Methode\ gibt\ den\ aktuellen\ Punktestand\ auf\ der\ Konsole\ aus.\r\n
+comment10.target=void\ error()
+comment10.text=\r\n\ Feedback-Message\ in\ case\ of\ an\ error\r\n
 comment2.params=
 comment2.target=void\ inputForDartboard()
+comment2.text=\r\n\ The\ method\ checks\ explicity\ the\ user\ input\ for\ the\ target-size\r\n
 comment3.params=
-comment3.target=void\ errorValue()
-comment3.text=\r\n\ Methode\ zur\ Ausgabe\ eines\ Error\ bez\u00FCglich\ der\ Oberfl\u00E4che\r\n
+comment3.target=void\ startGame()
+comment3.text=\r\n\ the\ method\ start\ the\ game\:\r\n\ \ \ \ \ \ \ \ \ \ -\ inputs\ will\ be\ validated\r\n\ \ \ \ \ \ \ \ \ \ -\ score\ is\ set\ to\ zero\r\n\ \ \ \ \ \ \ \ \ \ -\ the\ current\ player\ is\ ONE\r\n\ \ \ \ \ \ \ \ \ \ -\ a\ new\ surface\ (canvas)\ will\ be\ opened\r\n\ \ \ \ \ \ \ \ \ \ -\ printing\ of\ score\ and\ archers\r\n
 comment4.params=
-comment4.target=void\ welcomeText()
-comment4.text=\r\n\ Methode\ zur\ Ausgabe\ eines\ Willkommen-Textes\r\n
+comment4.target=void\ swapPlayers()
+comment4.text=\r\n\ the\ method\ switch\ the\ players\r\n
 comment5.params=
-comment5.target=void\ howTo()
-comment5.text=\r\n\ Die\ Methode\ help\ gibt\ die\ kleine\ Spielanleitung\ wieder.\r\n\ Sie\ wird\ dort\ aufgerufen,\ wo\ sie\ ben\u00F6tit\ wird.\ \r\n
+comment5.target=void\ turn()
+comment5.text=\r\n\ Gives\ information\ which\ player\ turn\ it\ is.\ \r\n\ Displays\ the\ points\ of\ the\ round\ in\ the\ console.\r\n
 comment6.params=
-comment6.target=void\ error()
-comment6.text=\r\n\ Error\ gibt\ einen\ Fehler\ wieder,\ wenn\ keine\ der\ geforderten\ Tasten\ gedr\u00FCckt\ wird\r\n
+comment6.target=void\ returnPoints()
+comment6.text=\r\n\ \ Method\ is\ able\ to\ give\ the\ points/score\ of\ the\ two\ players\ in\ the\ console\ at\ the\ end\ of\ the\ game\r\n
 comment7.params=
-comment7.target=void\ startGame()
+comment7.target=void\ errorValue()
+comment7.text=\r\n\ Feedback-Message\ due\ to\ an\ error\ related\ to\ the\ surface\ (CanvasBG)\ \r\n
 comment8.params=
-comment8.target=void\ swapPlayers()
+comment8.target=void\ welcomeText()
+comment8.text=\r\n\ First\ message\ to\ welcome\ the\ players\r\n
 comment9.params=
-comment9.target=void\ turn()
+comment9.target=void\ howTo()
+comment9.text=\r\n\ Feedback-Message\ for\ instruction\ or\ help\r\n\ (How\ to\ play\ the\ game)\r\n
 numComments=11
diff --git a/Terminal.java b/Terminal.java
index e72d8b3..94552c6 100644
--- a/Terminal.java
+++ b/Terminal.java
@@ -4,47 +4,83 @@
 
 /**
  * 
- * Die Klasse game beinhaltet die wichtige Funktion, das Spielfeld zu erstellen.
+ * The Terminal creates the field/dashboard.
+ * It is also able to open a console for the input of the game instructions.
+ * Terminal gets and checks the user inputs.
  * 
- * @author JR, CS, SVC
- * @version v1.2 (02.06.2022 15:35)
+ * One important thing is to give messages and feedback to the user.
+ *              - game instruction
+ *              - hints for inputs
+ *              - help
+ * 
+ * @author      Johannes Richter
+ *              Simon Cirdei
+ *              Christoph Schramm
+ * @version     v1.3 (02.06.2022 16:45)
  */ 
 public class Terminal extends Game
 {
-    private Scanner scanner;        //Einführen des scanners
-    private short a;                //Short für den Bereich bullseye
-    private int ahalbe;             //Variable zum Rechnen
-    private int starttarget;        //Anfang Zielscheibenbereich
-    private CanvasBG screenbg;
-    private boolean checker;
-    private int ea, eb;
+    private Scanner scanner;        // create a new scanner 
+    private short a;                // variable for area of bullseye
+    private int ahalbe;             // variable to calculate the target
+    private int starttarget;        // variable to set the beginning of the target
+    private CanvasBG screenbg;      // set a new field/background
+    private boolean gameRunning;    // is game on?
+    private int ea, eb;             // help-variables for user inputs
+    
     
+    /**
+     * The method game checks all the inputs of the players and runs selected loops.
+     * Instructions and errors/feedback will be given
+     */
     public void newGame () {       
-        scanner = new Scanner (System.in); // Soll die Eingabe scannen. Dafür wird in Zeile 1 der Java Scanner importiert
+        scanner = new Scanner (System.in);  // receives the input of the users
         welcomeText();
-        boolean noInput = true;       //setzt noInput auf true
-        super.currentPlayer = 1;
+        boolean noInput = true;             // noInput is true or input is false
+        super.currentPlayer = 1;            // current player is one
+        
+        // while the input is false, checking of input
         while (noInput = true) {    
-            String input = scanner.nextLine();  //Scanner der Eingabe für Tastenkürzel liest
+            String input = scanner.nextLine();  // checking of the input
+            // if s, the game will starts
             if (input.equals("s")) {
-                startGame();
+                // starts the game
+                if(gameRunning == false) {
+                    startGame();
+                    gameRunning = true;
+                } else {
+                    System.out.println("The game is already running. Please press n for the next turn.");
+                }
             }
+            // if n, checking of running. If true, the players change
             else if (input.equals("n")) {
-                screenbg.clearField();
-                swapPlayers();
-                turn();
+                if(gameRunning == false) {
+                    System.out.println("The game is not yet running. Please press s to start it first.");
+                } else {
+                    screenbg.clearField();
+                    swapPlayers();
+                    turn();
+                }
+                
             }
+            // if e, the game ends and the score will be printed
             else if (input.equals("e")) {
                 noInput = false;
                 System.out.println("Game over.");
+                gameRunning = false;
                 returnPoints();
-                System.exit(0);
+                System.exit(0);         // closes the screen -> the console stays opened
             }
+            // if h, the instruction are printed
             else if (input.equals("h")) {
                 howTo();
             }
+            /**
+             * this is a fast solution for debbugging!
+             * 
             else if (input.equals("joe")) {
                 screenbg = new CanvasBG ((short)30, 265);
+                gameRunning = true;
                 super.currentPlayer = 1;
                 super.scorePlayer1 = 0;
                 super.scorePlayer2 = 0;
@@ -53,17 +89,24 @@ else if (input.equals("joe")) {
                 screenbg.printArcher();
                 turn();
             }
+            */
+        
+            // if nothing of the previous conditions happens, an error mesage will be print. 
             else {
                 error();
             }   
         }
     }
     
+    /**
+     * The method checks explicity the user input for the target-size
+     */
     public void inputForDartboard() {
         //ask for a
         System.out.println("Please enter a value for a [between 1 & "
         + (super.canvasHeight-super.wallStart)/9+"]. Hint: "
         +((super.canvasHeight-super.wallStart)/30)+" is a good value.");
+        //check input for a
         boolean aOK = false;
         while(!aOK) {
             Scanner inputDimensions = new Scanner(System.in);
@@ -77,16 +120,16 @@ public void inputForDartboard() {
                 aOK = true;
             }
         }
-        
         //ask for b
         System.out.println("Please enter a value for b [between "+(super.wallStart+(4*ea)+ahalbe)
         +" & "+(super.canvasHeight-(4*ea)-ahalbe)+"]. Hint: "
         +((super.canvasHeight-super.wallStart)/2+super.wallStart)+" is a good value.");
+        //check input for b
         boolean bOK = false;
         while(!bOK) {
             Scanner inputDimensions = new Scanner(System.in);
-            eb = inputDimensions.nextInt();     //process b
-            starttarget = eb - 4 * ea - ahalbe;     //required var for check b
+            eb = inputDimensions.nextInt();             //process b
+            starttarget = eb - 4 * ea - ahalbe;         //required var for check b
             if(eb < super.wallStart+(4*ea)+ahalbe) {
                 errorValue();
             } else if(eb > (super.canvasHeight-(4*ea)-ahalbe)) {
@@ -95,48 +138,18 @@ public void inputForDartboard() {
                 bOK = true;
             }
         }
-        
+        // output for player  :) 
         System.out.println("Inputs saved. Let's go!");
-    } 
-    
-    /**
-     * Methode zur Ausgabe eines Error bezüglich der Oberfläche
-     */
-    public void errorValue() {
-        System.out.println ("ERROR. Please enter a valid value. The limits can be seen above. You may try again.");
     }
     
     /**
-     * Methode zur Ausgabe eines Willkommen-Textes
+     * the method start the game:
+     *          - inputs will be validated
+     *          - score is set to zero
+     *          - the current player is ONE
+     *          - a new surface (canvas) will be opened
+     *          - printing of score and archers
      */
-    public void welcomeText() {
-        System.out.println("Welcome to 2Darts" + "\n\n" + "Before playing, here is the overview:" +"\n");
-        System.out.println("- The red area (bullseye) gives 50 points" + "\n" + "- Green (bull) gives 25 points" + "\n" + "- Black gives 10 points" + "\n" + "- Everything else 0 points");
-        howTo();
-    }
-    
-    /**
-     * Die Methode help gibt die kleine Spielanleitung wieder.
-     * Sie wird dort aufgerufen, wo sie benötit wird. 
-     */
-    public void howTo() {
-        System.out.println("\n" +"------------------------------------------------");
-        System.out.println("s = start game");
-        System.out.println("n = next player");
-        System.out.println("e = end game");
-        System.out.println("h = help");
-        System.out.println("------------------------------------------------");
-    }
-    
-    /**
-     * Error gibt einen Fehler wieder, wenn keine der geforderten Tasten gedrückt wird
-     */
-    public void error() {
-        System.out.println("\n" +"------------------------------------------------" +"\n");
-        System.out.println("Mistake! Please check your entry!");
-        System.out.println("\n" + "If you need some help, press" + " h" + "");
-    }
-
     public void startGame() {
         inputForDartboard();
         super.currentPlayer = 1;
@@ -148,10 +161,16 @@ public void startGame() {
         screenbg.printArcher();
         turn();
     }
+    
+    /**
+     * the method switch the players
+     */
 
     public void swapPlayers() {
+        // archer will be switched
         screenbg.swapArcher(super.currentPlayer);
-                
+        
+        //players-switch
         if (super.currentPlayer == 1) {
             super.currentPlayer = 2;
         }
@@ -160,43 +179,101 @@ else if(super.currentPlayer == 2) {
         }
     }
 
+    /**
+     * Gives information which player turn it is. 
+     * Displays the points of the round in the console.
+     */   
     public void turn() {
         System.out.println("It's player "+ super.currentPlayer +"'s turn.");
                 
         int score = screenbg.shootArrow();
         
-        //send won points to super
+        // send won points to super
         if(super.currentPlayer == 1) {
             super.scorePlayer1 = super.scorePlayer1 + score;
         } else if(super.currentPlayer == 2) {
             super.scorePlayer2 = super.scorePlayer2 + score;
         }
         
+        // Message when arrow hits the bullseye
         if(score == 50) {
-            System.out.println("BULLSEYE! Player "+ super.currentPlayer +" got "+ score + " Points! :)");
-        } else if(score == 0) {
+            System.out.println("BULLSEYE! Player "+ super.currentPlayer +" got "+ score + " points! :)");
+        } 
+        // Message when arrow hits nothing
+        else if(score == 0) {
             System.out.println("Player "+ super.currentPlayer +" missed. :(");
-        } else {
-            System.out.println("Player "+ super.currentPlayer +" got "+ score + " Points.");
+        } 
+        // Message when arrow hits green or black
+        else {
+            System.out.println("Player "+ super.currentPlayer +" got "+ score + " points.");
         }
         
         screenbg.printScore(super.scorePlayer1, super.scorePlayer2);
     }
       
-     /**
-     *  Diese Methode gibt den aktuellen Punktestand auf der Konsole aus.
+    /**
+     *  Method is able to give the points/score of the two players in the console at the end of the game
      */
     public void returnPoints()
     {
+        //If score player 1 is bigger than two, Player 1 wins
         if(super.scorePlayer1 > super.scorePlayer2) {
-            System.out.println("Player 1 wins with " + super.scorePlayer1 + " points. Player 2 has " + super.scorePlayer2 + " points.");
-        } else if(super.scorePlayer2 > super.scorePlayer1) {
-            System.out.println("Player 2 wins with " + super.scorePlayer2 + " points. Player 1 has " + super.scorePlayer1 + " points.");
-        } else if((super.scorePlayer1 == 0) && (super.scorePlayer1 == 0)) {
-            System.out.println("Did you even play? Both players have " + super.scorePlayer1 + " points.");
-        } else if(super.scorePlayer1 == super.scorePlayer2) {
+            System.out.println("Player 1 wins with " + super.scorePlayer1 + " points. "
+            +"Player 2 has " + super.scorePlayer2 + " points.");
+        } 
+        //If score player 2 is bigger than two, Player 2 wins
+        else if(super.scorePlayer2 > super.scorePlayer1) {
+            System.out.println("Player 2 wins with " + super.scorePlayer2 + " points. "
+            +"Player 1 has " + super.scorePlayer1 + " points.");
+        } 
+        //If score is zero
+        else if((super.scorePlayer1 == 0) && (super.scorePlayer1 == 0)) {
+            System.out.println("Did you even play? No player has any points.");
+        } 
+        //If score player 1 is the same as player 2 = tie
+        else if(super.scorePlayer1 == super.scorePlayer2) {
             System.out.println("It's a tie! Both players have " + super.scorePlayer1 + " points.");
         }
+        // you can close the console with Ctrl+W
         System.out.println("Press Ctrl+W to close this window.");
+    } 
+    
+    /**
+     * Feedback-Message due to an error related to the surface (CanvasBG) 
+     */
+    public void errorValue() {
+        System.out.println ("ERROR. Please enter a valid value. The limits can be seen above. You may try again.");
+    }
+    
+    /**
+     * First message to welcome the players
+     */
+    public void welcomeText() {
+        System.out.println("Welcome to 2Darts" + "\n\n" + "Before playing, here is the overview:" +"\n");
+        System.out.println("- The red area (bullseye) gives 50 points" + "\n" + "- Green (bull) gives 25 points"
+        + "\n" + "- Black gives 10 points" + "\n" + "- Everything else 0 points");
+        howTo();
+    }
+    
+    /**
+     * Feedback-Message for instruction or help
+     * (How to play the game)
+     */
+    public void howTo() {
+        System.out.println("\n" +"------------------------------------------------");
+        System.out.println("s = start game");
+        System.out.println("n = next player");
+        System.out.println("e = end game");
+        System.out.println("h = help");
+        System.out.println("------------------------------------------------");
+    }
+    
+    /**
+     * Feedback-Message in case of an error
+     */
+    public void error() {
+        System.out.println("ERROR. This input cannot be processed. Please check your entry.");
+        System.out.println("If you need help, enter h.");
     }
 }
+
diff --git a/package.bluej b/package.bluej
index bc76610..ac74f39 100644
--- a/package.bluej
+++ b/package.bluej
@@ -1,45 +1,45 @@
 #BlueJ package file
-dependency1.from=Terminal
-dependency1.to=CanvasBG
+dependency1.from=Points
+dependency1.to=Canvas
 dependency1.type=UsesDependency
-dependency2.from=Points
+dependency2.from=Archer
 dependency2.to=Canvas
 dependency2.type=UsesDependency
-dependency3.from=Archer
+dependency3.from=Arrow
 dependency3.to=Canvas
 dependency3.type=UsesDependency
-dependency4.from=Arrow
-dependency4.to=Canvas
+dependency4.from=Game
+dependency4.to=Terminal
 dependency4.type=UsesDependency
-dependency5.from=CanvasBG
-dependency5.to=Canvas
+dependency5.from=Terminal
+dependency5.to=CanvasBG
 dependency5.type=UsesDependency
 dependency6.from=CanvasBG
-dependency6.to=Archer
+dependency6.to=Canvas
 dependency6.type=UsesDependency
 dependency7.from=CanvasBG
-dependency7.to=Points
+dependency7.to=Archer
 dependency7.type=UsesDependency
 dependency8.from=CanvasBG
-dependency8.to=Arrow
+dependency8.to=Points
 dependency8.type=UsesDependency
-dependency9.from=Game
-dependency9.to=Terminal
+dependency9.from=CanvasBG
+dependency9.to=Arrow
 dependency9.type=UsesDependency
-editor.fx.0.height=737
-editor.fx.0.width=814
-editor.fx.0.x=360
-editor.fx.0.y=28
+editor.fx.0.height=744
+editor.fx.0.width=1376
+editor.fx.0.x=1528
+editor.fx.0.y=-8
 objectbench.height=136
-objectbench.width=1336
+objectbench.width=1512
 package.divider.horizontal=0.5850032320620556
-package.divider.vertical=0.7779503105590062
-package.editor.height=494
-package.editor.width=1233
-package.editor.x=1528
+package.divider.vertical=0.8062770562770563
+package.editor.height=590
+package.editor.width=1410
+package.editor.x=0
 package.editor.y=0
-package.frame.height=744
-package.frame.width=1376
+package.frame.height=838
+package.frame.width=1550
 package.numDependencies=9
 package.numTargets=7
 package.showExtends=true