/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-06-08 00:02:37 UTC
  • Revision ID: josh@9ix.org-20130608000237-v50hyqvrinp5g4rs
try to make setting screen resolution more reliable

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,
29
32
   onStartFrame = function(self)
30
33
                     --- TAKE 2
31
34
 
39
42
                     if mouseVec:len2() > 64^2 then
40
43
                        self.acceleration = vector.new(300, 0)
41
44
                        self.acceleration:rotate_inplace(self.rotation)
 
45
                        self.thrust.visible = true
42
46
                     else
43
47
                        self.acceleration = {x=0, y=0}
 
48
                        self.thrust.visible = false
44
49
                        if DEBUG and the.console.visible then
45
50
                           self.velocity = {x=0, y=0}
46
51
                        end
58
63
                     end
59
64
                  end,
60
65
   onUpdate = function(self)
 
66
                 self.thrust.x = self.x - self.width
 
67
                 self.thrust.y = self.y
 
68
                 self.thrust.rotation = self.rotation
61
69
              end,
62
70
   onEndFrame = function(self)
63
71
                   self:collide(the.rockColliders)
71
79
                                       })
72
80
 
73
81
                     self:die()
74
 
 
75
 
                     local over = Text:new{
76
 
                        y = self.y,
77
 
                        x = self.x - the.app.width / 2,
78
 
                        width = the.app.width,
79
 
                        align = 'center',
80
 
                        font = 25,
81
 
                        text = "Game Over" }
82
 
                     the.app.view:add(over)
83
 
 
84
 
                     --the.storage.data.highScore
 
82
                     self.thrust:die()
 
83
 
 
84
                     the.over.visible = true
 
85
                     the.instructions.visible = true
 
86
                     the.app.view:updateScore()
 
87
 
85
88
                     local score = love.timer.getTime() - the.app.view.gameStart
86
89
                     if score > the.storage.data.highScore then
87
90
                        the.storage.data.highScore = score