/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 21:25:26 UTC
  • Revision ID: josh@9ix.org-20130513212526-3q6md6n9xzhcmoa6
and that fixes the corner bug

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
9
require 'wrap_tile'
12
 
require 'mirror'
13
10
require 'player'
14
11
require 'enemy'
15
12
require 'cursor'
16
13
require 'bullet'
17
 
require 'rock'
18
 
require 'boom'
19
 
require 'planet'
20
 
require 'trade_view'
21
 
require 'shield'
22
 
require 'pause_view'
23
14
 
24
15
util = {
25
16
   signOf = function(value)
28
19
               else
29
20
                  return -1
30
21
               end
31
 
            end,
 
22
            end
32
23
}
33
24
 
34
25
GameView = View:extend {
35
26
   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
 
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
 
50
36
              the.bg = Tile:new{
51
37
                 image = 'data/stars3.png',
52
 
                 width = 27320,
53
 
                 height = 15360
 
38
                 -- 1366x768 * 3
 
39
                 width = 4098,
 
40
                 height = 2304
54
41
              }
55
42
              self:add(the.bg)
56
43
 
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
 
 
 
44
              --the.player = CrystalPlayer:new{x=400,y=300}
 
45
              the.player = SpacePlayer:new{x=1366,y=768}
101
46
              self:add(the.player)
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)
 
47
 
 
48
              self:add(Enemy:new{x=400, y=300})
119
49
 
120
50
              the.cursor = Cursor:new()
121
51
              self:add(the.cursor)
122
52
 
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
 
 
144
53
              love.mouse.setGrab(true)
145
54
              love.mouse.setVisible(false)
146
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
147
55
 
 
56
              --self:loadLayers('data/map.lua')
148
57
              self.focus = the.player
 
58
              --self:clampTo(self.map)
149
59
           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,
163
60
   draw = function (self, x, y)
164
61
             View.draw(self, x, y)
165
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
166
 
          end,
 
62
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
63
          end
167
64
}
168
65
 
169
66
MenuScreen = View:extend {
183
80
the.app = App:new {
184
81
   onRun = function (self)
185
82
              print('Version: ' .. VERSION)
186
 
 
187
 
              math.randomseed(os.time())
188
 
 
189
83
              self.view = GameView:new()
190
 
 
191
84
              if DEBUG then
192
85
                 self.console:watch('VERSION', 'VERSION')
193
86
                 self.console:watch('updateTook', 'the.updateTook')
195
88
                 self.console:watch('the.player.y', 'the.player.y')
196
89
                 self.console:watch('the.app.width', 'the.app.width')
197
90
                 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()')
202
91
                 --self.console:watch('drawTook', 'the.drawTook')
203
92
 
204
93
                 -- back off that dark overlay a bit
206
95
              end
207
96
           end,
208
97
   onUpdate = function (self, dt)
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
 
98
                 if the.keys:justPressed('escape') then
 
99
                    self.quit()
218
100
                 end
219
101
              end,
220
102
   update = function (self, dt)
225
107
               end
226
108
            end
227
109
}
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'