bzr branch
/bzr/traderous
|
53
by Josh C
beginnings of trading interface |
1 |
Planet = Tile:extend { |
2 |
image = 'data/planet1.png', |
|
|
59
by Josh C
give planets sami-random goods at semi-random prices |
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} |
|
|
53
by Josh C
beginnings of trading interface |
13 |
},
|
|
59
by Josh C
give planets sami-random goods at semi-random prices |
14 |
goods = {}, |
|
53
by Josh C
beginnings of trading interface |
15 |
onNew = function (self) |
16 |
self.indicator = Tile:new{ image = 'data/planet1ind.png' } |
|
17 |
the.indicators:add(self.indicator) |
|
|
59
by Josh C
give planets sami-random goods at semi-random prices |
18 |
|
|
60
by Josh C
make sure every planet trades something |
19 |
while #self.goods == 0 do |
20 |
for _, good in ipairs(self.potentialGoods) do |
|
21 |
if math.random() < good.chance then |
|
22 |
local tier = math.random(4) -- betw 1 and 4 |
|
23 |
if tier == 1 then |
|
24 |
table.insert(self.goods, {good.name, good.low}) |
|
25 |
elseif tier ==2 then |
|
26 |
table.insert(self.goods, {good.name, good.high}) |
|
27 |
else
|
|
28 |
-- double chance for med (3 or 4)
|
|
29 |
table.insert(self.goods, {good.name, good.med}) |
|
30 |
end
|
|
|
59
by Josh C
give planets sami-random goods at semi-random prices |
31 |
end
|
32 |
end
|
|
33 |
end
|
|
|
53
by Josh C
beginnings of trading interface |
34 |
end, |
35 |
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 |
|
|
73
by Josh C
higher planet floor, recharge shields when you land, stop moving when you land |
42 |
the.player.velocity = {x=0, y=0} |
43 |
the.player.acceleration = {x=0, y=0} |
|
44 |
||
|
81
by Josh C
load/save (not working yet) |
45 |
-- save player data
|
46 |
the.storage.data.player = {x = the.player.x, |
|
47 |
y = the.player.y, |
|
48 |
money = the.player.money, |
|
49 |
goods = the.player.goods, |
|
50 |
cargoSpace = the.player.cargoSpace |
|
51 |
}
|
|
52 |
the.storage:save() |
|
53 |
||
|
53
by Josh C
beginnings of trading interface |
54 |
tradeView = TradeView:new{ planet = self } |
55 |
tradeView:activate() |
|
56 |
end
|
|
57 |
end
|
|
|
62
by Josh C
clean up some old code, put planet indicators in planet class |
58 |
end, |
59 |
onEndFrame = function (self) |
|
60 |
local indx, indy |
|
61 |
local pvec = vector.new( |
|
62 |
self.x - the.player.x + self.width / 2, |
|
63 |
self.y - the.player.y + self.height / 2 ) |
|
64 |
||
65 |
-- TODO: is there a better way to specify the
|
|
66 |
-- screen rectangle?
|
|
67 |
if self:intersects(the.player.x - the.app.width / 2, |
|
68 |
the.player.y - the.app.height / 2, |
|
69 |
the.app.width, |
|
70 |
the.app.height) then |
|
71 |
-- planet is on the screen
|
|
72 |
self.indicator.visible = false |
|
73 |
else
|
|
74 |
self.indicator.visible = true |
|
75 |
||
76 |
if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then |
|
77 |
indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8 |
|
78 |
indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x) |
|
79 |
else
|
|
80 |
indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8 |
|
81 |
indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y) |
|
82 |
end
|
|
83 |
||
84 |
self.indicator.x = the.player.x + indx |
|
85 |
self.indicator.y = the.player.y + indy |
|
86 |
end
|
|
87 |
||
88 |
end, |
|
|
63
by Josh C
bullets don't go through planets |
89 |
onCollide = function (self, other) |
90 |
if other:instanceOf(Bullet) then |
|
91 |
the.bullets:remove(other) |
|
92 |
other:die() |
|
93 |
end
|
|
94 |
end
|
|
|
53
by Josh C
beginnings of trading interface |
95 |
}
|