/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:50:45 UTC
  • Revision ID: josh@9ix.org-20130616035045-l5nd2aa0m30gk20x
clean up some old code, put planet indicators in planet class

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
   onPlanet = false,
33
 
   kills = 0,
34
31
   onNew = function(self)
35
32
              self.thrust = Tile:new{image = 'data/thrust.png'}
36
 
              self.shield = Shield:new{ship = self}
37
33
           end,
38
34
   onStartFrame = function(self)
39
35
                     --- TAKE 2
64
60
                           b = Bullet:new{
65
61
                              x = self.x + self.width / 2,
66
62
                              y = self.y + self.height / 2,
67
 
                              rotation = self.rotation,
68
 
                              source = self
69
63
                           }
70
64
                           self.lastFired = love.timer.getTime()
71
65
                     end
72
 
 
73
 
                     if the.keys:justPressed('x') then
74
 
                        --self:doHit()
75
 
                     end
76
66
                  end,
77
67
   onUpdate = function(self)
78
68
                 self.thrust.x = self.x - self.width
82
72
   onEndFrame = function(self)
83
73
                   self:collide(the.rockColliders)
84
74
                end,
85
 
   doHit = function(self)
86
 
              if self.shield.strength == 0 then
87
 
                 -- die
88
 
                 the.app.view:add( Boom:new {
89
 
                                      x = self.x,
90
 
                                      y = self.y,
91
 
                                      velocity = { rotation = 5 }
92
 
                                   })
93
 
 
94
 
                 self:die()
95
 
                 self.thrust:die()
96
 
              else
97
 
                 self.shield:onHit()
98
 
              end
99
 
 
100
 
              if not self.active then
101
 
                 the.interface:add(GameOver:new())
102
 
              end
103
 
           end,
104
75
   onCollide = function(self, other)
105
 
                  if other:instanceOf(Bullet) and other.source ~= self then
106
 
                     self:doHit()
107
 
 
108
 
                     other:die()
109
 
                     the.bullets:remove(other)
110
 
                  end
111
 
 
112
76
                  if other:instanceOf(RockCollider) then
113
77
                     the.app.view:add( Boom:new {
114
78
                                          x = self.x,
118
82
 
119
83
                     self:die()
120
84
                     self.thrust:die()
 
85
 
 
86
                     the.over.visible = true
 
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
121
99
                  end
122
100
               end,
123
101
   buy = function(self, good, price)
124
 
            if self.money >= price and self:availableSpace() > 0 then
 
102
            if self.money >= price then
125
103
               self.goods[good] = (self.goods[good] or 0) + 1
126
104
               self.money = self.money - price
127
105
            end
131
109
                self.goods[good] = self.goods[good] - 1
132
110
                self.money = self.money + price
133
111
             end
134
 
          end,
135
 
   availableSpace = function(self)
136
 
                       local cargo = 0
137
 
                       for _, amt in pairs(self.goods) do
138
 
                          cargo = cargo + amt
139
 
                       end
140
 
 
141
 
                       return self.cargoSpace - cargo
142
 
                    end,
143
 
   save = function(self)
144
 
             -- save player data
145
 
             the.storage.data.player = {x = self.x,
146
 
                                        y = self.y,
147
 
                                        money = self.money,
148
 
                                        goods = self.goods,
149
 
                                        cargoSpace = self.cargoSpace
150
 
                                     }
151
 
             the.storage:save()
152
112
          end
153
113
}
 
 
b'\\ No newline at end of file'