#122: Fixed more issues with the Survival Score and Last Survivor Bonus due to as the ScoreAndDamage needed to be reset after each round.

Author: flemming-n-larsen

server/src/main/kotlin/dev/robocode/tankroyale/server/score/ScoreAndDamage.kt

@@ -19,6 +19,16 @@ class ScoreAndDamage {
     var lastSurvivorCount: Int = 0
         private set
 
+    /** Clears all registered scores and damages when a new round is started. */
+    fun clear() {
+        bulletDamage.clear()
+        ramHits.clear()
+        bulletKillEnemyIds.clear()
+        ramKillEnemyIds.clear()
+        survivalCount = 0
+        lastSurvivorCount = 0
+    }
+
     /** The total bullet damage dealt by this bot to other bots. */
     fun getTotalBulletDamage() = bulletDamage.keys.sumOf { getBulletDamage(it) }
 
@@ -33,23 +43,28 @@ class ScoreAndDamage {
 
     /**
      * Returns the bullet damage dealt by this bot to specific bot.
-     * @param enemyId is the enemy bot to retrieve the damage for.
+     * @param enemyId is the identifier of the specific enemy bot
      * @return the bullet damage dealt to a specific bot.
      */
     private fun getBulletDamage(enemyId: ParticipantId): Double = bulletDamage[enemyId] ?: 0.0
 
     /**
      * Returns the number of times ram damage has been dealt by this bot to specific bot.
-     * @param enemyId is the enemy bot to retrieve the ram count for.
+     * @param enemyId is the identifier of the specific enemy bot
      * @return the ram count for a specific bot.
      */
     private fun getRamHits(enemyId: ParticipantId): Int = ramHits[enemyId] ?: 0
 
+    /**
+     * Returns the total damage dealt to a specific bot.
+     * @param enemyId is the identifier of the specific enemy bot
+     * @return the total damage dealt to the bot.
+     */
     fun getTotalDamage(enemyId: ParticipantId): Double = getBulletDamage(enemyId) + getRamHits(enemyId) * RAM_DAMAGE
 
     /**
      * Adds bullet damage to a specific enemy bot.
-     * @param enemyId is the identifier of the enemy bot
+     * @param enemyId is the identifier of the specific enemy bot
      * @param damage is the amount of damage that the enemy bot has received
      */
     fun addBulletDamage(enemyId: ParticipantId, damage: Double) {

server/src/main/kotlin/dev/robocode/tankroyale/server/score/ScoreTracker.kt

@@ -30,6 +30,7 @@ class ScoreTracker(private val participantIds: Set<ParticipantId>) {
     fun clear() {
         aliveParticipants.apply { clear(); addAll(participantIds) }
         lastSurvivors = null
+        scoreAndDamages.values.forEach { it.clear() }
     }
 
     /**
@@ -39,17 +40,19 @@ class ScoreTracker(private val participantIds: Set<ParticipantId>) {
      */
     fun calculateScore(participantId: ParticipantId): Score {
         getScoreAndDamage(participantId).apply {
-            val isAlive = aliveParticipants.any { it == participantId }
-            val isLastSurvivor = lastSurvivors?.any { it == participantId } ?: false
+            val scoreAndDamage = scoreAndDamages[participantId]
+
+            val survivalCount = scoreAndDamage?.survivalCount ?: 0
+            val lastSurvivorCount = scoreAndDamage?.lastSurvivorCount ?: 0
 
             return Score(
                 participantId = participantId,
                 bulletDamageScore = SCORE_PER_BULLET_DAMAGE * getTotalBulletDamage(),
                 bulletKillBonus = BONUS_PER_BULLET_KILL * getBulletKillEnemyIds().sumOf { getTotalDamage(it) },
                 ramDamageScore = SCORE_PER_RAM_DAMAGE * getTotalRamDamage(),
                 ramKillBonus = BONUS_PER_RAM_KILL * getRamKillEnemyIds().sumOf { getTotalDamage(it) },
-                survivalScore = SCORE_PER_SURVIVAL * if (isAlive) 1 else 0,
-                lastSurvivorBonus = BONUS_PER_LAST_SURVIVOR * if (isLastSurvivor) 1 else 0,
+                survivalScore = SCORE_PER_SURVIVAL * survivalCount,
+                lastSurvivorBonus = BONUS_PER_LAST_SURVIVOR * lastSurvivorCount,
             )
         }
     }