/ld27

To get this branch, use:
bzr branch http://9ix.org/bzr/ld27

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-08-25 21:05:20 UTC
  • Revision ID: josh@9ix.org-20130825210520-2of9iq2uemncp336
overhaul collision and physics to fix an annoying collision resolution 
bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
16
16
 
17
17
GameView = View:extend {
18
18
   gameStart = 0,
19
 
   switchSounds = {},
20
19
   onNew = function (self)
21
20
              self:loadLayers('data/map.lua')
22
21
              self.focus = the.player
43
42
                 end
44
43
              end
45
44
 
46
 
              local sndFiles = {'data/Explosion2.wav', 'data/Explosion3.wav', 'data/Hit_Hurt3.wav'}
47
 
 
48
 
              for _, sndFile in ipairs(sndFiles) do
49
 
                 local snd = love.audio.newSource(sndFile, 'static')
50
 
                 table.insert(self.switchSounds, snd)
51
 
              end
52
 
 
53
45
              --the.interface = Group:new()
54
46
 
55
47
              --self:add(the.interface)
96
88
                         the.activeGoal.visible = false
97
89
                      end
98
90
                      the.activeGoal = self.goals[newMaze]
99
 
 
100
 
                      love.audio.play(self.switchSounds[math.random(#self.switchSounds)])
101
91
                   else
102
92
                      the.activeMaze = self.maze2
103
93
                      the.activeBg = self.bg
125
115
}
126
116
 
127
117
MenuScreen = View:extend {
128
 
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
 
118
   title = Text:new{text = "Press a key to start", font = 48, wordWrap = false},
 
119
   --title = Tile:new{image = 'data/title.png', x = 0, y = 0},
129
120
   onNew = function(self)
130
 
              self:add(self.bg)
131
 
              --self.title:centerAround(400, 200)
132
 
 
133
 
              local nr = 'data/NewRocker-Regular.otf'
134
 
              self:add(Text:new{
135
 
                          text = 'Name Of Game',
136
 
                          --x = 0,
137
 
                          y = 100,
138
 
                          width = self.bg.width,
139
 
                          font = {nr, 48},
140
 
                          align = 'center',
141
 
                          tint = {0,0,0}
142
 
                       })
143
 
 
144
 
              self:add(Text:new{
145
 
                          text = 'Find the 4 lost shinies!',
146
 
                          y = 170,
147
 
                          width = self.bg.width,
148
 
                          font = {nr, 28},
149
 
                          align = 'center',
150
 
                          tint = {0,0,0}
151
 
                       })
152
 
 
153
 
              self:add(Text:new{
154
 
                          text = 'Use the arrow keys to move',
155
 
                          y = 375,
156
 
                          width = self.bg.width,
157
 
                          font = {nr, 24},
158
 
                          align = 'center',
159
 
                          tint = {0,0,0}
160
 
                       })
161
 
 
162
 
              self:add(Text:new{
163
 
                          text = 'Press a key to start',
164
 
                          y = 425,
165
 
                          width = self.bg.width,
166
 
                          font = {nr, 24},
167
 
                          align = 'center',
168
 
                          tint = {0,0,0}
169
 
                       })
170
 
 
171
 
 
 
121
              self:add(self.title)
 
122
              self.title:centerAround(400, 200)
172
123
           end,
173
124
   onUpdate = function(self, elapsed)
174
125
                 if the.keys:allJustPressed() then
181
132
   onRun = function (self)
182
133
              print('Version: ' .. VERSION)
183
134
 
184
 
              self.view = MenuScreen:new()
 
135
              self.view = GameView:new()
185
136
 
186
137
              if DEBUG then
187
138
                 self.console:watch('VERSION', 'VERSION')