feat: handle last shot and full reload in sounds section and explosio…

…n damage properly in dps calculation
HasangerGames · Dec 24, 2024 · a102647 · a102647
1 parent 62fbfe8
commit a102647
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/app/(wiki)/weapons/page.tsx b/app/(wiki)/weapons/page.tsx
@@ -4,24 +4,27 @@ import GridTable from "@/components/tables/GridTable";
 import { getSuroiImageLink } from "@/lib/util/suroi";
 import { Guns } from "@/vendor/suroi/common/src/definitions/guns";
 import { Melees } from "@/vendor/suroi/common/src/definitions/melees";
+import { Explosions } from "@/vendor/suroi/common/src/definitions/explosions";
 import { Throwables } from "@/vendor/suroi/common/src/definitions/throwables";
 import Link from "next/link";
 import TableWithHeader from "@/components/tables/TableWithHeader";
 import { FireMode } from "@/vendor/suroi/common/src/constants";
-
 const dpsList: Array<[string, number, number]> = [];
 for (const gun of Guns) {
+  const explosion = Explosions.definitions.find(
+    explosion => explosion.idString === gun.ballistics.onHitExplosion
+  );
   dpsList.push([
     gun.name,
     Number(gun.fireMode === FireMode.Burst
       ? (
         (1000
           / (gun.burstProperties.burstCooldown
             + gun.fireDelay * gun.burstProperties.shotsPerBurst))
-          * (gun.ballistics.damage * gun.burstProperties.shotsPerBurst)
+          * ((gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0)) * gun.burstProperties.shotsPerBurst)
       ).toFixed(2)
       : (
-        gun.ballistics.damage
+        (gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0))
         * (gun.bulletCount ?? 1)
         * (1000 / gun.fireDelay)
       ).toFixed(2)),
@@ -30,12 +33,12 @@ for (const gun of Guns) {
         (1000
           / (gun.burstProperties.burstCooldown
             + gun.fireDelay * gun.burstProperties.shotsPerBurst))
-          * (gun.ballistics.damage
+          * ((gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0))
             * gun.burstProperties.shotsPerBurst
             * gun.ballistics.obstacleMultiplier)
       ).toFixed(2)
       : (
-        gun.ballistics.damage
+        (gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0))
         * gun.ballistics.obstacleMultiplier
         * (gun.bulletCount ?? 1)
         * (1000 / gun.fireDelay)

diff --git a/components/sidebars/GunDetails.tsx b/components/sidebars/GunDetails.tsx
@@ -116,11 +116,11 @@ export default function GunDetails({ gun, explosion }: GunDetailsProps) {
             (1000
               / (gun.burstProperties.burstCooldown
                 + gun.fireDelay * gun.burstProperties.shotsPerBurst))
-              * (gun.ballistics.damage * gun.burstProperties.shotsPerBurst)
+              * ((gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0)) * gun.burstProperties.shotsPerBurst)
           ).toFixed(2)}
           {gun.fireMode !== FireMode.Burst
           && (
-            gun.ballistics.damage
+            (gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0))
             * (gun.bulletCount ?? 1)
             * (1000 / gun.fireDelay)
           ).toFixed(2)}
@@ -134,13 +134,13 @@ export default function GunDetails({ gun, explosion }: GunDetailsProps) {
             (1000
               / (gun.burstProperties.burstCooldown
                 + gun.fireDelay * gun.burstProperties.shotsPerBurst))
-              * (gun.ballistics.damage
+              * ((gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0))
                 * gun.ballistics.obstacleMultiplier
                 * gun.burstProperties.shotsPerBurst)
           ).toFixed(2)}
           {gun.fireMode !== FireMode.Burst
           && (
-            gun.ballistics.damage
+            (gun.ballistics.damage + (explosion?.damage ?? 0) + (explosion?.ballistics ? (explosion.ballistics.damage * explosion.shrapnelCount) : 0))
             * gun.ballistics.obstacleMultiplier
             * (gun.bulletCount ?? 1)
             * (1000 / gun.fireDelay)
@@ -220,6 +220,15 @@ export default function GunDetails({ gun, explosion }: GunDetailsProps) {
             ""
           )}_fire.mp3`}
         />
+        {gun.ballistics.lastShotFX && (
+          <InfoboxAudio
+            name="Last Shot"
+            src={`${SOUND_BASE_URL}/sfx/weapons/${gun.idString.replace(
+              "dual_",
+              ""
+            )}_fire_last.mp3`}
+          />
+        )}
         <InfoboxAudio
           name="Switch"
           src={`${SOUND_BASE_URL}/sfx/weapons/${gun.idString.replace(
@@ -231,6 +240,15 @@ export default function GunDetails({ gun, explosion }: GunDetailsProps) {
           name="Reload"
           src={`${SOUND_BASE_URL}/sfx/weapons/${gun.idString}_reload.mp3`}
         />
+        {gun.reloadFullOnEmpty && (
+          <InfoboxAudio
+            name="Full Reload"
+            src={`${SOUND_BASE_URL}/sfx/weapons/${gun.idString.replace(
+              "dual_",
+              ""
+            )}_reload_full.mp3`}
+          />
+        )}
         {gun.ballistics.onHitExplosion && (
           <InfoboxAudio
             name="Explosion"