/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:50:45 UTC
  • Revision ID: josh@9ix.org-20130616035045-l5nd2aa0m30gk20x
clean up some old code, put planet indicators in planet class

Show diffs side-by-side

added added

removed removed

Lines of Context:
planet.lua
11
11
       low = 5000, med = 6000, high = 8000,
12
12
       chance = 0.1}
13
13
   },
14
 
   potentialNames = {
15
 
      'Planet A',
16
 
      'Planet B',
17
 
      'Planet C',
18
 
      'Planet D',
19
 
      'Planet E',
20
 
      'Planet F',
21
 
   },
22
14
   goods = {},
23
15
   onNew = function (self)
24
16
              self.indicator = Tile:new{ image = 'data/planet1ind.png' }
25
17
              the.indicators:add(self.indicator)
26
18
 
27
 
              while not self.name do
28
 
                 local name = self.potentialNames[math.random(#self.potentialNames)]
29
 
                 local inUse = false
30
 
                 for _, planet in ipairs(the.planets.sprites) do
31
 
                    if name == planet.name then inUse = true end
32
 
                 end
33
 
 
34
 
                 if not inUse then
35
 
                    self.name = name
36
 
                 end
37
 
              end
38
 
 
39
19
              while #self.goods == 0 do
40
20
                 for _, good in ipairs(self.potentialGoods) do
41
21
                    if math.random() < good.chance then
59
39
                                            the.player.y - (self.y + hw))
60
40
 
61
41
                    if pvec:len2() < hw ^ 2 then
62
 
                       the.player.velocity = {x=0, y=0}
63
 
                       the.player.acceleration = {x=0, y=0}
64
 
 
65
 
                       -- save player data
66
 
                       the.storage.data.player = {x = the.player.x,
67
 
                                                  y = the.player.y,
68
 
                                                  money = the.player.money,
69
 
                                                  goods = the.player.goods,
70
 
                                                  cargoSpace = the.player.cargoSpace
71
 
                                               }
72
 
                       the.storage:save()
73
 
 
74
42
                       tradeView = TradeView:new{ planet = self }
75
43
                       tradeView:activate()
76
44
                    end
106
74
                   end
107
75
 
108
76
                end,
109
 
   onCollide = function (self, other)
110
 
                  if other:instanceOf(Bullet) then
111
 
                     the.bullets:remove(other)
112
 
                     other:die()
113
 
                  end
114
 
               end
115
77
}
 
 
b'\\ No newline at end of file'