Patch 1.0.1 (#13)

* Fix: timed mode game end

* fix: Timed mode initial time

* fix: Undo before any move clears game field

* refactor: rename Game.won to game.gameEnded

* setup luacheck

* lint

Author: Sasszem

.luacheckrc

@@ -0,0 +1,22 @@
+std = "lua51"
+
+unused_args = false
+
+read_globals = {
+    "Button",
+    "Label",
+    "VDiv",
+    "HDiv",
+    "Switcher",
+    "Font",
+    "GUI",
+}
+
+globals = {
+    "love",
+    "rgb",
+}
+
+exclude_files = {
+    "yalg"
+}

main.lua

@@ -1,12 +1,7 @@
-local Config = require("src.Config")
-local Game = require("src.Game")
 local Sounds = require("src.Sounds")
 
 local menu = require("src.menu.menu")
 
-local game = nil
-local config = nil
-
 function love.load()
     Sounds.playLooping("loop")
     menu:getWidget("options"):load()

src/Cell.lua

@@ -12,9 +12,9 @@ local function hex(hexstring)
     assert(hexstring:sub(0, 1)=="#", "Color strings must be in hex format!")
 
     -- extract string bits
-    r = hexstring:sub(2, 3)
-    g = hexstring:sub(4, 5)
-    b = hexstring:sub(6, 7)
+    local r = hexstring:sub(2, 3)
+    local g = hexstring:sub(4, 5)
+    local b = hexstring:sub(6, 7)
 
     -- convert to decimal
     r = tonumber(r, 16)

src/CellPool.lua

@@ -4,7 +4,6 @@
 
 
 local CellPool = {}
-local SaveRestore = require("src.SaveRestore")
 
 -- constructor
 function CellPool:new(game)

src/Game.lua

@@ -30,26 +30,27 @@ function Game:new(config, parentWidget, gamemode)
     o.cells = CellPool(o)
 
     -- game state
-    o.time = ((gamemode == "timed") and 30) or 0
+    o.time = ((gamemode == "timed") and 300) or 0
     o.biggestYet = 2
 
     -- load saved game
     SaveRestore.load(o)
 
     -- time updater
-    o.TM:periodic(function (self)
-        local dt = self.gamemode == "normal" and 1 or -1
-        self.time = self.time + dt
+    o.TM:periodic(function (game)
+        local dt = game.gamemode == "normal" and 1 or -1
+        game.time = game.time + dt
     end, 1, 0, o)
 
 
     -- time's up detector task
     if gamemode == "timed" then
-        o.TM:run(function (self)
-            while self.time > 0 do
+        o.TM:run(function (game)
+            while game.time > 0 do
                 coroutine.yield()
             end
-            self:endGame()
+            game.gameEnded = true
+            game:endGame()
         end, o)
     end
 
@@ -61,7 +62,12 @@ function Game:drawInfo()
     -- draw time
     love.graphics.setFont(self.config.gameFont)
     love.graphics.setColor(rgb(255, 255, 255))
-    love.graphics.printf(("%d:%02d"):format(math.floor(self.time / 60), self.time % 60), 0, 10*self.config.hP, self.config.width, "center")
+    love.graphics.printf(
+        ("%d:%02d"):format(
+            math.floor(self.time / 60),
+            self.time % 60),
+        0, 10*self.config.hP, self.config.width, "center"
+    )
 end
 
 
@@ -97,7 +103,7 @@ end
 
 
 function Game:quit()
-    if self.won then return end
+    if self.gameEnded then return end
 
     -- fast-forward to finish all animations
     while self.animating do

src/Path.lua

@@ -195,7 +195,7 @@ function Path:mergeAnimation()
         if currElem.value > self.game.biggestYet then
             if currElem.value == VICTORYVALUE then
                 Sounds.play("victory")
-                self.game.won = true
+                self.game.gameEnded = true
             else
                 Sounds.play("newBiggest")
             end

src/SaveRestore.lua

@@ -81,7 +81,7 @@ local function loadCellsData(gamemode)
 end
 
 
-function loadGameData(gamemode)
+local function loadGameData(gamemode)
     local info = love.filesystem.getInfo(GAMEDATAFILE:format(gamemode))
     if not info then return end
     -- check if file exists

src/Sounds.lua

@@ -22,7 +22,10 @@ function Sounds.getSource(name)
     -- fill in cache
     if not cache[name] then
         local filename = ("asset/%s.ogg"):format(name)
-        local fileInfo = assert(love.filesystem.getInfo(filename), ("Requested sound file %s can not be found!"):format(filename))
+        local fileInfo = assert(
+            love.filesystem.getInfo(filename),
+            ("Requested sound file %s can not be found!"):format(filename)
+        )
         local fileSize = fileInfo.size
         local sourceMode = (fileSize > StreamSize) and "stream" or "static"
         cache[name] = love.audio.newSource(filename, sourceMode)

src/Undo.lua

@@ -23,6 +23,7 @@ setmetatable(Undo, {__call = Undo.new})
 function Undo:backup()
     -- deep copies the game state for backup
     self.time = self.game.time
+    self.biggestYet = self.game.biggestYet
     self.cells = {}
 
     for i, C in ipairs(self.game.cells.cells) do
@@ -36,6 +37,10 @@ end
 
 
 function Undo:restore()
+    -- do not restore if no data
+    -- (no backup was made yet)
+    if self.biggestYet == 0 then return end
+
     -- deep copy the saved data back to game
     self.game.time = self.time
 

src/menu/GameWrapper.lua

@@ -79,7 +79,7 @@ function GameWrapper:quit()
     self.game:quit()
 
     -- pressing back OR winning?
-    if not self.game.won then
+    if not self.game.gameEnded then
         self:getWidget("switcher").selected = "mainMenu"
     else
         -- game end screen
@@ -89,7 +89,7 @@ function GameWrapper:quit()
         self:getWidget("gameOverLbl").text =
             (self.game.gamemode=="normal") and "You won!" or "Time's up"
 
-        self:getWidget("resultLbl").text = 
+        self:getWidget("resultLbl").text =
             (self.game.gamemode=="normal") and ("Time: %d:%02d"):format(self.game.time/60, self.game.time%60)
                 or ("Maximum value: %d"):format(self.game.biggestYet)
     end