/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:49:59 UTC
  • Revision ID: josh@9ix.org-20131214204959-sbwlos88we9pckgo
... add the map.  and the extra code to work w/ it.

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
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),
24
25
              self:add(the.clones)
25
26
              for _ = 1, 14 do
26
27
                 the.clones:add(Clone:new {
27
 
                                       x = math.random(the.app.width),
28
 
                                       y = math.random(the.app.height),
 
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,
36
37
                       np:doMove()
37
38
                    end
38
39
 
 
40
                    the.clones:collide(self.map)
 
41
                    the.player:collide(self.map)
 
42
 
39
43
                    the.clones:collide()
40
44
                    the.clones:collide(the.player)
41
45