/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
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--__ = require 'underscore'
6
5
vector = require 'vector'
 
6
--inspect = require 'inspect'
 
7
 
 
8
require 'group'
7
9
 
8
10
require 'version'
9
11
require 'wrap_tile'
 
12
require 'mirror'
10
13
require 'player'
11
14
require 'enemy'
12
15
require 'cursor'
13
16
require 'bullet'
 
17
require 'rock'
 
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
 
21
require 'shield'
 
22
require 'pause_view'
14
23
 
15
24
util = {
16
25
   signOf = function(value)
19
28
               else
20
29
                  return -1
21
30
               end
22
 
            end
 
31
            end,
23
32
}
24
33
 
25
34
GameView = View:extend {
26
35
   onNew = function (self)
27
 
              -- for x = 1,30 do
28
 
              --    for y = 1,30 do
29
 
              --       self:add(Fill:new{x=x*400, y=y*400,
30
 
              --                         width = 32, height = 32,
31
 
              --                         fill = {0,0,255}
32
 
              --                      })
33
 
              --    end
34
 
              -- 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
 
42
 
 
43
              the.bullets = Group:new()
 
44
              the.interface = Group:new()
 
45
              the.planets = Group:new()
 
46
              the.indicators = Group:new()
 
47
              the.enemies = Group:new()
35
48
 
36
49
              the.bg = Tile:new{
37
50
                 image = 'data/stars3.png',
38
 
                 -- 1366x768 * 3
39
 
                 width = 4098,
40
 
                 height = 2304
 
51
                 width = 27320,
 
52
                 height = 15360
41
53
              }
42
54
              self:add(the.bg)
43
55
 
 
56
              self:add(the.planets)
 
57
 
44
58
              --the.player = CrystalPlayer:new{x=400,y=300}
45
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
59
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
46
60
              self:add(the.player)
47
 
 
48
 
              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
 
74
 
 
75
              self:add(the.bullets)
 
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
49
89
 
50
90
              the.cursor = Cursor:new()
51
91
              self:add(the.cursor)
52
92
 
 
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)
 
113
 
53
114
              love.mouse.setGrab(true)
54
115
              love.mouse.setVisible(false)
 
116
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
55
117
 
56
 
              --self:loadLayers('data/map.lua')
57
118
              self.focus = the.player
58
 
              --self:clampTo(self.map)
59
119
           end,
 
120
   onUpdate = function(self, dt)
 
121
                 if the.keys:justPressed('escape') then
 
122
                    PauseView:new():activate()
 
123
                 end
 
124
 
 
125
                 the.bullets:collide(the.planets)
 
126
                 the.bullets:collide(the.player)
 
127
                 the.bullets:collide(the.enemies)
 
128
              end,
 
129
   onEndFrame = function(self)
 
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
 
132
                end,
60
133
   draw = function (self, x, y)
61
134
             View.draw(self, x, y)
62
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
63
 
          end
 
135
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
136
          end,
64
137
}
65
138
 
66
139
MenuScreen = View:extend {
80
153
the.app = App:new {
81
154
   onRun = function (self)
82
155
              print('Version: ' .. VERSION)
 
156
 
 
157
              math.randomseed(os.time())
 
158
 
83
159
              self.view = GameView:new()
 
160
 
84
161
              if DEBUG then
85
162
                 self.console:watch('VERSION', 'VERSION')
86
163
                 self.console:watch('updateTook', 'the.updateTook')
88
165
                 self.console:watch('the.player.y', 'the.player.y')
89
166
                 self.console:watch('the.app.width', 'the.app.width')
90
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')
91
171
                 --self.console:watch('drawTook', 'the.drawTook')
92
172
 
93
173
                 -- back off that dark overlay a bit
95
175
              end
96
176
           end,
97
177
   onUpdate = function (self, dt)
98
 
                 if the.keys:justPressed('escape') then
99
 
                    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
100
187
                 end
101
188
              end,
102
189
   update = function (self, dt)
107
194
               end
108
195
            end
109
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'