/traderous

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

« back to all changes in this revision

Viewing changes to main.lua

  • 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--__ = require 'underscore'
6
5
vector = require 'vector'
 
6
--inspect = require 'inspect'
7
7
 
8
8
require 'group'
9
9
 
10
10
require 'version'
11
11
require 'wrap_tile'
 
12
require 'mirror'
12
13
require 'player'
13
14
require 'enemy'
14
15
require 'cursor'
15
16
require 'bullet'
 
17
require 'rock'
 
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
 
21
require 'shield'
 
22
require 'pause_view'
 
23
require 'game_over'
 
24
require 'names'
 
25
require 'good'
16
26
 
17
27
util = {
18
28
   signOf = function(value)
21
31
               else
22
32
                  return -1
23
33
               end
24
 
            end
 
34
            end,
25
35
}
26
36
 
27
37
GameView = View:extend {
28
38
   onNew = function (self)
29
 
              -- for x = 1,30 do
30
 
              --    for y = 1,30 do
31
 
              --       self:add(Fill:new{x=x*400, y=y*400,
32
 
              --                         width = 32, height = 32,
33
 
              --                         fill = {0,0,255}
34
 
              --                      })
35
 
              --    end
36
 
              -- end
37
 
 
 
39
              the.storage = Storage:new{filename = 'world.lua'}
 
40
              the.storage:load()
 
41
              --if not the.storage.data.highScore then
 
42
              --   print('initializing storage')
 
43
              --   the.storage.data = {highScore = 0}
 
44
              --end
 
45
 
 
46
              the.bullets = Group:new()
 
47
              the.interface = Group:new()
 
48
              the.planets = Group:new()
 
49
              the.planetLabels = Group:new()
 
50
              the.indicators = Group:new()
 
51
              the.enemies = Group:new()
 
52
 
 
53
              -- init bg before build/load since planets need to know bg size
38
54
              the.bg = Tile:new{
39
55
                 image = 'data/stars3.png',
40
 
                 -- 1366x768 * 3
41
 
                 width = 4098,
42
 
                 height = 2304
 
56
                 width = 27320,
 
57
                 height = 15360
43
58
              }
44
59
              self:add(the.bg)
45
60
 
46
 
              --the.player = CrystalPlayer:new{x=400,y=300}
47
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
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
              self:add(the.planets)
 
110
              self:add(the.planetLabels)
 
111
 
48
112
              self:add(the.player)
49
 
 
50
 
              self:add(Enemy:new{x=400, y=300})
 
113
              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
 
126
 
 
127
              self:add(the.bullets)
 
128
              self:add(the.indicators)
 
129
              self:add(the.interface)
51
130
 
52
131
              the.cursor = Cursor:new()
53
132
              self:add(the.cursor)
54
133
 
55
134
              love.mouse.setGrab(true)
56
135
              love.mouse.setVisible(false)
 
136
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
57
137
 
58
 
              --self:loadLayers('data/map.lua')
59
138
              self.focus = the.player
60
 
              --self:clampTo(self.map)
61
139
           end,
 
140
   onUpdate = function(self, dt)
 
141
                 if the.keys:justPressed('escape') then
 
142
                    PauseView:new():activate()
 
143
                 end
 
144
 
 
145
                 the.bullets:collide(the.planets)
 
146
                 the.bullets:collide(the.player)
 
147
                 the.bullets:collide(the.enemies)
 
148
              end,
 
149
   onEndFrame = function(self)
 
150
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
151
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
152
                end,
62
153
   draw = function (self, x, y)
63
154
             View.draw(self, x, y)
64
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
65
 
          end
 
155
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
156
          end,
66
157
}
67
158
 
68
159
MenuScreen = View:extend {
80
171
}
81
172
 
82
173
the.app = App:new {
 
174
   name = 'Traderous',
83
175
   onRun = function (self)
84
176
              print('Version: ' .. VERSION)
 
177
 
 
178
              math.randomseed(os.time())
 
179
 
85
180
              self.view = GameView:new()
 
181
 
86
182
              if DEBUG then
87
183
                 self.console:watch('VERSION', 'VERSION')
88
184
                 self.console:watch('updateTook', 'the.updateTook')
90
186
                 self.console:watch('the.player.y', 'the.player.y')
91
187
                 self.console:watch('the.app.width', 'the.app.width')
92
188
                 self.console:watch('the.app.height', 'the.app.height')
 
189
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
190
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
191
                 self.console:watch('num planets', '#the.planets.sprites')
 
192
                 self.console:watch('num enemies', 'the.enemies:count()')
 
193
                 self.console:watch('onPlanet', 'the.player.onPlanet')
 
194
                 self.console:watch('kills', 'the.player.kills')
93
195
                 --self.console:watch('drawTook', 'the.drawTook')
94
196
 
95
197
                 -- back off that dark overlay a bit
97
199
              end
98
200
           end,
99
201
   onUpdate = function (self, dt)
100
 
                 if the.keys:justPressed('escape') then
101
 
                    self.quit()
 
202
                 if not (DEBUG and the.console.visible) then
 
203
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
204
                       love.graphics.toggleFullscreen()
 
205
                    elseif the.keys:justPressed('f1') then
 
206
                       local ss = love.graphics.newScreenshot()
 
207
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
208
                    elseif the.keys:justPressed('f11') then
 
209
                       love.graphics.toggleFullscreen()
 
210
                    end
102
211
                 end
103
212
              end,
104
213
   update = function (self, dt)
109
218
               end
110
219
            end
111
220
}
 
221
 
 
222
realRun = love.run
 
223
function love.run()
 
224
   -- should fail silently if it can't go to fullscreen...
 
225
   love.graphics.toggleFullscreen()
 
226
 
 
227
   realRun()
 
228
end
 
 
b'\\ No newline at end of file'