/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 00:50:23 UTC
  • Revision ID: josh@9ix.org-20130619005023-necyd2i8kgqbp1s9
shield

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
74
75
                   self:collide(the.rockColliders)
75
76
                end,
76
77
   onCollide = function(self, other)
 
78
                  if other:instanceOf(Bullet) then
 
79
                     if self.shield.strength == 0 then
 
80
                        -- die
 
81
                        the.app.view:add( Boom:new {
 
82
                                             x = self.x,
 
83
                                             y = self.y,
 
84
                                             velocity = { rotation = 5 }
 
85
                                          })
 
86
 
 
87
                        self:die()
 
88
                        self.thrust:die()
 
89
                     else
 
90
                        self.shield:onHit()
 
91
                        other:die()
 
92
                        the.bullets:remove(other)
 
93
                     end
 
94
                  end
 
95
 
77
96
                  if other:instanceOf(RockCollider) then
78
97
                     the.app.view:add( Boom:new {
79
98
                                          x = self.x,