/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
 
   goods = {},
31
 
   onNew = function(self)
32
 
              self.thrust = Tile:new{image = 'data/thrust.png'}
33
 
           end,
34
29
   onStartFrame = function(self)
35
30
                     --- TAKE 2
36
31
 
44
39
                     if mouseVec:len2() > 64^2 then
45
40
                        self.acceleration = vector.new(300, 0)
46
41
                        self.acceleration:rotate_inplace(self.rotation)
47
 
                        self.thrust.visible = true
48
42
                     else
49
43
                        self.acceleration = {x=0, y=0}
50
 
                        self.thrust.visible = false
51
44
                        if DEBUG and the.console.visible then
52
45
                           self.velocity = {x=0, y=0}
53
46
                        end
60
53
                           b = Bullet:new{
61
54
                              x = self.x + self.width / 2,
62
55
                              y = self.y + self.height / 2,
63
 
                              rotation = self.rotation
64
56
                           }
65
57
                           self.lastFired = love.timer.getTime()
66
58
                     end
67
59
                  end,
68
60
   onUpdate = function(self)
69
 
                 self.thrust.x = self.x - self.width
70
 
                 self.thrust.y = self.y
71
 
                 self.thrust.rotation = self.rotation
72
61
              end,
73
62
   onEndFrame = function(self)
74
63
                   self:collide(the.rockColliders)
82
71
                                       })
83
72
 
84
73
                     self:die()
85
 
                     self.thrust:die()
86
 
 
87
 
                     the.over.visible = true
88
 
                     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
 
89
84
                     the.app.view:updateScore()
90
85
 
91
86
                     local score = love.timer.getTime() - the.app.view.gameStart
98
93
                        )
99
94
                     end
100
95
                  end
101
 
               end,
102
 
   buy = function(self, good, price)
103
 
            if self.money >= price then
104
 
               self.goods[good] = (self.goods[good] or 0) + 1
105
 
               self.money = self.money - price
106
 
            end
107
 
         end,
108
 
   sell = function(self, good, price)
109
 
             if self.goods[good] and self.goods[good] > 0 then
110
 
                self.goods[good] = self.goods[good] - 1
111
 
                self.money = self.money + price
112
 
             end
113
 
          end
 
96
               end
114
97
}
 
 
b'\\ No newline at end of file'