Compare commits

...

8 Commits

Author SHA1 Message Date
Matthew Olker
e3a71cf171 Revert: Allow Roaming Gimmighoul to be caught 2024-05-20 23:51:16 -04:00
José Ricardo Fleury Oliveira
e97d79170d
added nonExplicitSupportedLngs (#1181) 2024-05-20 23:26:53 -04:00
Madmadness65
82be3daf9d Allow Roaming Gimmighoul to be caught 2024-05-20 22:12:07 -05:00
Matthew Olker
680eecc452 Fix incorrect passive costs 2024-05-20 21:40:56 -04:00
Greenlamp2
c454e2d232
Fix - shiny color swap (#1183)
* return a list of errors if something is wrong with the variant's sprite

* reformat

* added data in error message

* added read comfort + detection of missing json for existing variant

* fix an error of message display

* fix fetch color swap, missing a return
2024-05-20 19:17:21 -05:00
damocleas
0fd2dcf0aa
Update pokemon-species.ts (#1184)
Updated Starter Point Values for 6+ Cost mons
2024-05-20 19:15:09 -05:00
Tempoanon
6952fe065b
Add selstar to credits (#1180) 2024-05-20 16:11:36 -05:00
Matthew Olker
04045623a0 Update shiny event end to match discord announcement 2024-05-20 16:41:40 -04:00
6 changed files with 56 additions and 55 deletions

View File

@ -74,7 +74,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
### 🎨 Trainer Portraits ### 🎨 Trainer Portraits
- pkmn_realidea (Paid Commissions) - pkmn_realidea (Paid Commissions)
### 🎨 Pokemon Sprites ### 🎨 Pokemon Sprites and Animation
- GAMEFREAK (Pokémon Black/White 2) - GAMEFREAK (Pokémon Black/White 2)
- Smogon Sprite Project (Various Artists) - Smogon Sprite Project (Various Artists)
- Skyflyer - Skyflyer
@ -100,6 +100,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
- bizcoeindoloro - bizcoeindoloro
- mangalos810 - mangalos810
- Involuntary-Twitch - Involuntary-Twitch
- selstar
### 🎨 Move Animations ### 🎨 Move Animations
- Pokémon Reborn - Pokémon Reborn

View File

@ -1608,8 +1608,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
new SpeciesEvolution(Species.FROSMOTH, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM) new SpeciesEvolution(Species.FROSMOTH, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM)
], ],
[Species.GIMMIGHOUL]: [ [Species.GIMMIGHOUL]: [
new SpeciesEvolution(Species.GHOLDENGO, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG) new SpeciesEvolution(Species.GHOLDENGO, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG) ]
]
}; };
interface PokemonPrevolutions { interface PokemonPrevolutions {

View File

@ -2634,7 +2634,7 @@ export const speciesStarters = {
[Species.MOLTRES]: 6, [Species.MOLTRES]: 6,
[Species.DRATINI]: 4, [Species.DRATINI]: 4,
[Species.MEWTWO]: 8, [Species.MEWTWO]: 8,
[Species.MEW]: 7, [Species.MEW]: 6,
[Species.CHIKORITA]: 3, [Species.CHIKORITA]: 3,
[Species.CYNDAQUIL]: 3, [Species.CYNDAQUIL]: 3,
@ -2693,7 +2693,7 @@ export const speciesStarters = {
[Species.LARVITAR]: 4, [Species.LARVITAR]: 4,
[Species.LUGIA]: 8, [Species.LUGIA]: 8,
[Species.HO_OH]: 8, [Species.HO_OH]: 8,
[Species.CELEBI]: 7, [Species.CELEBI]: 6,
[Species.TREECKO]: 3, [Species.TREECKO]: 3,
[Species.TORCHIC]: 3, [Species.TORCHIC]: 3,
@ -2765,9 +2765,9 @@ export const speciesStarters = {
[Species.REGISTEEL]: 6, [Species.REGISTEEL]: 6,
[Species.LATIAS]: 7, [Species.LATIAS]: 7,
[Species.LATIOS]: 7, [Species.LATIOS]: 7,
[Species.KYOGRE]: 8, [Species.KYOGRE]: 9,
[Species.GROUDON]: 8, [Species.GROUDON]: 9,
[Species.RAYQUAZA]: 8, [Species.RAYQUAZA]: 9,
[Species.JIRACHI]: 7, [Species.JIRACHI]: 7,
[Species.DEOXYS]: 7, [Species.DEOXYS]: 7,
@ -2809,19 +2809,19 @@ export const speciesStarters = {
[Species.MANTYKE]: 3, [Species.MANTYKE]: 3,
[Species.SNOVER]: 3, [Species.SNOVER]: 3,
[Species.ROTOM]: 5, [Species.ROTOM]: 5,
[Species.UXIE]: 7, [Species.UXIE]: 6,
[Species.MESPRIT]: 7, [Species.MESPRIT]: 6,
[Species.AZELF]: 7, [Species.AZELF]: 6,
[Species.DIALGA]: 8, [Species.DIALGA]: 8,
[Species.PALKIA]: 8, [Species.PALKIA]: 8,
[Species.HEATRAN]: 7, [Species.HEATRAN]: 6,
[Species.REGIGIGAS]: 8, [Species.REGIGIGAS]: 7,
[Species.GIRATINA]: 8, [Species.GIRATINA]: 8,
[Species.CRESSELIA]: 7, [Species.CRESSELIA]: 6,
[Species.PHIONE]: 5, [Species.PHIONE]: 4,
[Species.MANAPHY]: 7, [Species.MANAPHY]: 7,
[Species.DARKRAI]: 7, [Species.DARKRAI]: 6,
[Species.SHAYMIN]: 7, [Species.SHAYMIN]: 6,
[Species.ARCEUS]: 9, [Species.ARCEUS]: 9,
[Species.VICTINI]: 7, [Species.VICTINI]: 7,
@ -2903,9 +2903,9 @@ export const speciesStarters = {
[Species.ZEKROM]: 8, [Species.ZEKROM]: 8,
[Species.LANDORUS]: 7, [Species.LANDORUS]: 7,
[Species.KYUREM]: 8, [Species.KYUREM]: 8,
[Species.KELDEO]: 7, [Species.KELDEO]: 6,
[Species.MELOETTA]: 7, [Species.MELOETTA]: 6,
[Species.GENESECT]: 7, [Species.GENESECT]: 6,
[Species.CHESPIN]: 3, [Species.CHESPIN]: 3,
[Species.FENNEKIN]: 3, [Species.FENNEKIN]: 3,
@ -2943,7 +2943,7 @@ export const speciesStarters = {
[Species.ZYGARDE]: 8, [Species.ZYGARDE]: 8,
[Species.DIANCIE]: 7, [Species.DIANCIE]: 7,
[Species.HOOPA]: 7, [Species.HOOPA]: 7,
[Species.VOLCANION]: 7, [Species.VOLCANION]: 6,
[Species.ETERNAL_FLOETTE]: 5, [Species.ETERNAL_FLOETTE]: 5,
[Species.ROWLET]: 3, [Species.ROWLET]: 3,
@ -2971,7 +2971,7 @@ export const speciesStarters = {
[Species.WIMPOD]: 3, [Species.WIMPOD]: 3,
[Species.SANDYGAST]: 3, [Species.SANDYGAST]: 3,
[Species.PYUKUMUKU]: 3, [Species.PYUKUMUKU]: 3,
[Species.TYPE_NULL]: 6, [Species.TYPE_NULL]: 5,
[Species.MINIOR]: 5, [Species.MINIOR]: 5,
[Species.KOMALA]: 5, [Species.KOMALA]: 5,
[Species.TURTONATOR]: 5, [Species.TURTONATOR]: 5,
@ -2985,21 +2985,21 @@ export const speciesStarters = {
[Species.TAPU_LELE]: 6, [Species.TAPU_LELE]: 6,
[Species.TAPU_BULU]: 6, [Species.TAPU_BULU]: 6,
[Species.TAPU_FINI]: 6, [Species.TAPU_FINI]: 6,
[Species.COSMOG]: 7, [Species.COSMOG]: 6,
[Species.NIHILEGO]: 7, [Species.NIHILEGO]: 6,
[Species.BUZZWOLE]: 7, [Species.BUZZWOLE]: 6,
[Species.PHEROMOSA]: 7, [Species.PHEROMOSA]: 7,
[Species.XURKITREE]: 7, [Species.XURKITREE]: 6,
[Species.CELESTEELA]: 7, [Species.CELESTEELA]: 6,
[Species.KARTANA]: 7, [Species.KARTANA]: 7,
[Species.GUZZLORD]: 7, [Species.GUZZLORD]: 6,
[Species.NECROZMA]: 8, [Species.NECROZMA]: 8,
[Species.MAGEARNA]: 7, [Species.MAGEARNA]: 7,
[Species.MARSHADOW]: 7, [Species.MARSHADOW]: 7,
[Species.POIPOLE]: 7, [Species.POIPOLE]: 7,
[Species.STAKATAKA]: 7, [Species.STAKATAKA]: 6,
[Species.BLACEPHALON]: 7, [Species.BLACEPHALON]: 7,
[Species.ZERAORA]: 7, [Species.ZERAORA]: 6,
[Species.MELTAN]: 6, [Species.MELTAN]: 6,
[Species.ALOLA_RATTATA]: 2, [Species.ALOLA_RATTATA]: 2,
[Species.ALOLA_SANDSHREW]: 4, [Species.ALOLA_SANDSHREW]: 4,
@ -3046,14 +3046,14 @@ export const speciesStarters = {
[Species.ARCTOVISH]: 5, [Species.ARCTOVISH]: 5,
[Species.DURALUDON]: 5, [Species.DURALUDON]: 5,
[Species.DREEPY]: 4, [Species.DREEPY]: 4,
[Species.ZACIAN]: 8, [Species.ZACIAN]: 9,
[Species.ZAMAZENTA]: 8, [Species.ZAMAZENTA]: 8,
[Species.ETERNATUS]: 10, [Species.ETERNATUS]: 10,
[Species.KUBFU]: 7, [Species.KUBFU]: 6,
[Species.ZARUDE]: 7, [Species.ZARUDE]: 6,
[Species.REGIELEKI]: 6, [Species.REGIELEKI]: 6,
[Species.REGIDRAGO]: 6, [Species.REGIDRAGO]: 6,
[Species.GLASTRIER]: 7, [Species.GLASTRIER]: 6,
[Species.SPECTRIER]: 7, [Species.SPECTRIER]: 7,
[Species.CALYREX]: 8, [Species.CALYREX]: 8,
[Species.GALAR_MEOWTH]: 4, [Species.GALAR_MEOWTH]: 4,
@ -3127,27 +3127,27 @@ export const speciesStarters = {
[Species.IRON_THORNS]: 6, [Species.IRON_THORNS]: 6,
[Species.FRIGIBAX]: 4, [Species.FRIGIBAX]: 4,
[Species.GIMMIGHOUL]: 5, [Species.GIMMIGHOUL]: 5,
[Species.WO_CHIEN]: 7, [Species.WO_CHIEN]: 6,
[Species.CHIEN_PAO]: 7, [Species.CHIEN_PAO]: 7,
[Species.TING_LU]: 7, [Species.TING_LU]: 6,
[Species.CHI_YU]: 7, [Species.CHI_YU]: 7,
[Species.ROARING_MOON]: 6, [Species.ROARING_MOON]: 6,
[Species.IRON_VALIANT]: 6, [Species.IRON_VALIANT]: 6,
[Species.KORAIDON]: 8, [Species.KORAIDON]: 9,
[Species.MIRAIDON]: 8, [Species.MIRAIDON]: 9,
[Species.WALKING_WAKE]: 7, [Species.WALKING_WAKE]: 6,
[Species.IRON_LEAVES]: 7, [Species.IRON_LEAVES]: 6,
[Species.POLTCHAGEIST]: 4, [Species.POLTCHAGEIST]: 4,
[Species.OKIDOGI]: 7, [Species.OKIDOGI]: 6,
[Species.MUNKIDORI]: 7, [Species.MUNKIDORI]: 6,
[Species.FEZANDIPITI]: 7, [Species.FEZANDIPITI]: 6,
[Species.OGERPON]: 8, [Species.OGERPON]: 7,
[Species.GOUGING_FIRE]: 7, [Species.GOUGING_FIRE]: 7,
[Species.RAGING_BOLT]: 7, [Species.RAGING_BOLT]: 6,
[Species.IRON_BOULDER]: 7, [Species.IRON_BOULDER]: 7,
[Species.IRON_CROWN]: 7, [Species.IRON_CROWN]: 6,
[Species.TERAPAGOS]: 8, [Species.TERAPAGOS]: 8,
[Species.PECHARUNT]: 7, [Species.PECHARUNT]: 6,
[Species.PALDEA_TAUROS]: 5, [Species.PALDEA_TAUROS]: 5,
[Species.PALDEA_WOOPER]: 3, [Species.PALDEA_WOOPER]: 3,
[Species.BLOODMOON_URSALUNA]: 7, [Species.BLOODMOON_URSALUNA]: 7,

View File

@ -336,7 +336,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
console.error(`Could not load ${res.url}!`); console.error(`Could not load ${res.url}!`);
return; return;
} }
res.json() return res.json()
}).then(c => { }).then(c => {
variantColorCache[key] = c; variantColorCache[key] = c;
resolve(); resolve();
@ -1127,7 +1127,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
let shinyThreshold = new Utils.IntegerHolder(32); let shinyThreshold = new Utils.IntegerHolder(32);
if (thresholdOverride === undefined) { if (thresholdOverride === undefined) {
if (!this.hasTrainer()) { if (!this.hasTrainer()) {
if (new Date() < new Date('2024-05-21')) if (new Date() < new Date(2024, 4, 21, 20))
shinyThreshold.value *= 3; shinyThreshold.value *= 3;
this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold);
} }

View File

@ -93,8 +93,9 @@ export function initI18n(): void {
i18next.use(LanguageDetector).init({ i18next.use(LanguageDetector).init({
lng: lang, lng: lang,
nonExplicitSupportedLngs: true,
fallbackLng: 'en', fallbackLng: 'en',
supportedLngs: ['en', 'es', 'fr', 'it', 'de', 'zh_CN','pt_BR'], supportedLngs: ['en', 'es', 'fr', 'it', 'de', 'zh','pt'],
debug: true, debug: true,
interpolation: { interpolation: {
escapeValue: false, escapeValue: false,

View File

@ -85,11 +85,11 @@ const languageSettings: { [key: string]: LanguageSetting } = {
const starterCandyCosts: { passive: integer, costReduction: [integer, integer] }[] = [ const starterCandyCosts: { passive: integer, costReduction: [integer, integer] }[] = [
{ passive: 50, costReduction: [30, 75] }, // 1 { passive: 50, costReduction: [30, 75] }, // 1
{ passive: 45, costReduction: [25, 60] }, // 2 { passive: 45, costReduction: [25, 60] }, // 2
{ passive: 30, costReduction: [20, 50] }, // 3 { passive: 40, costReduction: [20, 50] }, // 3
{ passive: 25, costReduction: [15, 40] }, // 4 { passive: 30, costReduction: [15, 40] }, // 4
{ passive: 20, costReduction: [12, 35] }, // 5 { passive: 25, costReduction: [12, 35] }, // 5
{ passive: 15, costReduction: [10, 30] }, // 6 { passive: 20, costReduction: [10, 30] }, // 6
{ passive: 10, costReduction: [8, 20] }, // 7 { passive: 15, costReduction: [8, 20] }, // 7
{ passive: 10, costReduction: [5, 15] }, // 8 { passive: 10, costReduction: [5, 15] }, // 8
{ passive: 10, costReduction: [3, 10] }, // 9 { passive: 10, costReduction: [3, 10] }, // 9
{ passive: 10, costReduction: [3, 10] }, // 10 { passive: 10, costReduction: [3, 10] }, // 10