/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:
86
86
              the.interface = Group:new()
87
87
              the.planets = Group:new()
88
88
              the.indicators = Group:new()
 
89
              the.enemies = Group:new()
89
90
 
90
91
              the.bg = Tile:new{
91
92
                 image = 'data/stars3.png',
102
103
              self:add(the.player.thrust)
103
104
              self:add(the.player.shield)
104
105
 
 
106
              self:add(the.enemies)
 
107
 
105
108
              local e = Enemy:new{x=400, y=300}
106
109
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
107
 
              self:add(e)
 
110
              the.enemies:add(e)
108
111
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
112
              self:add(e.shield)
109
113
 
110
114
              self:add(the.bullets)
111
115
              self:add(the.indicators)
125
129
              the.cursor = Cursor:new()
126
130
              self:add(the.cursor)
127
131
 
 
132
              the.over = Text:new{
 
133
                 y = the.app.height / 2,
 
134
                 width = the.app.width,
 
135
                 align = 'center',
 
136
                 font = 25,
 
137
                 text = "Game Over",
 
138
                 visible = false
 
139
              }
 
140
              the.interface:add(the.over)
 
141
 
 
142
 
 
143
              the.instructions = Text:new{
 
144
                 y = the.app.height / 2 + 32,
 
145
                 width = the.app.width,
 
146
                 align = 'center',
 
147
                 font = 12,
 
148
                 text = "Press Enter to start a new game\nPress Q to quit",
 
149
                 visible = false
 
150
              }
 
151
              the.interface:add(the.instructions)
 
152
 
128
153
              love.mouse.setGrab(true)
129
154
              love.mouse.setVisible(false)
130
155
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
134
159
   onUpdate = function(self, dt)
135
160
                 the.bullets:collide(the.planets)
136
161
                 the.bullets:collide(the.player)
 
162
                 the.bullets:collide(the.enemies)
137
163
              end,
138
164
   onEndFrame = function(self)
139
165
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2