/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-23 02:28:12 UTC
  • Revision ID: josh@9ix.org-20130623022812-zhz3azvff45bgsw1
bigger space, slower movement, maintain enemy density

Show diffs side-by-side

added added

removed removed

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