Sudden Death fixes

GuybrushGit · Jun 16, 2024 · 6013b36 · 6013b36
1 parent 3403109
commit 6013b36
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 11 deletions.
diff --git a/dist/js/classes/player.min.js b/dist/js/classes/player.min.js
diff --git a/dist/js/classes/spell.min.js b/dist/js/classes/spell.min.js
diff --git a/dist/js/data/buffs.min.js b/dist/js/data/buffs.min.js
diff --git a/dist/js/data/enchants.min.js b/dist/js/data/enchants.min.js
diff --git a/dist/js/data/gear_sod.min.js b/dist/js/data/gear_sod.min.js
diff --git a/js/classes/player.js b/js/classes/player.js
@@ -1327,8 +1327,8 @@ class Player {
             if (this.auras.voodoofrenzy && rng10k() < 1500) {
                 this.auras.voodoofrenzy.use();
             }
-            // Sudden Death
-            if (this.auras.suddendeath && rng10k() < 1000) {
+            // Sudden Death - Execute proc is handled on execute spell
+            if (!(spell instanceof Execute) && this.auras.suddendeath && rng10k() < 1000) {
                 this.auras.suddendeath.use();
             }
             // Fresh Meat

diff --git a/js/classes/spell.js b/js/classes/spell.js
@@ -176,14 +176,24 @@ class Execute extends Spell {
         this.player.rage -= this.cost;
         this.usedrage = ~~this.player.rage;
         this.totalusedrage += this.usedrage - (this.player.auras.suddendeath && this.player.auras.suddendeath.timer ? 10 : 0);
-        this.timer = batching - (step % batching);
+        this.timer = 1 - (step % 1);
         this.maxdelay = rng(this.player.reactionmin, this.player.reactionmax);
     }
     step(a) {
         if (this.timer <= a) {
             this.timer = 0;
-            if (this.result != RESULT.MISS && this.result != RESULT.DODGE)
-                this.player.rage = this.player.auras.suddendeath && this.player.auras.suddendeath.timer ? 10 : 0;
+            if (this.result != RESULT.MISS && this.result != RESULT.DODGE) {
+                if (this.player.auras.suddendeath && this.player.auras.suddendeath.timer) {
+                    this.player.rage = Math.min(this.player.rage, 10);
+                    this.player.auras.suddendeath.remove();
+                    // proc new sudden death
+                    if (rng10k() < 1000) this.player.auras.suddendeath.use();
+                }
+                else {
+                    this.player.rage = 0;
+                }
+            }
+
             /* start-log */ if (log) this.player.log(`Execute batch (${Object.keys(RESULT)[this.result]})`); /* end-log */
         }
         else {
@@ -2334,4 +2344,8 @@ class SuddenDeath extends Aura {
             /* start-log */ if (log) this.player.log(`${this.name} removed`); /* end-log */
         }
     }
+    remove() {
+        this.timer = 0;
+        this.step();
+    }
 }
diff --git a/js/data/enchants.js b/js/data/enchants.js
@@ -1082,7 +1082,8 @@ var enchant = {
     name: 'Battlegear of Valor',
     items: [226765,226764,226766,226770,226771,226769,226767,226768],
     bonus: [
-       { count: 4, stats: { ap: 40 } }
+       { count: 4, stats: { ap: 40 } },
+       { count: 6, stats: { procspell: "WarriorsResolve", procchance: 2 } }
     ]
    },
    {
@@ -1094,4 +1095,29 @@ var enchant = {
        { count: 6, stats: { gladdmg: 4 } },
     ]
  },
+ {
+  id: 1761,
+  name: 'Champion\'s Battlegear',
+  items: [227050,227051,227043,227042,227049,227048],
+  bonus: [
+     { count: 2, stats: { ap: 40 } }
+  ]
+},
+{
+  id: 1775,
+  name: 'Lieutenant Commander\'s Battlegear',
+  items: [227046,227047,227053,227052,227044,227045],
+  bonus: [
+     { count: 2, stats: { ap: 40 } }
+  ]
+},
+{
+  id: 1778,
+  name: 'Battlegear of Heroism',
+  items: [226879,226880,226878,226877,226876,226875,226874,226873],
+  bonus: [
+     { count: 2, stats: { ap: 40 } },
+     { count: 4, stats: { procspell: "WarriorsResolve", procchance: 2 } }
+  ]
+},
 ];