/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
 
                       the.player.velocity = {x=0, y=0}
43
 
                       the.player.acceleration = {x=0, y=0}
44
 
 
45
 
                       -- save player data
46
 
                       the.storage.data.player = {x = the.player.x,
47
 
                                                  y = the.player.y,
48
 
                                                  money = the.player.money,
49
 
                                                  goods = the.player.goods,
50
 
                                                  cargoSpace = the.player.cargoSpace
51
 
                                               }
52
 
                       the.storage:save()
53
 
 
54
42
                       tradeView = TradeView:new{ planet = self }
55
43
                       tradeView:activate()
56
44
                    end
86
74
                   end
87
75
 
88
76
                end,
89
 
   onCollide = function (self, other)
90
 
                  if other:instanceOf(Bullet) then
91
 
                     the.bullets:remove(other)
92
 
                     other:die()
93
 
                  end
94
 
               end
95
77
}
 
 
b'\\ No newline at end of file'