/traderous

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

« back to all changes in this revision

Viewing changes to planet.lua

  • Committer: Josh C
  • Date: 2013-06-25 17:05:31 UTC
  • Revision ID: josh@9ix.org-20130625170531-4es1bgbdaf0q8sch
fix start new game

Show diffs side-by-side

added added

removed removed

Lines of Context:
planet.lua
39
39
                                            the.player.y - (self.y + hw))
40
40
 
41
41
                    if pvec:len2() < hw ^ 2 then
 
42
                       the.player.velocity = {x=0, y=0}
 
43
                       the.player.acceleration = {x=0, y=0}
 
44
 
42
45
                       tradeView = TradeView:new{ planet = self }
43
46
                       tradeView:activate()
44
47
                    end
74
77
                   end
75
78
 
76
79
                end,
 
80
   onCollide = function (self, other)
 
81
                  if other:instanceOf(Bullet) then
 
82
                     the.bullets:remove(other)
 
83
                     other:die()
 
84
                  end
 
85
               end
77
86
}
 
 
b'\\ No newline at end of file'