To get this branch, use:
bzr branch
http://9ix.org/bzr/traderous
« back to all changes in this revision
Viewing changes to main.lua
- browse files at revision 92
- compare with another revision
- download diff
- download tarball
- view history from revision 92
- Committer: Josh C
- Date: 2013-06-30 22:36:26 UTC
- Revision ID: josh@9ix.org-20130630223626-pgya1z6raymhzj2v
5-7 planets, tweak some goods
- files added:
- game_over.lua
- files modified:
- Info.plist
added
removed
main.lua
19
19
require 'planet'
20
20
require 'trade_view'
21
21
require 'shield'
22
require 'pause_view'
23
require 'game_over'
24
require 'names'
25
require 'good'
22
26
23
27
util = {
24
28
signOf = function(value)
28
32
return -1
29
33
end
30
34
end,
31
shortestVector = function(from, to)
32
if STRICT then
33
if from.x < the.app.width / 2 or
34
from.x > the.bg.width - the.app.width / 2 or
35
from.y < the.app.height / 2 or
36
from.y > the.bg.height - the.app.height / 2 then
37
error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
38
end
39
40
if to.x < the.app.width / 2 or
41
to.x > the.bg.width - the.app.width / 2 or
42
to.y < the.app.height / 2 or
43
to.y > the.bg.height - the.app.height / 2 then
44
error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
45
end
46
end
47
48
-- normalize grid to account for mirror zones
49
local fx = from.x - the.app.width / 2
50
local fy = from.y - the.app.height / 2
51
local tx = to.x - the.app.width / 2
52
local ty = to.y - the.app.height / 2
53
54
local short = {}
55
56
-- pick shorter x
57
if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
58
-- straight path is shorter
59
short.x = tx - fx
60
else
61
short.x = tx - fx - (the.bg.width - the.app.width)
62
end
63
64
-- pick shorter y
65
if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
66
-- straight path is shorter
67
short.y = ty - fy
68
else
69
short.y = ty - fy - (the.bg.height - the.app.height)
70
end
71
72
return vector.new(short.x, short.y)
73
end
74
35
}
75
36
76
37
GameView = View:extend {
77
38
onNew = function (self)
78
the.storage = Storage:new{filename = 'scores.lua'}
39
the.storage = Storage:new{filename = 'world.lua'}
79
40
the.storage:load()
80
41
--if not the.storage.data.highScore then
81
42
-- print('initializing storage')
85
46
the.bullets = Group:new()
86
47
the.interface = Group:new()
87
48
the.planets = Group:new()
49
the.planetLabels = Group:new()
88
50
the.indicators = Group:new()
51
the.enemies = Group:new()
89
52
53
-- init bg before build/load since planets need to know bg size
90
54
the.bg = Tile:new{
91
55
image = 'data/stars3.png',
92
width = 13660,
93
height = 7680
56
width = 27320,
57
height = 15360
94
58
}
95
59
self:add(the.bg)
96
60
61
if self.newWorld or not the.storage.data.player then
62
the.storage.data = {planets = {}}
63
64
-- build planets from random
65
for _ = 1, math.random(5, 7) do
66
local planet = Planet:new{
67
x = math.random(the.app.width / 2,
68
the.bg.width - the.app.width / 2),
69
y = math.random(the.app.height / 2,
70
the.bg.height - the.app.height / 2),
71
rotation = math.random() * math.pi
72
}
73
the.planets:add(planet)
74
table.insert(the.storage.data.planets, {
75
x = planet.x,
76
y = planet.y,
77
rotation = planet.rotation,
78
goods = planet.goods,
79
name = planet.name
80
})
81
end
82
83
Good:stockPlanets()
84
85
-- build fresh player
86
local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
87
the.player = player
88
the.storage.data.player = {x = player.x,
89
y = player.y,
90
money = player.money,
91
goods = player.goods,
92
cargoSpace = player.cargoSpace
93
}
94
95
the.storage:save()
96
else
97
-- load planets with x, y, goods
98
for _, planetData in ipairs(the.storage.data.planets) do
99
the.planets:add(Planet:new(planetData))
100
end
101
102
-- load player with cargo, money, position
103
the.player = SpacePlayer:new(the.storage.data.player)
104
105
-- reload storage as we've turned it all into objects
106
the.storage:load()
107
end
108
97
109
self:add(the.planets)
110
self:add(the.planetLabels)
98
111
99
--the.player = CrystalPlayer:new{x=400,y=300}
100
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
101
112
self:add(the.player)
102
113
self:add(the.player.thrust)
103
114
self:add(the.player.shield)
104
115
105
local e = Enemy:new{x=400, y=300}
106
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
107
self:add(e)
108
self:add(e.thrust) -- why doesn't this work in Enemy.new?
116
self:add(the.enemies)
117
118
for _ = 1, 20 do
119
local e = Enemy:new{x = math.random(the.bg.width),
120
y = math.random(the.bg.height)}
121
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
122
the.enemies:add(e)
123
self:add(e.thrust) -- why doesn't this work in Enemy.new?
124
self:add(e.shield)
125
end
109
126
110
127
self:add(the.bullets)
111
128
self:add(the.indicators)
112
129
self:add(the.interface)
113
130
114
for _ = 1, math.random(6) do
115
local planet = Planet:new{
116
x = math.random(the.app.width / 2,
117
the.bg.width - the.app.width / 2),
118
y = math.random(the.app.height / 2,
119
the.bg.height - the.app.height / 2),
120
rotation = math.random() * math.pi
121
}
122
the.planets:add(planet)
123
end
124
125
131
the.cursor = Cursor:new()
126
132
self:add(the.cursor)
127
133
132
138
self.focus = the.player
133
139
end,
134
140
onUpdate = function(self, dt)
141
if the.keys:justPressed('escape') then
142
PauseView:new():activate()
143
end
144
135
145
the.bullets:collide(the.planets)
136
146
the.bullets:collide(the.player)
147
the.bullets:collide(the.enemies)
137
148
end,
138
149
onEndFrame = function(self)
139
150
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
177
188
self.console:watch('num mirrors', '#the.mirrors.sprites')
178
189
self.console:watch('num rocks', '#the.rocks.sprites')
179
190
self.console:watch('num planets', '#the.planets.sprites')
191
self.console:watch('num enemies', 'the.enemies:count()')
192
self.console:watch('onPlanet', 'the.player.onPlanet')
180
193
--self.console:watch('drawTook', 'the.drawTook')
181
194
182
195
-- back off that dark overlay a bit
185
198
end,
186
199
onUpdate = function (self, dt)
187
200
if not (DEBUG and the.console.visible) then
188
if the.keys:justPressed('q') then
189
self.quit()
190
elseif the.keys:justPressed('return') then
191
if the.keys:pressed('alt') then
192
love.graphics.toggleFullscreen()
193
else
194
self.view = GameView:new()
195
end
201
if the.keys:justPressed('return') and the.keys:pressed('alt') then
202
love.graphics.toggleFullscreen()
196
203
elseif the.keys:justPressed('f1') then
197
204
local ss = love.graphics.newScreenshot()
198
205
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1