Show optimized DPS and regen variants
This commit is contained in:
@@ -764,6 +764,26 @@ function findOptimalDamageSetup(totals, effectCount, combatStyle, optimizationTa
|
|||||||
return best;
|
return best;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createTotalsFromOptimumCounts(totals, optimumCounts, currentSummary = null) {
|
||||||
|
const effects = createEmptyEffectTotals();
|
||||||
|
for (const effect of EFFECTS) {
|
||||||
|
const count = optimumCounts[effect.id] || 0;
|
||||||
|
if (!count) continue;
|
||||||
|
const current = currentSummary?.[effect.id];
|
||||||
|
const valuePerEffect = current?.count ? current.total / current.count : effect.cap;
|
||||||
|
effects[effect.id] = count * valuePerEffect;
|
||||||
|
}
|
||||||
|
return { baseDamage: totals.baseDamage, baseHealth: totals.baseHealth, effects };
|
||||||
|
}
|
||||||
|
|
||||||
|
function calculateDpsAndRegen(totals) {
|
||||||
|
const dps = calculateDps(totals, state.combatStyle);
|
||||||
|
return {
|
||||||
|
dps,
|
||||||
|
regen: calculateRegenDetails(totals, dps).total,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
function renderEffectComparisonRows(optimumCounts, currentSummary) {
|
function renderEffectComparisonRows(optimumCounts, currentSummary) {
|
||||||
const rows = EFFECTS.map((effect) => {
|
const rows = EFFECTS.map((effect) => {
|
||||||
const optimumCount = optimumCounts[effect.id] || 0;
|
const optimumCount = optimumCounts[effect.id] || 0;
|
||||||
@@ -788,13 +808,20 @@ function renderOptimalDamageSetup(totals, currentDps) {
|
|||||||
const currentMetric = calculateOptimizationMetric(totals, state.combatStyle, state.optimizationTarget, metricContext);
|
const currentMetric = calculateOptimizationMetric(totals, state.combatStyle, state.optimizationTarget, metricContext);
|
||||||
const delta = percentChange(currentMetric, optimum.metric);
|
const delta = percentChange(currentMetric, optimum.metric);
|
||||||
const currentEffectSummary = summarizeCurrentEffects();
|
const currentEffectSummary = summarizeCurrentEffects();
|
||||||
|
const optimumCounts = effectCount ? optimum.counts : {};
|
||||||
|
const fullOptimumMetrics = calculateDpsAndRegen(createTotalsFromOptimumCounts(totals, optimumCounts));
|
||||||
|
const averageOptimumMetrics = calculateDpsAndRegen(createTotalsFromOptimumCounts(totals, optimumCounts, currentEffectSummary));
|
||||||
|
|
||||||
$("#optimumEffectCount").textContent = `${effectCount} effect${effectCount === 1 ? "" : "s"}`;
|
$("#optimumEffectCount").textContent = `${effectCount} effect${effectCount === 1 ? "" : "s"}`;
|
||||||
$("#optimumMetricLabel").textContent = getOptimizationMetricLabel(state.optimizationTarget);
|
$("#optimumMetricLabel").textContent = getOptimizationMetricLabel(state.optimizationTarget);
|
||||||
$("#optimumDps").textContent = fmt(optimum.metric);
|
$("#optimumDps").textContent = fmt(optimum.metric);
|
||||||
$("#optimumDpsDelta").textContent = formatDelta(delta, "%");
|
$("#optimumDpsDelta").textContent = formatDelta(delta, "%");
|
||||||
$("#optimumDpsDelta").className = deltaClass(delta);
|
$("#optimumDpsDelta").className = deltaClass(delta);
|
||||||
renderEffectComparisonRows(effectCount ? optimum.counts : {}, currentEffectSummary);
|
$("#optimumFullDps").textContent = fmt(fullOptimumMetrics.dps);
|
||||||
|
$("#optimumFullRegen").textContent = fmt(fullOptimumMetrics.regen);
|
||||||
|
$("#optimumAverageDps").textContent = fmt(averageOptimumMetrics.dps);
|
||||||
|
$("#optimumAverageRegen").textContent = fmt(averageOptimumMetrics.regen);
|
||||||
|
renderEffectComparisonRows(optimumCounts, currentEffectSummary);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getOptimizationMetricContext(totals, effectCount, combatStyle, optimizationTarget) {
|
function getOptimizationMetricContext(totals, effectCount, combatStyle, optimizationTarget) {
|
||||||
|
|||||||
@@ -108,6 +108,10 @@
|
|||||||
<div class="optimum-results">
|
<div class="optimum-results">
|
||||||
<div><span id="optimumMetricLabel">Optimal DPS</span><strong id="optimumDps">0</strong></div>
|
<div><span id="optimumMetricLabel">Optimal DPS</span><strong id="optimumDps">0</strong></div>
|
||||||
<div><span>Difference vs current</span><strong id="optimumDpsDelta">0</strong></div>
|
<div><span>Difference vs current</span><strong id="optimumDpsDelta">0</strong></div>
|
||||||
|
<div><span>Optimized max-roll DPS</span><strong id="optimumFullDps">0</strong></div>
|
||||||
|
<div><span>Optimized max-roll Regen</span><strong id="optimumFullRegen">0</strong></div>
|
||||||
|
<div><span>Optimized current-average DPS</span><strong id="optimumAverageDps">0</strong></div>
|
||||||
|
<div><span>Optimized current-average Regen</span><strong id="optimumAverageRegen">0</strong></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="effect-comparison-wrap">
|
<div class="effect-comparison-wrap">
|
||||||
<table class="effect-comparison-table">
|
<table class="effect-comparison-table">
|
||||||
|
|||||||
Reference in New Issue
Block a user