chore: Tidy ups 03

Author: SeriousSoftware

src/main/scala-2.11/nl/amsscala/simplegame/Page.scala

@@ -22,6 +22,9 @@ protected trait Page {
    * @return None if not ready else the same GameState if drawn
    */
   protected[simplegame] def render(gs: GameState) = {
+    def gameOverTxt = "Game Over?"
+    def explainTxt = "Use the arrow keys to\nattack the hidden monster."
+
     if (bgImage.isReady && heroImage.isReady && monsterImage.isReady) {
       ctx.drawImage(bgImage.element, 0, 0, canvas.width, canvas.height)
       ctx.drawImage(heroImage.element, gs.hero.pos.x, gs.hero.pos.y)
@@ -33,6 +36,20 @@ protected trait Page {
       ctx.textAlign = "left"
       ctx.textBaseline = "top"
       ctx.fillText(f"Goblins caught: ${gs.monstersCaught}%03d", 32, 32)
+
+      if (gs.newGame) {
+        ctx.textAlign = "center"
+        ctx.font = "48px Helvetica"
+
+        ctx.fillText(
+          if (gs.isGameOver) gameOverTxt else {
+            val txt = explainTxt.split('\n')
+            ctx.fillText(txt(1), canvas.width / 2, canvas.height / 2 + 32)
+            txt(0)
+          }, canvas.width / 2, canvas.height / 2 - 48
+        )
+      }
+
       Some(gs)
     } else None
   }

src/main/scala-2.11/nl/amsscala/simplegame/game.scala

@@ -102,11 +102,13 @@ private case class GameState(
       if (newHero.pos.isValidPosition(Position(canvas.width, canvas.height), Hero.size)) // Are they touching?
         if (newHero.pos.areTouching(monster.pos, Hero.size)) // Reset the game when the player catches a monster
           new GameState(canvas, monstersCaught, true)
-        else copy(hero = newHero)
+        else copy(hero = newHero, newGame = false)
       else this
     }
   }
 
+  def isGameOver = newGame && monstersCaught != 0
+
   /**
    * Auxiliary GameState constructor
    *