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 64
- compare with another revision
- download diff
- download tarball
- view history from revision 64
- Committer: Josh C
- Date: 2013-06-16 03:58:19 UTC
- Revision ID: josh@9ix.org-20130616035819-y3jhfpuogpmy7se4
more old code cleanup
added
removed
main.lua
18
18
require 'boom'
19
19
require 'planet'
20
20
require 'trade_view'
21
require 'shield'
22
require 'pause_view'
23
require 'game_over'
24
require 'names'
25
require 'good'
26
21
27
22
util = {
28
23
signOf = function(value)
32
27
return -1
33
28
end
34
29
end,
30
shortestVector = function(from, to)
31
if STRICT then
32
if from.x < the.app.width / 2 or
33
from.x > the.bg.width - the.app.width / 2 or
34
from.y < the.app.height / 2 or
35
from.y > the.bg.height - the.app.height / 2 then
36
error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
37
end
38
39
if to.x < the.app.width / 2 or
40
to.x > the.bg.width - the.app.width / 2 or
41
to.y < the.app.height / 2 or
42
to.y > the.bg.height - the.app.height / 2 then
43
error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
44
end
45
end
46
47
-- normalize grid to account for mirror zones
48
local fx = from.x - the.app.width / 2
49
local fy = from.y - the.app.height / 2
50
local tx = to.x - the.app.width / 2
51
local ty = to.y - the.app.height / 2
52
53
local short = {}
54
55
-- pick shorter x
56
if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
57
-- straight path is shorter
58
short.x = tx - fx
59
else
60
short.x = tx - fx - (the.bg.width - the.app.width)
61
end
62
63
-- pick shorter y
64
if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
65
-- straight path is shorter
66
short.y = ty - fy
67
else
68
short.y = ty - fy - (the.bg.height - the.app.height)
69
end
70
71
return vector.new(short.x, short.y)
72
end
35
73
}
36
74
37
75
GameView = View:extend {
38
76
onNew = function (self)
39
the.storage = Storage:new{filename = 'world.lua'}
77
the.storage = Storage:new{filename = 'scores.lua'}
40
78
the.storage:load()
41
79
--if not the.storage.data.highScore then
42
80
-- print('initializing storage')
46
84
the.bullets = Group:new()
47
85
the.interface = Group:new()
48
86
the.planets = Group:new()
49
the.planetLabels = Group:new()
50
87
the.indicators = Group:new()
51
the.enemies = Group:new()
52
88
53
-- init bg before build/load since planets need to know bg size
54
89
the.bg = Tile:new{
55
90
image = 'data/stars3.png',
56
width = 27320,
57
height = 15360
91
width = 13660,
92
height = 7680
58
93
}
59
94
self:add(the.bg)
60
95
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
109
96
self:add(the.planets)
110
self:add(the.planetLabels)
111
97
98
--the.player = CrystalPlayer:new{x=400,y=300}
99
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
100
self:add(the.player)
113
101
self:add(the.player.thrust)
114
self:add(the.player.shield)
115
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
102
103
--self:add(Enemy:new{x=400, y=300})
126
104
127
105
self:add(the.bullets)
128
106
self:add(the.indicators)
129
107
self:add(the.interface)
130
108
109
for _ = 1, math.random(6) do
110
local planet = Planet:new{
111
x = math.random(the.app.width / 2,
112
the.bg.width - the.app.width / 2),
113
y = math.random(the.app.height / 2,
114
the.bg.height - the.app.height / 2),
115
rotation = math.random() * math.pi
116
}
117
the.planets:add(planet)
118
end
119
131
120
the.cursor = Cursor:new()
132
121
self:add(the.cursor)
133
122
138
127
self.focus = the.player
139
128
end,
140
129
onUpdate = function(self, dt)
141
if the.keys:justPressed('escape') then
142
PauseView:new():activate()
143
end
144
145
130
the.bullets:collide(the.planets)
146
the.bullets:collide(the.player)
147
the.bullets:collide(the.enemies)
148
131
end,
149
132
onEndFrame = function(self)
150
133
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
188
171
self.console:watch('num mirrors', '#the.mirrors.sprites')
189
172
self.console:watch('num rocks', '#the.rocks.sprites')
190
173
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')
193
self.console:watch('kills', 'the.player.kills')
194
174
--self.console:watch('drawTook', 'the.drawTook')
195
175
196
176
-- back off that dark overlay a bit
199
179
end,
200
180
onUpdate = function (self, dt)
201
181
if not (DEBUG and the.console.visible) then
202
if the.keys:justPressed('return') and the.keys:pressed('alt') then
203
love.graphics.toggleFullscreen()
182
if the.keys:justPressed('q') then
183
self.quit()
184
elseif the.keys:justPressed('return') then
185
if the.keys:pressed('alt') then
186
love.graphics.toggleFullscreen()
187
else
188
self.view = GameView:new()
189
end
204
190
elseif the.keys:justPressed('f1') then
205
191
local ss = love.graphics.newScreenshot()
206
192
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1