diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java index 58912c3..27d6366 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java @@ -20,23 +20,23 @@ public final class GameEngineController extends ViewController { /** * Current score. * */ - private int currentScore = 0; + private int currentScore; /** * Current frame for animation loop. * */ - private int frameCounter = 0; + private int frameCounter; /** * Current seconds remaining before minigame * is over. * */ - private int secondsRemaining = 60; + private int secondsRemaining; /** * Current rank the player has for this minigame. * */ - private char currentRank = 'E'; + private char currentRank; /** * String shown to describe the effect of the game, @@ -119,7 +119,7 @@ public void launchGimmickSession(final GameGimmick gimmick) { frameCounter = 0; currentRank = 'E'; reportActive = false; - secondsRemaining = 60; + secondsRemaining = 20; refreshMetrics(); getViewElement().setGameGimmickContent(gimmick, (scoreDelta) -> { @@ -149,27 +149,27 @@ private void refreshMetrics() { int seconds = secondsRemaining % 60; String formattedTime = String.format("%02d:%02d:%02d", hours, minutes, seconds); - if (currentScore > 400) { + if (currentScore > 150) { currentRank = 'S'; rankEffectString = "Extremely good fortune awaits " + chosenStock.getSymbol(); fortuneToSet = 0.10; - } else if (currentScore > 300) { + } else if (currentScore > 120) { currentRank = 'A'; rankEffectString = "Really good fortune awaits " + chosenStock.getSymbol(); fortuneToSet = 0.5; - } else if (currentScore > 200) { + } else if (currentScore > 80) { currentRank = 'B'; rankEffectString = "Good fortune awaits " + chosenStock.getSymbol(); fortuneToSet = 0.2; - } else if (currentScore > 150) { + } else if (currentScore > 50) { currentRank = 'C'; rankEffectString = "Bad fortune awaits " + chosenStock.getSymbol(); fortuneToSet = -0.2; - } else if (currentScore > 100) { + } else if (currentScore > 20) { currentRank = 'D'; rankEffectString = "Really bad fortune awaits " + chosenStock.getSymbol(); fortuneToSet = -0.5; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/FindStockGame.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/FindStockGame.java index 28d92ee..c70ca90 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/FindStockGame.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/FindStockGame.java @@ -118,9 +118,9 @@ private void generateRound() { * */ private void handleChoice(final String chosen) { if (chosen.equals(targetSymbol)) { - scoreModifier.accept(2); + scoreModifier.accept(14); } else { - scoreModifier.accept(-1); + scoreModifier.accept(-7); } generateRound(); }