/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-11 00:15:54 UTC
  • Revision ID: josh@9ix.org-20130611001554-tkzp73ke16buhnuy
bring indicators a little closer from edge

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
19
 
require 'planet'
20
 
require 'trade_view'
21
19
 
22
20
util = {
23
21
   signOf = function(value)
73
71
}
74
72
 
75
73
GameView = View:extend {
 
74
   lastRock = 0,
 
75
   rockInterval = 1,
 
76
   gameStart = 0,
76
77
   onNew = function (self)
 
78
              -- for x = 1,30 do
 
79
              --    for y = 1,30 do
 
80
              --       self:add(Fill:new{x=x*400, y=y*400,
 
81
              --                         width = 32, height = 32,
 
82
              --                         fill = {0,0,255}
 
83
              --                      })
 
84
              --    end
 
85
              -- end
 
86
 
77
87
              the.storage = Storage:new{filename = 'scores.lua'}
78
88
              the.storage:load()
79
 
              --if not the.storage.data.highScore then
80
 
              --   print('initializing storage')
81
 
              --   the.storage.data = {highScore = 0}
82
 
              --end
 
89
              if not the.storage.data.highScore then
 
90
                 print('initializing storage')
 
91
                 the.storage.data = {highScore = 0}
 
92
              end
83
93
 
 
94
              --the.rockColliders = Group:new()
84
95
              the.bullets = Group:new()
 
96
              the.mirrors = Group:new()
 
97
              --the.rocks = Group:new()
85
98
              the.interface = Group:new()
86
99
              the.planets = Group:new()
87
100
              the.indicators = Group:new()
96
109
              self:add(the.planets)
97
110
 
98
111
              --the.player = CrystalPlayer:new{x=400,y=300}
99
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
112
              the.player = SpacePlayer:new{x=1366,y=768}
100
113
              self:add(the.player)
101
114
              self:add(the.player.thrust)
102
115
 
103
 
              local e = Enemy:new{x=400, y=300}
104
 
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
105
 
              self:add(e)
106
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
116
              --self:add(Enemy:new{x=400, y=300})
107
117
 
108
118
              self:add(the.bullets)
 
119
              --self:add(the.rockColliders)
 
120
              self:add(the.mirrors)
 
121
              --self:add(the.rocks)
109
122
              self:add(the.indicators)
110
123
              self:add(the.interface)
111
124
 
112
125
              for _ = 1, math.random(6) do
113
 
                 local planet = Planet:new{
 
126
                 local planet = Tile:new{
 
127
                    image = 'data/planet1.png',
114
128
                    x = math.random(the.app.width / 2,
115
129
                                    the.bg.width - the.app.width / 2),
116
130
                    y = math.random(the.app.height / 2,
118
132
                    rotation = math.random() * math.pi
119
133
                 }
120
134
                 the.planets:add(planet)
 
135
 
 
136
                 planet.indicator = Tile:new{
 
137
                    image = 'data/planet1ind.png',
 
138
                 }
 
139
                 the.indicators:add(planet.indicator)
121
140
              end
122
141
 
123
142
              the.cursor = Cursor:new()
124
143
              self:add(the.cursor)
125
144
 
 
145
              the.score = Text:new{
 
146
                 x = 8,
 
147
                 y = 8,
 
148
                 width = the.app.width,
 
149
                 --align = 'center',
 
150
                 font = 25}
 
151
              --the.interface:add(the.score)
 
152
 
 
153
              local hs = the.storage.data.highScore
 
154
              local m = hs / 60
 
155
              local s = hs % 60
 
156
 
 
157
              the.highScore = Text:new{
 
158
                 x = -8,
 
159
                 y = 8,
 
160
                 width = the.app.width,
 
161
                 align = 'right',
 
162
                 font = 25,
 
163
                 text = string.format('High Score: %d:%02d', m, s)
 
164
              }
 
165
              --the.interface:add(the.highScore)
 
166
 
 
167
              the.over = Text:new{
 
168
                 y = the.app.height / 2,
 
169
                 width = the.app.width,
 
170
                 align = 'center',
 
171
                 font = 25,
 
172
                 text = "Game Over",
 
173
                 visible = false
 
174
              }
 
175
              the.interface:add(the.over)
 
176
 
 
177
 
 
178
              the.instructions = Text:new{
 
179
                 y = the.app.height / 2 + 32,
 
180
                 width = the.app.width,
 
181
                 align = 'center',
 
182
                 font = 12,
 
183
                 text = "Press Enter to start a new game\nPress Q to quit",
 
184
                 visible = false
 
185
              }
 
186
              the.interface:add(the.instructions)
 
187
 
126
188
              love.mouse.setGrab(true)
127
189
              love.mouse.setVisible(false)
128
190
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
129
191
 
 
192
              --self:loadLayers('data/map.lua')
130
193
              self.focus = the.player
 
194
              --self:clampTo(self.map)
 
195
 
 
196
              self.gameStart = love.timer.getTime()
131
197
           end,
132
198
   onUpdate = function(self, dt)
133
 
                 the.bullets:collide(the.planets)
 
199
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
200
                    local unseenRock = nil
 
201
                    while not unseenRock do
 
202
                       local rock = Rock:new{
 
203
                          x = math.random(the.app.width / 2,
 
204
                                          the.bg.width - the.app.width / 2),
 
205
                          y = math.random(the.app.height / 2,
 
206
                                          the.bg.height - the.app.height / 2),
 
207
                          velocity = {
 
208
                             x = math.random(-300, 300),
 
209
                             y = math.random(-300, 300),
 
210
                             rotation = math.random(-7, 7)
 
211
                          },
 
212
                          scale = math.random() + 0.5
 
213
                       }
 
214
 
 
215
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
216
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
217
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
218
                         unseenRock = rock
 
219
                        end
 
220
                    end
 
221
 
 
222
                    the.rocks:add(unseenRock)
 
223
 
 
224
                    self.lastRock = love.timer.getTime()
 
225
                 end
 
226
 
 
227
                 the.bullets:collide(the.rockColliders)
 
228
 
 
229
                 -- this should really go somewhere else...
 
230
                 for _, planet in ipairs(the.planets.sprites) do
 
231
                    local indx, indy
 
232
                    local pvec = vector.new(
 
233
                       planet.x - the.player.x + planet.width / 2,
 
234
                       planet.y - the.player.y + planet.height / 2 )
 
235
 
 
236
                    -- TODO: is there a better way to specify the
 
237
                    -- screen rectangle?
 
238
                    if planet:intersects(the.player.x - the.app.width / 2,
 
239
                                         the.player.y - the.app.height / 2,
 
240
                                         the.app.width,
 
241
                                         the.app.height) then
 
242
                       -- planet is on the screen
 
243
                       planet.indicator.visible = false
 
244
                    else
 
245
                       planet.indicator.visible = true
 
246
 
 
247
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
 
248
                          indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
 
249
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
 
250
                       else
 
251
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
 
252
                          indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
 
253
                       end
 
254
 
 
255
                       planet.indicator.x = the.player.x + indx
 
256
                       planet.indicator.y = the.player.y + indy
 
257
                    end
 
258
                 end
 
259
 
 
260
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
 
261
                 --    if not mirror.of then
 
262
                 --       print('mirror:' .. inspect(mirror))
 
263
                 --       error('mirror OF NOTHING')
 
264
                 --    end
 
265
                 -- end
134
266
              end,
135
267
   onEndFrame = function(self)
136
268
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
137
269
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
270
 
 
271
                   if the.player.active then
 
272
                      self:updateScore()
 
273
                   end
138
274
                end,
139
275
   draw = function (self, x, y)
140
276
             View.draw(self, x, y)
141
277
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
142
278
          end,
 
279
   updateScore = function(self)
 
280
                    local t = love.timer.getTime() - self.gameStart
 
281
                    local m = t / 60
 
282
                    local s = t % 60
 
283
 
 
284
                    the.score.text = string.format('Score: %d:%02d', m, s)
 
285
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
286
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
287
 
 
288
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
289
                    --the.highScore.x = the.player.x - the.app.width / 2
 
290
                 end
143
291
}
144
292
 
145
293
MenuScreen = View:extend {