/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-10 23:43:01 UTC
  • Revision ID: josh@9ix.org-20130610234301-7psv1434q7dacikh
make bullets not wrap

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
26
26
   maxVelocity = {x=velLimit,y=velLimit},
27
27
   minVelocity = {x=-velLimit, y=-velLimit},
28
28
   lastFired = 0,
29
 
   money = 2000, -- what to use for money symbol? ✪ or ☥ or Ⓐ?
30
 
   goods = {},
31
29
   onNew = function(self)
32
30
              self.thrust = Tile:new{image = 'data/thrust.png'}
33
 
              self.shield = Shield:new{ship = self}
34
31
           end,
35
32
   onStartFrame = function(self)
36
33
                     --- TAKE 2
61
58
                           b = Bullet:new{
62
59
                              x = self.x + self.width / 2,
63
60
                              y = self.y + self.height / 2,
64
 
                              rotation = self.rotation,
65
 
                              source = self
66
61
                           }
67
62
                           self.lastFired = love.timer.getTime()
68
63
                     end
76
71
                   self:collide(the.rockColliders)
77
72
                end,
78
73
   onCollide = function(self, other)
79
 
                  if other:instanceOf(Bullet) and other.source ~= self then
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
93
 
 
94
 
                     other:die()
95
 
                     the.bullets:remove(other)
96
 
                  end
97
 
 
98
74
                  if other:instanceOf(RockCollider) then
99
75
                     the.app.view:add( Boom:new {
100
76
                                          x = self.x,
119
95
                        )
120
96
                     end
121
97
                  end
122
 
               end,
123
 
   buy = function(self, good, price)
124
 
            if self.money >= price then
125
 
               self.goods[good] = (self.goods[good] or 0) + 1
126
 
               self.money = self.money - price
127
 
            end
128
 
         end,
129
 
   sell = function(self, good, price)
130
 
             if self.goods[good] and self.goods[good] > 0 then
131
 
                self.goods[good] = self.goods[good] - 1
132
 
                self.money = self.money + price
133
 
             end
134
 
          end
 
98
               end
135
99
}
 
 
b'\\ No newline at end of file'