From 997a35291ca7f9e7263b9948a57177365c4d7ab0 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Sat, 13 Apr 2024 17:20:11 +0330 Subject: [PATCH 1/5] basic structure of classes was made --- Answers/Third_Project/.gitignore | 38 +++++++++++++++++++ Answers/Third_Project/.idea/.gitignore | 3 ++ Answers/Third_Project/.idea/encodings.xml | 7 ++++ Answers/Third_Project/.idea/misc.xml | 14 +++++++ Answers/Third_Project/.idea/vcs.xml | 6 +++ Answers/Third_Project/pom.xml | 17 +++++++++ .../Third_Project/src/main/java/Beater.java | 12 ++++++ .../Third_Project/src/main/java/Chaser.java | 11 ++++++ .../Third_Project/src/main/java/Keeper.java | 10 +++++ .../Third_Project/src/main/java/Player.java | 11 ++++++ .../Third_Project/src/main/java/Seeker.java | 14 +++++++ .../Third_Project/src/main/java/Success.java | 3 ++ 12 files changed, 146 insertions(+) create mode 100644 Answers/Third_Project/.gitignore create mode 100644 Answers/Third_Project/.idea/.gitignore create mode 100644 Answers/Third_Project/.idea/encodings.xml create mode 100644 Answers/Third_Project/.idea/misc.xml create mode 100644 Answers/Third_Project/.idea/vcs.xml create mode 100644 Answers/Third_Project/pom.xml create mode 100644 Answers/Third_Project/src/main/java/Beater.java create mode 100644 Answers/Third_Project/src/main/java/Chaser.java create mode 100644 Answers/Third_Project/src/main/java/Keeper.java create mode 100644 Answers/Third_Project/src/main/java/Player.java create mode 100644 Answers/Third_Project/src/main/java/Seeker.java create mode 100644 Answers/Third_Project/src/main/java/Success.java diff --git a/Answers/Third_Project/.gitignore b/Answers/Third_Project/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/Answers/Third_Project/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Answers/Third_Project/.idea/.gitignore b/Answers/Third_Project/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Answers/Third_Project/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Answers/Third_Project/.idea/encodings.xml b/Answers/Third_Project/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/Answers/Third_Project/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Answers/Third_Project/.idea/misc.xml b/Answers/Third_Project/.idea/misc.xml new file mode 100644 index 0000000..fdc35ea --- /dev/null +++ b/Answers/Third_Project/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Answers/Third_Project/.idea/vcs.xml b/Answers/Third_Project/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/Answers/Third_Project/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Answers/Third_Project/pom.xml b/Answers/Third_Project/pom.xml new file mode 100644 index 0000000..5540a07 --- /dev/null +++ b/Answers/Third_Project/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.example + Third_Project + 1.0-SNAPSHOT + + + 21 + 21 + UTF-8 + + + \ No newline at end of file diff --git a/Answers/Third_Project/src/main/java/Beater.java b/Answers/Third_Project/src/main/java/Beater.java new file mode 100644 index 0000000..6e21522 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Beater.java @@ -0,0 +1,12 @@ +class Beater extends Player implements Success { + Beater(String name, int number) { + super(name, number); + } + + @Override + public void isSuccessful() { + + } +} + + diff --git a/Answers/Third_Project/src/main/java/Chaser.java b/Answers/Third_Project/src/main/java/Chaser.java new file mode 100644 index 0000000..98b7237 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Chaser.java @@ -0,0 +1,11 @@ +class Chaser extends Player implements Success { + Chaser(String name, int number) { + super(name, number); + } + + + @Override + public void isSuccessful() { + + } +} diff --git a/Answers/Third_Project/src/main/java/Keeper.java b/Answers/Third_Project/src/main/java/Keeper.java new file mode 100644 index 0000000..beeb4f8 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Keeper.java @@ -0,0 +1,10 @@ + class Keeper extends Player implements Success { + Keeper(String name, int number) { + super(name, number); + } + + @Override + public void isSuccessful() { + + } + } diff --git a/Answers/Third_Project/src/main/java/Player.java b/Answers/Third_Project/src/main/java/Player.java new file mode 100644 index 0000000..341e210 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Player.java @@ -0,0 +1,11 @@ +public class Player { + String name; + int number; + public Player(String name, int number){ + this.name = name; + this.number = number; + } + + + +} diff --git a/Answers/Third_Project/src/main/java/Seeker.java b/Answers/Third_Project/src/main/java/Seeker.java new file mode 100644 index 0000000..88f9252 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Seeker.java @@ -0,0 +1,14 @@ +class Seeker extends Player implements Success { + Seeker(String name, int number) { + super(name, number); + } + + @Override + public void isSuccessful(){ + + } + + + +} + diff --git a/Answers/Third_Project/src/main/java/Success.java b/Answers/Third_Project/src/main/java/Success.java new file mode 100644 index 0000000..c906ee7 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Success.java @@ -0,0 +1,3 @@ +public interface Success { + void isSuccessful(); +} From 7d2f796b6a208faed10a986565e689718a4d0c19 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Sat, 13 Apr 2024 20:20:46 +0330 Subject: [PATCH 2/5] class Team created --- Answers/Third_Project/src/main/java/Keeper.java | 3 +-- Answers/Third_Project/src/main/java/Player.java | 15 +++++++++++---- Answers/Third_Project/src/main/java/Team.java | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 Answers/Third_Project/src/main/java/Team.java diff --git a/Answers/Third_Project/src/main/java/Keeper.java b/Answers/Third_Project/src/main/java/Keeper.java index beeb4f8..ad76916 100644 --- a/Answers/Third_Project/src/main/java/Keeper.java +++ b/Answers/Third_Project/src/main/java/Keeper.java @@ -1,8 +1,7 @@ - class Keeper extends Player implements Success { +class Keeper extends Player implements Success { Keeper(String name, int number) { super(name, number); } - @Override public void isSuccessful() { diff --git a/Answers/Third_Project/src/main/java/Player.java b/Answers/Third_Project/src/main/java/Player.java index 341e210..a2cde01 100644 --- a/Answers/Third_Project/src/main/java/Player.java +++ b/Answers/Third_Project/src/main/java/Player.java @@ -1,11 +1,18 @@ public class Player { - String name; - int number; - public Player(String name, int number){ + private String name; + private int number; + + public Player(String name, int number) { this.name = name; this.number = number; } + /*public void setName(String name) { + this.name = name; + } - + public void setNumber(int number) { + this.number = number; + }*/ } + diff --git a/Answers/Third_Project/src/main/java/Team.java b/Answers/Third_Project/src/main/java/Team.java new file mode 100644 index 0000000..97037f2 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Team.java @@ -0,0 +1,17 @@ +public class Team { + Keeper keeper = new Keeper("keeper",1); + Seeker seeker = new Seeker("seeker",2); + Chaser chaser1 = new Chaser("chaser1",3); + Chaser chaser2 = new Chaser("chaser2",4); + Chaser chaser3 = new Chaser("chaser3",5); + Beater beater1 = new Beater("beater1",6); + Beater beater2 = new Beater("beater2",7); + static int goal = 0; + private void setgoal(){ + goal ++; + } + public void play(){ + + } + +} From dc288333fdfc5b6f6785d12b277fd3a51d63ae35 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Mon, 15 Apr 2024 00:22:45 +0330 Subject: [PATCH 3/5] interface and isSuccessful method created! --- .../Third_Project/src/main/java/Beater.java | 12 -- .../Third_Project/src/main/java/Chaser.java | 11 -- .../Third_Project/src/main/java/Keeper.java | 9 -- .../Third_Project/src/main/java/Match.java | 15 ++ .../Third_Project/src/main/java/MyApp.java | 6 + .../Third_Project/src/main/java/Player.java | 135 +++++++++++++++++- .../Third_Project/src/main/java/Seeker.java | 14 -- .../Third_Project/src/main/java/Success.java | 2 +- Answers/Third_Project/src/main/java/Team.java | 12 +- 9 files changed, 167 insertions(+), 49 deletions(-) delete mode 100644 Answers/Third_Project/src/main/java/Beater.java delete mode 100644 Answers/Third_Project/src/main/java/Chaser.java delete mode 100644 Answers/Third_Project/src/main/java/Keeper.java create mode 100644 Answers/Third_Project/src/main/java/Match.java create mode 100644 Answers/Third_Project/src/main/java/MyApp.java delete mode 100644 Answers/Third_Project/src/main/java/Seeker.java diff --git a/Answers/Third_Project/src/main/java/Beater.java b/Answers/Third_Project/src/main/java/Beater.java deleted file mode 100644 index 6e21522..0000000 --- a/Answers/Third_Project/src/main/java/Beater.java +++ /dev/null @@ -1,12 +0,0 @@ -class Beater extends Player implements Success { - Beater(String name, int number) { - super(name, number); - } - - @Override - public void isSuccessful() { - - } -} - - diff --git a/Answers/Third_Project/src/main/java/Chaser.java b/Answers/Third_Project/src/main/java/Chaser.java deleted file mode 100644 index 98b7237..0000000 --- a/Answers/Third_Project/src/main/java/Chaser.java +++ /dev/null @@ -1,11 +0,0 @@ -class Chaser extends Player implements Success { - Chaser(String name, int number) { - super(name, number); - } - - - @Override - public void isSuccessful() { - - } -} diff --git a/Answers/Third_Project/src/main/java/Keeper.java b/Answers/Third_Project/src/main/java/Keeper.java deleted file mode 100644 index ad76916..0000000 --- a/Answers/Third_Project/src/main/java/Keeper.java +++ /dev/null @@ -1,9 +0,0 @@ -class Keeper extends Player implements Success { - Keeper(String name, int number) { - super(name, number); - } - @Override - public void isSuccessful() { - - } - } diff --git a/Answers/Third_Project/src/main/java/Match.java b/Answers/Third_Project/src/main/java/Match.java new file mode 100644 index 0000000..e503905 --- /dev/null +++ b/Answers/Third_Project/src/main/java/Match.java @@ -0,0 +1,15 @@ +public class Match { + Team blue = new Team(); + Team red = new Team(); + public void start(){ + for (int i=0; i<100; i++){ + blue.play(); + red.play(); + } + int blue_point = blue.getgoal(); + int red_point = red.getgoal(); + System.out.println(blue_point); + System.out.println(red_point); + + } +} diff --git a/Answers/Third_Project/src/main/java/MyApp.java b/Answers/Third_Project/src/main/java/MyApp.java new file mode 100644 index 0000000..e9e53de --- /dev/null +++ b/Answers/Third_Project/src/main/java/MyApp.java @@ -0,0 +1,6 @@ +public class MyApp { + public static void main(String[] args) { + Match x = new Match(); + x.start(); + } +} diff --git a/Answers/Third_Project/src/main/java/Player.java b/Answers/Third_Project/src/main/java/Player.java index a2cde01..c485852 100644 --- a/Answers/Third_Project/src/main/java/Player.java +++ b/Answers/Third_Project/src/main/java/Player.java @@ -1,3 +1,5 @@ +import java.util.Random; + public class Player { private String name; private int number; @@ -6,7 +8,6 @@ public Player(String name, int number) { this.name = name; this.number = number; } - /*public void setName(String name) { this.name = name; } @@ -16,3 +17,135 @@ public void setNumber(int number) { }*/ } + + + +class Keeper extends Player implements Success { + private int goalsSaved; + private Random random; + + public Keeper(String name, int number) { + super(name, number); + this.goalsSaved = 0; + this.random = new Random(); + } + + public void attemptToSaveGoal() { + if (random.nextDouble() <= 0.7) { + saveGoal(); + } + } + + private void saveGoal() { + goalsSaved++; + } + + public int getGoalsSaved() { + return goalsSaved; + } + + @Override + public boolean isSuccessful() { + return goalsSaved > 0; + } +} + + + + + +class Seeker extends Player implements Success { + private boolean foundSnitch; + private Random random; + + public Seeker(String name, int number) { + super(name, number); + this.foundSnitch = false; + this.random = new Random(); + } + + public void attemptToFindSnitch() { + if (random.nextDouble() <= 0.05) { + foundSnitch = true; + } + } + + public boolean hasFoundSnitch() { + return foundSnitch; + } + + @Override + public boolean isSuccessful() { + return foundSnitch; + } +} + + + + +class Chaser extends Player implements Success { + private int goalsScored; + private Random random; + + public Chaser(String name, int number) { + super(name, number); + this.goalsScored = 0; + this.random = new Random(); + } + + public void attemptToScoreGoal() { + if (random.nextDouble() <= 0.3) { + scoreGoal(); + } + } + + private void scoreGoal() { + goalsScored++; + } + + public int getGoalsScored() { + return goalsScored; + } + + @Override + public boolean isSuccessful() { + return goalsScored > 0; + } +} + + + + + +class Beater extends Player implements Success { + private int chasersStopped; + private Random random; + + public Beater(String name, int number) { + super(name, number); + this.chasersStopped = 0; + this.random = new Random(); + } + + public void attemptToStopChaser() { + if (random.nextDouble() <= 0.4) { + stopChaser(); + } + } + + private void stopChaser() { + chasersStopped++; + } + + public int getChasersStopped() { + return chasersStopped; + } + + @Override + public boolean isSuccessful() { + return chasersStopped > 0; + } +} + + + diff --git a/Answers/Third_Project/src/main/java/Seeker.java b/Answers/Third_Project/src/main/java/Seeker.java deleted file mode 100644 index 88f9252..0000000 --- a/Answers/Third_Project/src/main/java/Seeker.java +++ /dev/null @@ -1,14 +0,0 @@ -class Seeker extends Player implements Success { - Seeker(String name, int number) { - super(name, number); - } - - @Override - public void isSuccessful(){ - - } - - - -} - diff --git a/Answers/Third_Project/src/main/java/Success.java b/Answers/Third_Project/src/main/java/Success.java index c906ee7..bc0bcf2 100644 --- a/Answers/Third_Project/src/main/java/Success.java +++ b/Answers/Third_Project/src/main/java/Success.java @@ -1,3 +1,3 @@ public interface Success { - void isSuccessful(); + boolean isSuccessful(); } diff --git a/Answers/Third_Project/src/main/java/Team.java b/Answers/Third_Project/src/main/java/Team.java index 97037f2..0c8dc9e 100644 --- a/Answers/Third_Project/src/main/java/Team.java +++ b/Answers/Third_Project/src/main/java/Team.java @@ -6,12 +6,22 @@ public class Team { Chaser chaser3 = new Chaser("chaser3",5); Beater beater1 = new Beater("beater1",6); Beater beater2 = new Beater("beater2",7); - static int goal = 0; + private int goal = 0; private void setgoal(){ goal ++; } + public int getgoal(){ + return goal; + }; public void play(){ + boolean score = false; + boolean chaser = chaser1.isSuccessful() || chaser2.isSuccessful() ||chaser3.isSuccessful(); + score = keeper.isSuccessful() && (beater1.isSuccessful() || beater2.isSuccessful()) && (beater1.isSuccessful()|| beater2.isSuccessful()) && chaser; + if (score) + setgoal(); + if (seeker.isSuccessful()){ + } } } From d378bb6ec2830b23493703f768df6503d29bc1ae Mon Sep 17 00:00:00 2001 From: arshiammz Date: Mon, 15 Apr 2024 20:27:17 +0330 Subject: [PATCH 4/5] players are ready --- .../Third_Project/src/main/java/Match.java | 11 ++- .../Third_Project/src/main/java/MyApp.java | 4 +- .../Third_Project/src/main/java/Player.java | 95 +++++-------------- .../Third_Project/src/main/java/Success.java | 2 +- Answers/Third_Project/src/main/java/Team.java | 34 +++++-- 5 files changed, 57 insertions(+), 89 deletions(-) diff --git a/Answers/Third_Project/src/main/java/Match.java b/Answers/Third_Project/src/main/java/Match.java index e503905..7a70954 100644 --- a/Answers/Third_Project/src/main/java/Match.java +++ b/Answers/Third_Project/src/main/java/Match.java @@ -2,14 +2,15 @@ public class Match { Team blue = new Team(); Team red = new Team(); public void start(){ - for (int i=0; i<100; i++){ - blue.play(); - red.play(); - } + for (int i=0; i<100; i++) { + + blue.play(); + red.play(); + } + int blue_point = blue.getgoal(); int red_point = red.getgoal(); System.out.println(blue_point); System.out.println(red_point); - } } diff --git a/Answers/Third_Project/src/main/java/MyApp.java b/Answers/Third_Project/src/main/java/MyApp.java index e9e53de..fbc0f3f 100644 --- a/Answers/Third_Project/src/main/java/MyApp.java +++ b/Answers/Third_Project/src/main/java/MyApp.java @@ -1,6 +1,6 @@ public class MyApp { public static void main(String[] args) { - Match x = new Match(); - x.start(); + Match match = new Match(); + match.start(); } } diff --git a/Answers/Third_Project/src/main/java/Player.java b/Answers/Third_Project/src/main/java/Player.java index c485852..5b9a45e 100644 --- a/Answers/Third_Project/src/main/java/Player.java +++ b/Answers/Third_Project/src/main/java/Player.java @@ -3,69 +3,50 @@ public class Player { private String name; private int number; + protected Random random; public Player(String name, int number) { this.name = name; this.number = number; + this.random = new Random(); } - /*public void setName(String name) { - this.name = name; + protected int getRandomNumber(){ + return random.nextInt(101); } - public void setNumber(int number) { - this.number = number; - }*/ } - - - +//-------------------------------------------------------------------------- class Keeper extends Player implements Success { - private int goalsSaved; - private Random random; + private boolean Saved; public Keeper(String name, int number) { super(name, number); - this.goalsSaved = 0; - this.random = new Random(); + this.Saved = false; } - public void attemptToSaveGoal() { - if (random.nextDouble() <= 0.7) { - saveGoal(); + if (getRandomNumber() <= 70 ) { + Saved = true; } } - private void saveGoal() { - goalsSaved++; - } - - public int getGoalsSaved() { - return goalsSaved; - } - @Override public boolean isSuccessful() { - return goalsSaved > 0; + return Saved; } } - - - +//----------------------------------------------------------------------- class Seeker extends Player implements Success { private boolean foundSnitch; - private Random random; public Seeker(String name, int number) { super(name, number); this.foundSnitch = false; - this.random = new Random(); } - public void attemptToFindSnitch() { - if (random.nextDouble() <= 0.05) { + if (getRandomNumber() <= 5 ) { foundSnitch = true; } } @@ -80,70 +61,42 @@ public boolean isSuccessful() { } } - - - +//-------------------------------------------------------------------- class Chaser extends Player implements Success { - private int goalsScored; - private Random random; + private boolean Scored; public Chaser(String name, int number) { super(name, number); - this.goalsScored = 0; - this.random = new Random(); + this.Scored = false; } - public void attemptToScoreGoal() { - if (random.nextDouble() <= 0.3) { - scoreGoal(); + if (getRandomNumber() <= 30 ) { + Scored = true; } } - - private void scoreGoal() { - goalsScored++; - } - - public int getGoalsScored() { - return goalsScored; - } - @Override public boolean isSuccessful() { - return goalsScored > 0; + return Scored; } } - - - +//---------------------------------------------------------------------- class Beater extends Player implements Success { - private int chasersStopped; - private Random random; - + private boolean Stopped; public Beater(String name, int number) { super(name, number); - this.chasersStopped = 0; - this.random = new Random(); + this.Stopped = false; } public void attemptToStopChaser() { - if (random.nextDouble() <= 0.4) { - stopChaser(); + if (getRandomNumber() <= 40 ) { + Stopped = true; } } - - private void stopChaser() { - chasersStopped++; - } - - public int getChasersStopped() { - return chasersStopped; - } - @Override public boolean isSuccessful() { - return chasersStopped > 0; + return Stopped; } } diff --git a/Answers/Third_Project/src/main/java/Success.java b/Answers/Third_Project/src/main/java/Success.java index bc0bcf2..c748298 100644 --- a/Answers/Third_Project/src/main/java/Success.java +++ b/Answers/Third_Project/src/main/java/Success.java @@ -1,3 +1,3 @@ public interface Success { - boolean isSuccessful(); + public boolean isSuccessful(); } diff --git a/Answers/Third_Project/src/main/java/Team.java b/Answers/Third_Project/src/main/java/Team.java index 0c8dc9e..64ac2a5 100644 --- a/Answers/Third_Project/src/main/java/Team.java +++ b/Answers/Third_Project/src/main/java/Team.java @@ -6,22 +6,36 @@ public class Team { Chaser chaser3 = new Chaser("chaser3",5); Beater beater1 = new Beater("beater1",6); Beater beater2 = new Beater("beater2",7); + private int goal = 0; private void setgoal(){ goal ++; } public int getgoal(){ return goal; - }; - public void play(){ - boolean score = false; - boolean chaser = chaser1.isSuccessful() || chaser2.isSuccessful() ||chaser3.isSuccessful(); - score = keeper.isSuccessful() && (beater1.isSuccessful() || beater2.isSuccessful()) && (beater1.isSuccessful()|| beater2.isSuccessful()) && chaser; - if (score) - setgoal(); - if (seeker.isSuccessful()){ - - } } + public void play(){ + + keeper.attemptToSaveGoal(); + chaser1.attemptToScoreGoal(); + chaser2.attemptToScoreGoal(); + chaser3.attemptToScoreGoal(); + beater1.attemptToStopChaser(); + beater2.attemptToStopChaser(); + + + + + boolean condition = false; + boolean chasing = (chaser1.isSuccessful() && chaser2.isSuccessful()) || (chaser1.isSuccessful() && chaser3.isSuccessful()) || (chaser2.isSuccessful() && chaser3.isSuccessful()); + boolean beating = (beater1.isSuccessful() || beater2.isSuccessful()); + boolean keeping = keeper.isSuccessful(); + condition = chasing && beating && keeping; + if (condition) + setgoal(); + /*if (seeker.isSuccessful()){ + + }*/ + } } From c4f807808d24b15c5d9527a73cc78578c0e0743b Mon Sep 17 00:00:00 2001 From: arshiammz Date: Mon, 15 Apr 2024 22:40:58 +0330 Subject: [PATCH 5/5] MyApp created ! --- .../Third_Project/src/main/java/Match.java | 20 ++++++++++--- .../Third_Project/src/main/java/MyApp.java | 2 +- .../Third_Project/src/main/java/Player.java | 24 ++++++---------- Answers/Third_Project/src/main/java/Team.java | 28 +++++++++---------- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/Answers/Third_Project/src/main/java/Match.java b/Answers/Third_Project/src/main/java/Match.java index 7a70954..d5833db 100644 --- a/Answers/Third_Project/src/main/java/Match.java +++ b/Answers/Third_Project/src/main/java/Match.java @@ -3,14 +3,26 @@ public class Match { Team red = new Team(); public void start(){ for (int i=0; i<100; i++) { - + if (blue.getgoal() > 100) + break; + if (red.getgoal() > 100) + break; blue.play(); red.play(); } - int blue_point = blue.getgoal(); int red_point = red.getgoal(); - System.out.println(blue_point); - System.out.println(red_point); + String result = " "; + if (blue_point > red_point) + result = "The winner is : Blue Team"; + else if (red_point > blue_point) { + result = "The winner is : Red Team"; + }else { + result = "No Winner Draw !"; + } + + System.out.println(result); + System.out.println("Blue team : " + blue_point); + System.out.println("Red team : " + red_point); } } diff --git a/Answers/Third_Project/src/main/java/MyApp.java b/Answers/Third_Project/src/main/java/MyApp.java index fbc0f3f..60d474f 100644 --- a/Answers/Third_Project/src/main/java/MyApp.java +++ b/Answers/Third_Project/src/main/java/MyApp.java @@ -3,4 +3,4 @@ public static void main(String[] args) { Match match = new Match(); match.start(); } -} +} \ No newline at end of file diff --git a/Answers/Third_Project/src/main/java/Player.java b/Answers/Third_Project/src/main/java/Player.java index 5b9a45e..a7108e0 100644 --- a/Answers/Third_Project/src/main/java/Player.java +++ b/Answers/Third_Project/src/main/java/Player.java @@ -13,10 +13,10 @@ public Player(String name, int number) { protected int getRandomNumber(){ return random.nextInt(101); } - } -//-------------------------------------------------------------------------- +//--------------------------------------------------------------------- + class Keeper extends Player implements Success { private boolean Saved; @@ -29,14 +29,13 @@ public void attemptToSaveGoal() { Saved = true; } } - @Override public boolean isSuccessful() { return Saved; } } -//----------------------------------------------------------------------- +//--------------------------------------------------------------------- class Seeker extends Player implements Success { private boolean foundSnitch; @@ -50,18 +49,14 @@ public void attemptToFindSnitch() { foundSnitch = true; } } - - public boolean hasFoundSnitch() { - return foundSnitch; - } - @Override public boolean isSuccessful() { return foundSnitch; } } -//-------------------------------------------------------------------- +//--------------------------------------------------------------------- + class Chaser extends Player implements Success { private boolean Scored; @@ -80,15 +75,15 @@ public boolean isSuccessful() { } } -//---------------------------------------------------------------------- +//--------------------------------------------------------------------- class Beater extends Player implements Success { private boolean Stopped; + public Beater(String name, int number) { super(name, number); this.Stopped = false; } - public void attemptToStopChaser() { if (getRandomNumber() <= 40 ) { Stopped = true; @@ -98,7 +93,4 @@ public void attemptToStopChaser() { public boolean isSuccessful() { return Stopped; } -} - - - +} \ No newline at end of file diff --git a/Answers/Third_Project/src/main/java/Team.java b/Answers/Third_Project/src/main/java/Team.java index 64ac2a5..f1d7909 100644 --- a/Answers/Third_Project/src/main/java/Team.java +++ b/Answers/Third_Project/src/main/java/Team.java @@ -16,26 +16,26 @@ public int getgoal(){ } public void play(){ - + //game plays keeper.attemptToSaveGoal(); chaser1.attemptToScoreGoal(); chaser2.attemptToScoreGoal(); chaser3.attemptToScoreGoal(); beater1.attemptToStopChaser(); beater2.attemptToStopChaser(); - - - - - boolean condition = false; - boolean chasing = (chaser1.isSuccessful() && chaser2.isSuccessful()) || (chaser1.isSuccessful() && chaser3.isSuccessful()) || (chaser2.isSuccessful() && chaser3.isSuccessful()); - boolean beating = (beater1.isSuccessful() || beater2.isSuccessful()); - boolean keeping = keeper.isSuccessful(); - condition = chasing && beating && keeping; - if (condition) + seeker.attemptToFindSnitch(); + //result + boolean SnitchCatched = seeker.isSuccessful(); + boolean condition = false; + boolean chasing = (chaser1.isSuccessful() && chaser2.isSuccessful()) || (chaser1.isSuccessful() && chaser3.isSuccessful()) || (chaser2.isSuccessful() && chaser3.isSuccessful()); + boolean beating = (beater1.isSuccessful() || beater2.isSuccessful()); + boolean keeping = keeper.isSuccessful(); + condition = chasing && beating && keeping; + + if (SnitchCatched){ + goal += 150; + } + if (condition ) setgoal(); - /*if (seeker.isSuccessful()){ - - }*/ } }