/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:
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
 
                                })
44
 
              end
45
 
 
46
 
              if self.level ~= 1 then
47
 
                 self:flash({0,0,0})
 
27
                                       x = math.random(the.app.width),
 
28
                                       y = math.random(the.app.height),
 
29
                                    })
48
30
              end
49
31
           end,
50
32
   onUpdate = function(self, dt)
51
33
                 if the.player.moved then
52
 
                    the.clones:collide(the.player)
53
 
                    the.goalPerson:collide(the.player)
54
 
 
55
 
                    if self.level ~= 2 then
56
 
                       the.goalPerson:doMove()
57
 
                    end
58
 
 
 
34
                    -- this should encapsulate
59
35
                    for _, np in ipairs(the.clones.sprites) do
60
36
                       np:doMove()
61
37
                    end
62
38
 
63
 
                    -- yeah, again.  once for flip, twice for displace
64
 
                    the.clones:collide(the.player)
65
 
                    the.goalPerson:collide(the.player) -- will this fix?
66
 
 
67
 
                    the.clones:collide(self.map)
68
 
                    the.player:collide(self.map)
69
 
                    the.goalPerson:collide(self.map)
70
 
 
71
39
                    the.clones:collide()
72
 
 
73
 
                    if math.random(1,6) == 1 then
74
 
                       local c = the.clones.sprites[math.random(the.clones:count())]
75
 
                       if self.level == 3 and not c.cured then
76
 
                          c.image = 'data/goal.png'
77
 
                       end
78
 
                    end
 
40
                    the.clones:collide(the.player)
79
41
 
80
42
                    the.player.moved = false
81
43
                 end
86
48
              end,
87
49
}
88
50
 
89
 
SlowView = View:extend {
90
 
   onNew = function(self)
91
 
              local text = Text:new {
92
 
                 text = 'Your movements have slowed...',
93
 
                 --height = the.app.height,
94
 
                 width = the.app.width,
95
 
                 align = 'center',
96
 
                 font = 18
97
 
              }
98
 
              text:centerAround(the.app.width / 2, the.app.height / 2)
99
 
              self:add(text)
100
 
 
101
 
              self.timer:after(2, function()
102
 
                 the.app.view = GameView:new{level = self.level}
103
 
              end)
104
 
           end
105
 
}
106
 
 
107
 
WinView = View:extend {
108
 
   onNew = function(self)
109
 
              local text = Text:new {
110
 
                 text = 'You win!',
111
 
                 width = the.app.width,
112
 
                 align = 'center',
113
 
                 font = 18
114
 
              }
115
 
              text:centerAround(the.app.width / 2, the.app.height / 2)
116
 
              self:add(text)
117
 
           end
118
 
}
119
 
 
120
51
the.app = App:new {
121
52
   name = "LD28",
122
 
   fps = 30,
123
53
   onRun = function (self)
124
54
              print('Version: ' .. VERSION)
125
55
 
126
 
              self.view = GameView:new{level = 1}
127
 
              --self.view = SlowView:new{level = 1}
 
56
              self.view = GameView:new()
128
57
 
129
58
              if DEBUG then
130
59
                 self.console:watch('VERSION', 'VERSION')
131
 
                 self.console:watch('level', 'the.view.level')
132
60
 
133
61
                 -- back off that dark overlay a bit
134
62
                 self.console.fill.fill[4] = 75