/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
16
16
              self.indicator = Tile:new{ image = 'data/planet1ind.png' }
17
17
              the.indicators:add(self.indicator)
18
18
 
19
 
              while not self.name do
20
 
                 local name = PlanetNames[math.random(#PlanetNames)]
21
 
                 local inUse = false
22
 
                 for _, planet in ipairs(the.planets.sprites) do
23
 
                    if name == planet.name then inUse = true end
24
 
                 end
25
 
 
26
 
                 if not inUse then
27
 
                    self.name = name
28
 
                 end
29
 
              end
30
 
 
31
19
              while #self.goods == 0 do
32
20
                 for _, good in ipairs(self.potentialGoods) do
33
21
                    if math.random() < good.chance then
43
31
                    end
44
32
                 end
45
33
              end
46
 
 
47
 
              self.label = Text:new {
48
 
                 text = self.name,
49
 
                 x = self.x,
50
 
                 y = self.y - 32,
51
 
                 width = self.width,
52
 
                 align = 'center',
53
 
                 font = 20
54
 
              }
55
 
              the.planetLabels:add(self.label)
56
 
 
57
 
              self.keyLabel = Text:new {
58
 
                 text = 'Press L to land',
59
 
                 x = self.x,
60
 
                 y = self.y + self.height + 12,
61
 
                 width = self.width,
62
 
                 align = 'center',
63
 
                 font = 20
64
 
              }
65
 
              the.planetLabels:add(self.keyLabel)
66
34
           end,
67
35
   onUpdate = function (self)
68
 
                 local hw = self.width / 2
69
 
                 local pvec = vector.new(the.player.x - (self.x + hw),
70
 
                                         the.player.y - (self.y + hw))
71
 
 
72
 
                 if pvec:len2() < hw ^ 2 then
73
 
                    self.label.visible = true
74
 
                    self.keyLabel.visible = true
75
 
 
76
 
                    if the.keys:justPressed('l') then
77
 
                       the.player.velocity = {x=0, y=0}
78
 
                       the.player.acceleration = {x=0, y=0}
79
 
 
80
 
                       -- save player data
81
 
                       the.storage.data.player = {x = the.player.x,
82
 
                                                  y = the.player.y,
83
 
                                                  money = the.player.money,
84
 
                                                  goods = the.player.goods,
85
 
                                                  cargoSpace = the.player.cargoSpace
86
 
                                               }
87
 
                       the.storage:save()
88
 
 
 
36
                 if the.keys:justPressed('l') then
 
37
                    local hw = self.width / 2
 
38
                    local pvec = vector.new(the.player.x - (self.x + hw),
 
39
                                            the.player.y - (self.y + hw))
 
40
 
 
41
                    if pvec:len2() < hw ^ 2 then
89
42
                       tradeView = TradeView:new{ planet = self }
90
43
                       tradeView:activate()
91
44
                    end
92
 
                 else
93
 
                    self.label.visible = false
94
 
                    self.keyLabel.visible = false
95
45
                 end
96
46
              end,
97
47
   onEndFrame = function (self)
124
74
                   end
125
75
 
126
76
                end,
127
 
   onCollide = function (self, other)
128
 
                  if other:instanceOf(Bullet) then
129
 
                     the.bullets:remove(other)
130
 
                     other:die()
131
 
                  end
132
 
               end
133
77
}
 
 
b'\\ No newline at end of file'