/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-06-25 19:55:40 UTC
  • Revision ID: josh@9ix.org-20130625195540-f4nwz7ffj9f6658a
patch zoetrope storage so it can save lists (arrays indexed by number)

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
 
 
8
require 'group'
7
9
 
8
10
require 'version'
9
11
require 'wrap_tile'
 
12
require 'mirror'
10
13
require 'player'
11
14
require 'enemy'
12
15
require 'cursor'
13
16
require 'bullet'
 
17
require 'rock'
 
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
 
21
require 'shield'
 
22
require 'pause_view'
14
23
 
15
24
util = {
16
25
   signOf = function(value)
19
28
               else
20
29
                  return -1
21
30
               end
22
 
            end
 
31
            end,
23
32
}
24
33
 
25
34
GameView = View:extend {
26
35
   onNew = function (self)
27
 
              -- for x = 1,30 do
28
 
              --    for y = 1,30 do
29
 
              --       self:add(Fill:new{x=x*400, y=y*400,
30
 
              --                         width = 32, height = 32,
31
 
              --                         fill = {0,0,255}
32
 
              --                      })
33
 
              --    end
34
 
              -- end
35
 
 
 
36
              the.storage = Storage:new{filename = 'world.lua'}
 
37
              the.storage:load()
 
38
              --if not the.storage.data.highScore then
 
39
              --   print('initializing storage')
 
40
              --   the.storage.data = {highScore = 0}
 
41
              --end
 
42
 
 
43
              the.bullets = Group:new()
 
44
              the.interface = Group:new()
 
45
              the.planets = Group:new()
 
46
              the.indicators = Group:new()
 
47
              the.enemies = Group:new()
 
48
 
 
49
              -- init bg before build/load since planets need to know bg size
36
50
              the.bg = Tile:new{
37
51
                 image = 'data/stars3.png',
38
 
                 -- 1366x768 * 3
39
 
                 width = 4098,
40
 
                 height = 2304
 
52
                 width = 27320,
 
53
                 height = 15360
41
54
              }
42
55
              self:add(the.bg)
43
56
 
44
 
              --the.player = CrystalPlayer:new{x=400,y=300}
45
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
57
              if self.newWorld or not the.storage.data.player then
 
58
                 the.storage.data = {planets = {}}
 
59
 
 
60
                 -- build planets from random
 
61
                 for _ = 1, math.random(3, 6) do
 
62
                    local planet = Planet:new{
 
63
                       x = math.random(the.app.width / 2,
 
64
                                       the.bg.width - the.app.width / 2),
 
65
                       y = math.random(the.app.height / 2,
 
66
                                       the.bg.height - the.app.height / 2),
 
67
                       rotation = math.random() * math.pi
 
68
                    }
 
69
                    the.planets:add(planet)
 
70
                    table.insert(the.storage.data.planets, {
 
71
                                    x = planet.x,
 
72
                                    y = planet.y,
 
73
                                    rotation = planet.rotation,
 
74
                                    goods = planet.goods
 
75
                                 })
 
76
                 end
 
77
 
 
78
                 -- build fresh player
 
79
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
80
                 the.player = player
 
81
                 the.storage.data.player = {x = player.x,
 
82
                                            y = player.y,
 
83
                                            money = player.money,
 
84
                                            goods = player.goods,
 
85
                                            cargoSpace = player.cargoSpace
 
86
                                         }
 
87
 
 
88
                 the.storage:save()
 
89
              else
 
90
                 -- load planets with x, y, goods
 
91
                 for _, planetData in ipairs(the.storage.data.planets) do
 
92
                    the.planets:add(Planet:new(planetData))
 
93
                 end
 
94
 
 
95
                 -- load player with cargo, money, position
 
96
                 the.player = SpacePlayer:new(the.storage.data.player)
 
97
              end
 
98
 
 
99
              self:add(the.planets)
 
100
 
46
101
              self:add(the.player)
47
 
 
48
 
              self:add(Enemy:new{x=400, y=300})
 
102
              self:add(the.player.thrust)
 
103
              self:add(the.player.shield)
 
104
 
 
105
              self:add(the.enemies)
 
106
 
 
107
              for _ = 1, 20 do
 
108
                 local e = Enemy:new{x = math.random(the.bg.width),
 
109
                                     y = math.random(the.bg.height)}
 
110
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
111
                 the.enemies:add(e)
 
112
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
113
                 self:add(e.shield)
 
114
              end
 
115
 
 
116
              self:add(the.bullets)
 
117
              self:add(the.indicators)
 
118
              self:add(the.interface)
49
119
 
50
120
              the.cursor = Cursor:new()
51
121
              self:add(the.cursor)
52
122
 
 
123
              the.over = Text:new{
 
124
                 y = the.app.height / 2,
 
125
                 width = the.app.width,
 
126
                 align = 'center',
 
127
                 font = 25,
 
128
                 text = "Game Over",
 
129
                 visible = false
 
130
              }
 
131
              the.interface:add(the.over)
 
132
 
 
133
 
 
134
              the.instructions = Text:new{
 
135
                 y = the.app.height / 2 + 32,
 
136
                 width = the.app.width,
 
137
                 align = 'center',
 
138
                 font = 12,
 
139
                 text = "Press Enter to start a new game\nPress Q to quit",
 
140
                 visible = false
 
141
              }
 
142
              the.interface:add(the.instructions)
 
143
 
53
144
              love.mouse.setGrab(true)
54
145
              love.mouse.setVisible(false)
 
146
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
55
147
 
56
 
              --self:loadLayers('data/map.lua')
57
148
              self.focus = the.player
58
 
              --self:clampTo(self.map)
59
149
           end,
 
150
   onUpdate = function(self, dt)
 
151
                 if the.keys:justPressed('escape') then
 
152
                    PauseView:new():activate()
 
153
                 end
 
154
 
 
155
                 the.bullets:collide(the.planets)
 
156
                 the.bullets:collide(the.player)
 
157
                 the.bullets:collide(the.enemies)
 
158
              end,
 
159
   onEndFrame = function(self)
 
160
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
161
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
162
                end,
60
163
   draw = function (self, x, y)
61
164
             View.draw(self, x, y)
62
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
63
 
          end
 
165
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
166
          end,
64
167
}
65
168
 
66
169
MenuScreen = View:extend {
80
183
the.app = App:new {
81
184
   onRun = function (self)
82
185
              print('Version: ' .. VERSION)
 
186
 
 
187
              math.randomseed(os.time())
 
188
 
83
189
              self.view = GameView:new()
 
190
 
84
191
              if DEBUG then
85
192
                 self.console:watch('VERSION', 'VERSION')
86
193
                 self.console:watch('updateTook', 'the.updateTook')
88
195
                 self.console:watch('the.player.y', 'the.player.y')
89
196
                 self.console:watch('the.app.width', 'the.app.width')
90
197
                 self.console:watch('the.app.height', 'the.app.height')
 
198
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
199
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
200
                 self.console:watch('num planets', '#the.planets.sprites')
 
201
                 self.console:watch('num enemies', 'the.enemies:count()')
91
202
                 --self.console:watch('drawTook', 'the.drawTook')
 
203
 
 
204
                 -- back off that dark overlay a bit
 
205
                 self.console.fill.fill[4] = 75
92
206
              end
93
207
           end,
94
208
   onUpdate = function (self, dt)
95
 
                 if the.keys:justPressed('escape') then
96
 
                    self.quit()
 
209
                 if not (DEBUG and the.console.visible) then
 
210
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
211
                       love.graphics.toggleFullscreen()
 
212
                    elseif the.keys:justPressed('f1') then
 
213
                       local ss = love.graphics.newScreenshot()
 
214
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
215
                    elseif the.keys:justPressed('f11') then
 
216
                       love.graphics.toggleFullscreen()
 
217
                    end
97
218
                 end
98
219
              end,
99
220
   update = function (self, dt)
104
225
               end
105
226
            end
106
227
}
 
228
 
 
229
realRun = love.run
 
230
function love.run()
 
231
   -- should fail silently if it can't go to fullscreen...
 
232
   love.graphics.toggleFullscreen()
 
233
 
 
234
   realRun()
 
235
end
 
 
b'\\ No newline at end of file'