/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
3
3
 
4
4
require 'zoetrope'
5
5
--require 'pepperprof'
 
6
--inspect = require 'inspect'
6
7
 
7
 
--require 'group'
 
8
require 'sprite'
 
9
require 'util'
8
10
 
9
11
require 'version'
10
 
--require 'wrap_tile'
11
12
require 'player'
12
13
require 'goal'
13
14
require 'pause_view'
 
15
require 'win_view'
14
16
 
15
17
GameView = View:extend {
16
18
   gameStart = 0,
32
34
              self.maze3.playerScale = 1
33
35
 
34
36
              self.goals = {}
 
37
              the.goalsAchieved = 0
35
38
              for _, obj in ipairs(self.objects.sprites) do
36
39
                 if obj:instanceOf(Goal) then
37
40
                    obj.visible = false
59
62
                 end
60
63
 
61
64
                 if not (DEBUG and the.console.visible) then
62
 
                    the.activeMaze:collide(the.player.collider)
 
65
                    --the.player.collider:collide(the.activeMaze)
63
66
                    the.player.collider:collide(the.activeGoal)
64
67
                 end
65
68
 
66
69
                 if the.keys:justPressed('escape', 'q') then
67
70
                    PauseView:new():activate()
 
71
                 --elseif the.keys:justPressed('w') then
 
72
                 --   WinView:new():activate()
68
73
                 end
69
74
              end,
70
75
   switchMaze = function(self)
131
136
 
132
137
              if DEBUG then
133
138
                 self.console:watch('VERSION', 'VERSION')
 
139
                 self.console:watch('player.x', 'the.player.x')
 
140
                 self.console:watch('player.y', 'the.player.y')
134
141
 
135
142
                 -- back off that dark overlay a bit
136
143
                 self.console.fill.fill[4] = 75