/ld28

To get this branch, use:
bzr branch http://9ix.org/bzr/ld28

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-12-14 20:52:47 UTC
  • Revision ID: josh@9ix.org-20131214205247-f42dwe3rx00da9cr
player collide w/ map

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
deque = require 'deque'
 
6
--inspect = require 'inspect'
 
7
require 'sprite'
6
8
 
 
9
require 'util'
7
10
require 'version'
8
11
require 'player'
9
 
require 'notplayer'
 
12
require 'clone'
10
13
 
11
14
GameView = View:extend {
12
15
   onNew = function (self)
13
 
              --self:loadLayers('data/map.lua')
14
 
              --self.focus = the.player
15
 
              --self:clampTo(self.bg)
 
16
              self:loadLayers('data/map.lua')
16
17
 
17
18
              the.player = Player:new{
18
19
                 x = math.random(the.app.width),
20
21
              }
21
22
              self:add(the.player)
22
23
 
23
 
              the.notplayers = Group:new()
24
 
              self:add(the.notplayers)
25
 
              for _ = 1, math.random(1,2) do
26
 
                 the.notplayers:add(NotPlayer:new {
27
 
                                       x = math.random(the.app.width),
28
 
                                       y = math.random(the.app.height),
 
24
              the.clones = Group:new()
 
25
              self:add(the.clones)
 
26
              for _ = 1, 14 do
 
27
                 the.clones:add(Clone:new {
 
28
                                       x = math.random(16, the.app.width-32),
 
29
                                       y = math.random(16, the.app.height-32),
29
30
                                    })
30
31
              end
31
32
           end,
32
33
   onUpdate = function(self, dt)
33
34
                 if the.player.moved then
34
35
                    -- this should encapsulate
35
 
                    for _, np in ipairs(the.notplayers.sprites) do
 
36
                    for _, np in ipairs(the.clones.sprites) do
36
37
                       np:doMove()
37
38
                    end
38
39
 
 
40
                    the.clones:collide(self.map)
 
41
                    the.player:collide(self.map)
 
42
 
 
43
                    the.clones:collide()
 
44
                    the.clones:collide(the.player)
 
45
 
39
46
                    the.player.moved = false
40
47
                 end
41
48
 
59
66
                 self.console.fill.fill[4] = 75
60
67
              end
61
68
           end,
 
69
   onUpdate = function (self, dt)
 
70
                 if the.keys:justPressed('f1') then
 
71
                    local ss = love.graphics.newScreenshot()
 
72
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
73
                 end
 
74
              end
62
75
}