/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-05-13 20:26:30 UTC
  • Revision ID: josh@9ix.org-20130513202630-jd3tf1rr5zp3gbcm
move player around looping world

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