diff options
| -rw-r--r-- | assets/sprites/gui/ui.skin | 9 | ||||
| -rw-r--r-- | core/src/kz/ilotterytea/maxon/pets/PetWidget.java | 10 | ||||
| -rw-r--r-- | core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java | 14 |
3 files changed, 27 insertions, 6 deletions
diff --git a/assets/sprites/gui/ui.skin b/assets/sprites/gui/ui.skin index 752ca37..cc281a1 100644 --- a/assets/sprites/gui/ui.skin +++ b/assets/sprites/gui/ui.skin @@ -6,6 +6,7 @@ store_item_disabled: { hex: "#888888ff" }, store_item_price_available: { hex: "#00ff00ff" }, store_item_price_disabled: { hex: "#ff0000ff" }, + store_item_amount: { hex: "#1b1412ff" }, orange: {hex: "#ffa300ff" }, yellow: {hex: "#ffec27ff" }, @@ -72,6 +73,10 @@ file: fnt/FontText.fnt, scaledSize: 30 }, + store_item_amount: { + file: fnt/FontText.fnt, + scaledSize: 48 + }, store_control: { file: fnt/FontText.fnt, scaledSize: 18 @@ -191,6 +196,10 @@ parent: store_item_price_mobile, fontColor: store_item_price_disabled }, + store_item_amount: { + font: store_item_amount, + fontColor: store_item_amount + }, slots: { font: slots, fontColor: white diff --git a/core/src/kz/ilotterytea/maxon/pets/PetWidget.java b/core/src/kz/ilotterytea/maxon/pets/PetWidget.java index 70a0e94..c8b56fb 100644 --- a/core/src/kz/ilotterytea/maxon/pets/PetWidget.java +++ b/core/src/kz/ilotterytea/maxon/pets/PetWidget.java @@ -17,7 +17,7 @@ import kz.ilotterytea.maxon.utils.formatters.NumberFormatter; public class PetWidget extends Table { private double price; private final Skin skin; - private final Label priceLabel, nameLabel; + private final Label priceLabel, nameLabel, amountLabel; private TextTooltip priceTooltip; private final Pet pet; @@ -98,6 +98,9 @@ public class PetWidget extends Table { } } }); + + this.amountLabel = new Label("", skin, "store_item_amount"); + super.add(amountLabel); } public void setPrice(double price) { @@ -169,6 +172,11 @@ public class PetWidget extends Table { this.nameLabel.addListener(tooltip); } + public void setAmount(Integer amount) { + this.amountLabel.setVisible(amount > 0); + this.amountLabel.setText(amount); + } + public boolean isLocked() { return isLocked; } diff --git a/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java b/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java index 76e5a04..b0b6d77 100644 --- a/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java +++ b/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java @@ -248,6 +248,9 @@ public class ShopUI { for (Pet pet : pets) { PetWidget widget = new PetWidget(this.skin, pet, this.atlas); + Integer amount = savegame.getPurchasedPets().get(pet.getId()); + if (amount == null) amount = 0; + widget.setAmount(amount); widget.addListener(new ClickListener() { @Override public void clicked(InputEvent event, float x, float y) { @@ -258,12 +261,11 @@ public class ShopUI { return; } - if (mode == ShopMode.BUY) { - Integer amount = savegame.getPurchasedPets().get(pet.getId()); + Integer amount = savegame.getPurchasedPets().get(pet.getId()); + if (amount == null) amount = 0; - if (amount == null) { - amount = 0; - } + if (mode == ShopMode.BUY) { + widget.setAmount(amount + multiplier.getMultiplier()); savegame.decreaseMoney(widget.getPrice()); savegame.increaseMultiplier(pet.getMultiplier() * multiplier.getMultiplier()); @@ -273,6 +275,8 @@ public class ShopUI { ); purchaseSound.play(soundVolume); } else { + widget.setAmount(amount - multiplier.getMultiplier()); + savegame.increaseMoney(widget.getPrice()); savegame.decreaseMultiplier(pet.getMultiplier() * multiplier.getMultiplier()); savegame.getPurchasedPets().put( |