/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
14
 
20
15
util = {
21
16
   signOf = function(value)
24
19
               else
25
20
                  return -1
26
21
               end
27
 
            end,
28
 
   shortestVector = function(from, to)
29
 
                       if STRICT then
30
 
                          if from.x < the.app.width / 2 or
31
 
                             from.x > the.bg.width - the.app.width / 2 or
32
 
                             from.y < the.app.height / 2 or
33
 
                             from.y > the.bg.height - the.app.height / 2 then
34
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
35
 
                          end
36
 
 
37
 
                          if to.x < the.app.width / 2 or
38
 
                             to.x > the.bg.width - the.app.width / 2 or
39
 
                             to.y < the.app.height / 2 or
40
 
                             to.y > the.bg.height - the.app.height / 2 then
41
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
42
 
                          end
43
 
                       end
44
 
 
45
 
                       -- normalize grid to account for mirror zones
46
 
                       local fx = from.x - the.app.width / 2
47
 
                       local fy = from.y - the.app.height / 2
48
 
                       local tx = to.x - the.app.width / 2
49
 
                       local ty = to.y - the.app.height / 2
50
 
 
51
 
                       local short = {}
52
 
 
53
 
                       -- pick shorter x
54
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
55
 
                          -- straight path is shorter
56
 
                          short.x = tx - fx
57
 
                       else
58
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
59
 
                       end
60
 
 
61
 
                       -- pick shorter y
62
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
63
 
                          -- straight path is shorter
64
 
                          short.y = ty - fy
65
 
                       else
66
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
67
 
                       end
68
 
 
69
 
                       return vector.new(short.x, short.y)
70
 
                    end
 
22
            end
71
23
}
72
24
 
73
25
GameView = View:extend {
74
 
   lastRock = 0,
75
 
   rockInterval = 1,
76
 
   gameStart = 0,
77
26
   onNew = function (self)
78
27
              -- for x = 1,30 do
79
28
              --    for y = 1,30 do
84
33
              --    end
85
34
              -- end
86
35
 
87
 
              the.storage = Storage:new{filename = 'scores.lua'}
88
 
              the.storage:load()
89
 
              if not the.storage.data.highScore then
90
 
                 print('initializing storage')
91
 
                 the.storage.data = {highScore = 0}
92
 
              end
93
 
 
94
 
              the.rockColliders = Group:new()
95
 
              the.bullets = Group:new()
96
 
              the.mirrors = Group:new()
97
 
              the.rocks = Group:new()
98
 
              the.interface = Group:new()
99
 
 
100
36
              the.bg = Tile:new{
101
37
                 image = 'data/stars3.png',
102
38
                 -- 1366x768 * 3
109
45
              the.player = SpacePlayer:new{x=1366,y=768}
110
46
              self:add(the.player)
111
47
 
112
 
              --self:add(Enemy:new{x=400, y=300})
113
 
 
114
 
              self:add(the.bullets)
115
 
              self:add(the.rockColliders)
116
 
              self:add(the.mirrors)
117
 
              self:add(the.rocks)
118
 
              self:add(the.interface)
 
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.score = Text:new{
124
 
                 x = 8,
125
 
                 y = 8,
126
 
                 width = the.app.width,
127
 
                 --align = 'center',
128
 
                 font = 25}
129
 
              the.interface:add(the.score)
130
 
 
131
 
              local hs = the.storage.data.highScore
132
 
              local m = hs / 60
133
 
              local s = hs % 60
134
 
 
135
 
              the.highScore = Text:new{
136
 
                 x = -8,
137
 
                 y = 8,
138
 
                 width = the.app.width,
139
 
                 align = 'right',
140
 
                 font = 25,
141
 
                 text = string.format('High Score: %d:%02d', m, s)
142
 
              }
143
 
              the.interface:add(the.highScore)
144
 
 
145
 
              the.over = Text:new{
146
 
                 y = the.app.height / 2,
147
 
                 width = the.app.width,
148
 
                 align = 'center',
149
 
                 font = 25,
150
 
                 text = "Game Over",
151
 
                 visible = false
152
 
              }
153
 
              the.interface:add(the.over)
154
 
 
155
 
 
156
 
              the.instructions = Text:new{
157
 
                 y = the.app.height / 2 + 32,
158
 
                 width = the.app.width,
159
 
                 align = 'center',
160
 
                 font = 12,
161
 
                 text = "Press Enter to start a new game\nPress Q to quit",
162
 
                 visible = false
163
 
              }
164
 
              the.interface:add(the.instructions)
165
 
 
166
53
              love.mouse.setGrab(true)
167
54
              love.mouse.setVisible(false)
168
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
169
55
 
170
56
              --self:loadLayers('data/map.lua')
171
57
              self.focus = the.player
172
58
              --self:clampTo(self.map)
173
 
 
174
 
              self.gameStart = love.timer.getTime()
175
59
           end,
176
 
   onUpdate = function(self, dt)
177
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
178
 
                    local unseenRock = nil
179
 
                    while not unseenRock do
180
 
                       local rock = Rock:new{
181
 
                          x = math.random(the.app.width / 2,
182
 
                                          the.bg.width - the.app.width / 2),
183
 
                          y = math.random(the.app.height / 2,
184
 
                                          the.bg.height - the.app.height / 2),
185
 
                          velocity = {
186
 
                             x = math.random(-300, 300),
187
 
                             y = math.random(-300, 300),
188
 
                             rotation = math.random(-7, 7)
189
 
                          },
190
 
                          scale = math.random() + 0.5
191
 
                       }
192
 
 
193
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
194
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
195
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
196
 
                         unseenRock = rock
197
 
                        end
198
 
                    end
199
 
 
200
 
                    the.rocks:add(unseenRock)
201
 
 
202
 
                    self.lastRock = love.timer.getTime()
203
 
                 end
204
 
 
205
 
                 the.bullets:collide(the.rockColliders)
206
 
 
207
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
208
 
                 --    if not mirror.of then
209
 
                 --       print('mirror:' .. inspect(mirror))
210
 
                 --       error('mirror OF NOTHING')
211
 
                 --    end
212
 
                 -- end
213
 
              end,
214
 
   onEndFrame = function(self)
215
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
216
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
217
 
 
218
 
                   if the.player.active then
219
 
                      self:updateScore()
220
 
                   end
221
 
                end,
222
60
   draw = function (self, x, y)
223
61
             View.draw(self, x, y)
224
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
225
 
          end,
226
 
   updateScore = function(self)
227
 
                    local t = love.timer.getTime() - self.gameStart
228
 
                    local m = t / 60
229
 
                    local s = t % 60
230
 
 
231
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
232
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
233
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
234
 
 
235
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
236
 
                    --the.highScore.x = the.player.x - the.app.width / 2
237
 
                 end
 
62
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
63
          end
238
64
}
239
65
 
240
66
MenuScreen = View:extend {
254
80
the.app = App:new {
255
81
   onRun = function (self)
256
82
              print('Version: ' .. VERSION)
257
 
 
258
 
              math.randomseed(os.time())
259
 
 
260
83
              self.view = GameView:new()
261
84
              if DEBUG then
262
85
                 self.console:watch('VERSION', 'VERSION')
265
88
                 self.console:watch('the.player.y', 'the.player.y')
266
89
                 self.console:watch('the.app.width', 'the.app.width')
267
90
                 self.console:watch('the.app.height', 'the.app.height')
268
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
269
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
270
91
                 --self.console:watch('drawTook', 'the.drawTook')
271
92
 
272
93
                 -- back off that dark overlay a bit
274
95
              end
275
96
           end,
276
97
   onUpdate = function (self, dt)
277
 
                 if the.keys:justPressed('q') then
 
98
                 if the.keys:justPressed('escape') then
278
99
                    self.quit()
279
 
                 elseif the.keys:justPressed('return') then
280
 
                    self.view = GameView:new()
281
100
                 end
282
101
              end,
283
102
   update = function (self, dt)