PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-20 02:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Supai Terms - Fall Damage - Cavern IA (#1)

Browse source 
Tweaks
This commit is contained in:
ScrawnyRonnie 2023-10-26 20:52:22 -04:00 committed by GitHub
parent 0485c759e7
commit e7850fb612
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/resources/zonemaps/ugd01.json
View file

@ -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,

8
src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala
View file

@ -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
}
}
}

2
src/main/scala/net/psforever/services/InterstellarClusterService.scala
View file

@ -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))