From 35270cce7b5a186c58ad4f22c0d4f9ea2947517a Mon Sep 17 00:00:00 2001 From: Felix Koppe Date: Fri, 29 Nov 2024 12:49:07 +0100 Subject: [PATCH] Fix ceremony statistics error --- .../pp/mdga/client/dialog/CeremonyDialog.java | 54 ++++++++++--------- .../java/pp/mdga/client/gui/DiceControl.java | 1 + .../pp/mdga/client/view/CeremonyView.java | 3 +- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/CeremonyDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/CeremonyDialog.java index 261ce033..d21296d0 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/CeremonyDialog.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/CeremonyDialog.java @@ -5,43 +5,20 @@ import com.jme3.scene.Node; import pp.mdga.client.MdgaApp; import pp.mdga.client.button.AbstractButton; -import pp.mdga.client.button.InputButton; import pp.mdga.client.button.LabelButton; import pp.mdga.client.button.MenuButton; -import pp.mdga.client.view.MainView; import java.util.ArrayList; public class CeremonyDialog extends Dialog { private ArrayList> labels; - float offsetX = 0.5f; + float offsetX; public CeremonyDialog(MdgaApp app, Node node) { super(app, node); - labels = new ArrayList<>(); - - ArrayList first = new ArrayList<>(); - Vector2f size = new Vector2f(4, 1.2f); - first.add(new LabelButton(app, node, "", size, new Vector2f())); - first.add(new LabelButton(app, node, "Figuren geworfen", size, new Vector2f())); - first.add(new LabelButton(app, node, "Figuren verloren", size, new Vector2f())); - first.add(new LabelButton(app, node, "Verwendete Bonuskarten", size, new Vector2f())); - first.add(new LabelButton(app, node, "Gewürfelte 6en", size, new Vector2f())); - first.add(new LabelButton(app, node, "Gelaufene Felder", size, new Vector2f())); - first.add(new LabelButton(app, node, "Bonusfeldern erreicht", size, new Vector2f())); - - float offsetY = 0.5f; - - for (LabelButton b : first) { - b.setPos(new Vector2f(offsetX, MenuButton.VERTICAL - offsetY)); - offsetY += 0.8f; - } - - offsetX += 2.3f; - - labels.add(first); + prepare(); } @Override @@ -98,4 +75,31 @@ public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5 labels.add(row); } + + public void prepare() { + offsetX = 0.5f; + + labels = new ArrayList<>(); + + ArrayList first = new ArrayList<>(); + Vector2f size = new Vector2f(4, 1.2f); + first.add(new LabelButton(app, node, "", size, new Vector2f())); + first.add(new LabelButton(app, node, "Figuren geworfen", size, new Vector2f())); + first.add(new LabelButton(app, node, "Figuren verloren", size, new Vector2f())); + first.add(new LabelButton(app, node, "Verwendete Bonuskarten", size, new Vector2f())); + first.add(new LabelButton(app, node, "Gewürfelte 6en", size, new Vector2f())); + first.add(new LabelButton(app, node, "Gelaufene Felder", size, new Vector2f())); + first.add(new LabelButton(app, node, "Bonusfeldern erreicht", size, new Vector2f())); + + float offsetY = 0.5f; + + for (LabelButton b : first) { + b.setPos(new Vector2f(offsetX, MenuButton.VERTICAL - offsetY)); + offsetY += 0.8f; + } + + offsetX += 2.3f; + + labels.add(first); + } } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java index be71d8f3..d2a3e5c9 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java @@ -165,4 +165,5 @@ public void create(Vector3f pos, float scale, boolean shadow){ public void setPos(Vector3f pos){ spatial.setLocalTranslation(pos); } + } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java index d6fd6941..5c800265 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java @@ -8,7 +8,6 @@ import pp.mdga.client.button.ButtonLeft; import pp.mdga.client.button.ButtonRight; import pp.mdga.client.button.CeremonyButton; -import pp.mdga.client.button.LobbyButton; import pp.mdga.client.dialog.CeremonyDialog; import pp.mdga.game.Color; @@ -65,6 +64,8 @@ public void onLeave() { ceremonyButtons.clear(); rootNode.removeLight(ambient); + + ceremonyDialog.prepare(); } @Override