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

Damage Changes/Explosions (#644)

Browse source 
* created base damage interaction classes and replaced various projectile-based damage that utilized ResolvedProjectile; not refined, maintains redundancy and overloads, but should work

* continuing to reduce the exposure of ResolvedProjectile and replacing it with applications of DamageInteraction, DamageResult, and DamageReason

* removed ResolvedProjectile from the project; adjusted remaining code paths to work around it

* vitals.test became vital.base; no one liked this

* lots of inheritance, polymorphism, and other chicanery; moved around files, so it also looks like more files have changed when they have not (even if they did)

* codecov file correction

* master rebase; vital directory structure changed, so file imports have been modified in several other files; ResolutionSelection has been removed, requiring direct function literal assignment; tests repaired, where necessary; no actual functional change

* code comments

* DamageResult is its own case class now, wrapping around a before/after target and the interaction used in its calaculations; tests have been corrected

* adjusted Player.Die() to demonstrate a damage-based suicide approach

* resolved circular inheritance in projectile damage modifiers; better employed explosion reason, damages players around exploding vehicle as example

* expanded explosions to other object types; exploding is now a flag and the damage is an innate property of the object type; removed advanced references to properties on the damage source, since the damage source is easily accessible; wrote comments; fixed tests

* overhaul to painbox damage to align with normal player damage handling, thus assimilating it properly into the damage system

* future development; normal vector from euler angles; custom proximity test

* where 'innateDamage' should have not replaced 'explosion'

* moved the hitPos for the generator test; attempting to imrpove the reliability of the auto-repair integration tests (didn't ...)

* spelling and private val
This commit is contained in:
Fate-JH 2020-12-08 14:32:42 -05:00 • committed by GitHub
parent b3101d9a8d
commit 6c93746767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 4083 additions and 2490 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.codecov.yml
View file

@ -4,7 +4,7 @@ comment: off
ignore:
- "src/main/scala/net/psforever/objects/ObjectType.scala"
- "src/main/scala/net/psforever/objects/avatar/Avatars.scala"
- "src/main/scala/net/psforever/objects/ballistics/ProjectileResolution.scala"
- "src/main/scala/net/psforever/objects/ballistics/DamageResolution.scala"
- "src/main/scala/net/psforever/objects/ballistics/Projectiles.scala"
- "src/main/scala/net/psforever/objects/equipment/Ammo.scala"
- "src/main/scala/net/psforever/objects/equipment/CItem.scala"
@ -22,15 +22,23 @@ ignore:
- "src/main/scala/net/psforever/objects/vehicles/SeatArmoRestriction.scala"
- "src/main/scala/net/psforever/objects/vehicles/Turrets.scala"
- "src/main/scala/net/psforever/objects/vehicles/VehicleLockState.scala"
- "src/main/scala/net/psforever/objects/vital/base"
- "src/main/scala/net/psforever/objects/vital/collision"
- "src/main/scala/net/psforever/objects/vital/damage/DamageProfile.scala"
- "src/main/scala/net/psforever/objects/vital/projectile/ProjectileCalculations.scala"
- "src/main/scala/net/psforever/objects/vital/damage/SpecificDamageProfile.scala"
- "src/main/scala/net/psforever/objects/vital/etc"
- "src/main/scala/net/psforever/objects/vital/interaction"
- "src/main/scala/net/psforever/objects/vital/projectile/ProjectileReason.scala"
- "src/main/scala/net/psforever/objects/vital/projectile/ProjectileDamageModifiers.scala"
- "src/main/scala/net/psforever/objects/vital/prop"
- "src/main/scala/net/psforever/objects/vital/resistance/ResistanceProfile.scala"
- "src/main/scala/net/psforever/objects/vital/resistance/ResistanceSelection.scala"
- "src/main/scala/net/psforever/objects/vital/resolution/DamageResistanceCalculations.scala"
- "src/main/scala/net/psforever/objects/vital/resolution/DamageResistanceModel.scala"
- "src/main/scala/net/psforever/objects/vital/DamageResistanceModel.scala"
- "src/main/scala/net/psforever/objects/vital/DamageType.scala"
- "src/main/scala/net/psforever/objects/vital/StandardDamages.scala"
- "src/main/scala/net/psforever/objects/vital/StandardResistanceProfile.scala"
- "src/main/scala/net/psforever/objects/vital/StandardResistances.scala"
- "src/main/scala/net/psforever/objects/vital/StandardResolutions.scala"
- "src/main/scala/net/psforever/objects/vital/VitalityDefinition.scala"
- "src/main/scala/net/psforever/packet/crypto"
- "src/main/scala/net/psforever/packet/game/objectcreate/DrawnSlot.scala"
- "src/main/scala/net/psforever/packet/game/objectcreate/DriveState.scala"