rend & glance formula

GuybrushGit · Nov 12, 2023 · ff5a1f9 · ff5a1f9
1 parent 2ea646c
commit ff5a1f9
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 35 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/session.min.js b/dist/js/data/session.min.js
diff --git a/dist/js/data/session_sod.min.js b/dist/js/data/session_sod.min.js
diff --git a/dist/js/data/spells.min.js b/dist/js/data/spells.min.js
diff --git a/js/classes/player.js b/js/classes/player.js
@@ -591,8 +591,8 @@ class Player {
     }
     getGlanceReduction(weapon) {
         let diff = this.target.defense - this.stats['skill_' + weapon.type];
-        let low = Math.min(1.3 - 0.05 * diff, 0.91);
-        let high = Math.min(1.2 - 0.03 * diff, 0.99);
+        let low = Math.max(Math.min(1.3 - 0.05 * diff, 0.91), 0.01);
+        let high = Math.max(Math.min(1.2 - 0.03 * diff, 0.99), 0.2);
         if (this.weaponrng) return Math.random() * (high - low) + low;
         else return avg(low, high);
     }

diff --git a/js/classes/spell.js b/js/classes/spell.js
@@ -23,8 +23,8 @@ class Spell {
         if (spell.reaction) this.maxdelay = parseInt(spell.reaction);
         if (spell.cooldown) this.cooldown = parseInt(spell.cooldown) || 0;
         if (spell.durationactive) this.cooldown = Math.max(parseInt(spell.duration), this.cooldown);
-        if (spell.value1) this.value1 = spell.value1;
-        if (spell.value2) this.value2 = spell.value2;
+        if (spell.value1) this.value1 = parseInt(spell.value1);
+        if (spell.value2) this.value2 = parseInt(spell.value2);
         if (spell.priorityapactive) this.priorityap = parseInt(spell.priorityap);
         if (spell.flagellation) this.flagellation = spell.flagellation;
         if (spell.consumedrage) this.consumedrage = spell.consumedrage;
@@ -1277,7 +1277,8 @@ class ConsumedRage extends Aura {
 class Rend extends Aura {
     constructor(player, id) {
         super(player, id);
-        this.duration = this.duration || 9;
+        let dur = this.value2 * 3;
+        this.duration = Math.max(this.duration || dur, dur);
         this.cost = 10;
         this.idmg = 0;
         this.totaldmg = 0;
@@ -1287,8 +1288,8 @@ class Rend extends Aura {
     step() {
         while (step >= this.nexttick && this.stacks) {
             let dmg = this.value1 * this.player.stats.dmgmod * this.dmgmod;
-            this.idmg += ~~(dmg / 3);
-            this.totaldmg += ~~(dmg / 3);
+            this.idmg += ~~(dmg / this.value2);
+            this.totaldmg += ~~(dmg / this.value2);
 
             if (this.player.bleedrage) {
                 let oldRage = this.player.rage;
@@ -1298,7 +1299,7 @@ class Rend extends Aura {
                     this.player.auras.consumedrage.use();
             }
 
-            /* start-log */ if (log) this.player.log(`${this.name} tick for ${~~(dmg / 3)}`); /* end-log */
+            /* start-log */ if (log) this.player.log(`${this.name} tick for ${~~(dmg / this.value2)}`); /* end-log */
 
             this.nexttick += 3000;
             this.stacks--;
@@ -1315,7 +1316,7 @@ class Rend extends Aura {
         this.nexttick = step + 3000;
         this.timer = step + this.duration * 1000;
         this.starttimer = step;
-        this.stacks = 3;
+        this.stacks = this.value2;
         /* start-log */ if (log) this.player.log(`${this.name} applied`); /* end-log */
     }
     canUse() {

diff --git a/js/data/session.js b/js/data/session.js
@@ -37,7 +37,7 @@ var session = {
            "minlevel": 4,
            "maxlevel": 9,
            "value1": 15,
-           "duration": 10,
+           "duration": 16,
            "durationactive": true,
            "active": false,
            "aura": true
@@ -50,7 +50,7 @@ var session = {
            "minlevel": 10,
            "maxlevel": 19,
            "value1": 28,
-           "duration": 10,
+           "duration": 16,
            "durationactive": true,
            "active": false,
            "aura": true
@@ -63,7 +63,7 @@ var session = {
            "minlevel": 20,
            "maxlevel": 29,
            "value1": 45,
-           "duration": 10,
+           "duration": 16,
            "durationactive": true,
            "active": false,
            "aura": true
@@ -76,7 +76,7 @@ var session = {
            "minlevel": 30,
            "maxlevel": 39,
            "value1": 66,
-           "duration": 10,
+           "duration": 16,
            "durationactive": true,
            "active": false,
            "aura": true
@@ -89,7 +89,7 @@ var session = {
            "minlevel": 40,
            "maxlevel": 49,
            "value1": 98,
-           "duration": 10,
+           "duration": 16,
            "durationactive": true,
            "active": false,
            "aura": true
@@ -102,7 +102,7 @@ var session = {
            "minlevel": 50,
            "maxlevel": 59,
            "value1": 126,
-           "duration": 10,
+           "duration": 16,
            "durationactive": true,
            "active": false,
            "aura": true
@@ -114,7 +114,7 @@ var session = {
            "iconname": "ability_gouge",
            "minlevel": 60,
            "value1": 147,
-           "duration": 10,
+           "duration": 16,
            "durationactive": true,
            "active": false,
            "aura": true