/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 19:56:26 UTC
  • Revision ID: josh@9ix.org-20130625195626-00x63mxdyk1k6ud7
last fix for saving

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
45
57
                 end
46
 
              end
 
58
              end,
 
59
   onEndFrame = function (self)
 
60
                   local indx, indy
 
61
                   local pvec = vector.new(
 
62
                      self.x - the.player.x + self.width / 2,
 
63
                      self.y - the.player.y + self.height / 2 )
 
64
 
 
65
                   -- TODO: is there a better way to specify the
 
66
                   -- screen rectangle?
 
67
                   if self:intersects(the.player.x - the.app.width / 2,
 
68
                                      the.player.y - the.app.height / 2,
 
69
                                      the.app.width,
 
70
                                      the.app.height) then
 
71
                      -- planet is on the screen
 
72
                      self.indicator.visible = false
 
73
                   else
 
74
                      self.indicator.visible = true
 
75
 
 
76
                      if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
 
77
                         indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
 
78
                         indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
 
79
                      else
 
80
                         indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
 
81
                         indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
 
82
                      end
 
83
 
 
84
                      self.indicator.x = the.player.x + indx
 
85
                      self.indicator.y = the.player.y + indy
 
86
                   end
 
87
 
 
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
47
95
}
 
 
b'\\ No newline at end of file'