/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 17:35:23 UTC
  • Revision ID: josh@9ix.org-20131214173523-8g4gd5hlk4fix1r6
collision

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'
8
6
 
9
 
require 'util'
10
7
require 'version'
11
8
require 'player'
12
9
require 'clone'
13
 
require 'goal'
14
 
require 'goal_person'
15
 
 
16
 
dirs = {'left', 'right', 'up', 'down'}
17
10
 
18
11
GameView = View:extend {
19
12
   onNew = function (self)
20
 
              self:loadLayers('data/map.lua')
21
 
 
22
 
              local tw = math.floor(the.app.width / 16)
23
 
              local th = math.floor(the.app.height / 16)
 
13
              --self:loadLayers('data/map.lua')
 
14
              --self.focus = the.player
 
15
              --self:clampTo(self.bg)
24
16
 
25
17
              the.player = Player:new{
26
 
                 x = math.random(2, tw-2) * 16,
27
 
                 y = math.random(2, th-2) * 16
 
18
                 x = math.random(the.app.width),
 
19
                 y = math.random(the.app.height),
28
20
              }
29
21
              self:add(the.player)
30
22
 
31
 
              the.goalPerson = GoalPerson:new{
32
 
                 x = math.random(2, tw-2) * 16,
33
 
                 y = math.random(2, th-2) * 16
34
 
              }
35
 
              self:add(the.goalPerson)
36
 
 
37
23
              the.clones = Group:new()
38
24
              self:add(the.clones)
39
 
              for _ = 1, 15 do
 
25
              for _ = 1, 14 do
40
26
                 the.clones:add(Clone:new {
41
 
                                   x = math.random(2, tw-2) * 16,
42
 
                                   y = math.random(2, th-2) * 16
43
 
                                })
 
27
                                       x = math.random(the.app.width),
 
28
                                       y = math.random(the.app.height),
 
29
                                    })
44
30
              end
45
31
           end,
46
32
   onUpdate = function(self, dt)
47
33
                 if the.player.moved then
48
34
                    -- this should encapsulate
49
 
 
50
 
                    the.clones:collide(the.player)
51
 
                    the.goalPerson:collide(the.player)
52
 
 
53
 
                    the.goalPerson:doMove()
54
 
 
55
35
                    for _, np in ipairs(the.clones.sprites) do
56
36
                       np:doMove()
57
37
                    end
58
38
 
59
 
                    -- yeah, again.  once for flip, twice for displace
60
 
                    the.clones:collide(the.player)
61
 
 
62
 
                    the.clones:collide(self.map)
63
 
                    the.player:collide(self.map)
64
 
                    the.goalPerson:collide(self.map)
65
 
 
66
39
                    the.clones:collide()
67
 
 
68
 
                    if math.random(1,5) == 1 then
69
 
                       local c = the.clones.sprites[math.random(the.clones:count())]
70
 
                       if not c.cured then
71
 
                          c.image = 'data/goal.png'
72
 
                       end
73
 
                    end
 
40
                    the.clones:collide(the.player)
74
41
 
75
42
                    the.player.moved = false
76
43
                 end
83
50
 
84
51
the.app = App:new {
85
52
   name = "LD28",
86
 
   fps = 30,
87
53
   onRun = function (self)
88
54
              print('Version: ' .. VERSION)
89
55