/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-30 22:36:26 UTC
  • Revision ID: josh@9ix.org-20130630223626-pgya1z6raymhzj2v
5-7 planets, tweak some goods

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
   goods = {},
31
31
   cargoSpace = 20,
32
32
   onPlanet = false,
33
 
   kills = 0,
34
33
   onNew = function(self)
35
34
              self.thrust = Tile:new{image = 'data/thrust.png'}
36
35
              self.shield = Shield:new{ship = self}
69
68
                           }
70
69
                           self.lastFired = love.timer.getTime()
71
70
                     end
72
 
 
73
 
                     if the.keys:justPressed('x') then
74
 
                        --self:doHit()
75
 
                     end
76
71
                  end,
77
72
   onUpdate = function(self)
78
73
                 self.thrust.x = self.x - self.width
82
77
   onEndFrame = function(self)
83
78
                   self:collide(the.rockColliders)
84
79
                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
80
   onCollide = function(self, other)
105
81
                  if other:instanceOf(Bullet) and other.source ~= self then
106
 
                     self:doHit()
 
82
                     if self.shield.strength == 0 then
 
83
                        -- die
 
84
                        the.app.view:add( Boom:new {
 
85
                                             x = self.x,
 
86
                                             y = self.y,
 
87
                                             velocity = { rotation = 5 }
 
88
                                          })
 
89
 
 
90
                        self:die()
 
91
                        self.thrust:die()
 
92
                     else
 
93
                        self.shield:onHit()
 
94
                     end
107
95
 
108
96
                     other:die()
109
97
                     the.bullets:remove(other)
119
107
                     self:die()
120
108
                     self.thrust:die()
121
109
                  end
 
110
 
 
111
                  if not self.active then
 
112
                     the.interface:add(GameOver:new())
 
113
                  end
122
114
               end,
123
115
   buy = function(self, good, price)
124
116
            if self.money >= price and self:availableSpace() > 0 then
139
131
                       end
140
132
 
141
133
                       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
 
          end
 
134
                    end
153
135
}
 
 
b'\\ No newline at end of file'