redo sfjeowfew

src/main.lua

@@ -1,39 +1,24 @@
-local tween = require "lib.tween"
+math.randomseed(os.time())
+
+local cron = require "lib.cron"
 
 local lg = love.graphics
 
 local function Enemy(enemyType)
     self = {}
-    self.w = 15
-    self.h = 15
+    self.x = lg.getWidth() + 10
+    if enemyType == 'top' then
+        self.y = lg.getHeight() * 1/5
+    elseif enemyType == 'bottom' then
+        self.y = lg.getHeight() * 4/5
+    elseif enemyType == 'random' then
+        self.y = math.random(10, lg.getHeight() - 10)
+    end
+    self.w = 20
+    self.h = 20
     self.color = {255, 0, 0}
-    self.position = {
-        x = lg.getWidth() + 5,
-        y = lg.getHeight() / 2
-    }
-    --[[
-    self.goal = {
-        x = -5,
-        y = lg.getHeight() / 2
-    }
-    self.tween = tween.new(8, self.position, self.goal, tween.easing.outBack)
-    --]]
-
-    --local tween1 = tween.new(8, self.position, {x = -5, y = lg.getHeight() / 2}, tween.easing.outBack)
-    --local currentTween = tween1
-    local currentTween = tween.new(3.5, self.position, {x = lg.getWidth() / 2, y = lg.getHeight() / 2}, tween.easing.outBack)
-    local tweens = {}
-    tweens[1] = {2, self.position, {x = lg.getWidth() * 3/4, y = lg.getHeight() * 1/4}, tween.easing.inBack}--tween.new(2, self.position, {x = lg.getWidth() * 3/4, y = lg.getHeight() * 1/4}, tween.easing.inBack)
-    self.tween = {}
-    self.tween.update = function(self, dt)
-        if currentTween then
-            if currentTween:update(dt) then
-                local shit = table.remove(tweens, #tweens)
-                if shit then currentTween = tween.new(shit[1], shit[2], shit[3], shit[4]) end
-            end
-        else
-            return true
-        end
+    self.update = function(self, dt)
+        self.x = self.x - 960/3 * dt
     end
 
     return self
@@ -41,14 +26,33 @@ end
 
 local enemies = {}
 
-table.insert(enemies, Enemy())
+table.insert(enemies, Enemy('top'))
+table.insert(enemies, Enemy('bottom'))
+
+local newEnemies = cron.every(1, function()
+    table.insert(enemies, Enemy('top'))
+    table.insert(enemies, Enemy('bottom'))
+end)
+
+local randEnemies
+
+local function randEneesfs()
+    for i=0,math.random(2) do
+        table.insert(enemies, Enemy('random'))
+    end
+    randEnemies = cron.after(math.random(5, 22) / 2, randEneesfs)
+end
+
+randEnemies = cron.after(3.2, randEneesfs)
 
 function love.update(dt)
+    newEnemies:update(dt)
+    randEnemies:update(dt)
     for i=1,#enemies do
-        if enemies[i].tween then
-            if enemies[i].tween:update(dt) then
-                enemies[i].tween = nil
-                print("Success")
+        if enemies[i].update then
+            if enemies[i]:update(dt) then
+                --enemies[i] = nil
+                --table.remove(enemies, i)
             end
         end
     end
@@ -57,7 +61,7 @@ end
 function love.draw()
     for i=1,#enemies do
         lg.setColor(enemies[i].color)
-        lg.rectangle("fill", enemies[i].position.x - enemies[i].w / 2, enemies[i].position.y - enemies[i].h / 2, enemies[i].w, enemies[i].h)
+        lg.rectangle("fill", enemies[i].x - enemies[i].w / 2, enemies[i].y - enemies[i].h / 2, enemies[i].w, enemies[i].h)
     end
 end