/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:28:16 UTC
  • Revision ID: josh@9ix.org-20130616032816-wue00cdqvlqr3rre
give planets sami-random goods at semi-random prices

Show diffs side-by-side

added added

removed removed

Lines of Context:
planet.lua
16
16
              self.indicator = Tile:new{ image = 'data/planet1ind.png' }
17
17
              the.indicators:add(self.indicator)
18
18
 
19
 
              while #self.goods == 0 do
20
 
                 for _, good in ipairs(self.potentialGoods) do
21
 
                    if math.random() < good.chance then
22
 
                       local tier = math.random(4) -- betw 1 and 4
23
 
                       if tier == 1 then
24
 
                          table.insert(self.goods, {good.name, good.low})
25
 
                       elseif tier ==2 then
26
 
                          table.insert(self.goods, {good.name, good.high})
27
 
                       else
28
 
                          -- double chance for med (3 or 4)
29
 
                          table.insert(self.goods, {good.name, good.med})
30
 
                       end
 
19
              for _, good in ipairs(self.potentialGoods) do
 
20
                 if math.random() < good.chance then
 
21
                    local tier = math.random(4) -- betw 1 and 4
 
22
                    if tier == 1 then
 
23
                       table.insert(self.goods, {good.name, good.low})
 
24
                    elseif tier ==2 then
 
25
                       table.insert(self.goods, {good.name, good.high})
 
26
                    else
 
27
                       -- double chance for med (3 or 4)
 
28
                       table.insert(self.goods, {good.name, good.med})
31
29
                    end
32
30
                 end
33
31
              end
39
37
                                            the.player.y - (self.y + hw))
40
38
 
41
39
                    if pvec:len2() < hw ^ 2 then
42
 
                       the.player.velocity = {x=0, y=0}
43
 
                       the.player.acceleration = {x=0, y=0}
44
 
 
45
40
                       tradeView = TradeView:new{ planet = self }
46
41
                       tradeView:activate()
47
42
                    end
48
43
                 end
49
 
              end,
50
 
   onEndFrame = function (self)
51
 
                   local indx, indy
52
 
                   local pvec = vector.new(
53
 
                      self.x - the.player.x + self.width / 2,
54
 
                      self.y - the.player.y + self.height / 2 )
55
 
 
56
 
                   -- TODO: is there a better way to specify the
57
 
                   -- screen rectangle?
58
 
                   if self:intersects(the.player.x - the.app.width / 2,
59
 
                                      the.player.y - the.app.height / 2,
60
 
                                      the.app.width,
61
 
                                      the.app.height) then
62
 
                      -- planet is on the screen
63
 
                      self.indicator.visible = false
64
 
                   else
65
 
                      self.indicator.visible = true
66
 
 
67
 
                      if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
68
 
                         indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
69
 
                         indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
70
 
                      else
71
 
                         indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
72
 
                         indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
73
 
                      end
74
 
 
75
 
                      self.indicator.x = the.player.x + indx
76
 
                      self.indicator.y = the.player.y + indy
77
 
                   end
78
 
 
79
 
                end,
80
 
   onCollide = function (self, other)
81
 
                  if other:instanceOf(Bullet) then
82
 
                     the.bullets:remove(other)
83
 
                     other:die()
84
 
                  end
85
 
               end
 
44
              end
86
45
}
 
 
b'\\ No newline at end of file'