From 2b938b68f905e3f388bff38c8f1711c853e34388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Nie=C3=9Fen?= Date: Fri, 4 Aug 2023 17:41:59 +0200 Subject: [PATCH] Tried tu debug without success :C. Now thinking of unicorns to be happier :D --- .../AttackInformations.java | 31 ++++++++++ .../game-logic/{ => Manager/Field}/Field.java | 2 + .../{ => Manager/Field/Player}/Player.java | 2 + .../game-logic/{ => Manager}/GameManager.java | 58 ++++++------------- server/game-logic/Manager/Test.java | 16 +++++ server/game-logic/Test.java | 13 ++++- 6 files changed, 80 insertions(+), 42 deletions(-) create mode 100644 server/game-logic/Manager/AttackInformations/AttackInformations.java rename server/game-logic/{ => Manager/Field}/Field.java (97%) rename server/game-logic/{ => Manager/Field/Player}/Player.java (94%) rename server/game-logic/{ => Manager}/GameManager.java (65%) create mode 100644 server/game-logic/Manager/Test.java diff --git a/server/game-logic/Manager/AttackInformations/AttackInformations.java b/server/game-logic/Manager/AttackInformations/AttackInformations.java new file mode 100644 index 0000000..77b1374 --- /dev/null +++ b/server/game-logic/Manager/AttackInformations/AttackInformations.java @@ -0,0 +1,31 @@ +package AttackInformations; + +public class AttackInformations{ + private int attack_field_dice; + private int defense_field_dice; + private boolean attack_success; + private boolean attack_allowed; + + public AttackInformations(int input_att_field, int input_def_field,boolean input_attack_allowed){ + attack_field_dice = input_att_field; + defense_field_dice = input_def_field; + attack_success = (input_att_field >= input_def_field); + attack_allowed = input_attack_allowed; + } + + public int get_attack_field_dice(){ + return attack_field_dice; + } + + public int get_defense_field_dice(){ + return defense_field_dice; + } + + public boolean get_attack_success(){ + return attack_success; + } + + public boolean get_attack_allowed(){ + return attack_allowed; + } +} \ No newline at end of file diff --git a/server/game-logic/Field.java b/server/game-logic/Manager/Field/Field.java similarity index 97% rename from server/game-logic/Field.java rename to server/game-logic/Manager/Field/Field.java index 90142c6..b22ee2e 100644 --- a/server/game-logic/Field.java +++ b/server/game-logic/Manager/Field/Field.java @@ -1,3 +1,5 @@ +package Field; + import java.util.ArrayList; import Player; diff --git a/server/game-logic/Player.java b/server/game-logic/Manager/Field/Player/Player.java similarity index 94% rename from server/game-logic/Player.java rename to server/game-logic/Manager/Field/Player/Player.java index 34722eb..fc460a5 100644 --- a/server/game-logic/Player.java +++ b/server/game-logic/Manager/Field/Player/Player.java @@ -1,3 +1,5 @@ +package Field.Player; + public class Player{ private String name; private int playerid; diff --git a/server/game-logic/GameManager.java b/server/game-logic/Manager/GameManager.java similarity index 65% rename from server/game-logic/GameManager.java rename to server/game-logic/Manager/GameManager.java index e5d5fa5..eca7b49 100644 --- a/server/game-logic/GameManager.java +++ b/server/game-logic/Manager/GameManager.java @@ -1,10 +1,13 @@ -import Player; -import Field; +package Manager; + +import Field.Field; +import Player.Player; +import AttackInformations.AttackInformations; import java.util.ArrayList; import java.util.Random; -public class Max{ +class Max{ private int max; public Max(int num1, int num2){ @@ -16,41 +19,11 @@ public class Max{ } } - public get_max(){ + public int get_max(){ return max; } } -public class AttackInformations{ - private int attack_field_dice; - private int defense_field_dice; - private boolean attack_success; - private boolean attack_allowed; - - public AttackInformations(int input_att_field, int input_def_field,boolean input_attack_allowed){ - attack_field_dice = input_att_field; - defense_field_dice = input_def_field; - attack_success = (input_att_field >= input_def_field); - attack_allowed = input_attack_allowed; - } - - public int get_attack_field_dice(){ - return attack_field_dice; - } - - public int get_defense_field_dice(){ - return defense_field_dice; - } - - public boolean get_attack_success(){ - return attack_success; - } - - public boolean get_attack_allowed(){ - return attack_allowed; - } -} - public class GameManager { private ArrayList fields; private ArrayList players; @@ -69,12 +42,13 @@ public class GameManager { public void add_player(String input){ if(players.size() < 8){ - players.add(Player(input,players.size())); + Player pl = new Player(input,players.size()); + players.add(pl); } } public AttackInformations attack_field(Field att_field, Field def_field){ - boolean attack_allowed; + boolean attack_allowed= false; boolean att_field_allowed = false; boolean def_field_allowed = false; @@ -95,6 +69,8 @@ public class GameManager { attack_allowed = att_field_allowed && def_field_allowed && attack_allowed; + AttackInformations infor; + if(attack_allowed){ int att_field_sum = 0; int def_field_sum = 0; @@ -106,17 +82,21 @@ public class GameManager { def_field_sum += 1 + rand_num_gen.nextInt(6); } - AttackInformations infor = new AttackInformations(att_field_sum, def_field_sum,true); + infor = new AttackInformations(att_field_sum, def_field_sum,true); if(infor.get_attack_success()){ - def_field.set_dice_number(Max(att_field.get_dice_number()-1,1).get_max()); + Max M = new Max(att_field.get_dice_number()-1,1); + def_field.set_dice_number(M.get_max()); def_field.set_owner(att_field.get_owner()); } att_field.set_dice_number(1); } + else{ + infor = new AttackInformations(-1,-1,false); + } - return AttackInformations(-1,-1,false); + return infor; } public ArrayList get_fields(){ diff --git a/server/game-logic/Manager/Test.java b/server/game-logic/Manager/Test.java new file mode 100644 index 0000000..7a87620 --- /dev/null +++ b/server/game-logic/Manager/Test.java @@ -0,0 +1,16 @@ +import Manager.GameManager; +import Player.Player; + +public class Test { + public static void main(String[] args){ + GameManager gm = new GameManager(); + gm.add_player("Sebastian"); + gm.add_player("Lars"); + gm.add_player("Nils"); + gm.add_player("Felix"); + + for(Player current:gm.get_players()){ + System.out.println(current); + } + } +} \ No newline at end of file diff --git a/server/game-logic/Test.java b/server/game-logic/Test.java index da84aed..33fad81 100644 --- a/server/game-logic/Test.java +++ b/server/game-logic/Test.java @@ -1,8 +1,15 @@ -import GameManager.*; +import Manager.GameManager; public class Test { public static void main(String[] args){ - Random rand_num = new Random(); - System.out.println(Integer.toString(rand_num.nextInt(2))); + GameManager gm = new GameManager(); + gm.add_player("Sebastian"); + gm.add_player("Lars"); + gm.add_player("Nils"); + gm.add_player("Felix"); + + for(Player current:gm.get_players()){ + System.out.println(current); + } } } \ No newline at end of file