/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:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
 
6
--inspect = require 'inspect'
6
7
 
7
8
require 'group'
8
9
 
15
16
require 'bullet'
16
17
require 'rock'
17
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
 
21
require 'shield'
 
22
require 'pause_view'
18
23
 
19
24
util = {
20
25
   signOf = function(value)
24
29
                  return -1
25
30
               end
26
31
            end,
27
 
   shortestVector = function(from, to)
28
 
                       if STRICT then
29
 
                          if from.x < the.app.width / 2 or
30
 
                             from.x > the.bg.width - the.app.width / 2 or
31
 
                             from.y < the.app.height / 2 or
32
 
                             from.y > the.bg.height - the.app.height / 2 then
33
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
34
 
                          end
35
 
 
36
 
                          if to.x < the.app.width / 2 or
37
 
                             to.x > the.bg.width - the.app.width / 2 or
38
 
                             to.y < the.app.height / 2 or
39
 
                             to.y > the.bg.height - the.app.height / 2 then
40
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
41
 
                          end
42
 
                       end
43
 
 
44
 
                       -- normalize grid to account for mirror zones
45
 
                       local fx = from.x - the.app.width / 2
46
 
                       local fy = from.y - the.app.height / 2
47
 
                       local tx = to.x - the.app.width / 2
48
 
                       local ty = to.y - the.app.height / 2
49
 
 
50
 
                       local short = {}
51
 
 
52
 
                       -- pick shorter x
53
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
54
 
                          -- straight path is shorter
55
 
                          short.x = tx - fx
56
 
                       else
57
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
58
 
                       end
59
 
 
60
 
                       -- pick shorter y
61
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
62
 
                          -- straight path is shorter
63
 
                          short.y = ty - fy
64
 
                       else
65
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
66
 
                       end
67
 
 
68
 
                       return vector.new(short.x, short.y)
69
 
                    end
70
32
}
71
33
 
72
34
GameView = View:extend {
73
 
   lastRock = 0,
74
 
   rockInterval = 1,
75
 
   gameStart = 0,
76
35
   onNew = function (self)
77
 
              -- for x = 1,30 do
78
 
              --    for y = 1,30 do
79
 
              --       self:add(Fill:new{x=x*400, y=y*400,
80
 
              --                         width = 32, height = 32,
81
 
              --                         fill = {0,0,255}
82
 
              --                      })
83
 
              --    end
84
 
              -- end
 
36
              the.storage = Storage:new{filename = 'scores.lua'}
 
37
              the.storage:load()
 
38
              --if not the.storage.data.highScore then
 
39
              --   print('initializing storage')
 
40
              --   the.storage.data = {highScore = 0}
 
41
              --end
85
42
 
86
 
              the.rockColliders = Group:new()
87
43
              the.bullets = Group:new()
88
 
              the.mirrors = Group:new()
89
 
              the.rocks = Group:new()
 
44
              the.interface = Group:new()
 
45
              the.planets = Group:new()
 
46
              the.indicators = Group:new()
 
47
              the.enemies = Group:new()
90
48
 
91
49
              the.bg = Tile:new{
92
50
                 image = 'data/stars3.png',
93
 
                 -- 1366x768 * 3
94
 
                 width = 4098,
95
 
                 height = 2304
 
51
                 width = 27320,
 
52
                 height = 15360
96
53
              }
97
54
              self:add(the.bg)
98
55
 
 
56
              self:add(the.planets)
 
57
 
99
58
              --the.player = CrystalPlayer:new{x=400,y=300}
100
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
59
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
101
60
              self:add(the.player)
102
 
 
103
 
              --self:add(Enemy:new{x=400, y=300})
 
61
              self:add(the.player.thrust)
 
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
104
74
 
105
75
              self:add(the.bullets)
106
 
              self:add(the.rockColliders)
107
 
              self:add(the.mirrors)
108
 
              self:add(the.rocks)
 
76
              self:add(the.indicators)
 
77
              self:add(the.interface)
 
78
 
 
79
              for _ = 1, math.random(3, 6) do
 
80
                 local planet = Planet:new{
 
81
                    x = math.random(the.app.width / 2,
 
82
                                    the.bg.width - the.app.width / 2),
 
83
                    y = math.random(the.app.height / 2,
 
84
                                    the.bg.height - the.app.height / 2),
 
85
                    rotation = math.random() * math.pi
 
86
                 }
 
87
                 the.planets:add(planet)
 
88
              end
109
89
 
110
90
              the.cursor = Cursor:new()
111
91
              self:add(the.cursor)
112
92
 
113
 
              the.score = Text:new{
114
 
                 width = the.app.width,
115
 
                 align = 'center',
116
 
                 font = 25}
117
 
              self:add(the.score)
 
93
              the.over = Text:new{
 
94
                 y = the.app.height / 2,
 
95
                 width = the.app.width,
 
96
                 align = 'center',
 
97
                 font = 25,
 
98
                 text = "Game Over",
 
99
                 visible = false
 
100
              }
 
101
              the.interface:add(the.over)
 
102
 
 
103
 
 
104
              the.instructions = Text:new{
 
105
                 y = the.app.height / 2 + 32,
 
106
                 width = the.app.width,
 
107
                 align = 'center',
 
108
                 font = 12,
 
109
                 text = "Press Enter to start a new game\nPress Q to quit",
 
110
                 visible = false
 
111
              }
 
112
              the.interface:add(the.instructions)
118
113
 
119
114
              love.mouse.setGrab(true)
120
115
              love.mouse.setVisible(false)
121
116
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
122
117
 
123
 
              --self:loadLayers('data/map.lua')
124
118
              self.focus = the.player
125
 
              --self:clampTo(self.map)
126
 
 
127
 
              self.gameStart = love.timer.getTime()
128
119
           end,
129
120
   onUpdate = function(self, dt)
130
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
131
 
                    local unseenRock = nil
132
 
                    while not unseenRock do
133
 
                       local rock = Rock:new{
134
 
                          x = math.random(the.app.width / 2,
135
 
                                          the.bg.width - the.app.width / 2),
136
 
                          y = math.random(the.app.height / 2,
137
 
                                          the.bg.height - the.app.height / 2),
138
 
                          velocity = {
139
 
                             x = math.random(-300, 300),
140
 
                             y = math.random(-300, 300),
141
 
                             rotation = math.random(-7, 7)
142
 
                          },
143
 
                          scale = math.random() + 0.5
144
 
                       }
145
 
 
146
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
147
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
148
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
149
 
                         unseenRock = rock
150
 
                        end
151
 
                    end
152
 
 
153
 
                    the.rocks:add(unseenRock)
154
 
 
155
 
                    self.lastRock = love.timer.getTime()
 
121
                 if the.keys:justPressed('escape') then
 
122
                    PauseView:new():activate()
156
123
                 end
157
124
 
158
 
                 the.bullets:collide(the.rockColliders)
 
125
                 the.bullets:collide(the.planets)
 
126
                 the.bullets:collide(the.player)
 
127
                 the.bullets:collide(the.enemies)
159
128
              end,
160
129
   onEndFrame = function(self)
161
 
                   if the.player.active then
162
 
                      local t = love.timer.getTime() - self.gameStart
163
 
                      local m = t / 60
164
 
                      local s = t % 60
165
 
 
166
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
167
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
168
 
                      the.score.x = the.player.x - the.app.width / 2
169
 
                   end
 
130
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
131
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
170
132
                end,
171
133
   draw = function (self, x, y)
172
134
             View.draw(self, x, y)
173
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
174
 
          end
 
135
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
136
          end,
175
137
}
176
138
 
177
139
MenuScreen = View:extend {
195
157
              math.randomseed(os.time())
196
158
 
197
159
              self.view = GameView:new()
 
160
 
198
161
              if DEBUG then
199
162
                 self.console:watch('VERSION', 'VERSION')
200
163
                 self.console:watch('updateTook', 'the.updateTook')
202
165
                 self.console:watch('the.player.y', 'the.player.y')
203
166
                 self.console:watch('the.app.width', 'the.app.width')
204
167
                 self.console:watch('the.app.height', 'the.app.height')
 
168
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
169
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
170
                 self.console:watch('num planets', '#the.planets.sprites')
205
171
                 --self.console:watch('drawTook', 'the.drawTook')
206
172
 
207
173
                 -- back off that dark overlay a bit
209
175
              end
210
176
           end,
211
177
   onUpdate = function (self, dt)
212
 
                 if the.keys:justPressed('escape') then
213
 
                    self.quit()
 
178
                 if not (DEBUG and the.console.visible) then
 
179
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
180
                       love.graphics.toggleFullscreen()
 
181
                    elseif the.keys:justPressed('f1') then
 
182
                       local ss = love.graphics.newScreenshot()
 
183
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
184
                    elseif the.keys:justPressed('f11') then
 
185
                       love.graphics.toggleFullscreen()
 
186
                    end
214
187
                 end
215
188
              end,
216
189
   update = function (self, dt)
221
194
               end
222
195
            end
223
196
}
 
197
 
 
198
realRun = love.run
 
199
function love.run()
 
200
   -- should fail silently if it can't go to fullscreen...
 
201
   love.graphics.toggleFullscreen()
 
202
 
 
203
   realRun()
 
204
end
 
 
b'\\ No newline at end of file'