/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-16 03:50:45 UTC
  • Revision ID: josh@9ix.org-20130616035045-l5nd2aa0m30gk20x
clean up some old code, put planet indicators in planet class

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
 
                       -- TODO: probably you should pay to fix shield
43
 
                       the.player.shield.strength = the.player.shield.max
44
 
                       the.player.velocity = {x=0, y=0}
45
 
                       the.player.acceleration = {x=0, y=0}
46
 
 
47
42
                       tradeView = TradeView:new{ planet = self }
48
43
                       tradeView:activate()
49
44
                    end
79
74
                   end
80
75
 
81
76
                end,
82
 
   onCollide = function (self, other)
83
 
                  if other:instanceOf(Bullet) then
84
 
                     the.bullets:remove(other)
85
 
                     other:die()
86
 
                  end
87
 
               end
88
77
}
 
 
b'\\ No newline at end of file'