/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-07-04 18:15:15 UTC
  • Revision ID: josh@9ix.org-20130704181515-pmp44y2vv3vw170x
reset kill counter on reward

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
19
19
                  end
20
20
}
21
21
 
22
 
local velLimit = 400
 
22
local velLimit = 300
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
   onPlanet = false,
 
33
   kills = 0,
31
34
   onNew = function(self)
32
35
              self.thrust = Tile:new{image = 'data/thrust.png'}
33
36
              self.shield = Shield:new{ship = self}
61
64
                           b = Bullet:new{
62
65
                              x = self.x + self.width / 2,
63
66
                              y = self.y + self.height / 2,
64
 
                              rotation = self.rotation
 
67
                              rotation = self.rotation,
 
68
                              source = self
65
69
                           }
66
70
                           self.lastFired = love.timer.getTime()
67
71
                     end
75
79
                   self:collide(the.rockColliders)
76
80
                end,
77
81
   onCollide = function(self, other)
78
 
                  if other:instanceOf(Bullet) then
 
82
                  if other:instanceOf(Bullet) and other.source ~= self then
79
83
                     if self.shield.strength == 0 then
80
84
                        -- die
81
85
                        the.app.view:add( Boom:new {
88
92
                        self.thrust:die()
89
93
                     else
90
94
                        self.shield:onHit()
91
 
                        other:die()
92
 
                        the.bullets:remove(other)
93
95
                     end
 
96
 
 
97
                     other:die()
 
98
                     the.bullets:remove(other)
94
99
                  end
95
100
 
96
101
                  if other:instanceOf(RockCollider) then
102
107
 
103
108
                     self:die()
104
109
                     self.thrust:die()
105
 
 
106
 
                     the.over.visible = true
107
 
                     the.instructions.visible = true
108
 
                     the.app.view:updateScore()
109
 
 
110
 
                     local score = love.timer.getTime() - the.app.view.gameStart
111
 
                     if score > the.storage.data.highScore then
112
 
                        the.storage.data.highScore = score
113
 
                        the.storage:save()
114
 
 
115
 
                        the.highScore.text = string.format(
116
 
                           'High Score: %d:%02d', score / 60, score % 60
117
 
                        )
118
 
                     end
 
110
                  end
 
111
 
 
112
                  if not self.active then
 
113
                     the.interface:add(GameOver:new())
119
114
                  end
120
115
               end,
121
116
   buy = function(self, good, price)
122
 
            if self.money >= price then
 
117
            if self.money >= price and self:availableSpace() > 0 then
123
118
               self.goods[good] = (self.goods[good] or 0) + 1
124
119
               self.money = self.money - price
125
120
            end
129
124
                self.goods[good] = self.goods[good] - 1
130
125
                self.money = self.money + price
131
126
             end
 
127
          end,
 
128
   availableSpace = function(self)
 
129
                       local cargo = 0
 
130
                       for _, amt in pairs(self.goods) do
 
131
                          cargo = cargo + amt
 
132
                       end
 
133
 
 
134
                       return self.cargoSpace - cargo
 
135
                    end,
 
136
   save = function(self)
 
137
             -- save player data
 
138
             the.storage.data.player = {x = self.x,
 
139
                                        y = self.y,
 
140
                                        money = self.money,
 
141
                                        goods = self.goods,
 
142
                                        cargoSpace = self.cargoSpace
 
143
                                     }
 
144
             the.storage:save()
132
145
          end
133
146
}
 
 
b'\\ No newline at end of file'