From 24c2e18ed794816af1336cd8f2d979629c2f3a58 Mon Sep 17 00:00:00 2001 From: Xavion3 Date: Mon, 22 Apr 2024 02:43:50 +1000 Subject: [PATCH 1/5] Stop weather being regenerated on save load --- src/phases.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/phases.ts b/src/phases.ts index ccb83cc2976..3399838cb63 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -794,7 +794,8 @@ export class EncounterPhase extends BattlePhase { pokemon.resetBattleData(); } - this.scene.arena.trySetWeather(getRandomWeatherType(this.scene.arena), false); + if (!this.loaded) + this.scene.arena.trySetWeather(getRandomWeatherType(this.scene.arena), false); const enemyField = this.scene.getEnemyField(); this.scene.tweens.add({ From c6f395d63a1764589b0b7bb5320b6b37b835781f Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Apr 2024 14:09:54 -0400 Subject: [PATCH 2/5] Add link to npm/node guide to README --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 424d47ff1b0..b2955f8c4b5 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,11 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#vote** channel in the discord. ### 💻 Environment Setup -node: 18.3.0 +#### Prerequisites +- node: 18.3.0 +- npm: [how to install](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) +#### Running Locally 1. Clone the repo and in the root directory run `npm install` - *if you run into any errors, reach out in the **#dev-corner** channel in discord* 2. Run `npm run start:dev` to locally run the project in `localhost:8000` From 3d9f5fb157a4265ef093343b7726d036b25393c4 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 21 Apr 2024 16:19:11 -0400 Subject: [PATCH 3/5] Protect against cross-session overwrites --- src/phases.ts | 4 +++- src/system/game-data.ts | 31 ++++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/phases.ts b/src/phases.ts index 3399838cb63..31f631bf4a6 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -3420,6 +3420,8 @@ export class GameOverPhase extends BattlePhase { handleClearSession(): void { this.scene.gameData.tryClearSession(this.scene, this.scene.sessionSlotId).then((success: boolean | [boolean, boolean]) => { + if (!success[0]) + return this.scene.reset(true); this.scene.time.delayedCall(1000, () => { let firstClear = false; if (this.victory && success[1]) { @@ -4327,7 +4329,7 @@ export class EggLapsePhase extends Phase { const eggsToHatch: Egg[] = this.scene.gameData.eggs.filter((egg: Egg) => { return --egg.hatchWaves < 1 - }) + }); if (eggsToHatch.length) { this.scene.queueMessage('Oh?'); diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 491042777b7..c5b9f32cf9c 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -1,7 +1,7 @@ import BattleScene, { PokeballCounts, bypassLogin } from "../battle-scene"; import Pokemon, { EnemyPokemon, PlayerPokemon } from "../field/pokemon"; import { pokemonEvolutions, pokemonPrevolutions } from "../data/pokemon-evolutions"; -import PokemonSpecies, { SpeciesFormKey, allSpecies, getPokemonSpecies, noStarterFormKeys, speciesStarters } from "../data/pokemon-species"; +import PokemonSpecies, { allSpecies, getPokemonSpecies, noStarterFormKeys, speciesStarters } from "../data/pokemon-species"; import { Species, defaultStarterSpecies } from "../data/enums/species"; import * as Utils from "../utils"; import PokemonData from "./pokemon-data"; @@ -27,7 +27,7 @@ import { Moves } from "../data/enums/moves"; import { speciesEggMoves } from "../data/egg-moves"; import { allMoves } from "../data/move"; import { TrainerVariant } from "../field/trainer"; -import { OutdatedPhase, ReloadSessionPhase, UnavailablePhase } from "#app/phases"; +import { OutdatedPhase, ReloadSessionPhase } from "#app/phases"; import { Variant, variantData } from "#app/data/variant"; const saveKey = 'x0i2O7WRiANTqPmZ'; // Temporary; secure encryption is not yet necessary @@ -722,9 +722,19 @@ export class GameData { Utils.apiFetch(`savedata/delete?datatype=${GameDataType.SESSION}&slot=${slotId}`, true).then(response => { if (response.ok) { loggedInUser.lastSessionSlot = -1; - return resolve(true); + resolve(true); } - resolve(false); + return response.text(); + }).then(error => { + if (error) { + if (error.startsWith('session out of date')) { + this.scene.clearPhaseQueue(); + this.scene.unshiftPhase(new ReloadSessionPhase(this.scene)); + } + console.error(error); + resolve(false); + } + resolve(true); }); }); }); @@ -742,12 +752,19 @@ export class GameData { return resolve([false, false]); const sessionData = this.getSessionSaveData(scene); Utils.apiPost(`savedata/clear?slot=${slotId}`, JSON.stringify(sessionData)).then(response => { - if (response.ok) { + if (response.ok) loggedInUser.lastSessionSlot = -1; - return response.json(); + return response.json(); + }).then(jsonResponse => { + if (!jsonResponse.error) + return resolve([true, jsonResponse.success as boolean]); + if (jsonResponse && jsonResponse.error.startsWith('session out of date')) { + this.scene.clearPhaseQueue(); + this.scene.unshiftPhase(new ReloadSessionPhase(this.scene)); } + console.error(jsonResponse); resolve([false, false]); - }).then(jsonResponse => resolve([true, jsonResponse.success as boolean])); + }); }); }); } From 8a31468dda83a602e2430abbbf491aa1c0a4022a Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Sun, 21 Apr 2024 15:44:30 -0500 Subject: [PATCH 4/5] Add new Stellar Terapagos graphics Despite this, Stellar Terapagos still cannot be obtained legitimately yet. --- public/images/pokemon/1024-stellar.json | 22 +++++++++--------- public/images/pokemon/1024-stellar.png | Bin 1700 -> 3744 bytes public/images/pokemon/back/1024-stellar.json | 22 +++++++++--------- public/images/pokemon/back/1024-stellar.png | Bin 1570 -> 3342 bytes .../pokemon/back/shiny/1024-stellar.json | 22 +++++++++--------- .../pokemon/back/shiny/1024-stellar.png | Bin 1571 -> 3342 bytes public/images/pokemon/shiny/1024-stellar.json | 22 +++++++++--------- public/images/pokemon/shiny/1024-stellar.png | Bin 1699 -> 3750 bytes 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/public/images/pokemon/1024-stellar.json b/public/images/pokemon/1024-stellar.json index 3f8ffe6c4ca..0972c56328f 100644 --- a/public/images/pokemon/1024-stellar.json +++ b/public/images/pokemon/1024-stellar.json @@ -4,30 +4,30 @@ "image": "1024-stellar.png", "format": "RGBA8888", "size": { - "w": 96, - "h": 96 + "w": 119, + "h": 119 }, - "scale": 0.5, + "scale": 1, "frames": [ { "filename": "0001.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 96, - "h": 96 + "w": 119, + "h": 119 }, "spriteSourceSize": { - "x": 9, + "x": 0, "y": 0, - "w": 78, - "h": 96 + "w": 115, + "h": 119 }, "frame": { "x": 0, "y": 0, - "w": 78, - "h": 96 + "w": 115, + "h": 119 } } ] @@ -36,6 +36,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c9ee64bda72f2dadb06109338796ccac:1313f1218b7da2c57ad9f290d1323840:c1508f3b01ae78a28a1267fd6caa4f7b$" + "smartupdate": "$TexturePacker:SmartUpdate:bc663acf2e62803fce6c3a525dc8dd98:ccd7d0de8a487235cfbd6f372afa931f:c1508f3b01ae78a28a1267fd6caa4f7b$" } } diff --git a/public/images/pokemon/1024-stellar.png b/public/images/pokemon/1024-stellar.png index 6500eddec8e84043639383a608810f75a93f8545..7e40fb0043f771598ab60d07033e96e6111f2f66 100644 GIT binary patch literal 3744 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 KMNUMnLSTY?(uK+Z literal 1700 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 YKZ(Y(VlZxN4FCWD07*qoM6N<$f|xnJPXGV_ literal 1570 zcmV+-2Hp9IP)IrE%YHs_5c6?0d!JM zQvg8b*k%9#1*1tsK~#8N&DURR8%GcT@D&(4KpJkbda99QXupBkA|d=@(PIy23-rA} z4li>7Ctx9S6LBu|DFi|a#wFtLOTU8Zpo_D%sb5+k!XO9@U=(Wl823IyXHW89N%jdS zbgaW*&rdV6dw)1KE*`MSVtW0527vjnJe_@vDTKfQzm~m%iz?>^R(3EIEHm4iWC%&X z`fq_X8JG?TOtKSx;N_IRoV@@#U{?zhlyI1>tlUIX=R9%~17|`oh07BN8o2*Zp^P!z7W*)w6|kJ0d4U3O`uMf43RRM zUTp)!Q1W%K!ubvTq(NX6pcJ;D1Yx|gSh2?S(-;5|=oMH2SP@|2)9=RgQ;r4zF`(}k zRE1DUd*53l3y491Ev!Uk)In)ggRk2}=Z64ZE>NxzD$~ST*CC|l0&i`on>B{#1?ab+ zF;>jLB`|$0mWSI%fwZJ)0Ww6&6&Oq{M0s{?sDG2cbymRiBq|YQqB-j2x$<>^CclzS zY*Zi6=!gOh5Z6Whd_|*60Q*2Jk}qH1G_#cTG{2HcA)=^B$rOAxY7WkiAJ0XO&z32{ zr1lF4GlYpn&Soo3#;yTF(sVI6I|j)V=3kuMF}Zi1T^qe}Ho+oK)AJ4mXJI>L&*MRb zVPW#~4(F7fhUCSzcSpZo`($khKy8+Q;5IlHA%Vl{bNwtnen0dO(W@;^Apz7yzH+1u zPukC3=wlqZ7s1Zb{hm~yq&m-+;CS%l>BATL{ncB}8r%3C#8UAc2Gj;PDIrQ6>?cp* zhvWKEeB}b2dAkR*OGOv`00GFDV+DYS7e0lsR~M}-74GUidv+&}0lq{$2ND#)VjpPh zvY64GWLCT28xRbDD1lNEs;?i0?{}6ifxC=tygkx?zY5TALfK)Eqts^~bwTXxT!7ARDL8SzZc74DOH zcq#CTn+25M6}vV7C3ktX%0>d$s}&xRsTGg_czK|Zk9(367!|H>n`QKIaLp+LICQ1s zjRS$2$6DbGcs3oQL zkREp&0LQTjSk~BgT!(-`AVFOMY#gXDcNkQ2Y;0Ht243lm%> U53%k77XSbN07*qoM6N<$g58tK@Bjb+ diff --git a/public/images/pokemon/back/shiny/1024-stellar.json b/public/images/pokemon/back/shiny/1024-stellar.json index eeabac109a3..ce84b0d4502 100644 --- a/public/images/pokemon/back/shiny/1024-stellar.json +++ b/public/images/pokemon/back/shiny/1024-stellar.json @@ -4,30 +4,30 @@ "image": "1024-stellar.png", "format": "RGBA8888", "size": { - "w": 96, - "h": 96 + "w": 119, + "h": 119 }, - "scale": 0.333, + "scale": 1, "frames": [ { "filename": "0001.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 96, - "h": 96 + "w": 119, + "h": 119 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 86, - "h": 96 + "w": 115, + "h": 119 }, "frame": { "x": 0, "y": 0, - "w": 86, - "h": 96 + "w": 115, + "h": 119 } } ] @@ -36,6 +36,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2bd25bae0fabcfbc35e24bd578a7b4b5:aec60788a0d77f38fb599d721e41a0d6:c1508f3b01ae78a28a1267fd6caa4f7b$" + "smartupdate": "$TexturePacker:SmartUpdate:210ba1c2e6e58501571ae226d073a3c5:f12bdf191842f7ec3a4be98a43fb8121:c1508f3b01ae78a28a1267fd6caa4f7b$" } } diff --git a/public/images/pokemon/back/shiny/1024-stellar.png b/public/images/pokemon/back/shiny/1024-stellar.png index 6b9e35174eea0e6c8aa9c8ce587734479e55f14c..0bb2993d857edfa4e44f1d33bfcdf1c5508bdf8d 100644 GIT binary patch literal 3342 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 YKZ(Y(VlZxN4FCWD07*qoM6N<$f|xnJPXGV_ literal 1571 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 From 9531f929974efd365763bf124e6de812dcac1884 Mon Sep 17 00:00:00 2001 From: maru Date: Sun, 21 Apr 2024 17:19:33 -0400 Subject: [PATCH 5/5] Use new API URL --- src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.ts b/src/utils.ts index 3cbbfd84263..7d3f0e761e4 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -212,7 +212,7 @@ export function executeIf(condition: boolean, promiseFunc: () => Promise): export const sessionIdKey = 'pokerogue_sessionId'; export const isLocal = window.location.hostname === 'localhost'; export const serverUrl = isLocal ? 'http://localhost:8001' : ''; -export const apiUrl = isLocal ? serverUrl : 'api'; +export const apiUrl = isLocal ? serverUrl : 'https://api.pokerogue.net'; export function setCookie(cName: string, cValue: string): void { const expiration = new Date();