diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/ClickerGame.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/ClickerGame.java index f2d9f06..b7fd9d7 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/ClickerGame.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/ClickerGame.java @@ -25,6 +25,11 @@ public final class ClickerGame * */ private int clickValue; + /** + * Local reference to current score. + */ + private int score; + /** * The current cost of upgrading the amount gained per click. * */ @@ -71,17 +76,22 @@ public Node getCanvasNode() { @Override public void initialize(final IntConsumer scoreModifier) { - - clickBtn.setOnAction(e -> scoreModifier.accept(clickValue)); + score = 0; + clickBtn.setOnAction(e -> { + scoreModifier.accept(clickValue); + score += clickValue; + }); upgradeBtn.setOnAction(e -> { - // TODO: Change validation to only upgrade if enough score. scoreModifier.accept(-upgradeCost); - clickValue += 1; - upgradeCost *= 2; - clickBtn.setText("+" + clickValue); - upgradeBtn.setText("+" + clickValue + " per click\n-" - + upgradeCost + " points"); + if (upgradeCost <= score) { + score -= upgradeCost; + clickValue += 1; + upgradeCost *= 2; + clickBtn.setText("+" + clickValue); + upgradeBtn.setText("+1 per click\n-" + + upgradeCost + " points"); + } }); }