/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:32:01 UTC
  • Revision ID: josh@9ix.org-20130616033201-91uqlfnqa6cgo989
make sure every planet trades something

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
 
                       print('saving')
53
 
                       the.storage:save()
54
 
                       print('finished saving')
55
 
 
56
42
                       tradeView = TradeView:new{ planet = self }
57
43
                       tradeView:activate()
58
44
                    end
59
45
                 end
60
 
              end,
61
 
   onEndFrame = function (self)
62
 
                   local indx, indy
63
 
                   local pvec = vector.new(
64
 
                      self.x - the.player.x + self.width / 2,
65
 
                      self.y - the.player.y + self.height / 2 )
66
 
 
67
 
                   -- TODO: is there a better way to specify the
68
 
                   -- screen rectangle?
69
 
                   if self:intersects(the.player.x - the.app.width / 2,
70
 
                                      the.player.y - the.app.height / 2,
71
 
                                      the.app.width,
72
 
                                      the.app.height) then
73
 
                      -- planet is on the screen
74
 
                      self.indicator.visible = false
75
 
                   else
76
 
                      self.indicator.visible = true
77
 
 
78
 
                      if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
79
 
                         indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
80
 
                         indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
81
 
                      else
82
 
                         indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
83
 
                         indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
84
 
                      end
85
 
 
86
 
                      self.indicator.x = the.player.x + indx
87
 
                      self.indicator.y = the.player.y + indy
88
 
                   end
89
 
 
90
 
                end,
91
 
   onCollide = function (self, other)
92
 
                  if other:instanceOf(Bullet) then
93
 
                     the.bullets:remove(other)
94
 
                     other:die()
95
 
                  end
96
 
               end
 
46
              end
97
47
}
 
 
b'\\ No newline at end of file'