diff --git a/src/main/java/PingPong/Score.java b/src/main/java/PingPong/Score.java index 7068698..9b60491 100644 --- a/src/main/java/PingPong/Score.java +++ b/src/main/java/PingPong/Score.java @@ -16,8 +16,8 @@ public class Score extends Rectangle { } public void draw(Graphics g) { - g.setColor(Color.white); - g.setFont(new Font("Consolas", Font.BOLD,50)); + ScoreColor(g); + g.setFont(new Font("Consolas", Font.BOLD,50)); g.drawLine(FRAME_WIDTH/2, 0, FRAME_WIDTH/2, FRAME_HEIGHT); g.drawOval((FRAME_WIDTH/2)-(COURT_CIRCLE/2), (FRAME_HEIGHT/2) - (COURT_CIRCLE/2), COURT_CIRCLE,COURT_CIRCLE); g.fillOval((FRAME_WIDTH/2)-(CENTER_DOT/2), (FRAME_HEIGHT/2) - (CENTER_DOT/2), CENTER_DOT,CENTER_DOT); @@ -25,4 +25,8 @@ public class Score extends Rectangle { g.drawString(String.valueOf(player_2/10) + String.valueOf(player_2%10), (FRAME_WIDTH/2)+ 20, 50); } + + private static void ScoreColor(Graphics g) { + g.setColor(Color.white); + } } diff --git a/target/hellsgamers-1.0-SNAPSHOT.jar b/target/hellsgamers-1.0-SNAPSHOT.jar index 0adfec4..359ee6a 100644 Binary files a/target/hellsgamers-1.0-SNAPSHOT.jar and b/target/hellsgamers-1.0-SNAPSHOT.jar differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index a3f66d2..aa0aa9b 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Feb 08 21:32:53 CET 2023 +#Thu Feb 09 20:07:26 CET 2023 groupId=Hellsgamers artifactId=hellsgamers version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index c11ae49..699554d 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -4,7 +4,6 @@ BattleShip\BSButton.class Snake\Window.class PingPong\GamePanel$AL.class Snake\Controller$1.class -MenuPanel$GameFrame.class BattleShip\Ship.class PingPong\Ball.class BattleShip\BShip$NewGameListener.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..4e2114b --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1,5 @@ +test_BShip.class +test_AIGridGUI.class +test_Snake.class +test_CollisionChecker.class +test_Ship.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..7cdc2e8 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1,5 @@ +C:\Users\Laura\IdeaProjects\hellsgamers\src\test\java\test_CollisionChecker.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\test\java\test_Snake.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\test\java\test_BShip.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\test\java\test_Ship.java +C:\Users\Laura\IdeaProjects\hellsgamers\src\test\java\test_AIGridGUI.java diff --git a/target/test-classes/ShipTest.class b/target/test-classes/ShipTest.class deleted file mode 100644 index 2f24884..0000000 Binary files a/target/test-classes/ShipTest.class and /dev/null differ diff --git a/target/test-classes/AIGridGUITest.class b/target/test-classes/test_AIGridGUI.class similarity index 73% rename from target/test-classes/AIGridGUITest.class rename to target/test-classes/test_AIGridGUI.class index 50abe40..8d3c0f5 100644 Binary files a/target/test-classes/AIGridGUITest.class and b/target/test-classes/test_AIGridGUI.class differ diff --git a/target/test-classes/BShipTest.class b/target/test-classes/test_BShip.class similarity index 50% rename from target/test-classes/BShipTest.class rename to target/test-classes/test_BShip.class index 277a7c9..aedf091 100644 Binary files a/target/test-classes/BShipTest.class and b/target/test-classes/test_BShip.class differ diff --git a/target/test-classes/CollisionCheckerTest.class b/target/test-classes/test_CollisionChecker.class similarity index 60% rename from target/test-classes/CollisionCheckerTest.class rename to target/test-classes/test_CollisionChecker.class index 1b6f82b..3fcae45 100644 Binary files a/target/test-classes/CollisionCheckerTest.class and b/target/test-classes/test_CollisionChecker.class differ diff --git a/target/test-classes/test_Ship.class b/target/test-classes/test_Ship.class new file mode 100644 index 0000000..5631c9c Binary files /dev/null and b/target/test-classes/test_Ship.class differ diff --git a/target/test-classes/SnakeTest.class b/target/test-classes/test_Snake.class similarity index 79% rename from target/test-classes/SnakeTest.class rename to target/test-classes/test_Snake.class index 1c96711..5685e4e 100644 Binary files a/target/test-classes/SnakeTest.class and b/target/test-classes/test_Snake.class differ diff --git a/team.md b/team.md index 5690043..66ea298 100644 --- a/team.md +++ b/team.md @@ -1,4 +1,6 @@ - Berkan Sarp, fdai4616 - Justin Senn, fdai7107 - Eren Esen, fdai4581 -- Brice Tchoumi, fdai6138 \ No newline at end of file +- Brice Tchoumi, fdai6138 + +Bei Berkan, die mit der FD Nummer bewerten. \ No newline at end of file