Skip to content

Commit 1181ec2

Browse files
committed
skin-set mult fix
1 parent cbd6301 commit 1181ec2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

public/.DS_Store

0 Bytes
Binary file not shown.

src/utils/statEngine.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,8 +1085,8 @@ export class StatEngine {
10851085
const skinDmgFactor = 1 + this.skinDamageMulti;
10861086
const skinHpFactor = 1 + this.skinHealthMulti;
10871087

1088-
const setDmgFactor = 1 + this.setDamageMulti;
1089-
const setHpFactor = 1 + this.setHealthMulti;
1088+
const setDmgFactor = this.setDamageMulti;
1089+
const setHpFactor = this.setHealthMulti;
10901090

10911091
this.debugLogs.push(`Skin Factor: Dmg=${skinDmgFactor.toFixed(3)}, Hp=${skinHpFactor.toFixed(3)}`);
10921092
this.debugLogs.push(`Set Factor: Dmg=${setDmgFactor.toFixed(3)}, Hp=${setHpFactor.toFixed(3)}`);
@@ -1095,10 +1095,10 @@ export class StatEngine {
10951095
console.log(`[StatEngine DEBUG] additiveDmg=${damageAdditiveMulti.toFixed(4)}, additiveHp=${healthAdditiveMulti.toFixed(4)}`);
10961096
console.log(`[StatEngine DEBUG] skinDmg=${skinDmgFactor.toFixed(4)}, skinHp=${skinHpFactor.toFixed(4)}`);
10971097
console.log(`[StatEngine DEBUG] setDmg=${setDmgFactor.toFixed(4)}, setHp=${setHpFactor.toFixed(4)}`);
1098-
console.log(`[StatEngine DEBUG] totalDmg=${(flatDamageWithMelee * damageAdditiveMulti * skinDmgFactor * setDmgFactor).toFixed(2)}, totalHp=${(flatHealth * healthAdditiveMulti * skinHpFactor * setHpFactor).toFixed(2)}`);
1098+
console.log(`[StatEngine DEBUG] totalDmg=${(flatDamageWithMelee * damageAdditiveMulti * (skinDmgFactor + setDmgFactor)).toFixed(2)}, totalHp=${(flatHealth * healthAdditiveMulti * (skinHpFactor + setHpFactor)).toFixed(2)}`);
10991099

1100-
const damageAfterGlobalMultis = flatDamageWithMelee * damageAdditiveMulti * skinDmgFactor * setDmgFactor;
1101-
const healthAfterGlobalMultis = flatHealth * healthAdditiveMulti * skinHpFactor * setHpFactor;
1100+
const damageAfterGlobalMultis = flatDamageWithMelee * damageAdditiveMulti * (skinDmgFactor + setDmgFactor);
1101+
const healthAfterGlobalMultis = flatHealth * healthAdditiveMulti * (skinHpFactor + setHpFactor);
11021102

11031103
// 6. Melee/Ranged Specific Multipliers (Multiplicative)
11041104
const specificDamageMulti = isWeaponMelee
@@ -1127,7 +1127,7 @@ export class StatEngine {
11271127
const flatDamageNoMelee = this.stats.basePlayerDamage + this.stats.itemDamage + this.stats.petDamage;
11281128

11291129
// Melee/Ranged specific damage (for display)
1130-
const globalDmgFactor = damageAdditiveMulti * skinDmgFactor * setDmgFactor;
1130+
const globalDmgFactor = damageAdditiveMulti * (skinDmgFactor + setDmgFactor);
11311131
this.stats.meleeDamage = isWeaponMelee ? this.stats.totalDamage : (flatDamageWithMelee * globalDmgFactor * (1 + this.secondaryStats.meleeDamageMulti));
11321132
this.stats.rangedDamage = !isWeaponMelee ? this.stats.totalDamage : (flatDamageNoMelee * globalDmgFactor * (1 + this.secondaryStats.rangedDamageMulti));
11331133

0 commit comments

Comments
 (0)