/traderous

To get this branch, use:
bzr branch http://9ix.org/bzr/traderous

« back to all changes in this revision

Viewing changes to enemy.lua

  • Committer: Josh C
  • Date: 2013-10-21 18:31:36 UTC
  • Revision ID: josh@9ix.org-20131021183136-l3vwmptork5es02v
factor out doHit so I can try to reproduce double ships

Show diffs side-by-side

added added

removed removed

Lines of Context:
enemy.lua
50
50
 
51
51
                     if pdist2 < (the.app.width / 2)^2 then
52
52
                        -- if player is roughly on enemy's screen
53
 
                        if self.state == 'patrolling' and the.player.active then
 
53
                        if self.state == 'patrolling' and the.player.active and not the.player.onPlanet then
54
54
                           self.state = 'combat'
55
55
                           self.target = the.player
56
56
                        end
113
113
                        the.app.view:remove(self.thrust)
114
114
                        the.app.view:remove(self.shield)
115
115
 
 
116
                        if other.source == the.player then
 
117
                           the.player.kills = the.player.kills + 1
 
118
                        end
 
119
 
116
120
                        -- and add a new enemy somewhere else...
117
121
                        local e = Enemy:new{x = math.random(the.bg.width),
118
122
                                            y = math.random(the.bg.height)}