Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI] Extend suggest reforge toast #1061

Merged
merged 7 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/core/components/gear_picker/gear_picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export class ItemRenderer extends Component {
}

if (newItem.reforge) {
const reforgeData = this.player.getReforgeData(newItem, newItem.reforge);
const reforgeData = Player.getReforgeData(newItem, newItem.reforge);
const fromText = shortSecondaryStatNames.get(newItem.reforge?.fromStat);
const toText = shortSecondaryStatNames.get(newItem.reforge?.toStat);
this.reforgeElem.innerText = `Reforged ${Math.abs(reforgeData.fromAmount)} ${fromText} → ${reforgeData.toAmount} ${toText}`;
Expand Down
2 changes: 1 addition & 1 deletion ui/core/components/gear_picker/selector_modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ export default class SelectorModal extends BaseModal {
}),
computeEP: (reforge: ReforgeData) => this.player.computeReforgingEP(reforge),
equippedToItemFn: (equippedItem: EquippedItem | null) =>
equippedItem?.reforge ? this.player.getReforgeData(equippedItem, equippedItem.reforge) : null,
equippedItem?.reforge ? Player.getReforgeData(equippedItem, equippedItem.reforge) : null,
onRemove: (eventID: number) => {
const equippedItem = gearData.getEquippedItem();
if (equippedItem) {
Expand Down
2 changes: 1 addition & 1 deletion ui/core/components/individual_sim_ui/reforge_summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class ReforgeSummary extends Component {
gear.getItemSlots().forEach(itemSlot => {
const item = gear.getEquippedItem(itemSlot);
if (item?.reforge && item.reforge?.id !== 0) {
const reforge = this.player.getReforgeData(item, item.reforge);
const reforge = Player.getReforgeData(item, item.reforge);
if (reforge) {
const { fromStat, toStat, fromAmount, toAmount } = reforge;

Expand Down
87 changes: 73 additions & 14 deletions ui/core/components/suggest_reforges_action.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@ import { Constraint, greaterEq, lessEq, Model, Options, Solution, solve } from '

import * as Mechanics from '../constants/mechanics.js';
import { IndividualSimUI } from '../individual_sim_ui';
import { Player } from '../player';
import { Class, ItemSlot, PseudoStat, Spec, Stat } from '../proto/common';
import { StatCapType } from '../proto/ui';
import { Player, ReforgeData } from '../player';
import { Class, ItemSlot, PseudoStat, ReforgeStat, Spec, Stat } from '../proto/common';
import { IndividualSimSettings, StatCapType } from '../proto/ui';
import { Gear } from '../proto_utils/gear';
import { slotNames, statCapTypeNames } from '../proto_utils/names';
import { shortSecondaryStatNames, slotNames, statCapTypeNames } from '../proto_utils/names';
import { pseudoStatIsCapped, StatCap, Stats, UnitStat, UnitStatPresets } from '../proto_utils/stats';
import { SpecTalents } from '../proto_utils/utils';
import { Sim } from '../sim';
import { ActionGroupItem } from '../sim_ui';
import { EventID, TypedEvent } from '../typed_event';
import { isDevMode, sleep } from '../utils';
import { CopyButton } from './copy_button';
import { BooleanPicker } from './pickers/boolean_picker';
import { EnumPicker } from './pickers/enum_picker';
import { NumberPicker, NumberPickerConfig } from './pickers/number_picker';
Expand Down Expand Up @@ -87,6 +88,8 @@ export class ReforgeOptimizer {
readonly freezeItemSlotsChangeEmitter = new TypedEvent<void>();
protected freezeItemSlots = false;
protected frozenItemSlots = new Map<ItemSlot, boolean>();
protected previousGear = new Map<ItemSlot, ReforgeData>();
protected currentGear = new Map<ItemSlot, ReforgeData>();
1337LutZ marked this conversation as resolved.
Show resolved Hide resolved

constructor(simUI: IndividualSimUI<any>, options?: ReforgeOptimizerOptions) {
this.simUI = simUI;
Expand Down Expand Up @@ -117,15 +120,9 @@ export class ReforgeOptimizer {
try {
performance.mark('reforge-optimization-start');
await this.optimizeReforges();
new Toast({
variant: 'success',
body: 'Reforge optimization complete!',
});
} catch {
new Toast({
variant: 'error',
body: 'Reforge optimization failed. Please try again, or report the issue if it persists.',
});
this.onReforgeDone();
} catch (error) {
this.onReforgeError(error);
} finally {
performance.mark('reforge-optimization-end');
if (isDevMode())
Expand Down Expand Up @@ -650,7 +647,9 @@ export class ReforgeOptimizer {
console.log('The following slots will not be cleared:');
console.log(Array.from(this.frozenItemSlots.keys()).filter(key => this.frozenItemSlots.get(key)));
}
const baseGear = this.player.getGear().withoutReforges(this.player.canDualWield2H(), this.frozenItemSlots);
const previousGear = this.player.getGear();
this.previousGear = previousGear.getAllReforges();
const baseGear = previousGear.withoutReforges(this.player.canDualWield2H(), this.frozenItemSlots);
const baseStats = await this.updateGear(baseGear);

// Compute effective stat caps for just the Reforge contribution
Expand All @@ -673,6 +672,7 @@ export class ReforgeOptimizer {

// Solve in multiple passes to enforce caps
await this.solveModel(baseGear, validatedWeights, reforgeCaps, reforgeSoftCaps, variables, constraints);
this.currentGear = this.player.getGear().getAllReforges();
}

async updateGear(gear: Gear): Promise<Stats> {
Expand Down Expand Up @@ -1001,4 +1001,63 @@ export class ReforgeOptimizer {
}
return statPoints;
}

onReforgeDone() {
const itemSlots = this.player.getGear().getItemSlots();
const changedSlots = new Map<ItemSlot, ReforgeData | undefined>();
for (const slot of itemSlots) {
const prev = this.previousGear.get(slot);
const current = this.currentGear.get(slot);
if (!ReforgeStat.equals(prev?.reforge, current?.reforge)) changedSlots.set(slot, current);
}
const hasReforgeChanges = changedSlots.size;

const copyButtonContainerRef = ref<HTMLDivElement>();
const changedReforgeMessage = (
<>
<p className="mb-0">The following items were reforged:</p>
<ul>
{[...changedSlots].map(([slot, reforge]) => {
if (reforge) {
const slotName = slotNames.get(slot);
const { fromStat, toStat } = reforge;
const fromText = shortSecondaryStatNames.get(fromStat);
const toText = shortSecondaryStatNames.get(toStat);
return (
<li>
{slotName}: {fromText} → {toText}
</li>
);
}
1337LutZ marked this conversation as resolved.
Show resolved Hide resolved
})}
</ul>
<div ref={copyButtonContainerRef} />
</>
);

if (hasReforgeChanges) {
const settingsExport = IndividualSimSettings.toJson(this.simUI.toProto());
if (settingsExport)
new CopyButton(copyButtonContainerRef.value!, {
extraCssClasses: ['btn-outline-primary'],
getContent: () => JSON.stringify(settingsExport),
text: 'Copy to Reforge Lite',
});
}

new Toast({
variant: 'success',
body: hasReforgeChanges ? changedReforgeMessage : <>No reforge changes were made!</>,
delay: hasReforgeChanges ? 5000 : 3000,
});
}

onReforgeError(error: any) {
if (isDevMode()) console.log(error);

new Toast({
variant: 'error',
body: 'Reforge optimization failed. Please try again, or report the issue if it persists.',
});
}
}
4 changes: 2 additions & 2 deletions ui/core/player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ export class Player<SpecType extends Spec> {
getAvailableReforgings(equippedItem: EquippedItem): Array<ReforgeData> {
const withRandomSuffixStats = equippedItem.getWithRandomSuffixStats();
return this.sim.db.getAvailableReforges(withRandomSuffixStats.item).map(reforge => {
return this.getReforgeData(equippedItem, reforge);
return Player.getReforgeData(equippedItem, reforge);
});
}

Expand All @@ -465,7 +465,7 @@ export class Player<SpecType extends Spec> {
return this.sim.db.getReforgeById(id);
}

getReforgeData(equippedItem: EquippedItem, reforge: ReforgeStat): ReforgeData {
static getReforgeData(equippedItem: EquippedItem, reforge: ReforgeStat): ReforgeData {
1337LutZ marked this conversation as resolved.
Show resolved Hide resolved
const withRandomSuffixStats = equippedItem.getWithRandomSuffixStats();
const item = withRandomSuffixStats.item;
const fromAmount = Math.ceil(-item.stats[reforge.fromStat] * reforge.multiplier);
Expand Down
11 changes: 11 additions & 0 deletions ui/core/proto_utils/gear.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Player, ReforgeData } from '../player';
import { EquipmentSpec, GemColor, ItemSlot, ItemSpec, ItemSwap, Profession, SimDatabase, SimEnchant, SimGem, SimItem } from '../proto/common.js';
import { UIEnchant as Enchant, UIGem as Gem, UIItem as Item } from '../proto/ui.js';
import { isBluntWeaponType, isSharpWeaponType } from '../proto_utils/utils.js';
Expand Down Expand Up @@ -372,6 +373,16 @@ export class Gear extends BaseGear {

return setItemCount;
}

getAllReforges() {
const reforgedItems = new Map<ItemSlot, ReforgeData>();
this.getEquippedItems().forEach((item, slot) => {
if (!item?.reforge) return;
const reforgeData = Player.getReforgeData(item, item.reforge);
reforgedItems.set(slot, reforgeData);
});
return reforgedItems;
}
}

/**
Expand Down
10 changes: 5 additions & 5 deletions ui/scss/shared/_bootstrap_style_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,14 @@ $gray-800: #323232;
.toast {
--icon-color: var(--bs-warning);

i {
line-height: 1;
color: var(--icon-color);
}

.toast-header {
border-bottom: 0;
padding-bottom: 0;

i {
line-height: 1;
color: var(--icon-color);
}
}

.btn-close {
Expand Down
Loading