/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-16 04:21:01 UTC
  • Revision ID: josh@9ix.org-20130616042101-tp1rddbd3subc8lg
enemy is back

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