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
- browse files at revision 101
- compare with another revision
- download diff
- download tarball
- view history from revision 101
- Committer: Josh C
- Date: 2013-10-21 18:31:36 UTC
- Revision ID: josh@9ix.org-20131021183136-l3vwmptork5es02v
factor out doHit so I can try to reproduce double ships
- files modified:
- player.lua
added
removed
trade_view.lua
132
132
self:add(b)
133
133
134
134
local sh = the.player.shield
135
local cost = (sh.max - sh.strength) * sh.cost
136
b = Button:new{
137
x = boxL, y = boxT,
138
width = 800,
139
-- WTF: trailing space makes it not wrap?
140
label = Text:new{ text = 'Repair shields (' .. cost .. ') ',
141
x = 3, y = 2 },
142
onMouseDown = function(self)
143
if the.player.money >= cost and sh.strength < sh.max then
144
the.player.money = the.player.money - cost
145
sh.strength = sh.max
146
self.visible = false
147
end
148
end
149
}
150
151
local tw, th = b.label:getSize()
152
b.background = Fill:new{
153
fill = {100,100,100},
154
width = tw + 3,
155
height = th + 4
156
}
157
b.x = boxR - b.background.width - 60
158
b.y = boxB - b.background.height - 10
159
160
135
if sh.strength < sh.max then
161
self:add(b)
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
})
162
145
end
163
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
164
176
self.playerMoney = Text:new{
165
177
text = 'Your money: ',
166
178
width = 200,
178
190
self:add(self.availSpace)
179
191
180
192
if the.player.kills > 0 then
181
local award = the.player.kills * 100
182
self:add(Text:new{
183
text = 'You have been awarded ' ..
184
award ..
185
' credits for killing bandits.',
186
width = 450,
187
align = 'center',
188
x = boxL,
189
y = boxB - 4 * th - 12
190
})
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
-- })
191
203
192
the.player.money = the.player.money + award
204
-- the.player.money = the.player.money + award
193
205
the.player.kills = 0
194
206
end
195
207
Loggerhead is a web-based interface for Breezy
Version: 2.0.1