From fd7efd2b80a1f31050ab9c225a7cf26f3ff0cdca Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Mon, 1 Apr 2019 01:19:45 -0700 Subject: [PATCH] Added labels for stash and inventory gold counts --- core/src/com/riiablo/entity/Player.java | 22 +++++++++++++++++++ .../src/com/riiablo/panel/InventoryPanel.java | 8 ++++++- core/src/com/riiablo/panel/StashPanel.java | 6 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/core/src/com/riiablo/entity/Player.java b/core/src/com/riiablo/entity/Player.java index cdb5087d..c6554bbf 100644 --- a/core/src/com/riiablo/entity/Player.java +++ b/core/src/com/riiablo/entity/Player.java @@ -471,6 +471,8 @@ public class Player extends Entity { int getColdResistance(); int getLightningResistance(); int getPoisonResistance(); + int getInvGold(); + int getStashGold(); } public class StatsImpl implements Stats { @@ -545,6 +547,16 @@ public class Player extends Entity { public int getPoisonResistance() { return 0; } + + @Override + public int getInvGold() { + return 0; + } + + @Override + public int getStashGold() { + return 0; + } } public class D2SStats implements Stats { @@ -607,6 +619,16 @@ public class Player extends Entity { public int getPoisonResistance() { return 0; } + + @Override + public int getInvGold() { + return d2s.stats.invGold; + } + + @Override + public int getStashGold() { + return d2s.stats.stashGold; + } } public interface Skills { diff --git a/core/src/com/riiablo/panel/InventoryPanel.java b/core/src/com/riiablo/panel/InventoryPanel.java index 43a6d784..b8e84c95 100644 --- a/core/src/com/riiablo/panel/InventoryPanel.java +++ b/core/src/com/riiablo/panel/InventoryPanel.java @@ -28,6 +28,7 @@ import com.riiablo.item.StoreLoc; import com.riiablo.loader.DC6Loader; import com.riiablo.screen.GameScreen; import com.riiablo.widget.Button; +import com.riiablo.widget.Label; import org.apache.commons.lang3.ArrayUtils; @@ -267,7 +268,12 @@ public class InventoryPanel extends WidgetGroup implements Disposable { getHeight() - inventory.gridTop - grid.getHeight()); addActor(grid); - //setDebug(true, true); + Label invgold = new Label(Integer.toString(gameScreen.player.stats.getInvGold()), Riiablo.fonts.font16); + invgold.setSize(90, 16); + invgold.setPosition(107, 24); + addActor(invgold); + + setDebug(true, true); } @Override diff --git a/core/src/com/riiablo/panel/StashPanel.java b/core/src/com/riiablo/panel/StashPanel.java index 17a9c8a5..5862b65c 100644 --- a/core/src/com/riiablo/panel/StashPanel.java +++ b/core/src/com/riiablo/panel/StashPanel.java @@ -16,6 +16,7 @@ import com.riiablo.item.StoreLoc; import com.riiablo.loader.DC6Loader; import com.riiablo.screen.GameScreen; import com.riiablo.widget.Button; +import com.riiablo.widget.Label; public class StashPanel extends WidgetGroup implements Disposable { private static final String TAG = "StashPanel"; @@ -63,6 +64,11 @@ public class StashPanel extends WidgetGroup implements Disposable { getHeight() - inventory.gridTop - grid.getHeight()); addActor(grid); + Label stashgold = new Label(Integer.toString(gameScreen.player.stats.getStashGold()), Riiablo.fonts.font16); + stashgold.setSize(150, 16); + stashgold.setPosition(98, 393); + addActor(stashgold); + setDebug(true, true); }