/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:
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
 
 
99
36
              the.bg = Tile:new{
100
37
                 image = 'data/stars3.png',
101
38
                 -- 1366x768 * 3
108
45
              the.player = SpacePlayer:new{x=1366,y=768}
109
46
              self:add(the.player)
110
47
 
111
 
              --self:add(Enemy:new{x=400, y=300})
112
 
 
113
 
              self:add(the.bullets)
114
 
              self:add(the.rockColliders)
115
 
              self:add(the.mirrors)
116
 
              self:add(the.rocks)
 
48
              self:add(Enemy:new{x=400, y=300})
117
49
 
118
50
              the.cursor = Cursor:new()
119
51
              self:add(the.cursor)
120
52
 
121
 
              the.score = Text:new{
122
 
                 width = the.app.width,
123
 
                 align = 'center',
124
 
                 font = 25}
125
 
              self:add(the.score)
126
 
 
127
 
              local hs = the.storage.data.highScore
128
 
              local m = hs / 60
129
 
              local s = hs % 60
130
 
 
131
 
              the.highScore = Text:new{
132
 
                 width = the.app.width,
133
 
                 align = 'right',
134
 
                 font = 25,
135
 
                 text = string.format('High Score: %d:%02d', m, s)
136
 
              }
137
 
              self:add(the.highScore)
138
 
 
139
53
              love.mouse.setGrab(true)
140
54
              love.mouse.setVisible(false)
141
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
142
55
 
143
56
              --self:loadLayers('data/map.lua')
144
57
              self.focus = the.player
145
58
              --self:clampTo(self.map)
146
 
 
147
 
              self.gameStart = love.timer.getTime()
148
59
           end,
149
 
   onUpdate = function(self, dt)
150
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
151
 
                    local unseenRock = nil
152
 
                    while not unseenRock do
153
 
                       local rock = Rock:new{
154
 
                          x = math.random(the.app.width / 2,
155
 
                                          the.bg.width - the.app.width / 2),
156
 
                          y = math.random(the.app.height / 2,
157
 
                                          the.bg.height - the.app.height / 2),
158
 
                          velocity = {
159
 
                             x = math.random(-300, 300),
160
 
                             y = math.random(-300, 300),
161
 
                             rotation = math.random(-7, 7)
162
 
                          },
163
 
                          scale = math.random() + 0.5
164
 
                       }
165
 
 
166
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
167
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
168
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
169
 
                         unseenRock = rock
170
 
                        end
171
 
                    end
172
 
 
173
 
                    the.rocks:add(unseenRock)
174
 
 
175
 
                    self.lastRock = love.timer.getTime()
176
 
                 end
177
 
 
178
 
                 the.bullets:collide(the.rockColliders)
179
 
 
180
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
181
 
                 --    if not mirror.of then
182
 
                 --       print('mirror:' .. inspect(mirror))
183
 
                 --       error('mirror OF NOTHING')
184
 
                 --    end
185
 
                 -- end
186
 
              end,
187
 
   onEndFrame = function(self)
188
 
                   if the.player.active then
189
 
                      self:updateScore()
190
 
                   end
191
 
                end,
192
60
   draw = function (self, x, y)
193
61
             View.draw(self, x, y)
194
62
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
195
 
          end,
196
 
   updateScore = function(self)
197
 
                    local t = love.timer.getTime() - self.gameStart
198
 
                    local m = t / 60
199
 
                    local s = t % 60
200
 
 
201
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
202
 
                    the.score.y = the.player.y - the.app.height / 2 + the.player.height
203
 
                    the.score.x = the.player.x - the.app.width / 2
204
 
 
205
 
                    the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
206
 
                    the.highScore.x = the.player.x - the.app.width / 2
207
 
                 end
 
63
          end
208
64
}
209
65
 
210
66
MenuScreen = View:extend {
224
80
the.app = App:new {
225
81
   onRun = function (self)
226
82
              print('Version: ' .. VERSION)
227
 
 
228
 
              math.randomseed(os.time())
229
 
 
230
83
              self.view = GameView:new()
231
84
              if DEBUG then
232
85
                 self.console:watch('VERSION', 'VERSION')
235
88
                 self.console:watch('the.player.y', 'the.player.y')
236
89
                 self.console:watch('the.app.width', 'the.app.width')
237
90
                 self.console:watch('the.app.height', 'the.app.height')
238
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
239
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
240
91
                 --self.console:watch('drawTook', 'the.drawTook')
241
92
 
242
93
                 -- back off that dark overlay a bit