/traderous

To get this branch, use:
bzr branch http://9ix.org/bzr/traderous

« back to all changes in this revision

Viewing changes to trade_view.lua

  • Committer: Josh C
  • Date: 2013-06-19 01:06:14 UTC
  • Revision ID: josh@9ix.org-20130619010614-j3rbcv1c0my2tw0f
enemy shields and death

Show diffs side-by-side

added added

removed removed

Lines of Context:
trade_view.lua
131
131
 
132
132
              self:add(b)
133
133
 
134
 
              local sh = the.player.shield
135
 
              if sh.strength < sh.max then
136
 
                 sh.strength = sh.max
137
 
 
138
 
                 self:add(Text:new{
139
 
                             text = 'Your shield has been recharged',
140
 
                             width = 450,
141
 
                             align = 'center',
142
 
                             x = boxL,
143
 
                             y = boxB - 4 * th - 12
144
 
                          })
145
 
              end
146
 
 
147
 
              -- local cost = (sh.max - sh.strength) * sh.cost
148
 
              -- b = Button:new{
149
 
              --    x = boxL, y = boxT,
150
 
              --    width = 800,
151
 
              --    -- WTF: trailing space makes it not wrap?
152
 
              --    label = Text:new{ text = 'Repair shields (' .. cost .. ') ',
153
 
              --                      x = 3, y = 2 },
154
 
              --    onMouseDown = function(self)
155
 
              --                     if the.player.money >= cost and sh.strength < sh.max then
156
 
              --                        the.player.money = the.player.money - cost
157
 
              --                        sh.strength = sh.max
158
 
              --                        self.visible = false
159
 
              --                     end
160
 
              --                  end
161
 
              -- }
162
 
 
163
 
              -- local tw, th = b.label:getSize()
164
 
              -- b.background = Fill:new{
165
 
              --    fill = {100,100,100},
166
 
              --    width = tw + 3,
167
 
              --    height = th + 4
168
 
              -- }
169
 
              -- b.x = boxR - b.background.width - 60
170
 
              -- b.y = boxB - b.background.height - 10
171
 
 
172
 
              -- if sh.strength < sh.max then
173
 
              --    self:add(b)
174
 
              -- end
175
 
 
176
134
              self.playerMoney = Text:new{
177
135
                 text = 'Your money: ',
178
136
                 width = 200,
181
139
              }
182
140
              self:add(self.playerMoney)
183
141
 
184
 
              self.availSpace = Text:new{
185
 
                 text = 'Available cargo space: ',
186
 
                 width = 200,
187
 
                 x = boxL + 10,
188
 
                 y = boxB - 2 * th - 12
189
 
              }
190
 
              self:add(self.availSpace)
191
 
 
192
 
              if the.player.kills > 0 then
193
 
                 -- local award = the.player.kills * 100
194
 
                 -- self:add(Text:new{
195
 
                 --             text = 'You have been awarded ' ..
196
 
                 --                award ..
197
 
                 --                ' credits for killing bandits.',
198
 
                 --             width = 450,
199
 
                 --             align = 'center',
200
 
                 --             x = boxL,
201
 
                 --             y = boxB - 4 * th - 12
202
 
                 --          })
203
 
 
204
 
                 -- the.player.money = the.player.money + award
205
 
                 the.player.kills = 0
206
 
              end
207
 
 
208
142
              -- give the buttons a cycle to get out of the T/L corner
209
143
              self:update(0)
210
144
           end,
217
151
                 Subview.activate(self)
218
152
              end,
219
153
   close = function (self)
220
 
              the.player:save()
221
 
 
222
154
              the.cursor.visible = true
223
155
              love.mouse.setVisible(false)
224
156
              love.mouse.setGrab(true)
232
164
                 end
233
165
 
234
166
                 self.playerMoney.text = 'Your money: ' .. the.player.money
235
 
                 self.availSpace.text = 'Available cargo space: ' .. the.player:availableSpace()
236
167
 
237
168
                 for good, have in pairs(self.have) do
238
169
                    have.text = the.player.goods[good] or 0