/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-15 19:59:03 UTC
  • Revision ID: josh@9ix.org-20131215195903-3pb7rnz9xow0wkc9
move quit keybindings to app

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
42
42
                                   y = math.random(2, th-2) * 16
43
43
                                })
44
44
              end
 
45
 
 
46
              if self.level ~= 1 then
 
47
                 self:flash({0,0,0})
 
48
              end
45
49
           end,
46
50
   onUpdate = function(self, dt)
47
51
                 if the.player.moved then
48
 
                    -- this should encapsulate
 
52
                    the.clones:collide(the.player)
 
53
                    the.goalPerson:collide(the.player)
49
54
 
50
 
                    the.goalPerson:doMove()
 
55
                    if self.level ~= 2 then
 
56
                       the.goalPerson:doMove()
 
57
                    end
51
58
 
52
59
                    for _, np in ipairs(the.clones.sprites) do
53
60
                       np:doMove()
54
61
                    end
55
62
 
 
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
 
56
67
                    the.clones:collide(self.map)
57
68
                    the.player:collide(self.map)
58
69
                    the.goalPerson:collide(self.map)
59
70
 
60
71
                    the.clones:collide()
61
 
                    the.clones:collide(the.player)
62
 
                    the.goalPerson:collide(the.player)
63
72
 
64
 
                    if math.random(1,5) == 1 then
65
 
                       the.clones.sprites[math.random(the.clones:count())].image = 'data/goal.png'
 
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
66
78
                    end
67
79
 
68
80
                    the.player.moved = false
69
81
                 end
70
 
 
71
 
                 if the.keys:justPressed('escape', 'q') then
72
 
                    the.app:quit()
73
 
                 end
74
82
              end,
75
83
}
76
84
 
 
85
SlowView = View:extend {
 
86
   onNew = function(self)
 
87
              local text = Text:new {
 
88
                 text = 'Your movements have slowed...',
 
89
                 --height = the.app.height,
 
90
                 width = the.app.width,
 
91
                 align = 'center',
 
92
                 font = 18
 
93
              }
 
94
              text:centerAround(the.app.width / 2, the.app.height / 2)
 
95
              self:add(text)
 
96
 
 
97
              self.timer:after(2, function()
 
98
                 the.app.view = GameView:new{level = self.level}
 
99
              end)
 
100
           end
 
101
}
 
102
 
 
103
WinView = View:extend {
 
104
   onNew = function(self)
 
105
              local text = Text:new {
 
106
                 text = 'You win!',
 
107
                 width = the.app.width,
 
108
                 align = 'center',
 
109
                 font = 18
 
110
              }
 
111
              text:centerAround(the.app.width / 2, the.app.height / 2)
 
112
              self:add(text)
 
113
           end
 
114
}
 
115
 
 
116
TitleView = View:extend {
 
117
   onNew = function(self)
 
118
              self:add(Tile:new{
 
119
                          image = 'data/title.png'
 
120
                       })
 
121
           end,
 
122
   onUpdate = function(self)
 
123
                 if the.keys:allJustPressed() then
 
124
                    the.app.view = GameView:new{level = 1}
 
125
                 end
 
126
              end
 
127
}
 
128
 
77
129
the.app = App:new {
78
130
   name = "LD28",
79
131
   fps = 30,
80
132
   onRun = function (self)
81
133
              print('Version: ' .. VERSION)
82
134
 
83
 
              self.view = GameView:new()
 
135
              --self.view = GameView:new{level = 1}
 
136
              self.view = TitleView:new()
84
137
 
85
138
              if DEBUG then
86
139
                 self.console:watch('VERSION', 'VERSION')
 
140
                 self.console:watch('level', 'the.view.level')
87
141
 
88
142
                 -- back off that dark overlay a bit
89
143
                 self.console.fill.fill[4] = 75
94
148
                    local ss = love.graphics.newScreenshot()
95
149
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
96
150
                 end
 
151
 
 
152
                 if the.keys:justPressed('escape', 'q') then
 
153
                    the.app:quit()
 
154
                 end
97
155
              end
98
156
}