From e7850fb612e98bf4a20d515a360038ba1666c0d8 Mon Sep 17 00:00:00 2001
From: ScrawnyRonnie <73139382+ScrawnyRonnie@users.noreply.github.com>
Date: Thu, 26 Oct 2023 20:52:22 -0400
Subject: [PATCH] Supai Terms - Fall Damage - Cavern IA (#1)

Tweaks
---
 src/main/resources/zonemaps/ugd01.json         | 18 +++++++++---------
 .../CollisionDamageModifierFunctions.scala     |  8 ++++----
 .../services/InterstellarClusterService.scala  |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/zonemaps/ugd01.json b/src/main/resources/zonemaps/ugd01.json
index 5de03623..d5e480cc 100644
--- a/src/main/resources/zonemaps/ugd01.json
+++ b/src/main/resources/zonemaps/ugd01.json
@@ -10676,7 +10676,7 @@
     "Id": 897,
     "ObjectName": "vanu_equipment_term_200134",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 406,
     "AbsX": 869.22,
     "AbsY": 1466.66,
     "AbsZ": 90.84,
@@ -10702,7 +10702,7 @@
     "Id": 899,
     "ObjectName": "vanu_equipment_term_200136",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 406,
     "AbsX": 877.77,
     "AbsY": 1484.74,
     "AbsZ": 90.84,
@@ -10715,7 +10715,7 @@
     "Id": 898,
     "ObjectName": "vanu_equipment_term_200135",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 406,
     "AbsX": 886.94,
     "AbsY": 1458.3,
     "AbsZ": 90.84,
@@ -10741,7 +10741,7 @@
     "Id": 896,
     "ObjectName": "vanu_equipment_term_200133",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 406,
     "AbsX": 895.74,
     "AbsY": 1476.22,
     "AbsZ": 90.84,
@@ -10884,7 +10884,7 @@
     "Id": 295,
     "ObjectName": "vanu_equipment_term_200004",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 53,
     "AbsX": 1029.84,
     "AbsY": 1332.43,
     "AbsZ": 96.39,
@@ -11079,7 +11079,7 @@
     "Id": 903,
     "ObjectName": "vanu_equipment_term_200140",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 904,
     "AbsX": 1387.02,
     "AbsY": 846.09,
     "AbsZ": 91.74,
@@ -11092,7 +11092,7 @@
     "Id": 902,
     "ObjectName": "vanu_equipment_term_200139",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 904,
     "AbsX": 1393.14,
     "AbsY": 864.93,
     "AbsZ": 91.74,
@@ -11105,7 +11105,7 @@
     "Id": 900,
     "ObjectName": "vanu_equipment_term_200137",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 904,
     "AbsX": 1405.83,
     "AbsY": 839.8,
     "AbsZ": 91.74,
@@ -11118,7 +11118,7 @@
     "Id": 901,
     "ObjectName": "vanu_equipment_term_200138",
     "ObjectType": "vanu_equipment_term",
-    "Owner": null,
+    "Owner": 904,
     "AbsX": 1411.95,
     "AbsY": 858.67,
     "AbsZ": 91.74,
diff --git a/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala b/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala
index aa4d5073..f4a67557 100644
--- a/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala
+++ b/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala
@@ -11,7 +11,7 @@ import net.psforever.types.Vector3
   */
 case object GroundImpact extends CollisionDamageModifiers.Mod {
   def calculate(damage: Int, data: DamageInteraction, cause: CollisionReason): Int =
-    CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause)
+    CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 4
 }
 
 /**
@@ -19,7 +19,7 @@ case object GroundImpact extends CollisionDamageModifiers.Mod {
   */
 case object GroundImpactWith extends CollisionWithDamageModifiers.Mod {
   def calculate(damage: Int, data: DamageInteraction, cause: CollisionWithReason): Int =
-    CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause)
+    CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 4
 }
 
 /**
@@ -33,9 +33,9 @@ case object HeadonImpact extends CollisionDamageModifiers.Mod {
     if (vel > 0.05f) {
       val definition = data.target.Definition
       val xy = definition.collision.xy
-      damage + xy.hp(xy.throttle((vel + 0.5f) / definition.maxForwardSpeed))
+      (damage + xy.hp(xy.throttle((vel + 0.5f) / definition.maxForwardSpeed))) / 4
     } else {
-      damage
+      damage / 4
     }
   }
 }
diff --git a/src/main/scala/net/psforever/services/InterstellarClusterService.scala b/src/main/scala/net/psforever/services/InterstellarClusterService.scala
index 781ace2b..89b9bded 100644
--- a/src/main/scala/net/psforever/services/InterstellarClusterService.scala
+++ b/src/main/scala/net/psforever/services/InterstellarClusterService.scala
@@ -173,7 +173,7 @@ class InterstellarClusterService(context: ActorContext[InterstellarClusterServic
         }
         val hotspotsAndSpawnsInZones: Iterable[(Zone, HotSpotInfo, List[SpawnPoint])] = zones
           .collect {
-            case zone if !zone.map.cavern && zone.Players.nonEmpty =>
+            case zone if zone.Players.nonEmpty =>
               zone.HotSpotData
                 .map {
                   info => (zone, info, zone.findNearestSpawnPoints(faction, info.DisplayLocation, spawnTarget))