"multishot" alternation for shooting

GreeningSiren · Oct 20, 2024 · f08603b · f08603b
1 parent e89a2a1
commit f08603b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/towerdefence/engine.js b/towerdefence/engine.js
@@ -23,7 +23,7 @@ let lives = 10;
 var money = 0;
 
 function init() {
-    towerX = []; towerY = []; towerCooldown = []; towerTimer = []; towerHealth = []; towerShootMode = []; towerRange = []; towerC = 0;
+    towerX = []; towerY = []; towerCooldown = []; towerTimer = []; towerHealth = []; towerShootMode = []; towerRange = []; towerC = 0, towerLastShot = [];
     enemyX = []; enemyY = []; enemySize = []; enemyHealth = []; enemySpeed = []; enemyC = 0;
     bulletX = []; bulletY = []; bulletDX = []; bulletDY = []; bulletC = 0;
     enemyImage = tryToLoad("enemy", "red");

diff --git a/towerdefence/game.js b/towerdefence/game.js
@@ -14,25 +14,28 @@ function findTarget(towerIndex) {
             let maxHealth = 0;
             let maxHealthIndex = -1;
             for (let i = 0; i < enemyC; i++) {
-                if (enemyHealth[i] > maxHealth && areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex])) {
+                if (enemyHealth[i] > maxHealth && areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex]) && towerLastShot[towerIndex] != i) {
                     maxHealth = enemyHealth[i];
                     maxHealthIndex = i;
                 }
             }
+            towerLastShot[towerIndex] = maxHealthIndex;
             return maxHealthIndex;
         case "leastHealth":
             let minHealth = Infinity;
             let minHealthIndex = -1;
             for (let i = 0; i < enemyC; i++) {
-                if (enemyHealth[i] < minHealth && areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex])) {
+                if (enemyHealth[i] < minHealth && areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex]) && towerLastShot[towerIndex] != i) {
                     minHealth = enemyHealth[i];
                     minHealthIndex = i;
                 }
             }
+            towerLastShot[towerIndex] = minHealthIndex;
             return minHealthIndex;
         case "firstEnemy":
             for (let i = 0; i < enemyC; i++) {
-                if (areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex])) {
+                if (areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex]) && towerLastShot[towerIndex] != i) {
+                    towerLastShot[towerIndex] = i;
                     return i;
                 }
             }
@@ -41,11 +44,12 @@ function findTarget(towerIndex) {
             let minDistanceIndex = -1;
             for (let i = 0; i < enemyC; i++) {
                 let distance = getDistance(towerX[towerIndex], towerY[towerIndex], enemyX[i], enemyY[i]);
-                if (distance < minDistance && areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex])) {
+                if (distance < minDistance && areCirclesColliding(enemyX[i], enemyY[i], enemySize[i], towerX[towerIndex], towerY[towerIndex], towerRange[towerIndex]) && towerLastShot[towerIndex] != i) {
                     minDistance = distance;
                     minDistanceIndex = i;
                 }
             }
+            towerLastShot[towerIndex] = minDistanceIndex;
             return minDistanceIndex;
     }
 }