Implement "strike" command

Author: coditva

controllers/Map.lua

@@ -35,6 +35,13 @@ function controller.execute(model, args)
     elseif command.value == 'right' then
         user[1] = user[1] + 1
 
+    elseif command.value == 'strike' then
+        local artifact = model:getArtifact(user[1], user[2] - 1)
+        if artifact then
+            model:setTile(user[1], user[2] - 1, artifact)
+            globals.game.views.Map:update()
+        end
+
     elseif command.value == 'ifstart' then
         local start = model:getPosition('start')
         if start[1] == user[1] and start[2] == user[2] then

data/maps/forward.lua

@@ -24,6 +24,9 @@ local Map = {
         { 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1 },
         { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
     },
+    artifacts = {
+        default = 3,
+    },
     positions = {
         start = { 7, 6 },
         exit = { 7, 1 },
@@ -33,4 +36,8 @@ local Map = {
     },
 }
 
+-- example to add artifacts:
+--  Map.artifacts[3] = {}
+--  Map.artifacts[3][4] = 1
+
 return Map

game.lua

@@ -34,7 +34,7 @@ function game.event.add(stateName, event, cb)
 end
 
 function game.maps.current()
-    return game.maps[game.maps._current]
+    return maps[game.maps._current]
 end
 
 function game.event.push(event, args)
@@ -45,7 +45,7 @@ end
 
 function game.event.handlers.nextMap()
     local current = game.maps._current + 1
-    if game.maps[current] then
+    if maps[current] then
         game.maps._current = current
     else
         love.event.quit()
@@ -73,7 +73,7 @@ function game.event.handlers.run()
 end
 
 function game.event.handlers.startGame()
-    log.debug('game.startGame: starting new game')
+    log.debug('game.startGame: starting new game: ' .. game.maps.current())
     game.models.Map:load(game.maps.current())
     game.views.Map:update()
     game.state:push('Map')
@@ -87,6 +87,7 @@ function game.event.handlers.endGame(args)
         game.event.push('startGame')
     else
         game.models.Map:reset()
+        game.views.Map:update()
     end
 end
 
@@ -109,10 +110,6 @@ function game.load()
     game.loadComponent('Menu')
     game.loadComponent('Map')
 
-    for i=1,#maps do
-        game.maps[i] = require('data.maps.' .. maps[i])
-    end
-
     game.models.Menu:addItem('New Game', function()
         log.debug('Menu: new game')
         game.event.push('resetMap')

models/Map.lua

@@ -12,13 +12,14 @@ local function table_has(table, value)
     return false
 end
 
-function model:load(map)
-    self.map = map
+function model:load(mapName)
+    self.mapName = mapName
+    self.map = dofile('data/maps/' .. mapName .. '.lua')
     self.map.positions.user = {unpack(self.map.positions.start)}
 end
 
 function model:reset()
-    self.map.positions.user = {unpack(self.map.positions.start)}
+    self:load(self.mapName)
 end
 
 function model:getSize()
@@ -34,21 +35,46 @@ function model:getTile(x, y)
 end
 
 function model:setTile(x, y, tile)
-    if self.map.components[tile] then
+    if self:isTileOnMap(x, y) and self.map.components[tile] then
         self.map.data[y][x] = tile
     else
         error('No component for tile id "' .. tile .. '"')
     end
 end
 
-function model:isTileMovable(x, y)
+function model:isTileOnMap(x, y)
     return (x > 0 and y > 0
             and x <= self.map.size.width
-            and y <= self.map.size.height
+            and y <= self.map.size.height)
+end
+
+function model:isTileMovable(x, y)
+    return (self:isTileOnMap(x, y)
             and table_has({'grass', 'exit'},
                     self:getComponent(self:getTile(x, y))))
 end
 
+function model:isTileBreakable(x, y)
+    return (self:isTileOnMap(x, y)
+            and table_has({'box_closed'},
+                    self:getComponent(self:getTile(x, y))))
+end
+
+function model:hasArtifact(x, y)
+    return (self.isTileOnMap(x, y) and self.map.artifacts[y][x])
+end
+
+function model:getArtifact(x, y)
+    if self:isTileOnMap(x, y) then
+        if self.map.artifacts[y] and self.map.artifacts[y][x] then
+            return self.map.artifacts[y][x]
+        else
+            return self.map.artifacts.default
+        end
+    end
+    return nil
+end
+
 function model:getComponent(id)
     return self.map.components[id]
 end

parser.lua

@@ -30,7 +30,8 @@ local function parse(rawScript)
             break
         end
 
-        if table_has({ 'forward', 'backward', 'left', 'right' }, token) then
+        if table_has({ 'forward', 'backward', 'left', 'right', 'strike' },
+                token) then
             command = newCommand(token, command)
             commands[current] = command
             current = current + 1

tests/unit/Map_spec.lua

@@ -1,13 +1,12 @@
 local map = nil
-local dummy = require('data.maps.dummy')
 
 describe('Map', function()
     setup(function()
         map = require('models.Map')
     end)
 
     before_each(function()
-        map:load(dummy)
+        map:load('dummy')
     end)
 
     after_each(function()