Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
5 changes: 3 additions & 2 deletions src/app/components/player/WikiSyncButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const WikiSyncButton: React.FC<IWikiSyncButtonProps> = observer((props) => {
const WikiSyncButtonWrapper: React.FC = observer(() => {
const store = useStore();
const {
validWikiSyncInstances, updatePlayer,
validWikiSyncInstances, updatePlayer, recalculateLeaguesEffects,
} = store;
const items: WikiSyncSelectItem[] = [...validWikiSyncInstances].map(([port, ins]) => ({ label: ins.username!, value: port }));

Expand All @@ -116,10 +116,11 @@ const WikiSyncButtonWrapper: React.FC = observer(() => {
if (data) {
parseLoadoutsFromImportedData(data).forEach((player) => {
updatePlayer(player);
recalculateLeaguesEffects();
});
}
}
}, [validWikiSyncInstances, updatePlayer]);
}, [validWikiSyncInstances, updatePlayer, recalculateLeaguesEffects]);

return (
<Select
Expand Down
2 changes: 1 addition & 1 deletion src/state.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ class GlobalState implements State {
}

const leagueMagicBoost = Math.min(this.player.leagues.six.regenerateMagicBonus ?? 0, 10);
if ((boosts.magic ?? 0) !== 0 && leagueMagicBoost > 0) {
if ((boosts.magic ?? 0) === 0 && leagueMagicBoost > 0) {
// Regenerate magic boost does not stack with any other boosts
boosts.magic = leagueMagicBoost;
}
Expand Down
76 changes: 76 additions & 0 deletions src/wikisync/ParseWikiSync.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import { ImportableData } from '@/types/State';
import { dbrowDefinitions } from '@/app/components/player/demonicPactsLeague/parse_skill_tree_elements';

type League6Payload = {
mastery0?: number;
mastery1?: number;
mastery2?: number;
mastery3?: number;
mastery4?: number;
mastery5?: number;
};

type LoadoutWithLeague6 = ImportableData['loadouts'][number] & {
league6?: League6Payload;
};

const NODE_NAMES = Object.keys(dbrowDefinitions);

function decodeLeague6SelectedNodeIds(league6?: League6Payload): Set<string> {
const selected = new Set<string>();

if (!league6) {
return selected;
}

const values = [
league6.mastery0 ?? 0,
league6.mastery1 ?? 0,
league6.mastery2 ?? 0,
league6.mastery3 ?? 0,
league6.mastery4 ?? 0,
league6.mastery5 ?? 0,
];

values.forEach((value, groupIndex) => {
for (let bit = 0; bit < 32; bit += 1) {
if ((value & (1 << bit)) !== 0) {
const globalIndex = groupIndex * 32 + bit;
const nodeId = NODE_NAMES[globalIndex];
if (nodeId) {
selected.add(nodeId);
}
}
}
});

if (NODE_NAMES[0]) {
selected.add(NODE_NAMES[0]);
}

return selected;
}

export default function parseWikiSyncImportableData(data: ImportableData): ImportableData {
return {
...data,
loadouts: data.loadouts.map((loadout) => {
const { league6, ...rest } = loadout as LoadoutWithLeague6;

if (!league6) {
return loadout;
}

return {
...rest,
leagues: {
...rest.leagues,
six: {
...rest.leagues?.six,
selectedNodeIds: decodeLeague6SelectedNodeIds(league6),
},
},
};
}),
};
}
3 changes: 2 additions & 1 deletion src/wikisync/WikiSyncer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { makeAutoObservable } from 'mobx';
import { ImportableData } from '@/types/State';
import { GetPlayerRequest, WikiSyncerRequestType, WikiSyncerResponsesUnion } from './WikiSyncerTypes';
import parseWikiSyncImportableData from './ParseWikiSync';

const minimumPort = 37767;
const maximumPort = 37776;
Expand Down Expand Up @@ -66,7 +67,7 @@ export class WikiSyncer {
if (response.error) {
this.inFlightRequests.getPlayer.get(response.sequenceId)?.reject(new Error(response.error));
} else {
this.inFlightRequests.getPlayer.get(response.sequenceId)?.resolve(response.payload);
this.inFlightRequests.getPlayer.get(response.sequenceId)?.resolve(parseWikiSyncImportableData(response.payload));
}
break;

Expand Down
Loading