/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-19 01:06:14 UTC
  • Revision ID: josh@9ix.org-20130619010614-j3rbcv1c0my2tw0f
enemy shields and death

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}
33
34
           end,
34
35
   onStartFrame = function(self)
35
36
                     --- TAKE 2
60
61
                           b = Bullet:new{
61
62
                              x = self.x + self.width / 2,
62
63
                              y = self.y + self.height / 2,
63
 
                              rotation = self.rotation
 
64
                              rotation = self.rotation,
 
65
                              source = self
64
66
                           }
65
67
                           self.lastFired = love.timer.getTime()
66
68
                     end
74
76
                   self:collide(the.rockColliders)
75
77
                end,
76
78
   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
 
77
98
                  if other:instanceOf(RockCollider) then
78
99
                     the.app.view:add( Boom:new {
79
100
                                          x = self.x,