a bit more logic around busting/finishing

alyssaruth · Apr 7, 2024 · cb4df1a · cb4df1a
1 parent 449217d
commit cb4df1a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/main/kotlin/dartzee/screen/game/DartsGameScreen.kt b/src/main/kotlin/dartzee/screen/game/DartsGameScreen.kt
@@ -23,6 +23,7 @@ class DartsGameScreen(game: GameEntity, private val participants: List<IWrappedP
 
         if (InjectedThings.partyMode) {
             contentPane.add(tutorialPanel)
+            pack()
             extendedState = Frame.MAXIMIZED_BOTH
         } else {
             contentPane.add(gamePanel)

diff --git a/src/main/kotlin/dartzee/screen/game/TutorialPanel.kt b/src/main/kotlin/dartzee/screen/game/TutorialPanel.kt
@@ -5,9 +5,11 @@ import dartzee.core.util.setFontSize
 import dartzee.listener.DartboardListener
 import dartzee.`object`.Dart
 import dartzee.screen.GameplayDartboard
+import dartzee.utils.DartsColour
 import dartzee.utils.ResourceCache
 import dartzee.utils.sumScore
 import java.awt.BorderLayout
+import java.awt.Color
 import java.awt.Dimension
 import java.awt.event.ActionEvent
 import java.awt.event.ActionListener
@@ -104,7 +106,7 @@ class TutorialPanel(private val parent: DartsGameScreen) :
 
         // Center-East - Score indicators
         val panelEast = JPanel()
-        panelEast.preferredSize = Dimension(160, 50)
+        panelEast.preferredSize = Dimension(200, 50)
         add(panelEast, BorderLayout.EAST)
         panelEast.layout = MigLayout("al center center")
         val lblRemainingText = JLabel("Remaining:")
@@ -181,7 +183,7 @@ class TutorialPanel(private val parent: DartsGameScreen) :
     private fun confirmScore() {
         if (!isBust()) {
             scoreRemaining -= sumScore(dartsThrown)
-            lblRemaining.text = scoreRemaining.toString()
+            lblRemaining.text = if (scoreRemaining > 0) "$scoreRemaining" else "You win!"
         }
 
         clearDarts()
@@ -192,25 +194,41 @@ class TutorialPanel(private val parent: DartsGameScreen) :
         dartsThrown.clear()
 
         lblScored.text = "0"
+        lblScored.foreground = Color.BLACK
 
         btnReset.isEnabled = false
         btnConfirm.isEnabled = false
 
-        dartboard.ensureListening()
+        if (scoreRemaining > 0) {
+            dartboard.ensureListening()
+        }
     }
 
     override fun dartThrown(dart: Dart) {
         dartsThrown.add(dart)
 
-        lblScored.text = sumScore(dartsThrown).toString()
+        lblScored.text = getScoredDesc()
 
         btnReset.isEnabled = true
         btnConfirm.isEnabled = true
 
         if (dartsThrown.size == 3 || sumScore(dartsThrown) >= scoreRemaining) {
             dartboard.stopListening()
         }
+
+        if (isBust()) {
+            lblScored.foreground = DartsColour.DARK_RED
+        } else if (sumScore(dartsThrown) == scoreRemaining) {
+            lblScored.foreground = DartsColour.DARK_GREEN
+        }
     }
 
+    private fun getScoredDesc() =
+        if (dartsThrown.size > 1) {
+            "${dartsThrown.joinToString(" + ")} = ${sumScore(dartsThrown)}"
+        } else {
+            sumScore(dartsThrown).toString()
+        }
+
     private fun isBust(): Boolean = (scoreRemaining - sumScore(dartsThrown)) < 0
 }
diff --git a/src/main/kotlin/dartzee/utils/DartsColour.kt b/src/main/kotlin/dartzee/utils/DartsColour.kt
@@ -30,6 +30,8 @@ object DartsColour {
         Color.getHSBColor(242.toFloat() / 360, 0.48.toFloat(), 0.8.toFloat())
     val PURPLE = Color(138, 43, 226)
     val ORANGE = Color(255, 140, 0)
+    val DARK_GREEN = Color(1, 75, 32)
+    val DARK_RED = Color(139, 0, 0)
 
     val FIRST_COLOURS = Pair(Color.YELLOW, COLOUR_GOLD_TEXT)
     val SECOND_COLOURS = Pair(Color.GRAY, COLOUR_SILVER_TEXT)