/traderous

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

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-05-20 16:51:19 UTC
  • Revision ID: josh@9ix.org-20130520165119-mkjh7d9408e6ig0u
extract updating score.  update score again when you calc high score - 
should mitigate a bug I saw happen when thor played that put final score 
+ high score out of sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
21
21
 
22
22
local velLimit = 400
23
23
--local velLimit = 50
24
 
SpacePlayer = Tile:extend{
 
24
SpacePlayer = WrapTile:extend{
25
25
   image = 'data/ship.png',
26
26
   maxVelocity = {x=velLimit,y=velLimit},
27
27
   minVelocity = {x=-velLimit, y=-velLimit},
28
28
   lastFired = 0,
29
 
   money = 2000, -- what to use for money symbol? ✪ or ☥ or Ⓐ?
30
 
   onNew = function(self)
31
 
              self.thrust = Tile:new{image = 'data/thrust.png'}
32
 
           end,
33
29
   onStartFrame = function(self)
34
30
                     --- TAKE 2
35
31
 
43
39
                     if mouseVec:len2() > 64^2 then
44
40
                        self.acceleration = vector.new(300, 0)
45
41
                        self.acceleration:rotate_inplace(self.rotation)
46
 
                        self.thrust.visible = true
47
42
                     else
48
43
                        self.acceleration = {x=0, y=0}
49
 
                        self.thrust.visible = false
50
44
                        if DEBUG and the.console.visible then
51
45
                           self.velocity = {x=0, y=0}
52
46
                        end
64
58
                     end
65
59
                  end,
66
60
   onUpdate = function(self)
67
 
                 self.thrust.x = self.x - self.width
68
 
                 self.thrust.y = self.y
69
 
                 self.thrust.rotation = self.rotation
70
61
              end,
71
62
   onEndFrame = function(self)
72
63
                   self:collide(the.rockColliders)
80
71
                                       })
81
72
 
82
73
                     self:die()
83
 
                     self.thrust:die()
84
 
 
85
 
                     the.over.visible = true
86
 
                     the.instructions.visible = true
 
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
 
87
84
                     the.app.view:updateScore()
88
85
 
89
86
                     local score = love.timer.getTime() - the.app.view.gameStart