fix: flak jacket damage reduction

leia-uwu · Oct 6, 2024 · 41a0fb6 · 41a0fb6
1 parent 02ced8b
commit 41a0fb6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/server/src/game/objects/bullet.ts b/server/src/game/objects/bullet.ts
@@ -546,6 +546,7 @@ export class Bullet {
                         damageType: this.damageType,
                         amount: multiplier * finalDamage,
                         dir: this.dir,
+                        isExplosion: this.isShrapnel,
                     });
                 }
                 hit = col.collidable;

diff --git a/server/src/game/objects/explosion.ts b/server/src/game/objects/explosion.ts
@@ -178,6 +178,7 @@ export class ExplosionBarn {
             source: explosion.source,
             damageType: explosion.damageType,
             dir: collision.dir,
+            isExplosion: true,
         });
     }
 

diff --git a/server/src/game/objects/gameObject.ts b/server/src/game/objects/gameObject.ts
@@ -38,6 +38,7 @@ export interface DamageParams {
     gameSourceType?: string;
     mapSourceType?: string;
     source?: GameObject;
+    isExplosion?: boolean;
 }
 
 const MAX_ID = 65535;

diff --git a/server/src/game/objects/player.ts b/server/src/game/objects/player.ts
@@ -1836,11 +1836,7 @@ export class Player extends BaseGameObject {
             const gameSourceDef = GameObjectDefs[params.gameSourceType ?? ""];
 
             if (this.hasPerk("flak_jacket")) {
-                const isExplosion =
-                    gameSourceDef &&
-                    (gameSourceDef.type === "explosion" ||
-                        (gameSourceDef.type === "bullet" && gameSourceDef.shrapnel));
-                finalDamage *= isExplosion ? 0.1 : 0.9;
+                finalDamage *= params.isExplosion ? 0.1 : 0.9;
             }
 
             if (this.hasPerk("steelskin")) finalDamage *= 0.5;