diff --git a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/ElementGraph.class b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/ElementGraph.class index 7e9db6f..bd89960 100644 Binary files a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/ElementGraph.class and b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/ElementGraph.class differ diff --git a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Game.class b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Game.class index 50c6d8b..5ba526b 100644 Binary files a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Game.class and b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Game.class differ diff --git a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Player.class b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Player.class index d7be542..4363d65 100644 Binary files a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Player.class and b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Player.class differ diff --git a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/TamaGolem.class b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/TamaGolem.class index acce035..fb88db6 100644 Binary files a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/TamaGolem.class and b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/TamaGolem.class differ diff --git a/src/ElementGraph.java b/src/ElementGraph.java index 9e47145..58b587e 100644 --- a/src/ElementGraph.java +++ b/src/ElementGraph.java @@ -58,5 +58,19 @@ public class ElementGraph { return elements; } + public int getInteractionBetween(Element fromElement, Element toElement) { + for (GraphElement el : elements) { + if (el.getElement().equals(fromElement)){ + for (ElementLink link : el.getLinks()) { + if (link.getElement().equals(toElement)){ + return link.getValue(); + } + } + } + } + + return 0; + } + } diff --git a/src/FightEsit.java b/src/FightEsit.java new file mode 100644 index 0000000..77ed26e --- /dev/null +++ b/src/FightEsit.java @@ -0,0 +1,5 @@ +package it.arnaldo.unibs.tamagolem; + +public enum FightEsit { + GOLEM1, GOLEM2 +} diff --git a/src/Game.java b/src/Game.java index 4b00357..8347bc6 100644 --- a/src/Game.java +++ b/src/Game.java @@ -14,6 +14,7 @@ public class Game { this.player1 = player1; this.player2 = player2; this.worldBalance = worldBalance; + this.stonesPerElement = new HashMap<>(); } public Player getPlayer1() { diff --git a/src/GameLoop.java b/src/GameLoop.java index 0619953..b96cd95 100644 --- a/src/GameLoop.java +++ b/src/GameLoop.java @@ -29,7 +29,7 @@ public class GameLoop { Player p2 = new Player(InputData.readNonEmptyString(""" \s - Player 1: + Player 2: \tChoose your name:\s""", true)); int difficultyChoise = difficultyMenu.choose(); diff --git a/src/TamaGolem.java b/src/TamaGolem.java index 5f9e961..144d17f 100644 --- a/src/TamaGolem.java +++ b/src/TamaGolem.java @@ -18,7 +18,9 @@ public class TamaGolem { public Element useElementalStone() { if (!elementalStones.isEmpty()) { - return elementalStones.poll(); + Element removedStone = elementalStones.removeFirst(); + elementalStones.add(removedStone); + return removedStone; } return null; } @@ -35,4 +37,14 @@ public class TamaGolem { public boolean isAlive() { return lifePoints > 0; } + + @Override + public String toString() { + return "LP: " + lifePoints + ", Elemental stones:" + elementalStones.toString(); + } + + public void print() { + System.out.println(toString()); + + } }