/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-14 00:15:01 UTC
  • Revision ID: josh@9ix.org-20130514001501-z14e702ncp21s0yr
try to not spawn rocks where you can see them.  not working if screen 
crosses game boundaries.

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
7
 
8
8
require 'group'
9
9
 
15
15
require 'cursor'
16
16
require 'bullet'
17
17
require 'rock'
18
 
require 'boom'
19
 
require 'planet'
20
 
require 'trade_view'
21
18
 
22
19
util = {
23
20
   signOf = function(value)
73
70
}
74
71
 
75
72
GameView = View:extend {
 
73
   lastRock = 0,
 
74
   rockInterval = 1,
 
75
   gameStart = 0,
76
76
   onNew = function (self)
77
 
              the.storage = Storage:new{filename = 'scores.lua'}
78
 
              the.storage:load()
79
 
              --if not the.storage.data.highScore then
80
 
              --   print('initializing storage')
81
 
              --   the.storage.data = {highScore = 0}
82
 
              --end
83
 
 
84
 
              the.bullets = Group:new()
85
 
              the.interface = Group:new()
86
 
              the.planets = Group:new()
87
 
              the.indicators = Group:new()
 
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
88
85
 
89
86
              the.bg = Tile:new{
90
87
                 image = 'data/stars3.png',
91
 
                 width = 13660,
92
 
                 height = 7680
 
88
                 -- 1366x768 * 3
 
89
                 width = 4098,
 
90
                 height = 2304
93
91
              }
94
92
              self:add(the.bg)
95
93
 
96
 
              self:add(the.planets)
97
 
 
98
94
              --the.player = CrystalPlayer:new{x=400,y=300}
99
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
95
              the.player = SpacePlayer:new{x=1366,y=768}
100
96
              self:add(the.player)
101
 
              self:add(the.player.thrust)
102
 
 
103
 
              local e = Enemy:new{x=400, y=300}
104
 
              self:add(e)
105
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
106
 
 
107
 
              self:add(the.bullets)
108
 
              self:add(the.indicators)
109
 
              self:add(the.interface)
110
 
 
111
 
              for _ = 1, math.random(6) do
112
 
                 local planet = Planet:new{
113
 
                    x = math.random(the.app.width / 2,
114
 
                                    the.bg.width - the.app.width / 2),
115
 
                    y = math.random(the.app.height / 2,
116
 
                                    the.bg.height - the.app.height / 2),
117
 
                    rotation = math.random() * math.pi
118
 
                 }
119
 
                 the.planets:add(planet)
120
 
              end
 
97
 
 
98
              --self:add(Enemy:new{x=400, y=300})
121
99
 
122
100
              the.cursor = Cursor:new()
123
101
              self:add(the.cursor)
124
102
 
125
103
              love.mouse.setGrab(true)
126
104
              love.mouse.setVisible(false)
127
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
128
105
 
 
106
              --self:loadLayers('data/map.lua')
129
107
              self.focus = the.player
 
108
              --self:clampTo(self.map)
 
109
 
 
110
              self.gameStart = love.timer.getTime()
130
111
           end,
131
112
   onUpdate = function(self, dt)
132
 
                 the.bullets:collide(the.planets)
 
113
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
114
                    local unseenRock = nil
 
115
                    while not unseenRock do
 
116
                       local rock = Rock:new{
 
117
                          x = math.random(the.app.width / 2,
 
118
                                          the.bg.width - the.app.width / 2),
 
119
                          y = math.random(the.app.height / 2,
 
120
                                          the.bg.height - the.app.height / 2),
 
121
                          velocity = {
 
122
                             x = math.random(-300, 300),
 
123
                             y = math.random(-300, 300),
 
124
                             rotation = math.random(-7, 7)
 
125
                          },
 
126
                          scale = math.random() + 0.5
 
127
                       }
 
128
 
 
129
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
130
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
131
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
132
                         unseenRock = rock
 
133
                        end
 
134
                    end
 
135
 
 
136
                    self:add(unseenRock)
 
137
 
 
138
                    self.lastRock = love.timer.getTime()
 
139
                 end
133
140
              end,
134
 
   onEndFrame = function(self)
135
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
136
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
137
 
                end,
138
141
   draw = function (self, x, y)
139
142
             View.draw(self, x, y)
140
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
141
 
          end,
 
143
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
144
          end
142
145
}
143
146
 
144
147
MenuScreen = View:extend {
162
165
              math.randomseed(os.time())
163
166
 
164
167
              self.view = GameView:new()
165
 
 
166
168
              if DEBUG then
167
169
                 self.console:watch('VERSION', 'VERSION')
168
170
                 self.console:watch('updateTook', 'the.updateTook')
170
172
                 self.console:watch('the.player.y', 'the.player.y')
171
173
                 self.console:watch('the.app.width', 'the.app.width')
172
174
                 self.console:watch('the.app.height', 'the.app.height')
173
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
174
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
175
 
                 self.console:watch('num planets', '#the.planets.sprites')
176
175
                 --self.console:watch('drawTook', 'the.drawTook')
177
176
 
178
177
                 -- back off that dark overlay a bit
180
179
              end
181
180
           end,
182
181
   onUpdate = function (self, dt)
183
 
                 if not (DEBUG and the.console.visible) then
184
 
                    if the.keys:justPressed('q') then
185
 
                       self.quit()
186
 
                    elseif the.keys:justPressed('return') then
187
 
                       if the.keys:pressed('alt') then
188
 
                          love.graphics.toggleFullscreen()
189
 
                       else
190
 
                          self.view = GameView:new()
191
 
                       end
192
 
                    elseif the.keys:justPressed('f1') then
193
 
                       local ss = love.graphics.newScreenshot()
194
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
195
 
                    elseif the.keys:justPressed('f11') then
196
 
                       love.graphics.toggleFullscreen()
197
 
                    end
 
182
                 if the.keys:justPressed('escape') then
 
183
                    self.quit()
198
184
                 end
199
185
              end,
200
186
   update = function (self, dt)
205
191
               end
206
192
            end
207
193
}
208
 
 
209
 
realRun = love.run
210
 
function love.run()
211
 
   -- should fail silently if it can't go to fullscreen...
212
 
   love.graphics.toggleFullscreen()
213
 
 
214
 
   realRun()
215
 
end
 
 
b'\\ No newline at end of file'