diff options
3 files changed, 24 insertions, 2 deletions
diff --git a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java index 35cd821..43154ea 100644 --- a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java +++ b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java @@ -106,7 +106,7 @@ public class GameScreen implements Screen, InputProcessor { }, 10, 10)); // Add a 1/10th multiplier to the money every 1/10th of a second. - tasks.add(Timer.schedule(new MultiplierTask(savegame), 0.1f, 0.1f)); + tasks.add(Timer.schedule(new MultiplierTask(savegame, decalPlayer, shopUI.getMultiplierLabel()), 0.1f, 0.1f)); camera.update(); render(Gdx.graphics.getDeltaTime()); 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 327d676..af41ba9 100644 --- a/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java +++ b/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java @@ -358,7 +358,7 @@ public class ShopUI { public void render() { this.pointsLabel.setText(NumberFormatter.format(savegame.getMoney(), false)); - this.multiplierLabel.setText(String.format("%s/s", NumberFormatter.format(savegame.getMultiplier()))); + //this.multiplierLabel.setText(String.format("%s/s", NumberFormatter.format(savegame.getMultiplier()))); updatePurchaseItems(); } @@ -374,4 +374,8 @@ public class ShopUI { public boolean isShopListOpened() { return isShopListOpened; } + + public Label getMultiplierLabel() { + return multiplierLabel; + } } diff --git a/core/src/kz/ilotterytea/maxon/tasks/MultiplierTask.java b/core/src/kz/ilotterytea/maxon/tasks/MultiplierTask.java index 4d52388..dd9e4b0 100644 --- a/core/src/kz/ilotterytea/maxon/tasks/MultiplierTask.java +++ b/core/src/kz/ilotterytea/maxon/tasks/MultiplierTask.java @@ -1,16 +1,29 @@ package kz.ilotterytea.maxon.tasks; +import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.utils.Timer; import kz.ilotterytea.maxon.MaxonGame; import kz.ilotterytea.maxon.pets.Pet; +import kz.ilotterytea.maxon.player.DecalPlayer; import kz.ilotterytea.maxon.player.Savegame; +import kz.ilotterytea.maxon.utils.formatters.NumberFormatter; public class MultiplierTask extends Timer.Task { private final MaxonGame game = MaxonGame.getInstance(); private final Savegame savegame; + private final DecalPlayer player; + private final Label multiplierLabel; public MultiplierTask(Savegame savegame) { this.savegame = savegame; + this.player = null; + this.multiplierLabel = null; + } + + public MultiplierTask(Savegame savegame, DecalPlayer player, Label multiplierLabel) { + this.savegame = savegame; + this.player = player; + this.multiplierLabel = multiplierLabel; } @Override @@ -32,6 +45,11 @@ public class MultiplierTask extends Timer.Task { multiplier /= 10f; + if (player != null && multiplierLabel != null) { + multiplier *= 1.0 + player.getClickStreak() / 10000.0; + multiplierLabel.setText(NumberFormatter.format(multiplier * 10f) + "/s"); + } + savegame.increaseMoney(multiplier); } } |