/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 16:56:38 UTC
  • Revision ID: josh@9ix.org-20131215165638-ge97fjz6untvjv9i
get rid of spare pixels on bottom

Show diffs side-by-side

added added

removed removed

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