/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-15 16:59:30 UTC
  • Revision ID: josh@9ix.org-20130615165930-iud659qdwcvjlnoh
beginnings of trading interface

Show diffs side-by-side

added added

removed removed

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