/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:
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
49
45
           end,
50
46
   onUpdate = function(self, dt)
51
47
                 if the.player.moved then
 
48
                    -- this should encapsulate
 
49
 
52
50
                    the.clones:collide(the.player)
53
51
                    the.goalPerson:collide(the.player)
54
52
 
55
 
                    if self.level ~= 2 then
56
 
                       the.goalPerson:doMove()
57
 
                    end
 
53
                    the.goalPerson:doMove()
58
54
 
59
55
                    for _, np in ipairs(the.clones.sprites) do
60
56
                       np:doMove()
62
58
 
63
59
                    -- yeah, again.  once for flip, twice for displace
64
60
                    the.clones:collide(the.player)
65
 
                    the.goalPerson:collide(the.player) -- will this fix?
66
61
 
67
62
                    the.clones:collide(self.map)
68
63
                    the.player:collide(self.map)
70
65
 
71
66
                    the.clones:collide()
72
67
 
73
 
                    if math.random(1,6) == 1 then
 
68
                    if math.random(1,5) == 1 then
74
69
                       local c = the.clones.sprites[math.random(the.clones:count())]
75
 
                       if self.level == 3 and not c.cured then
 
70
                       if not c.cured then
76
71
                          c.image = 'data/goal.png'
77
72
                       end
78
73
                    end
86
81
              end,
87
82
}
88
83
 
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
84
the.app = App:new {
121
85
   name = "LD28",
122
86
   fps = 30,
123
87
   onRun = function (self)
124
88
              print('Version: ' .. VERSION)
125
89
 
126
 
              self.view = GameView:new{level = 1}
127
 
              --self.view = SlowView:new{level = 1}
 
90
              self.view = GameView:new()
128
91
 
129
92
              if DEBUG then
130
93
                 self.console:watch('VERSION', 'VERSION')
131
 
                 self.console:watch('level', 'the.view.level')
132
94
 
133
95
                 -- back off that dark overlay a bit
134
96
                 self.console.fill.fill[4] = 75