/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
19
19
                  end
20
20
}
21
21
 
22
 
local velLimit = 300
 
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
 
   cargoSpace = 20,
32
 
   onNew = function(self)
33
 
              self.thrust = Tile:new{image = 'data/thrust.png'}
34
 
              self.shield = Shield:new{ship = self}
35
 
           end,
36
29
   onStartFrame = function(self)
37
30
                     --- TAKE 2
38
31
 
46
39
                     if mouseVec:len2() > 64^2 then
47
40
                        self.acceleration = vector.new(300, 0)
48
41
                        self.acceleration:rotate_inplace(self.rotation)
49
 
                        self.thrust.visible = true
50
42
                     else
51
43
                        self.acceleration = {x=0, y=0}
52
 
                        self.thrust.visible = false
53
44
                        if DEBUG and the.console.visible then
54
45
                           self.velocity = {x=0, y=0}
55
46
                        end
62
53
                           b = Bullet:new{
63
54
                              x = self.x + self.width / 2,
64
55
                              y = self.y + self.height / 2,
65
 
                              rotation = self.rotation,
66
 
                              source = self
67
56
                           }
68
57
                           self.lastFired = love.timer.getTime()
69
58
                     end
70
59
                  end,
71
60
   onUpdate = function(self)
72
 
                 self.thrust.x = self.x - self.width
73
 
                 self.thrust.y = self.y
74
 
                 self.thrust.rotation = self.rotation
75
61
              end,
76
62
   onEndFrame = function(self)
77
63
                   self:collide(the.rockColliders)
78
64
                end,
79
65
   onCollide = function(self, other)
80
 
                  if other:instanceOf(Bullet) and other.source ~= self then
81
 
                     if self.shield.strength == 0 then
82
 
                        -- die
83
 
                        the.app.view:add( Boom:new {
84
 
                                             x = self.x,
85
 
                                             y = self.y,
86
 
                                             velocity = { rotation = 5 }
87
 
                                          })
88
 
 
89
 
                        self:die()
90
 
                        self.thrust:die()
91
 
                     else
92
 
                        self.shield:onHit()
93
 
                     end
94
 
 
95
 
                     other:die()
96
 
                     the.bullets:remove(other)
97
 
                  end
98
 
 
99
66
                  if other:instanceOf(RockCollider) then
100
67
                     the.app.view:add( Boom:new {
101
68
                                          x = self.x,
104
71
                                       })
105
72
 
106
73
                     self:die()
107
 
                     self.thrust:die()
108
 
                  end
109
 
 
110
 
                  if not self.active then
111
 
                     the.over.visible = true
112
 
                     the.instructions.visible = true
113
 
                  end
114
 
               end,
115
 
   buy = function(self, good, price)
116
 
            if self.money >= price and self:availableSpace() > 0 then
117
 
               self.goods[good] = (self.goods[good] or 0) + 1
118
 
               self.money = self.money - price
119
 
            end
120
 
         end,
121
 
   sell = function(self, good, price)
122
 
             if self.goods[good] and self.goods[good] > 0 then
123
 
                self.goods[good] = self.goods[good] - 1
124
 
                self.money = self.money + price
125
 
             end
126
 
          end,
127
 
   availableSpace = function(self)
128
 
                       local cargo = 0
129
 
                       for _, amt in pairs(self.goods) do
130
 
                          cargo = cargo + amt
131
 
                       end
132
 
 
133
 
                       return self.cargoSpace - cargo
134
 
                    end
 
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.app.view:updateScore()
 
85
 
 
86
                     local score = love.timer.getTime() - the.app.view.gameStart
 
87
                     if score > the.storage.data.highScore then
 
88
                        the.storage.data.highScore = score
 
89
                        the.storage:save()
 
90
 
 
91
                        the.highScore.text = string.format(
 
92
                           'High Score: %d:%02d', score / 60, score % 60
 
93
                        )
 
94
                     end
 
95
                  end
 
96
               end
135
97
}
 
 
b'\\ No newline at end of file'