/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-26 01:11:27 UTC
  • Revision ID: josh@9ix.org-20130626011127-7e7z5ed0r0xmtva3
show planet labels, get better names

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
 
19
31
              while #self.goods == 0 do
20
32
                 for _, good in ipairs(self.potentialGoods) do
21
33
                    if math.random() < good.chance then
31
43
                    end
32
44
                 end
33
45
              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)
34
66
           end,
35
67
   onUpdate = function (self)
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
 
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
42
77
                       the.player.velocity = {x=0, y=0}
43
78
                       the.player.acceleration = {x=0, y=0}
44
79
 
49
84
                                                  goods = the.player.goods,
50
85
                                                  cargoSpace = the.player.cargoSpace
51
86
                                               }
52
 
                       print('saving')
53
87
                       the.storage:save()
54
 
                       print('finished saving')
55
88
 
56
89
                       tradeView = TradeView:new{ planet = self }
57
90
                       tradeView:activate()
58
91
                    end
 
92
                 else
 
93
                    self.label.visible = false
 
94
                    self.keyLabel.visible = false
59
95
                 end
60
96
              end,
61
97
   onEndFrame = function (self)