Got a wave A WAVE

faulkner · Jan 15, 2012 · f2abe1e · f2abe1e
1 parent ba50e97
commit f2abe1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/bad.lua b/bad.lua
@@ -2,13 +2,15 @@ require 'rail'
 
 Bad = {}
 
-function Bad:new(x, y)
+function Bad:new(rail)
+    local r = rail or SamRail:new(0, 0)
+
     return setmetatable({
-        x = x,
-        y = y,
+        x = r.x,
+        y = r.y,
         dead = false,
         size = 15, 
-        rail = SamRail:new(x, y),
+        rail = r,
         shots = {}
     }, {__index = self})
 end

diff --git a/main.lua b/main.lua
@@ -2,6 +2,7 @@ require 'bad'
 require 'boom'
 require 'bullet'
 require 'ship'
+require 'wave'
 
 joystick = {
     n = 0,
@@ -37,8 +38,9 @@ function love.load(arg)
     ship = Ship:new(400, 300, joystick)
     table.insert(ships, ship)
 
-    for i = 1, 100, 1 do
-        table.insert(baddies, Bad:new(math.random() * 700 + 25, math.random() * 100))
+    local w = Wave:new()
+    for _, b in ipairs(w:spawn()) do
+        table.insert(baddies, b)
     end
 end