/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:53:05 UTC
  • Revision ID: josh@9ix.org-20130616035305-33ca39wd4q3q4v13
bullets don't go through planets

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
 
              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})
 
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
29
31
                    end
30
32
                 end
31
33
              end
41
43
                       tradeView:activate()
42
44
                    end
43
45
                 end
44
 
              end
 
46
              end,
 
47
   onEndFrame = function (self)
 
48
                   local indx, indy
 
49
                   local pvec = vector.new(
 
50
                      self.x - the.player.x + self.width / 2,
 
51
                      self.y - the.player.y + self.height / 2 )
 
52
 
 
53
                   -- TODO: is there a better way to specify the
 
54
                   -- screen rectangle?
 
55
                   if self:intersects(the.player.x - the.app.width / 2,
 
56
                                      the.player.y - the.app.height / 2,
 
57
                                      the.app.width,
 
58
                                      the.app.height) then
 
59
                      -- planet is on the screen
 
60
                      self.indicator.visible = false
 
61
                   else
 
62
                      self.indicator.visible = true
 
63
 
 
64
                      if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
 
65
                         indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
 
66
                         indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
 
67
                      else
 
68
                         indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
 
69
                         indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
 
70
                      end
 
71
 
 
72
                      self.indicator.x = the.player.x + indx
 
73
                      self.indicator.y = the.player.y + indy
 
74
                   end
 
75
 
 
76
                end,
 
77
   onCollide = function (self, other)
 
78
                  if other:instanceOf(Bullet) then
 
79
                     the.bullets:remove(other)
 
80
                     other:die()
 
81
                  end
 
82
               end
45
83
}
 
 
b'\\ No newline at end of file'