Update towers attack logic

daylifecraft · Apr 21, 2024 · 79aa2a7 · 79aa2a7
1 parent b7b8f2f
commit 79aa2a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...ain/kotlin/com/daylifecraft/minigames/minigames/instances/games/towerdefence/TowerData.kt b/...ain/kotlin/com/daylifecraft/minigames/minigames/instances/games/towerdefence/TowerData.kt
@@ -1,8 +1,10 @@
 package com.daylifecraft.minigames.minigames.instances.games.towerdefence
 
 import com.daylifecraft.common.config.ConfigFile
+import com.daylifecraft.minigames.minigames.instances.games.towerdefence.monsters.MonsterData
 import net.minestom.server.coordinate.Point
 import net.minestom.server.coordinate.Pos
+import net.minestom.server.entity.EntityCreature
 import net.minestom.server.instance.Instance
 import net.minestom.server.instance.block.Block
 import net.minestom.server.item.Material
@@ -74,6 +76,7 @@ class TowerData private constructor(
 
   var ownerData: Pair<UUID, TowerDefenceTeamInfo>? = null,
 ) {
+  var towerTargetEntity: MonsterData? = null
 
   /**
    * Returns all positions of current tower

diff --git a/...com/daylifecraft/minigames/minigames/instances/games/towerdefence/TowerDefenceInstance.kt b/...com/daylifecraft/minigames/minigames/instances/games/towerdefence/TowerDefenceInstance.kt
@@ -469,15 +469,20 @@ class TowerDefenceInstance private constructor(
       if(towerData.attackDamage == null) continue
       if(towerData.attackSpeedTicks != 0 && currentTicksCount % towerData.attackSpeedTicks.toLong() != 0L) continue
 
-      val randomMonsterData = miniGameWorldInstance.instance
+      val nearbyMonsterData = miniGameWorldInstance.instance
         .getNearbyEntities(towerData.position, towerData.attackRange.toDouble())
         .filterIsInstance<EntityCreature>()
         .mapNotNull { getMonsterDataByLinkedEntity(it) }
-        .randomOrNull()
 
-      if(randomMonsterData == null) break
+      if(towerData.towerTargetEntity != null && nearbyMonsterData.contains(towerData.towerTargetEntity)) {
+        towerData.towerTargetEntity!!
+          .linkedEntityCreature!!.damage(DamageType.PLAYER_ATTACK, towerData.attackDamage.toFloat())
+      }else {
+        val randomMonsterData = nearbyMonsterData.randomOrNull() ?: continue
 
-      randomMonsterData.linkedEntityCreature!!.damage(DamageType.PLAYER_ATTACK, towerData.attackDamage.toFloat())
+        randomMonsterData.linkedEntityCreature!!.damage(DamageType.PLAYER_ATTACK, towerData.attackDamage.toFloat())
+
+      }
     }
   }