peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2024-11-25 01:09:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'logic' into 'gui'

Browse Source 
Refactor

See merge request progproj/gruppen-ht24/Gruppe-02!9
This commit is contained in:
Johannes Schmelz 2024-11-18 04:01:41 +00:00
commit 5b66131d30
2 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/PlayerHandler.java
View File

@ -109,8 +109,10 @@ public class PlayerHandler {
* @return the next players who is active * @return the next players who is active
*/ */
Player nextPlayer() { Player nextPlayer() {
players.addLast(players.removeFirst()); Player tmp = players.get(0);
return players.getFirst(); players.remove(0);
players.add(tmp);
return players.get(0);
} }
/** /**

80
Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BoardManager.java
View File

@ -25,46 +25,46 @@ public class BoardManager {
private static List<Field> createBoard() { private static List<Field> createBoard() {
ArrayList<Field> fields = new ArrayList<>(); ArrayList<Field> fields = new ArrayList<>();
fields.addLast(new GoField()); fields.add(new GoField());
fields.addLast(new BuildingProperty("Gym", 1, 600, 20)); fields.add(new BuildingProperty("Gym", 1, 600, 20));
fields.addLast(new EventField("Hausfeier", 2)); fields.add(new EventField("Hausfeier", 2));
fields.addLast(new BuildingProperty("Sportplatz", 3, 600, 40)); fields.add(new BuildingProperty("Sportplatz", 3, 600, 40));
fields.addLast(new FineField("Diszi", 4, 2000)); fields.add(new FineField("Diszi", 4, 2000));
fields.addLast(new GateField("Südtor", 5)); fields.add(new GateField("Südtor", 5));
fields.addLast(new BuildingProperty("Studium+", 6, 1000, 60)); fields.add(new BuildingProperty("Studium+", 6, 1000, 60));
fields.addLast(new EventField("Üvas", 7)); fields.add(new EventField("Üvas", 7));
fields.addLast(new BuildingProperty("PhysikHörsaal", 8, 1000, 60)); fields.add(new BuildingProperty("PhysikHörsaal", 8, 1000, 60));
fields.addLast(new BuildingProperty("Audimax", 9, 1200, 80)); fields.add(new BuildingProperty("Audimax", 9, 1200, 80));
fields.addLast(new GulagField()); fields.add(new GulagField());
fields.addLast(new BuildingProperty("99er", 11, 1400, 100)); fields.add(new BuildingProperty("99er", 11, 1400, 100));
fields.addLast(new FoodField("Brandl", 12)); fields.add(new FoodField("Brandl", 12));
fields.addLast(new BuildingProperty("12er", 13, 1400, 100)); fields.add(new BuildingProperty("12er", 13, 1400, 100));
fields.addLast(new BuildingProperty("23er", 14, 1600, 120)); fields.add(new BuildingProperty("23er", 14, 1600, 120));
fields.addLast(new GateField("HauptWache", 15)); fields.add(new GateField("HauptWache", 15));
fields.addLast(new BuildingProperty("Schwimmhalle", 16, 1800, 140)); fields.add(new BuildingProperty("Schwimmhalle", 16, 1800, 140));
fields.addLast(new BuildingProperty("CISM-Bahn", 17, 1800, 140)); fields.add(new BuildingProperty("CISM-Bahn", 17, 1800, 140));
fields.addLast(new EventField("Marine-Welcome-Party", 18)); fields.add(new EventField("Marine-Welcome-Party", 18));
fields.addLast(new BuildingProperty("Kletterturm", 19, 2000, 160)); fields.add(new BuildingProperty("Kletterturm", 19, 2000, 160));
fields.addLast(new TestStreckeField()); fields.add(new TestStreckeField());
fields.addLast(new BuildingProperty("StudFBer C", 21, 2200, 180)); fields.add(new BuildingProperty("StudFBer C", 21, 2200, 180));
fields.addLast(new EventField("Üvas", 22)); fields.add(new EventField("Üvas", 22));
fields.addLast(new BuildingProperty("StudFBer B", 23, 2200, 180)); fields.add(new BuildingProperty("StudFBer B", 23, 2200, 180));
fields.addLast(new BuildingProperty("StudFBer A", 24, 2400, 200)); fields.add(new BuildingProperty("StudFBer A", 24, 2400, 200));
fields.addLast(new GateField("Nordtor", 25)); fields.add(new GateField("Nordtor", 25));
fields.addLast(new BuildingProperty("Cascada", 26, 2600, 220)); fields.add(new BuildingProperty("Cascada", 26, 2600, 220));
fields.addLast(new BuildingProperty("Fakultätsgebäude", 27, 2600, 220)); fields.add(new BuildingProperty("Fakultätsgebäude", 27, 2600, 220));
fields.addLast(new FoodField("Truppenküche", 28)); fields.add(new FoodField("Truppenküche", 28));
fields.addLast(new BuildingProperty("Prüfungsamt", 29, 2800, 240)); fields.add(new BuildingProperty("Prüfungsamt", 29, 2800, 240));
fields.addLast(new WacheField()); fields.add(new WacheField());
fields.addLast(new BuildingProperty("Feuerwehr", 31, 3000, 260)); fields.add(new BuildingProperty("Feuerwehr", 31, 3000, 260));
fields.addLast(new BuildingProperty("SanZ", 32, 300, 260)); fields.add(new BuildingProperty("SanZ", 32, 300, 260));
fields.addLast(new EventField("Maibock", 33)); fields.add(new EventField("Maibock", 33));
fields.addLast(new BuildingProperty("Rechenzentrum", 34, 3200, 280)); fields.add(new BuildingProperty("Rechenzentrum", 34, 3200, 280));
fields.addLast(new GateField("Osttor", 35)); fields.add(new GateField("Osttor", 35));
fields.addLast(new EventField("Üvas", 36)); fields.add(new EventField("Üvas", 36));
fields.addLast(new BuildingProperty("2er", 37, 3500, 350)); fields.add(new BuildingProperty("2er", 37, 3500, 350));
fields.addLast(new FineField("EZM", 38, 1000)); fields.add(new FineField("EZM", 38, 1000));
fields.addLast(new BuildingProperty("20er", 39, 4000, 500)); fields.add(new BuildingProperty("20er", 39, 4000, 500));
return fields; return fields;
} }