/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-19 01:12:39 UTC
  • Revision ID: josh@9ix.org-20130619011239-l1h3rnhphkpg0vdk
bring back game over screen

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
18
18
require 'boom'
19
19
require 'planet'
20
20
require 'trade_view'
 
21
require 'shield'
21
22
 
22
23
util = {
23
24
   signOf = function(value)
73
74
}
74
75
 
75
76
GameView = View:extend {
76
 
   lastRock = 0,
77
 
   rockInterval = 1,
78
 
   gameStart = 0,
79
77
   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
78
              the.storage = Storage:new{filename = 'scores.lua'}
90
79
              the.storage:load()
91
 
              if not the.storage.data.highScore then
92
 
                 print('initializing storage')
93
 
                 the.storage.data = {highScore = 0}
94
 
              end
 
80
              --if not the.storage.data.highScore then
 
81
              --   print('initializing storage')
 
82
              --   the.storage.data = {highScore = 0}
 
83
              --end
95
84
 
96
 
              --the.rockColliders = Group:new()
97
85
              the.bullets = Group:new()
98
 
              the.mirrors = Group:new()
99
 
              --the.rocks = Group:new()
100
86
              the.interface = Group:new()
101
87
              the.planets = Group:new()
102
88
              the.indicators = Group:new()
 
89
              the.enemies = Group:new()
103
90
 
104
91
              the.bg = Tile:new{
105
92
                 image = 'data/stars3.png',
114
101
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
115
102
              self:add(the.player)
116
103
              self:add(the.player.thrust)
117
 
 
118
 
              --self:add(Enemy:new{x=400, y=300})
 
104
              self:add(the.player.shield)
 
105
 
 
106
              self:add(the.enemies)
 
107
 
 
108
              local e = Enemy:new{x=400, y=300}
 
109
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
110
              the.enemies:add(e)
 
111
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
112
              self:add(e.shield)
119
113
 
120
114
              self:add(the.bullets)
121
 
              --self:add(the.rockColliders)
122
 
              self:add(the.mirrors)
123
 
              --self:add(the.rocks)
124
115
              self:add(the.indicators)
125
116
              self:add(the.interface)
126
117
 
138
129
              the.cursor = Cursor:new()
139
130
              self:add(the.cursor)
140
131
 
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
132
              the.over = Text:new{
164
133
                 y = the.app.height / 2,
165
134
                 width = the.app.width,
185
154
              love.mouse.setVisible(false)
186
155
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
187
156
 
188
 
              --self:loadLayers('data/map.lua')
189
157
              self.focus = the.player
190
 
              --self:clampTo(self.map)
191
 
 
192
 
              self.gameStart = love.timer.getTime()
193
158
           end,
194
159
   onUpdate = function(self, dt)
195
160
                 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
 
161
                 the.bullets:collide(the.player)
 
162
                 the.bullets:collide(the.enemies)
207
163
              end,
208
164
   onEndFrame = function(self)
209
165
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
210
166
                   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
167
                end,
216
168
   draw = function (self, x, y)
217
169
             View.draw(self, x, y)
218
170
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
219
171
          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
172
}
233
173
 
234
174
MenuScreen = View:extend {