/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-16 03:58:19 UTC
  • Revision ID: josh@9ix.org-20130616035819-y3jhfpuogpmy7se4
more old code cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
 
6
--inspect = require 'inspect'
6
7
 
7
8
require 'group'
8
9
 
15
16
require 'bullet'
16
17
require 'rock'
17
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
18
21
 
19
22
util = {
20
23
   signOf = function(value)
70
73
}
71
74
 
72
75
GameView = View:extend {
73
 
   lastRock = 0,
74
 
   rockInterval = 1,
75
 
   gameStart = 0,
76
76
   onNew = function (self)
77
 
              -- for x = 1,30 do
78
 
              --    for y = 1,30 do
79
 
              --       self:add(Fill:new{x=x*400, y=y*400,
80
 
              --                         width = 32, height = 32,
81
 
              --                         fill = {0,0,255}
82
 
              --                      })
83
 
              --    end
84
 
              -- end
 
77
              the.storage = Storage:new{filename = 'scores.lua'}
 
78
              the.storage:load()
 
79
              --if not the.storage.data.highScore then
 
80
              --   print('initializing storage')
 
81
              --   the.storage.data = {highScore = 0}
 
82
              --end
85
83
 
86
 
              the.rockColliders = Group:new()
87
84
              the.bullets = Group:new()
88
 
              the.mirrors = Group:new()
89
 
              the.rocks = Group:new()
 
85
              the.interface = Group:new()
 
86
              the.planets = Group:new()
 
87
              the.indicators = Group:new()
90
88
 
91
89
              the.bg = Tile:new{
92
90
                 image = 'data/stars3.png',
93
 
                 -- 1366x768 * 3
94
 
                 width = 4098,
95
 
                 height = 2304
 
91
                 width = 13660,
 
92
                 height = 7680
96
93
              }
97
94
              self:add(the.bg)
98
95
 
 
96
              self:add(the.planets)
 
97
 
99
98
              --the.player = CrystalPlayer:new{x=400,y=300}
100
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
99
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
101
100
              self:add(the.player)
 
101
              self:add(the.player.thrust)
102
102
 
103
103
              --self:add(Enemy:new{x=400, y=300})
104
104
 
105
105
              self:add(the.bullets)
106
 
              self:add(the.rockColliders)
107
 
              self:add(the.mirrors)
108
 
              self:add(the.rocks)
 
106
              self:add(the.indicators)
 
107
              self:add(the.interface)
 
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
109
119
 
110
120
              the.cursor = Cursor:new()
111
121
              self:add(the.cursor)
112
122
 
113
 
              the.score = Text:new{
114
 
                 width = the.app.width,
115
 
                 align = 'center',
116
 
                 font = 25}
117
 
              self:add(the.score)
118
 
 
119
123
              love.mouse.setGrab(true)
120
124
              love.mouse.setVisible(false)
121
125
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
122
126
 
123
 
              --self:loadLayers('data/map.lua')
124
127
              self.focus = the.player
125
 
              --self:clampTo(self.map)
126
 
 
127
 
              self.gameStart = love.timer.getTime()
128
128
           end,
129
129
   onUpdate = function(self, dt)
130
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
131
 
                    local unseenRock = nil
132
 
                    while not unseenRock do
133
 
                       local rock = Rock:new{
134
 
                          x = math.random(the.app.width / 2,
135
 
                                          the.bg.width - the.app.width / 2),
136
 
                          y = math.random(the.app.height / 2,
137
 
                                          the.bg.height - the.app.height / 2),
138
 
                          velocity = {
139
 
                             x = math.random(-300, 300),
140
 
                             y = math.random(-300, 300),
141
 
                             rotation = math.random(-7, 7)
142
 
                          },
143
 
                          scale = math.random() + 0.5
144
 
                       }
145
 
 
146
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
147
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
148
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
149
 
                         unseenRock = rock
150
 
                        end
151
 
                    end
152
 
 
153
 
                    the.rocks:add(unseenRock)
154
 
 
155
 
                    self.lastRock = love.timer.getTime()
156
 
                 end
157
 
 
158
 
                 the.bullets:collide(the.rockColliders)
 
130
                 the.bullets:collide(the.planets)
159
131
              end,
160
132
   onEndFrame = function(self)
161
 
                   if the.player.active then
162
 
                      local t = love.timer.getTime() - self.gameStart
163
 
                      local m = t / 60
164
 
                      local s = t % 60
165
 
 
166
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
167
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
168
 
                      the.score.x = the.player.x - the.app.width / 2
169
 
                   end
 
133
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
134
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
170
135
                end,
171
136
   draw = function (self, x, y)
172
137
             View.draw(self, x, y)
173
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
174
 
          end
 
138
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
139
          end,
175
140
}
176
141
 
177
142
MenuScreen = View:extend {
195
160
              math.randomseed(os.time())
196
161
 
197
162
              self.view = GameView:new()
 
163
 
198
164
              if DEBUG then
199
165
                 self.console:watch('VERSION', 'VERSION')
200
166
                 self.console:watch('updateTook', 'the.updateTook')
202
168
                 self.console:watch('the.player.y', 'the.player.y')
203
169
                 self.console:watch('the.app.width', 'the.app.width')
204
170
                 self.console:watch('the.app.height', 'the.app.height')
 
171
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
172
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
173
                 self.console:watch('num planets', '#the.planets.sprites')
205
174
                 --self.console:watch('drawTook', 'the.drawTook')
206
175
 
207
176
                 -- back off that dark overlay a bit
209
178
              end
210
179
           end,
211
180
   onUpdate = function (self, dt)
212
 
                 if the.keys:justPressed('escape') then
213
 
                    self.quit()
 
181
                 if not (DEBUG and the.console.visible) then
 
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
 
190
                    elseif the.keys:justPressed('f1') then
 
191
                       local ss = love.graphics.newScreenshot()
 
192
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
193
                    elseif the.keys:justPressed('f11') then
 
194
                       love.graphics.toggleFullscreen()
 
195
                    end
214
196
                 end
215
197
              end,
216
198
   update = function (self, dt)
221
203
               end
222
204
            end
223
205
}
 
206
 
 
207
realRun = love.run
 
208
function love.run()
 
209
   -- should fail silently if it can't go to fullscreen...
 
210
   love.graphics.toggleFullscreen()
 
211
 
 
212
   realRun()
 
213
end
 
 
b'\\ No newline at end of file'