/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 21:47:47 UTC
  • Revision ID: josh@9ix.org-20130625214747-bqjfaktdqj76aq8o
game over timer & penalty

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
 
42
54
                       tradeView = TradeView:new{ planet = self }
43
55
                       tradeView:activate()
44
56
                    end
74
86
                   end
75
87
 
76
88
                end,
 
89
   onCollide = function (self, other)
 
90
                  if other:instanceOf(Bullet) then
 
91
                     the.bullets:remove(other)
 
92
                     other:die()
 
93
                  end
 
94
               end
77
95
}
 
 
b'\\ No newline at end of file'