From 4a2e42a44fa2014657c35a044769e83ffb1c025c Mon Sep 17 00:00:00 2001 From: Rezzo Date: Tue, 23 Jan 2024 17:38:41 +0000 Subject: [PATCH 1/4] readd substitute placeholder sprites --- play.pokemonshowdown.com/src/battle-dex.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/play.pokemonshowdown.com/src/battle-dex.ts b/play.pokemonshowdown.com/src/battle-dex.ts index c8cd3c524..ab5cac486 100644 --- a/play.pokemonshowdown.com/src/battle-dex.ts +++ b/play.pokemonshowdown.com/src/battle-dex.ts @@ -734,12 +734,12 @@ const Dex = new class implements ModdedDex { // Placeholder sprites for Pet Mods Fakemons with no sprite data // window.modsprites[modSpriteId]: checks if it has custom sprite data. // window.BattlePokemonSprites[modSpriteId]: checks if it is a real Pokemon. - // if (!window.ModSprites[modSpriteId] && !window.BattlePokemonSprites[modSpriteId] && pokemon !== 'substitute') { - // spriteData = Dex.getSpriteData('substitute', spriteData.isFrontSprite, { - // gen: options.gen, - // mod: options.mod, - // }); - // } + if (window.BattlePokemonSprites && !window.ModSprites[modSpriteId] && !window.BattlePokemonSprites[modSpriteId] && pokemon !== 'substitute') { + spriteData = Dex.getSpriteData('substitute', spriteData.isFrontSprite, { + gen: options.gen, + mod: options.mod, + }); + } return spriteData; } From 8f78e13e36e8f60a37196e28d60e02614eaee19d Mon Sep 17 00:00:00 2001 From: Rezzo Date: Tue, 23 Jan 2024 17:44:37 +0000 Subject: [PATCH 2/4] no comment! --- play.pokemonshowdown.com/src/battle-dex.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/play.pokemonshowdown.com/src/battle-dex.ts b/play.pokemonshowdown.com/src/battle-dex.ts index ab5cac486..5c5911bdd 100644 --- a/play.pokemonshowdown.com/src/battle-dex.ts +++ b/play.pokemonshowdown.com/src/battle-dex.ts @@ -731,9 +731,6 @@ const Dex = new class implements ModdedDex { spriteData.h *= 1.5; spriteData.y += -11; } - // Placeholder sprites for Pet Mods Fakemons with no sprite data - // window.modsprites[modSpriteId]: checks if it has custom sprite data. - // window.BattlePokemonSprites[modSpriteId]: checks if it is a real Pokemon. if (window.BattlePokemonSprites && !window.ModSprites[modSpriteId] && !window.BattlePokemonSprites[modSpriteId] && pokemon !== 'substitute') { spriteData = Dex.getSpriteData('substitute', spriteData.isFrontSprite, { gen: options.gen, From d81530dcad0716773c597f614570d6cfb935c8cf Mon Sep 17 00:00:00 2001 From: Rezzo Date: Tue, 23 Jan 2024 17:47:09 +0000 Subject: [PATCH 3/4] refactor just in case --- play.pokemonshowdown.com/src/battle-dex.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/play.pokemonshowdown.com/src/battle-dex.ts b/play.pokemonshowdown.com/src/battle-dex.ts index 5c5911bdd..b54e87257 100644 --- a/play.pokemonshowdown.com/src/battle-dex.ts +++ b/play.pokemonshowdown.com/src/battle-dex.ts @@ -731,11 +731,13 @@ const Dex = new class implements ModdedDex { spriteData.h *= 1.5; spriteData.y += -11; } - if (window.BattlePokemonSprites && !window.ModSprites[modSpriteId] && !window.BattlePokemonSprites[modSpriteId] && pokemon !== 'substitute') { - spriteData = Dex.getSpriteData('substitute', spriteData.isFrontSprite, { - gen: options.gen, - mod: options.mod, - }); + if (window.BattlePokemonSprites) { + if (!window.ModSprites[modSpriteId] && !window.BattlePokemonSprites[modSpriteId] && pokemon !== 'substitute') { + spriteData = Dex.getSpriteData('substitute', spriteData.isFrontSprite, { + gen: options.gen, + mod: options.mod, + }); + } } return spriteData; } From 01746a3d40fa2dd78f484c1f132b8521764ecd9b Mon Sep 17 00:00:00 2001 From: Rezzo Date: Wed, 24 Jan 2024 14:53:56 +0000 Subject: [PATCH 4/4] update modResourcePrefix --- play.pokemonshowdown.com/src/battle-dex.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/play.pokemonshowdown.com/src/battle-dex.ts b/play.pokemonshowdown.com/src/battle-dex.ts index b54e87257..7d957b502 100644 --- a/play.pokemonshowdown.com/src/battle-dex.ts +++ b/play.pokemonshowdown.com/src/battle-dex.ts @@ -179,8 +179,7 @@ const Dex = new class implements ModdedDex { pokeballs: string[] | null = null; - //TODO we might want to move this to something like data/petmods - readonly modResourcePrefix = 'https://raw.githubusercontent.com/scoopapa/dh2/master/data/mods/'; + readonly modResourcePrefix = 'https://media.githubusercontent.com/media/scoopapa/DH2/main/data/mods/'; resourcePrefix = (() => {