/spacey

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

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-05-13 21:25:26 UTC
  • Revision ID: josh@9ix.org-20130513212526-3q6md6n9xzhcmoa6
and that fixes the corner bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
26
26
   maxVelocity = {x=velLimit,y=velLimit},
27
27
   minVelocity = {x=-velLimit, y=-velLimit},
28
28
   lastFired = 0,
29
 
   onNew = function(self)
30
 
              self.thrust = Tile:new{image = 'data/thrust.png'}
31
 
           end,
32
29
   onStartFrame = function(self)
33
30
                     --- TAKE 2
34
31
 
42
39
                     if mouseVec:len2() > 64^2 then
43
40
                        self.acceleration = vector.new(300, 0)
44
41
                        self.acceleration:rotate_inplace(self.rotation)
45
 
                        self.thrust.visible = true
46
42
                     else
47
43
                        self.acceleration = {x=0, y=0}
48
 
                        self.thrust.visible = false
49
44
                        if DEBUG and the.console.visible then
50
45
                           self.velocity = {x=0, y=0}
51
46
                        end
56
51
                       the.cursor:inTargetArea() then
57
52
                           --print('pew')
58
53
                           b = Bullet:new{
59
 
                              x = self.x + self.width / 2,
60
 
                              y = self.y + self.height / 2,
 
54
                              x = self.x, y = self.y,
61
55
                           }
 
56
                           the.app.view:add(b)
62
57
                           self.lastFired = love.timer.getTime()
63
58
                     end
64
59
                  end,
65
60
   onUpdate = function(self)
66
 
                 self.thrust.x = self.x - self.width
67
 
                 self.thrust.y = self.y
68
 
                 self.thrust.rotation = self.rotation
69
 
              end,
70
 
   onEndFrame = function(self)
71
 
                   self:collide(the.rockColliders)
72
 
                end,
73
 
   onCollide = function(self, other)
74
 
                  if other:instanceOf(RockCollider) then
75
 
                     the.app.view:add( Boom:new {
76
 
                                          x = self.x,
77
 
                                          y = self.y,
78
 
                                          velocity = { rotation = 5 }
79
 
                                       })
80
 
 
81
 
                     self:die()
82
 
                     self.thrust:die()
83
 
 
84
 
                     the.over.visible = true
85
 
                     the.instructions.visible = true
86
 
                     the.app.view:updateScore()
87
 
 
88
 
                     local score = love.timer.getTime() - the.app.view.gameStart
89
 
                     if score > the.storage.data.highScore then
90
 
                        the.storage.data.highScore = score
91
 
                        the.storage:save()
92
 
 
93
 
                        the.highScore.text = string.format(
94
 
                           'High Score: %d:%02d', score / 60, score % 60
95
 
                        )
96
 
                     end
97
 
                  end
98
 
               end
 
61
              end
99
62
}
 
 
b'\\ No newline at end of file'