/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:53:05 UTC
  • Revision ID: josh@9ix.org-20130616035305-33ca39wd4q3q4v13
bullets don't go through planets

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
30
30
   goods = {},
31
31
   onNew = function(self)
32
32
              self.thrust = Tile:new{image = 'data/thrust.png'}
33
 
              self.shield = Shield:new{ship = self}
34
33
           end,
35
34
   onStartFrame = function(self)
36
35
                     --- TAKE 2
61
60
                           b = Bullet:new{
62
61
                              x = self.x + self.width / 2,
63
62
                              y = self.y + self.height / 2,
64
 
                              rotation = self.rotation,
65
 
                              source = self
66
63
                           }
67
64
                           self.lastFired = love.timer.getTime()
68
65
                     end
76
73
                   self:collide(the.rockColliders)
77
74
                end,
78
75
   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
76
                  if other:instanceOf(RockCollider) then
99
77
                     the.app.view:add( Boom:new {
100
78
                                          x = self.x,