diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java index 514951e..1295ae4 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java @@ -77,6 +77,7 @@ public class Building1 extends BuildingCard { return super.toString() + " (Icon:" + this.icon.toString().substring(0, 3) + ")"; } + // TODO @Override public String toStringPlayer() { return super.toStringPlayer() + " (Icon:" + this.icon.toString().substring(0, 3) + ")"; diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java index 7c554ec..493dee4 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java @@ -111,6 +111,7 @@ public class Building11 extends BuildingCard { return super.toString() + "+" + this.characterType.toString().substring(0, 3) + "×" + this.prestigeMul; } + // TODO @Override public String toStringPlayer() { return super.toStringPlayer() + " (\uD83C\uDFC5:" + this.characterType.toString().substring(0, 3) + "×" + this.prestigeMul + ")"; diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java index bbaa2d5..10db47c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java @@ -21,11 +21,13 @@ public class ShamanicRitual extends EventCard { /** Prestige points awarded to the player with the most shaman icons. */ private int prestigeToAdd; + // TODO int getPrestigeToAdd() { return prestigeToAdd; } /** Prestige points removed from the player with the fewest shaman icons. */ private int prestigeToRemove; + // TODO int getPrestigeToRemove() { return prestigeToRemove; } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index 345a0f1..597f5d4 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -688,14 +688,9 @@ public class Game implements Serializable { } - //endregion //region Optional Card Methods - //endregion - - //endregion - /** * Prepares the next player and updates the game state according to the current game stage. * If the current stage is {@code SLOT_CHOICE}, the next player is taken from the order logic card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java index 74802fc..93729d2 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java @@ -72,7 +72,7 @@ public class Board implements Serializable { */ public List getLowerListBuilding() { return lowerListBuilding; } - + // TODO private final ArrayList> buildingCardsAllEras; /** Number of players */ private int nTotem; diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java index 6cf35d7..50dfe18 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java @@ -199,6 +199,8 @@ public class CurrentState implements Serializable { } } + + // TODO @Override public String toString(){ var table= new AsciiTable(BorderStyle.ROUNDED,4); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index cc68b71..0e2a181 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -224,6 +224,7 @@ public class Player implements Serializable { // region Functions + // TODO @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java b/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java index f99ee1a..d71e5fa 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java @@ -178,6 +178,7 @@ public class Slot implements Serializable { // Functions + // TODO @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -185,6 +186,7 @@ public class Slot implements Serializable { return slotId == ((Slot) obj).slotId; } + // TODO @Override public int hashCode() { return Character.hashCode(slotId);