From 9ec3b93cc20e945f3cfbaceb5a5683cd565f4141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= Date: Sat, 3 Jun 2023 21:43:56 +0300 Subject: [PATCH] Make all enemies active --- bundle/main.lua | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/bundle/main.lua b/bundle/main.lua index 4bd1953..77c167a 100644 --- a/bundle/main.lua +++ b/bundle/main.lua @@ -21,7 +21,7 @@ local explosion_duration = 0.4 local enemies = {} local enemy_radius = 0.025 local enemy_min_shoot = 5 -local enemy_max_shoot = 10 +local enemy_max_shoot = 20 local window_width = nil local window_height = nil @@ -62,16 +62,23 @@ function love.load() setScreenDimensions(width, height) movePaddle(0) spawnCities() - spawnEnemy(0.1, 0.1, false) - spawnEnemy(0.2, 0.1, true) - spawnEnemy(0.3, 0.1, false) - spawnEnemy(0.4, 0.1, true) - spawnEnemy(0.5, 0.1, false) - spawnEnemy(0.6, 0.1, true) - spawnEnemy(0.7, 0.1, false) - spawnEnemy(0.8, 0.1, true) - spawnEnemy(0.9, 0.1, false) - spawnEnemy(0.1, 0.3, true) + spawnEnemy(0.1, 0.1) + spawnEnemy(0.2, 0.1) + spawnEnemy(0.3, 0.1) + spawnEnemy(0.4, 0.1) + spawnEnemy(0.5, 0.1) + spawnEnemy(0.6, 0.1) + spawnEnemy(0.7, 0.1) + spawnEnemy(0.8, 0.1) + spawnEnemy(0.9, 0.1) + spawnEnemy(0.15, 0.2) + spawnEnemy(0.25, 0.2) + spawnEnemy(0.35, 0.2) + spawnEnemy(0.45, 0.2) + spawnEnemy(0.55, 0.2) + spawnEnemy(0.65, 0.2) + spawnEnemy(0.75, 0.2) + spawnEnemy(0.85, 0.2) end function spawnCities() @@ -118,11 +125,10 @@ function spawnExplosion(x, y) }) end -function spawnEnemy(x, y, active) +function spawnEnemy(x, y) table.insert(enemies, { x = x, y = y, - active = active, until_shoot = math.random() * (enemy_max_shoot - enemy_min_shoot), alive = true }) @@ -271,13 +277,11 @@ function updateEnemies(dt) while i <= #enemies do local enemy = enemies[i] - if enemy.active then - enemy.until_shoot = enemy.until_shoot - dt - if enemy.until_shoot < 0 then - enemy.until_shoot = enemy_min_shoot + math.random() * (enemy_max_shoot - enemy_min_shoot) - local target = cities[math.random(1, #cities)] - spawnMissile(enemy.x, enemy.y, target.x, target.y, 0.2) - end + enemy.until_shoot = enemy.until_shoot - dt + if enemy.until_shoot < 0 then + enemy.until_shoot = enemy_min_shoot + math.random() * (enemy_max_shoot - enemy_min_shoot) + local target = cities[math.random(1, #cities)] + spawnMissile(enemy.x, enemy.y, target.x, target.y, 0.2) end if not enemy.alive then