mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2024-12-01 19:26:16 +00:00
a07d2c57a4
* TS: enable strict-null * fix battle-scene.ts * fix voucher.ts * adapt more files to strict-null * adapt more files to strict-null ( 2) * adapt ability.ts to strict-null * adapt `arena.ts` to strict-null * adapt TagAddedEvent constructor to strict-null * adapt phases.ts.to strict-null * adapt status-effect.ts to strict-null * adapt `account.ts` to strict-null * adapt `configHandler.ts` to strict-null * adapt `ability.ts` to strict-null * adapt `biomes.ts` to strict-null * adapt `challenge.ts` to strict-null * adapt `daily-run.ts` to strict-null * adapt `nature.ts` to strict-null * adapt `pokemon-forms.ts` to strict-null * adapt `tainer-names.ts` to strict-null * adapt `types.ts` to strict-null * adapt `weather.ts` to strict-null * adapt `egg-hatch-phase.ts` to strict-null * adapt `evolution-phase.ts` to strict-null * adapt `pokemon-sprite-sparkle-handler.ts` to strict-null * adapt `evolution-phase.ts` to strict-null * adapt `game-mode.ts` to strict-null * adapt `utils.ts` to strict-null * adapt `voucher-ui-handler.ts` to strict-null * adapt `src/ui/unavailable-modal-ui-handler.ts` to strict-null * adapt `src/ui/ui.ts` to strict-null * adapt `src/ui/ui-theme.ts` to strict-null * adapt `src/ui/title-ui-handler.ts` to strict-null * adapt `src/ui/time-of-day-widget.ts` to strict-null * adapt `src/ui/text.ts` to strict-null * adapt `src/ui/target-select-ui-handler.ts` to strict-null * adapt `src/ui/settings/settings-keyboard-ui-handler.ts` to strict-null * adapt more files to strict-null (3) * adapt more files to strict-null (4) * adapt more files (mostly tests) to strict-null (5) * adapt more files to strict-null (6) * adapt more files to strict-null (7) * Update `src/data/pokemon-evolutions.ts` for strict-null Partial update `src/data/pokemon-species.ts` for strict-null * adapt more files to strict-null (8) * adapt more files to strict-null (9) * Strict some more nulls (still a few errors remaining) * adapt rest of the files to strict-null (9) * fix tests (check for null instead of undefined) * repalce a lot of `??` with bangs And added TODO notice as usual * fix more tests * all tests pass now * fix broken game-loop after trainer battle add some console.warn for missing cases and falling back to default * remove guessed fallback from utils.rgbHexToRgba * add TODO for this.currentBattle = null * adjust getPokemonById() return to include `null` * fix compilation errors * add test for pokemon.trySetStatus * `chanceMultiplier` shouldn't be optional * allow `null` for currentPhase * adjust hasExpSprite logic for no keymatch found * reduce bang usage in account.updateUserInfo() * fix new strict-null issues after merge * fix `strict-null` issues in dropdown.ts and sand_spit.test.ts * fix egg-gacha * adapt gul_missile.test.ts to strict-null * fix move.ts strict-null * fix i18n.ts strict-null * fix strict-null issues * fix baton_pass test after accidentially breaking it * chore: fix compiler errors * revert accidential changes in baton_pass.test.ts --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
60 lines
2.1 KiB
TypeScript
60 lines
2.1 KiB
TypeScript
import { bypassLogin } from "./battle-scene";
|
|
import * as Utils from "./utils";
|
|
|
|
export interface UserInfo {
|
|
username: string;
|
|
lastSessionSlot: integer;
|
|
discordId: string;
|
|
googleId: string;
|
|
}
|
|
|
|
export let loggedInUser: UserInfo | null = null;
|
|
// This is a random string that is used to identify the client session - unique per session (tab or window) so that the game will only save on the one that the server is expecting
|
|
export const clientSessionId = Utils.randomString(32);
|
|
|
|
export function initLoggedInUser(): void {
|
|
loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: ""};
|
|
}
|
|
|
|
export function updateUserInfo(): Promise<[boolean, integer]> {
|
|
return new Promise<[boolean, integer]>(resolve => {
|
|
if (bypassLogin) {
|
|
loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "" };
|
|
let lastSessionSlot = -1;
|
|
for (let s = 0; s < 5; s++) {
|
|
if (localStorage.getItem(`sessionData${s ? s : ""}_${loggedInUser.username}`)) {
|
|
lastSessionSlot = s;
|
|
break;
|
|
}
|
|
}
|
|
loggedInUser.lastSessionSlot = lastSessionSlot;
|
|
// Migrate old data from before the username was appended
|
|
[ "data", "sessionData", "sessionData1", "sessionData2", "sessionData3", "sessionData4" ].map(d => {
|
|
const lsItem = localStorage.getItem(d);
|
|
if (lsItem && !!loggedInUser?.username) {
|
|
const lsUserItem = localStorage.getItem(`${d}_${loggedInUser.username}`);
|
|
if (lsUserItem) {
|
|
localStorage.setItem(`${d}_${loggedInUser.username}_bak`, lsUserItem);
|
|
}
|
|
localStorage.setItem(`${d}_${loggedInUser.username}`, lsItem);
|
|
localStorage.removeItem(d);
|
|
}
|
|
});
|
|
return resolve([ true, 200 ]);
|
|
}
|
|
Utils.apiFetch("account/info", true).then(response => {
|
|
if (!response.ok) {
|
|
resolve([ false, response.status ]);
|
|
return;
|
|
}
|
|
return response.json();
|
|
}).then(jsonResponse => {
|
|
loggedInUser = jsonResponse;
|
|
resolve([ true, 200 ]);
|
|
}).catch(err => {
|
|
console.error(err);
|
|
resolve([ false, 500 ]);
|
|
});
|
|
});
|
|
}
|