From 02c238181eb8f763200316ee16e840d6cef830e9 Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Sun, 12 May 2024 00:37:00 -0400
Subject: [PATCH] cep from towers set to 10; reorganized an if...else

---
 .../participation/TowerHackParticipation.scala         |  4 ++--
 .../net/psforever/objects/zones/exp/KillAssists.scala  | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/net/psforever/objects/serverobject/structures/participation/TowerHackParticipation.scala b/src/main/scala/net/psforever/objects/serverobject/structures/participation/TowerHackParticipation.scala
index b780c7490..824f60898 100644
--- a/src/main/scala/net/psforever/objects/serverobject/structures/participation/TowerHackParticipation.scala
+++ b/src/main/scala/net/psforever/objects/serverobject/structures/participation/TowerHackParticipation.scala
@@ -132,12 +132,12 @@ final case class TowerHackParticipation(building: Building) extends FacilityHack
           overwhelmingOddsBonus = 30L
         )
         //6. calculate overall command experience points
-        val finalCep: Long = math.ceil(
+        val finalCep: Long = 10L /*math.ceil(
           baseExperienceFromFacilityCapture *
             populationModifier *
             competitionMultiplier *
             Config.app.game.experience.cep.rate + competitionBonus
-        ).toLong
+        ).toLong*/
         //7. reward participants
         //Classically, only players in the SOI are rewarded
         //terminal hacker (always cep)
diff --git a/src/main/scala/net/psforever/objects/zones/exp/KillAssists.scala b/src/main/scala/net/psforever/objects/zones/exp/KillAssists.scala
index 4695817bf..91a4d3a67 100644
--- a/src/main/scala/net/psforever/objects/zones/exp/KillAssists.scala
+++ b/src/main/scala/net/psforever/objects/zones/exp/KillAssists.scala
@@ -190,10 +190,12 @@ object KillAssists {
           val victimUnique = victim.unique
           val lastDeath = killer.progress.prior.flatMap(_.death)
           val sameLastKiller = lastDeath.map(_.assailant.map(_.unique)).flatMap(_.headOption).contains(victimUnique)
-          if (revenge.defaultExperience != 0 && sameLastKiller) {
-            revenge.defaultExperience
-          } else if (sameLastKiller) {
-            math.min(revenge.maxExperience, (lastDeath.map(_.experienceEarned.toFloat).getOrElse(0f) * revenge.rate).toLong)
+          if (sameLastKiller) {
+            if (revenge.defaultExperience != 0) {
+              revenge.defaultExperience
+            } else {
+              math.min(revenge.maxExperience, (lastDeath.map(_.experienceEarned.toFloat).getOrElse(0f) * revenge.rate).toLong)
+            }
           } else {
             0L
           }