/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-05-20 16:51:19 UTC
  • Revision ID: josh@9ix.org-20130520165119-mkjh7d9408e6ig0u
extract updating score.  update score again when you calc high score - 
should mitigate a bug I saw happen when thor played that put final score 
+ high score out of sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
planet.lua
1
 
Planet = Tile:extend {
2
 
   image = 'data/planet1.png',
3
 
   potentialGoods = {
4
 
      {name = 'Bobble-Headed Dolls',
5
 
       low = 50, med = 100, high = 150,
6
 
       chance = 0.5},
7
 
      {name = 'Alliance Foodstuffs',
8
 
       low = 100, med = 250, high = 400,
9
 
       chance = 0.8},
10
 
      {name = 'Antique Weapons',
11
 
       low = 5000, med = 6000, high = 8000,
12
 
       chance = 0.1}
13
 
   },
14
 
   goods = {},
15
 
   onNew = function (self)
16
 
              self.indicator = Tile:new{ image = 'data/planet1ind.png' }
17
 
              the.indicators:add(self.indicator)
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
 
              while #self.goods == 0 do
32
 
                 for _, good in ipairs(self.potentialGoods) do
33
 
                    if math.random() < good.chance then
34
 
                       local tier = math.random(4) -- betw 1 and 4
35
 
                       if tier == 1 then
36
 
                          table.insert(self.goods, {good.name, good.low})
37
 
                       elseif tier ==2 then
38
 
                          table.insert(self.goods, {good.name, good.high})
39
 
                       else
40
 
                          -- double chance for med (3 or 4)
41
 
                          table.insert(self.goods, {good.name, good.med})
42
 
                       end
43
 
                    end
44
 
                 end
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)
66
 
           end,
67
 
   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
 
 
89
 
                       tradeView = TradeView:new{ planet = self }
90
 
                       tradeView:activate()
91
 
                    end
92
 
                 else
93
 
                    self.label.visible = false
94
 
                    self.keyLabel.visible = false
95
 
                 end
96
 
              end,
97
 
   onEndFrame = function (self)
98
 
                   local indx, indy
99
 
                   local pvec = vector.new(
100
 
                      self.x - the.player.x + self.width / 2,
101
 
                      self.y - the.player.y + self.height / 2 )
102
 
 
103
 
                   -- TODO: is there a better way to specify the
104
 
                   -- screen rectangle?
105
 
                   if self:intersects(the.player.x - the.app.width / 2,
106
 
                                      the.player.y - the.app.height / 2,
107
 
                                      the.app.width,
108
 
                                      the.app.height) then
109
 
                      -- planet is on the screen
110
 
                      self.indicator.visible = false
111
 
                   else
112
 
                      self.indicator.visible = true
113
 
 
114
 
                      if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
115
 
                         indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
116
 
                         indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
117
 
                      else
118
 
                         indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
119
 
                         indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
120
 
                      end
121
 
 
122
 
                      self.indicator.x = the.player.x + indx
123
 
                      self.indicator.y = the.player.y + indy
124
 
                   end
125
 
 
126
 
                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
 
}
 
 
b'\\ No newline at end of file'