Merge pull request #2172 from wowsims/fixes

Expose BlockValueMultiplier pseudostat in the UI to fix stat display …
wowsims · Dec 15, 2022 · 225d321 · 225d321
2 parents a796f8d + 4ef2d5d
commit 225d321
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 18 deletions.
diff --git a/proto/common.proto b/proto/common.proto
@@ -121,6 +121,7 @@ enum PseudoStat {
  PseudoStatMainHandDps = 0;
  PseudoStatOffHandDps = 1;
  PseudoStatRangedDps = 2;
+ PseudoStatBlockValueMultiplier = 3;
 }
 
 message UnitStats {

diff --git a/sim/core/attack.go b/sim/core/attack.go
@@ -27,6 +27,14 @@ type Weapon struct {
  SpellSchool SpellSchool
 }
 
+func (w Weapon) DPS() float64 {
+ if w.SwingSpeed == 0 {
+ return 0
+ } else {
+ return (w.BaseDamageMin + w.BaseDamageMax) / 2.0 / w.SwingSpeed
+ }
+}
+
 func (w Weapon) WithBonusDPS(bonusDps float64) Weapon {
  newWeapon := w
  bonusSwingDamage := bonusDps * w.SwingSpeed

diff --git a/sim/core/character.go b/sim/core/character.go
@@ -538,7 +538,12 @@ func (character *Character) doneIteration(sim *Simulation) {
 }
 
 func (character *Character) GetPseudoStatsProto() []float64 {
- return nil
+ vals := make([]float64, stats.PseudoStatsLen)
+ vals[proto.PseudoStat_PseudoStatMainHandDps] = character.WeaponFromMainHand(0).DPS()
+ vals[proto.PseudoStat_PseudoStatOffHandDps] = character.WeaponFromOffHand(0).DPS()
+ vals[proto.PseudoStat_PseudoStatRangedDps] = character.WeaponFromRanged(0).DPS()
+ vals[proto.PseudoStat_PseudoStatBlockValueMultiplier] = character.PseudoStats.BlockValueMultiplier
+ return vals
 }
 
 func (character *Character) GetMetricsProto() *proto.UnitMetrics {

diff --git a/ui/core/components/character_stats.ts b/ui/core/components/character_stats.ts
@@ -1,4 +1,4 @@
-import { Stat, Class } from '..//proto/common.js';
+import { Stat, Class, PseudoStat } from '..//proto/common.js';
 import { TristateEffect } from '..//proto/common.js'
 import { getClassStatName, statOrder } from '..//proto_utils/names.js';
 import { Stats } from '..//proto_utils/stats.js';
@@ -87,13 +87,13 @@ export class CharacterStats extends Component {
  this.stats.forEach((stat, idx) => {
  let fragment = document.createElement('fragment');
  fragment.innerHTML = `
- <a href="javascript:void(0)" class="stat-value-link" role="button" data-bs-toggle="tooltip" data-bs-html="true">${this.statDisplayString(finalStats, stat)}</a>
+ <a href="javascript:void(0)" class="stat-value-link" role="button" data-bs-toggle="tooltip" data-bs-html="true">${this.statDisplayString(finalStats, finalStats, stat)}</a>
  `
  let valueElem = fragment.children[0] as HTMLElement;
  this.valueElems[idx].querySelector('.stat-value-link')?.remove()
  this.valueElems[idx].prepend(valueElem);
 
- let bonusStatValue = player.getBonusStats().getStat(stat);
+ let bonusStatValue = bonusStats.getStat(stat);
 
  if (bonusStatValue == 0) {
  valueElem.classList.remove('text-success', 'text-danger');
@@ -109,48 +109,53 @@ export class CharacterStats extends Component {
  valueElem.setAttribute('data-bs-title', `
  <div class="character-stats-tooltip-row">
  <span>Base:</span>
- <span>${this.statDisplayString(baseDelta, stat)}</span>
+ <span>${this.statDisplayString(baseStats, baseDelta, stat)}</span>
  </div>
  <div class="character-stats-tooltip-row">
  <span>Gear:</span>
- <span>${this.statDisplayString(gearDelta, stat)}</span>
+ <span>${this.statDisplayString(gearStats, gearDelta, stat)}</span>
  </div>
  <div class="character-stats-tooltip-row">
  <span>Talents:</span>
- <span>${this.statDisplayString(talentsDelta, stat)}</span>
+ <span>${this.statDisplayString(talentsStats, talentsDelta, stat)}</span>
  </div>
  <div class="character-stats-tooltip-row">
  <span>Buffs:</span>
- <span>${this.statDisplayString(buffsDelta, stat)}</span>
+ <span>${this.statDisplayString(buffsStats, buffsDelta, stat)}</span>
  </div>
  <div class="character-stats-tooltip-row">
  <span>Consumes:</span>
- <span>${this.statDisplayString(consumesDelta, stat)}</span>
+ <span>${this.statDisplayString(consumesStats, consumesDelta, stat)}</span>
  </div>
  ${debuffStats.getStat(stat) == 0 ? '' : `
  <div class="character-stats-tooltip-row">
  <span>Debuffs:</span>
- <span>${this.statDisplayString(debuffStats, stat)}</span>
+ <span>${this.statDisplayString(debuffStats, debuffStats, stat)}</span>
  </div>
  `}
  ${bonusStatValue == 0 ? '' : `
  <div class="character-stats-tooltip-row">
  <span>Bonus:</span>
- <span>${this.statDisplayString(this.player.getBonusStats(), stat)}</span>
+ <span>${this.statDisplayString(bonusStats, bonusStats, stat)}</span>
  </div>
  `}
  <div class="character-stats-tooltip-row">
  <span>Total:</span>
- <span>${this.statDisplayString(finalStats, stat)}</span>
+ <span>${this.statDisplayString(finalStats, finalStats, stat)}</span>
  </div>
  `);
 
  Tooltip.getOrCreateInstance(valueElem);
  });
  }
 
- private statDisplayString(stats: Stats, stat: Stat): string {
- const rawValue = stats.getStat(stat);
+ private statDisplayString(stats: Stats, deltaStats: Stats, stat: Stat): string {
+ let rawValue = deltaStats.getStat(stat);
+
+ if (stat == Stat.StatBlockValue) {
+ rawValue *= stats.getPseudoStat(PseudoStat.PseudoStatBlockValueMultiplier) || 1;
+ }
+
  let displayStr = String(Math.round(rawValue));
 
  if (stat == Stat.StatMeleeHit) {

diff --git a/ui/core/components/exporters.ts b/ui/core/components/exporters.ts
@@ -181,7 +181,6 @@ export class Individual80UEPExporter<SpecType extends Spec> extends Exporter {
  }
  static pseudoStatNames: Partial<Record<PseudoStat, string>> = {
  [PseudoStat.PseudoStatMainHandDps]: 'dps',
- [PseudoStat.PseudoStatOffHandDps]: '',
  [PseudoStat.PseudoStatRangedDps]: 'rangedDps',
  }
 }
@@ -270,7 +269,6 @@ export class IndividualPawnEPExporter<SpecType extends Spec> extends Exporter {
  }
  static pseudoStatNames: Partial<Record<PseudoStat, string>> = {
  [PseudoStat.PseudoStatMainHandDps]: 'MeleeDps',
- [PseudoStat.PseudoStatOffHandDps]: '',
  [PseudoStat.PseudoStatRangedDps]: 'RangedDps',
  }
 }
diff --git a/ui/core/components/stat_weights_action.ts b/ui/core/components/stat_weights_action.ts
@@ -203,8 +203,7 @@ class EpWeightsMenu extends Popup {
  this.tableBody.innerHTML = '';
  this.tableBody.appendChild(this.tableHeader);
 
- const allUnitStats = UnitStat.getAll();
- allUnitStats.forEach(stat => {
+ EpWeightsMenu.epUnitStats.forEach(stat => {
  const row = this.makeTableRow(stat, iterations, result);
  if ((stat.isStat() && !this.epStats.includes(stat.getStat())) || (stat.isPseudoStat() && !this.epPseudoStats.includes(stat.getPseudoStat()))) {
  row.classList.add('non-ep-stat');
@@ -538,6 +537,18 @@ class EpWeightsMenu extends Popup {
  bestGemEP: bestGemEP,
  };
  }
+
+ private static epUnitStats: Array<UnitStat> = UnitStat.getAll().filter(stat => {
+ if (stat.isStat()) {
+ return true;
+ } else {
+ return [
+ PseudoStat.PseudoStatMainHandDps,
+ PseudoStat.PseudoStatOffHandDps,
+ PseudoStat.PseudoStatRangedDps,
+ ].includes(stat.getPseudoStat());
+ }
+ });
 }
 
 interface BestGemsResult {

diff --git a/ui/core/proto_utils/names.ts b/ui/core/proto_utils/names.ts
@@ -186,11 +186,13 @@ export const pseudoStatOrder: Array<PseudoStat> = [
  PseudoStat.PseudoStatMainHandDps,
  PseudoStat.PseudoStatOffHandDps,
  PseudoStat.PseudoStatRangedDps,
+ PseudoStat.PseudoStatBlockValueMultiplier,
 ];
 export const pseudoStatNames: Record<PseudoStat, string> = {
  [PseudoStat.PseudoStatMainHandDps]: 'Main Hand DPS',
  [PseudoStat.PseudoStatOffHandDps]: 'Off Hand DPS',
  [PseudoStat.PseudoStatRangedDps]: 'Ranged DPS',
+ [PseudoStat.PseudoStatBlockValueMultiplier]: 'Block Value Multiplier',
 };
 
 export function getClassStatName(stat: Stat, playerClass: Class): string {