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