/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-25 17:05:31 UTC
  • Revision ID: josh@9ix.org-20130625170531-4es1bgbdaf0q8sch
fix start new game

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
require 'boom'
19
19
require 'planet'
20
20
require 'trade_view'
 
21
require 'shield'
 
22
require 'pause_view'
21
23
 
22
24
util = {
23
25
   signOf = function(value)
27
29
                  return -1
28
30
               end
29
31
            end,
30
 
   shortestVector = function(from, to)
31
 
                       if STRICT then
32
 
                          if from.x < the.app.width / 2 or
33
 
                             from.x > the.bg.width - the.app.width / 2 or
34
 
                             from.y < the.app.height / 2 or
35
 
                             from.y > the.bg.height - the.app.height / 2 then
36
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
37
 
                          end
38
 
 
39
 
                          if to.x < the.app.width / 2 or
40
 
                             to.x > the.bg.width - the.app.width / 2 or
41
 
                             to.y < the.app.height / 2 or
42
 
                             to.y > the.bg.height - the.app.height / 2 then
43
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
44
 
                          end
45
 
                       end
46
 
 
47
 
                       -- normalize grid to account for mirror zones
48
 
                       local fx = from.x - the.app.width / 2
49
 
                       local fy = from.y - the.app.height / 2
50
 
                       local tx = to.x - the.app.width / 2
51
 
                       local ty = to.y - the.app.height / 2
52
 
 
53
 
                       local short = {}
54
 
 
55
 
                       -- pick shorter x
56
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
57
 
                          -- straight path is shorter
58
 
                          short.x = tx - fx
59
 
                       else
60
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
61
 
                       end
62
 
 
63
 
                       -- pick shorter y
64
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
65
 
                          -- straight path is shorter
66
 
                          short.y = ty - fy
67
 
                       else
68
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
69
 
                       end
70
 
 
71
 
                       return vector.new(short.x, short.y)
72
 
                    end
73
32
}
74
33
 
75
34
GameView = View:extend {
76
 
   lastRock = 0,
77
 
   rockInterval = 1,
78
 
   gameStart = 0,
79
35
   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
 
 
89
36
              the.storage = Storage:new{filename = 'scores.lua'}
90
37
              the.storage:load()
91
 
              if not the.storage.data.highScore then
92
 
                 print('initializing storage')
93
 
                 the.storage.data = {highScore = 0}
94
 
              end
 
38
              --if not the.storage.data.highScore then
 
39
              --   print('initializing storage')
 
40
              --   the.storage.data = {highScore = 0}
 
41
              --end
95
42
 
96
 
              --the.rockColliders = Group:new()
97
43
              the.bullets = Group:new()
98
 
              the.mirrors = Group:new()
99
 
              --the.rocks = Group:new()
100
44
              the.interface = Group:new()
101
45
              the.planets = Group:new()
102
46
              the.indicators = Group:new()
 
47
              the.enemies = Group:new()
103
48
 
104
49
              the.bg = Tile:new{
105
50
                 image = 'data/stars3.png',
106
 
                 width = 13660,
107
 
                 height = 7680
 
51
                 width = 27320,
 
52
                 height = 15360
108
53
              }
109
54
              self:add(the.bg)
110
55
 
114
59
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
115
60
              self:add(the.player)
116
61
              self:add(the.player.thrust)
117
 
 
118
 
              --self:add(Enemy:new{x=400, y=300})
 
62
              self:add(the.player.shield)
 
63
 
 
64
              self:add(the.enemies)
 
65
 
 
66
              for _ = 1, 20 do
 
67
                 local e = Enemy:new{x = math.random(the.bg.width),
 
68
                                     y = math.random(the.bg.height)}
 
69
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
70
                 the.enemies:add(e)
 
71
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
72
                 self:add(e.shield)
 
73
              end
119
74
 
120
75
              self:add(the.bullets)
121
 
              --self:add(the.rockColliders)
122
 
              self:add(the.mirrors)
123
 
              --self:add(the.rocks)
124
76
              self:add(the.indicators)
125
77
              self:add(the.interface)
126
78
 
127
 
              for _ = 1, math.random(6) do
 
79
              for _ = 1, math.random(3, 6) do
128
80
                 local planet = Planet:new{
129
81
                    x = math.random(the.app.width / 2,
130
82
                                    the.bg.width - the.app.width / 2),
138
90
              the.cursor = Cursor:new()
139
91
              self:add(the.cursor)
140
92
 
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
93
              the.over = Text:new{
164
94
                 y = the.app.height / 2,
165
95
                 width = the.app.width,
185
115
              love.mouse.setVisible(false)
186
116
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
187
117
 
188
 
              --self:loadLayers('data/map.lua')
189
118
              self.focus = the.player
190
 
              --self:clampTo(self.map)
191
 
 
192
 
              self.gameStart = love.timer.getTime()
193
119
           end,
194
120
   onUpdate = function(self, dt)
 
121
                 if the.keys:justPressed('escape') then
 
122
                    PauseView:new():activate()
 
123
                 end
 
124
 
195
125
                 the.bullets:collide(the.planets)
196
 
 
197
 
                 -- this should really go somewhere else...
198
 
                 for _, planet in ipairs(the.planets.sprites) do
199
 
                 end
200
 
 
201
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
202
 
                 --    if not mirror.of then
203
 
                 --       print('mirror:' .. inspect(mirror))
204
 
                 --       error('mirror OF NOTHING')
205
 
                 --    end
206
 
                 -- end
 
126
                 the.bullets:collide(the.player)
 
127
                 the.bullets:collide(the.enemies)
207
128
              end,
208
129
   onEndFrame = function(self)
209
130
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
210
131
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
211
 
 
212
 
                   if the.player.active then
213
 
                      self:updateScore()
214
 
                   end
215
132
                end,
216
133
   draw = function (self, x, y)
217
134
             View.draw(self, x, y)
218
135
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
219
136
          end,
220
 
   updateScore = function(self)
221
 
                    local t = love.timer.getTime() - self.gameStart
222
 
                    local m = t / 60
223
 
                    local s = t % 60
224
 
 
225
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
226
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
227
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
228
 
 
229
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
230
 
                    --the.highScore.x = the.player.x - the.app.width / 2
231
 
                 end
232
137
}
233
138
 
234
139
MenuScreen = View:extend {
271
176
           end,
272
177
   onUpdate = function (self, dt)
273
178
                 if not (DEBUG and the.console.visible) then
274
 
                    if the.keys:justPressed('q') then
275
 
                       self.quit()
276
 
                    elseif the.keys:justPressed('return') then
277
 
                       if the.keys:pressed('alt') then
278
 
                          love.graphics.toggleFullscreen()
279
 
                       else
280
 
                          self.view = GameView:new()
281
 
                       end
 
179
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
180
                       love.graphics.toggleFullscreen()
282
181
                    elseif the.keys:justPressed('f1') then
283
182
                       local ss = love.graphics.newScreenshot()
284
183
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')