Show instructions count for task on success screen.

cat-in-the-dark · Oct 8, 2019 · 2854ad1 · 2854ad1
1 parent 41912f4
commit 2854ad1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/PlottingScreenState.kt b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/PlottingScreenState.kt
@@ -128,6 +128,7 @@ class PlottingScreenState : IState {
                         "instructionsCount", IOC.atOrFail<Int>("instructionsCount") +
                             state.instructions.size
                     )
+                    IOC.put("solutionInstructions", state.instructions.size)
                     IOC.put("state", States.SUCCESS_SCREEN)
                 }
             } else {

diff --git a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/SuccessScreenState.kt b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/SuccessScreenState.kt
@@ -1,34 +1,40 @@
 package org.catinthedark.jvcrplotter.game.states
 
-import com.badlogic.gdx.Gdx
-import com.badlogic.gdx.Input
 import com.badlogic.gdx.assets.AssetManager
-import com.badlogic.gdx.graphics.g2d.BitmapFont
 import com.badlogic.gdx.scenes.scene2d.Stage
-import org.catinthedark.jvcrplotter.game.Assets.Names.FONT_BIG_GREEN
+import org.catinthedark.jvcrplotter.game.Assets
 import org.catinthedark.jvcrplotter.game.States
 import org.catinthedark.jvcrplotter.game.Tasks
-import org.catinthedark.jvcrplotter.game.font
+import org.catinthedark.jvcrplotter.game.texture
+import org.catinthedark.jvcrplotter.game.ui.HelperDialog
 import org.catinthedark.jvcrplotter.lib.IOC
 import org.catinthedark.jvcrplotter.lib.atOrFail
 import org.catinthedark.jvcrplotter.lib.managed
 import org.catinthedark.jvcrplotter.lib.states.IState
 
-class SuccessScreenState: IState {
+class SuccessScreenState : IState {
     private val hud: Stage by lazy { IOC.atOrFail<Stage>("hud") }
     private val am: AssetManager by lazy { IOC.atOrFail<AssetManager>("assetManager") }
-    private val font: BitmapFont by lazy { am.font(FONT_BIG_GREEN) }
+    private lateinit var congratsDialog: HelperDialog
+    private var solutionInstructions: Int = 0
 
     override fun onActivate() {
-
+        solutionInstructions = IOC.atOrFail("solutionInstructions")
+        congratsDialog = HelperDialog(
+            400, 250, 530, 300,
+            "Congratulations, comrade!\n" +
+                "You've solved this task\n" +
+                "in [RED]$solutionInstructions[] instructions!"
+        )
     }
 
     override fun onUpdate() {
         hud.batch.managed {
-            font.draw(it, "SUCCESS. PRESS SPACE", 10f, 200f)
+            it.draw(am.texture(Assets.Names.WORKSPACE), 0f, 0f)
         }
 
-        if (Gdx.input.isKeyJustPressed(Input.Keys.SPACE)) {
+        congratsDialog.updateAndDraw(hud.batch)
+        if (congratsDialog.isClosed) {
             val currentTaskId = IOC.atOrFail<Int>("currentTaskId")
             val nextTaskId = (currentTaskId + 1) % Tasks.taskTextures.size
             if (nextTaskId < currentTaskId) {
@@ -37,6 +43,7 @@ class SuccessScreenState: IState {
                 IOC.put("currentTaskId", nextTaskId)
                 IOC.put("state", States.WORKSPACE_SCREEN)
             }
+            congratsDialog.reset()
         }
     }