From 6d41c585516e6adf0fd5a8e4cfbc512dce3df626 Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 10:23:43 +0330 Subject: [PATCH 01/13] implementations and extentions fixed --- Answers/Quidditch/src/main/java/org/example/Beater.java | 8 ++++++++ Answers/Quidditch/src/main/java/org/example/Chaser.java | 7 +++++++ Answers/Quidditch/src/main/java/org/example/Keeper.java | 7 +++++++ Answers/Quidditch/src/main/java/org/example/Player.java | 8 ++++++++ Answers/Quidditch/src/main/java/org/example/Seeker.java | 7 +++++++ Answers/Quidditch/src/main/java/org/example/Success.java | 5 +++++ 6 files changed, 42 insertions(+) create mode 100644 Answers/Quidditch/src/main/java/org/example/Beater.java create mode 100644 Answers/Quidditch/src/main/java/org/example/Chaser.java create mode 100644 Answers/Quidditch/src/main/java/org/example/Keeper.java create mode 100644 Answers/Quidditch/src/main/java/org/example/Player.java create mode 100644 Answers/Quidditch/src/main/java/org/example/Seeker.java create mode 100644 Answers/Quidditch/src/main/java/org/example/Success.java diff --git a/Answers/Quidditch/src/main/java/org/example/Beater.java b/Answers/Quidditch/src/main/java/org/example/Beater.java new file mode 100644 index 0000000..f9dd46b --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Beater.java @@ -0,0 +1,8 @@ +package org.example; + +class Beater extends Player{ + + + + +} diff --git a/Answers/Quidditch/src/main/java/org/example/Chaser.java b/Answers/Quidditch/src/main/java/org/example/Chaser.java new file mode 100644 index 0000000..23966a0 --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Chaser.java @@ -0,0 +1,7 @@ +package org.example; + +class Chaser extends Player { + + + +} diff --git a/Answers/Quidditch/src/main/java/org/example/Keeper.java b/Answers/Quidditch/src/main/java/org/example/Keeper.java new file mode 100644 index 0000000..3f914f5 --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Keeper.java @@ -0,0 +1,7 @@ +package org.example; + +class Keeper extends Player { + + + +} diff --git a/Answers/Quidditch/src/main/java/org/example/Player.java b/Answers/Quidditch/src/main/java/org/example/Player.java new file mode 100644 index 0000000..74db9d0 --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Player.java @@ -0,0 +1,8 @@ +package org.example; + +class Player implements Success{ + @Override + public boolean isSuccessful() { + return false; + } +} diff --git a/Answers/Quidditch/src/main/java/org/example/Seeker.java b/Answers/Quidditch/src/main/java/org/example/Seeker.java new file mode 100644 index 0000000..41ae718 --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Seeker.java @@ -0,0 +1,7 @@ +package org.example; + +class Seeker extends Player{ + + + +} diff --git a/Answers/Quidditch/src/main/java/org/example/Success.java b/Answers/Quidditch/src/main/java/org/example/Success.java new file mode 100644 index 0000000..14939f6 --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Success.java @@ -0,0 +1,5 @@ +package org.example; + +public interface Success { + public boolean isSuccessful(); +} From b139d1a36f5b5ea07223ec446d13964196d87aec Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 11:07:17 +0330 Subject: [PATCH 02/13] success rates implemented --- .../src/main/java/org/example/Beater.java | 15 +++++++++++++++ .../src/main/java/org/example/Chaser.java | 19 ++++++++++++++++--- .../src/main/java/org/example/Keeper.java | 15 +++++++++++++++ .../src/main/java/org/example/Player.java | 1 + .../src/main/java/org/example/Seeker.java | 15 +++++++++++++++ .../src/main/java/org/example/Team.java | 8 ++++++++ 6 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 Answers/Quidditch/src/main/java/org/example/Team.java diff --git a/Answers/Quidditch/src/main/java/org/example/Beater.java b/Answers/Quidditch/src/main/java/org/example/Beater.java index f9dd46b..60ffc76 100644 --- a/Answers/Quidditch/src/main/java/org/example/Beater.java +++ b/Answers/Quidditch/src/main/java/org/example/Beater.java @@ -1,8 +1,23 @@ package org.example; +import java.util.Random; + class Beater extends Player{ + @Override + public boolean isSuccessful() { + Random randomNumber = new Random(); + int successChance = randomNumber.nextInt(100); + if(successChance < 40) + { + return true; + } + else + { + return false; + } + } } diff --git a/Answers/Quidditch/src/main/java/org/example/Chaser.java b/Answers/Quidditch/src/main/java/org/example/Chaser.java index 23966a0..222f66b 100644 --- a/Answers/Quidditch/src/main/java/org/example/Chaser.java +++ b/Answers/Quidditch/src/main/java/org/example/Chaser.java @@ -1,7 +1,20 @@ package org.example; -class Chaser extends Player { - +import java.util.Random; +class Chaser extends Player { -} + @Override + public boolean isSuccessful() { + Random randomNumber = new Random(); + int successChance = randomNumber.nextInt(100); + if(successChance < 30) + { + return true; + } + else + { + return false; + } + } +} \ No newline at end of file diff --git a/Answers/Quidditch/src/main/java/org/example/Keeper.java b/Answers/Quidditch/src/main/java/org/example/Keeper.java index 3f914f5..78fb763 100644 --- a/Answers/Quidditch/src/main/java/org/example/Keeper.java +++ b/Answers/Quidditch/src/main/java/org/example/Keeper.java @@ -1,7 +1,22 @@ package org.example; +import java.util.Random; + class Keeper extends Player { + @Override + public boolean isSuccessful() { + Random randomNumber = new Random(); + int successChance = randomNumber.nextInt(100); + if(successChance < 70) + { + return true; + } + else + { + return false; + } + } } diff --git a/Answers/Quidditch/src/main/java/org/example/Player.java b/Answers/Quidditch/src/main/java/org/example/Player.java index 74db9d0..0b24190 100644 --- a/Answers/Quidditch/src/main/java/org/example/Player.java +++ b/Answers/Quidditch/src/main/java/org/example/Player.java @@ -3,6 +3,7 @@ class Player implements Success{ @Override public boolean isSuccessful() { + return false; } } diff --git a/Answers/Quidditch/src/main/java/org/example/Seeker.java b/Answers/Quidditch/src/main/java/org/example/Seeker.java index 41ae718..9e8c25c 100644 --- a/Answers/Quidditch/src/main/java/org/example/Seeker.java +++ b/Answers/Quidditch/src/main/java/org/example/Seeker.java @@ -1,7 +1,22 @@ package org.example; +import java.util.Random; + class Seeker extends Player{ + @Override + public boolean isSuccessful() { + Random randomNumber = new Random(); + int successChance = randomNumber.nextInt(100); + if(successChance < 5) + { + return true; + } + else + { + return false; + } + } } diff --git a/Answers/Quidditch/src/main/java/org/example/Team.java b/Answers/Quidditch/src/main/java/org/example/Team.java new file mode 100644 index 0000000..b9713af --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Team.java @@ -0,0 +1,8 @@ +package org.example; + +import java.util.Random; + +public class Team { + + +} From 1652893c5640be0e51685fb6bc1ef18fb9e06c8c Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 13:56:15 +0330 Subject: [PATCH 03/13] team class finished --- .../src/main/java/org/example/Team.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/Answers/Quidditch/src/main/java/org/example/Team.java b/Answers/Quidditch/src/main/java/org/example/Team.java index b9713af..70ad434 100644 --- a/Answers/Quidditch/src/main/java/org/example/Team.java +++ b/Answers/Quidditch/src/main/java/org/example/Team.java @@ -3,6 +3,75 @@ import java.util.Random; public class Team { + int goals; + Seeker teamSeeker; + Keeper teamKeeper; + Chaser teamChaser1; + Chaser teamChaser2; + Chaser teamChaser3; + Beater teamBeater1; + Beater teamBeater2; + public Team (Seeker teamSeeker,Keeper teamKeeper, Chaser teamChaser1,Chaser teamChaser2,Chaser teamChaser3,Beater teamBeater1,Beater teamBeater2 ) + { + this.teamBeater1 = teamBeater1; + this.teamBeater2 = teamBeater2; + this.teamChaser1 = teamChaser1; + this.teamChaser2 = teamChaser2; + this.teamChaser3 = teamChaser3; + this.teamKeeper = teamKeeper; + this.teamSeeker = teamSeeker; + this.goals = 0; + } + private void setGoals() + { + goals ++; + } + public void play(){ + if(requiredBeatersSuccess() && requiredChaserSuccess() && teamKeeper.isSuccessful()) + { + setGoals(); + } + } + private boolean requiredBeatersSuccess() + { + + if(teamBeater1.isSuccessful()) + { + return true; + } + if(teamBeater2.isSuccessful()) + { + return true; + } + else + { + return false; + } + } + private boolean requiredChaserSuccess() + { + int chaserSuccess = 0; + if(teamChaser1.isSuccessful()) + { + chaserSuccess ++; + } + if(teamChaser2.isSuccessful()) + { + chaserSuccess ++; + } + if(teamChaser3.isSuccessful()) + { + chaserSuccess ++; + } + if(chaserSuccess >= 2) + { + return true; + } + else + { + return false; + } + } } From a9aaf36003dee6b7aebbf0fea6502cb8479e61db Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:53:33 +0330 Subject: [PATCH 04/13] team class fixed --- .../src/main/java/org/example/Team.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Team.java b/Answers/Quidditch/src/main/java/org/example/Team.java index 70ad434..1685dec 100644 --- a/Answers/Quidditch/src/main/java/org/example/Team.java +++ b/Answers/Quidditch/src/main/java/org/example/Team.java @@ -1,9 +1,7 @@ package org.example; -import java.util.Random; - public class Team { - int goals; + int goals=0; Seeker teamSeeker; Keeper teamKeeper; Chaser teamChaser1; @@ -12,22 +10,15 @@ public class Team { Beater teamBeater1; Beater teamBeater2; - public Team (Seeker teamSeeker,Keeper teamKeeper, Chaser teamChaser1,Chaser teamChaser2,Chaser teamChaser3,Beater teamBeater1,Beater teamBeater2 ) - { - this.teamBeater1 = teamBeater1; - this.teamBeater2 = teamBeater2; - this.teamChaser1 = teamChaser1; - this.teamChaser2 = teamChaser2; - this.teamChaser3 = teamChaser3; - this.teamKeeper = teamKeeper; - this.teamSeeker = teamSeeker; - this.goals = 0; - } + private void setGoals() { goals ++; } + + + public void play(){ if(requiredBeatersSuccess() && requiredChaserSuccess() && teamKeeper.isSuccessful()) { From feafda8f58074f369fd9054607adab1d3a88b5d1 Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:53:52 +0330 Subject: [PATCH 05/13] chaser class fixed --- .../src/main/java/org/example/Chaser.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Chaser.java b/Answers/Quidditch/src/main/java/org/example/Chaser.java index 222f66b..32c8d2f 100644 --- a/Answers/Quidditch/src/main/java/org/example/Chaser.java +++ b/Answers/Quidditch/src/main/java/org/example/Chaser.java @@ -1,20 +1,11 @@ package org.example; -import java.util.Random; -class Chaser extends Player { +public class Chaser extends Player { - @Override - public boolean isSuccessful() { - Random randomNumber = new Random(); - int successChance = randomNumber.nextInt(100); - if(successChance < 30) - { - return true; - } - else - { - return false; - } + public Chaser(){ + this.chance = 30; } + + } \ No newline at end of file From 3a133c328a1cd8592604decaae8e7608b80c04db Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:54:13 +0330 Subject: [PATCH 06/13] beater class fixed --- .../src/main/java/org/example/Beater.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Beater.java b/Answers/Quidditch/src/main/java/org/example/Beater.java index 60ffc76..f3ba58f 100644 --- a/Answers/Quidditch/src/main/java/org/example/Beater.java +++ b/Answers/Quidditch/src/main/java/org/example/Beater.java @@ -1,23 +1,12 @@ package org.example; -import java.util.Random; -class Beater extends Player{ +public class Beater extends Player{ - - @Override - public boolean isSuccessful() { - Random randomNumber = new Random(); - int successChance = randomNumber.nextInt(100); - if(successChance < 40) - { - return true; - } - else - { - return false; - } + public Beater(){ + this.chance = 40; } + } From ae6ffa39d74ccee04270e6b624dfeb5209a1a906 Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:54:24 +0330 Subject: [PATCH 07/13] keeper class fixed --- .../src/main/java/org/example/Keeper.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Keeper.java b/Answers/Quidditch/src/main/java/org/example/Keeper.java index 78fb763..9c79ecc 100644 --- a/Answers/Quidditch/src/main/java/org/example/Keeper.java +++ b/Answers/Quidditch/src/main/java/org/example/Keeper.java @@ -1,22 +1,11 @@ package org.example; -import java.util.Random; -class Keeper extends Player { +public class Keeper extends Player { - @Override - public boolean isSuccessful() { - Random randomNumber = new Random(); - int successChance = randomNumber.nextInt(100); - if(successChance < 70) - { - return true; - } - else - { - return false; - } + public Keeper(){ + this.chance = 70; } } From 0337e215ed1669197898760637c357bbdb2b2e6c Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:54:35 +0330 Subject: [PATCH 08/13] player class fixed --- .../src/main/java/org/example/Player.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Player.java b/Answers/Quidditch/src/main/java/org/example/Player.java index 0b24190..dbb4c14 100644 --- a/Answers/Quidditch/src/main/java/org/example/Player.java +++ b/Answers/Quidditch/src/main/java/org/example/Player.java @@ -1,9 +1,21 @@ package org.example; +import java.util.Random; + class Player implements Success{ + + int chance ; + Random randomNumber = new Random(); + @Override public boolean isSuccessful() { - return false; + int successChance = randomNumber.nextInt(100)+1 ; + + if(successChance <= chance) + { + return true; + } + return false; } } From a60603c56453595eee5635baad5fdcb0b231713d Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:54:46 +0330 Subject: [PATCH 09/13] seeker class fixed --- .../src/main/java/org/example/Seeker.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Seeker.java b/Answers/Quidditch/src/main/java/org/example/Seeker.java index 9e8c25c..bcf7cc4 100644 --- a/Answers/Quidditch/src/main/java/org/example/Seeker.java +++ b/Answers/Quidditch/src/main/java/org/example/Seeker.java @@ -1,22 +1,12 @@ package org.example; -import java.util.Random; -class Seeker extends Player{ +public class Seeker extends Player{ - @Override - public boolean isSuccessful() { - Random randomNumber = new Random(); - int successChance = randomNumber.nextInt(100); - if(successChance < 5) - { - return true; - } - else - { - return false; - } + public Seeker(){ + this.chance=5; } + } From 76fbe84ab7a5c24992b6757378330b61e138de5d Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:55:08 +0330 Subject: [PATCH 10/13] success interface fixed --- Answers/Quidditch/src/main/java/org/example/Success.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Success.java b/Answers/Quidditch/src/main/java/org/example/Success.java index 14939f6..25be6f7 100644 --- a/Answers/Quidditch/src/main/java/org/example/Success.java +++ b/Answers/Quidditch/src/main/java/org/example/Success.java @@ -1,5 +1,5 @@ package org.example; public interface Success { - public boolean isSuccessful(); + boolean isSuccessful(); } From 8acd499a8629df99a570d0dc27a15b448659d32d Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:55:40 +0330 Subject: [PATCH 11/13] match class done --- .../src/main/java/org/example/Match.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Answers/Quidditch/src/main/java/org/example/Match.java diff --git a/Answers/Quidditch/src/main/java/org/example/Match.java b/Answers/Quidditch/src/main/java/org/example/Match.java new file mode 100644 index 0000000..a0e75bd --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/Match.java @@ -0,0 +1,55 @@ +package org.example; + +import java.sql.SQLOutput; + +public class Match { + Team team1 = new Team(); + Team team2 = new Team(); + + public void start () + { + for (int i = 0; i < 100; i++) + { + if(team1.teamSeeker.isSuccessful()) + { + team1.goals += 150; + System.out.println("team 1 WINS "); + System.out.println("team 1 score is :"+ team1.goals); + System.out.println("team 2 score is :"+ team2.goals); + return; + } + if(team2.teamSeeker.isSuccessful()) + { + team2.goals += 150; + System.out.println("team 2 WINS "); + System.out.println("team 1 score is :"+ team1.goals); + System.out.println("team 2 score is :"+ team2.goals); + return; + } + team1.play(); + team2.play(); + } + if(team1.goals < team2.goals) + { + System.out.println("team 2 WINS "); + System.out.println("team 1 score is :"+ team1.goals); + System.out.println("team 2 score is :"+ team2.goals); + + } + else if(team1.goals > team2.goals) + { + System.out.println("team 1 WINS "); + System.out.println("team 1 score is :"+ team1.goals); + System.out.println("team 2 score is :"+ team2.goals); + + } + else + { + System.out.println("DRAW"); + System.out.println("team 1 score is :"+ team1.goals); + System.out.println("team 2 score is :"+ team2.goals); + + } + + } +} \ No newline at end of file From 2f7b894440d1f8ad0f01629f346151c7a2dcb530 Mon Sep 17 00:00:00 2001 From: DanialArzani Date: Mon, 15 Apr 2024 21:55:49 +0330 Subject: [PATCH 12/13] my app done --- Answers/Quidditch/src/main/java/org/example/MyApp.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Answers/Quidditch/src/main/java/org/example/MyApp.java diff --git a/Answers/Quidditch/src/main/java/org/example/MyApp.java b/Answers/Quidditch/src/main/java/org/example/MyApp.java new file mode 100644 index 0000000..251b0a8 --- /dev/null +++ b/Answers/Quidditch/src/main/java/org/example/MyApp.java @@ -0,0 +1,9 @@ +package org.example; + +public class MyApp { + public static void main(String[] args){ + Match match = new Match(); + + match.start(); + } +} From 0e7cb77e1a3c59b92404ee5ee732739ac3213d00 Mon Sep 17 00:00:00 2001 From: AmirHosseinZg Date: Mon, 15 Apr 2024 22:28:20 +0330 Subject: [PATCH 13/13] final edit team class --- .../Quidditch/src/main/java/org/example/Team.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Answers/Quidditch/src/main/java/org/example/Team.java b/Answers/Quidditch/src/main/java/org/example/Team.java index 1685dec..44ad95a 100644 --- a/Answers/Quidditch/src/main/java/org/example/Team.java +++ b/Answers/Quidditch/src/main/java/org/example/Team.java @@ -2,13 +2,13 @@ public class Team { int goals=0; - Seeker teamSeeker; - Keeper teamKeeper; - Chaser teamChaser1; - Chaser teamChaser2; - Chaser teamChaser3; - Beater teamBeater1; - Beater teamBeater2; + Seeker teamSeeker = new Seeker(); + Keeper teamKeeper = new Keeper(); + Chaser teamChaser1 = new Chaser(); + Chaser teamChaser2 = new Chaser(); + Chaser teamChaser3 = new Chaser(); + Beater teamBeater1 = new Beater(); + Beater teamBeater2 = new Beater();