/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-23 02:28:12 UTC
  • Revision ID: josh@9ix.org-20130623022812-zhz3azvff45bgsw1
bigger space, slower movement, maintain enemy density

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
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
33
              self.shield = Shield:new{ship = self}
69
66
                           }
70
67
                           self.lastFired = love.timer.getTime()
71
68
                     end
72
 
 
73
 
                     if the.keys:justPressed('x') then
74
 
                        --self:doHit()
75
 
                     end
76
69
                  end,
77
70
   onUpdate = function(self)
78
71
                 self.thrust.x = self.x - self.width
82
75
   onEndFrame = function(self)
83
76
                   self:collide(the.rockColliders)
84
77
                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
78
   onCollide = function(self, other)
105
79
                  if other:instanceOf(Bullet) and other.source ~= self then
106
 
                     self:doHit()
 
80
                     if self.shield.strength == 0 then
 
81
                        -- die
 
82
                        the.app.view:add( Boom:new {
 
83
                                             x = self.x,
 
84
                                             y = self.y,
 
85
                                             velocity = { rotation = 5 }
 
86
                                          })
 
87
 
 
88
                        self:die()
 
89
                        self.thrust:die()
 
90
                     else
 
91
                        self.shield:onHit()
 
92
                     end
107
93
 
108
94
                     other:die()
109
95
                     the.bullets:remove(other)
119
105
                     self:die()
120
106
                     self.thrust:die()
121
107
                  end
 
108
 
 
109
                  if not self.active then
 
110
                     the.over.visible = true
 
111
                     the.instructions.visible = true
 
112
                  end
122
113
               end,
123
114
   buy = function(self, good, price)
124
 
            if self.money >= price and self:availableSpace() > 0 then
 
115
            if self.money >= price then
125
116
               self.goods[good] = (self.goods[good] or 0) + 1
126
117
               self.money = self.money - price
127
118
            end
131
122
                self.goods[good] = self.goods[good] - 1
132
123
                self.money = self.money + price
133
124
             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
125
          end
153
126
}
 
 
b'\\ No newline at end of file'