/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-06-16 03:58:19 UTC
  • Revision ID: josh@9ix.org-20130616035819-y3jhfpuogpmy7se4
more old code cleanup

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
24
SpacePlayer = Tile:extend{
25
25
   image = 'data/ship.png',
28
28
   lastFired = 0,
29
29
   money = 2000, -- what to use for money symbol? ✪ or ☥ or Ⓐ?
30
30
   goods = {},
31
 
   cargoSpace = 20,
32
31
   onNew = function(self)
33
32
              self.thrust = Tile:new{image = 'data/thrust.png'}
34
 
              self.shield = Shield:new{ship = self}
35
33
           end,
36
34
   onStartFrame = function(self)
37
35
                     --- TAKE 2
62
60
                           b = Bullet:new{
63
61
                              x = self.x + self.width / 2,
64
62
                              y = self.y + self.height / 2,
65
 
                              rotation = self.rotation,
66
 
                              source = self
67
63
                           }
68
64
                           self.lastFired = love.timer.getTime()
69
65
                     end
77
73
                   self:collide(the.rockColliders)
78
74
                end,
79
75
   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
76
                  if other:instanceOf(RockCollider) then
100
77
                     the.app.view:add( Boom:new {
101
78
                                          x = self.x,
105
82
 
106
83
                     self:die()
107
84
                     self.thrust:die()
108
 
                  end
109
85
 
110
 
                  if not self.active then
111
86
                     the.over.visible = true
112
87
                     the.instructions.visible = true
 
88
                     the.app.view:updateScore()
 
89
 
 
90
                     local score = love.timer.getTime() - the.app.view.gameStart
 
91
                     if score > the.storage.data.highScore then
 
92
                        the.storage.data.highScore = score
 
93
                        the.storage:save()
 
94
 
 
95
                        the.highScore.text = string.format(
 
96
                           'High Score: %d:%02d', score / 60, score % 60
 
97
                        )
 
98
                     end
113
99
                  end
114
100
               end,
115
101
   buy = function(self, good, price)
116
 
            if self.money >= price and self:availableSpace() > 0 then
 
102
            if self.money >= price then
117
103
               self.goods[good] = (self.goods[good] or 0) + 1
118
104
               self.money = self.money - price
119
105
            end
123
109
                self.goods[good] = self.goods[good] - 1
124
110
                self.money = self.money + price
125
111
             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
 
112
          end
135
113
}
 
 
b'\\ No newline at end of file'