mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-04 23:42:18 +02:00
Merge branch 'beta' into code1
This commit is contained in:
commit
4aca489411
@ -1 +1 @@
|
||||
Subproject commit a074ddb28c3f0c7e9bbd0560efa33e3ce5f71bcd
|
||||
Subproject commit 42cd5cf577f475c22bc82d55e7ca358eb4f3184f
|
@ -8,11 +8,11 @@ export type SignatureSpecies = {
|
||||
* The signature species for each Gym Leader, Elite Four member, and Champion.
|
||||
* The key is the trainer type, and the value is an array of Species or Species arrays.
|
||||
* This is in a separate const so it can be accessed from other places and not just the trainerConfigs
|
||||
*
|
||||
*
|
||||
* @remarks
|
||||
* The `Proxy` object allows us to define a handler that will intercept
|
||||
* The `Proxy` object allows us to define a handler that will intercept
|
||||
* the property access and return an empty array if the property does not exist in the object.
|
||||
*
|
||||
*
|
||||
* This means that accessing `signatureSpecies` will not throw an error if the property does not exist,
|
||||
* but instead default to an empty array.
|
||||
*/
|
||||
|
@ -19057,8 +19057,15 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.SLAKING,
|
||||
Species.HARIYAMA,
|
||||
Species.NOSEPASS,
|
||||
Species.ARON,
|
||||
Species.LAIRON,
|
||||
Species.AGGRON,
|
||||
Species.ELECTRIKE,
|
||||
Species.MANECTRIC,
|
||||
Species.GULPIN,
|
||||
Species.SWALOT,
|
||||
Species.WAILMER,
|
||||
Species.WAILORD,
|
||||
Species.NUMEL,
|
||||
Species.CAMERUPT,
|
||||
Species.TORKOAL,
|
||||
@ -19067,18 +19074,28 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.ZANGOOSE,
|
||||
Species.SEVIPER,
|
||||
Species.WHISCASH,
|
||||
Species.LILEEP,
|
||||
Species.CRADILY,
|
||||
Species.ANORITH,
|
||||
Species.ARMALDO,
|
||||
Species.SHUPPET,
|
||||
Species.BANETTE,
|
||||
Species.DUSKULL,
|
||||
Species.DUSCLOPS,
|
||||
Species.TROPIUS,
|
||||
Species.CHIMECHO,
|
||||
Species.ABSOL,
|
||||
Species.SPHEAL,
|
||||
Species.SEALEO,
|
||||
Species.WALREIN,
|
||||
Species.REGIROCK,
|
||||
Species.REGICE,
|
||||
Species.REGISTEEL,
|
||||
Species.TURTWIG,
|
||||
Species.GROTLE,
|
||||
Species.TORTERRA,
|
||||
Species.BIDOOF,
|
||||
Species.BIBAREL,
|
||||
Species.CRANIDOS,
|
||||
Species.RAMPARDOS,
|
||||
Species.SHIELDON,
|
||||
@ -19120,6 +19137,11 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.TEPIG,
|
||||
Species.PIGNITE,
|
||||
Species.EMBOAR,
|
||||
Species.MUNNA,
|
||||
Species.MUSHARNA,
|
||||
Species.ROGGENROLA,
|
||||
Species.BOLDORE,
|
||||
Species.GIGALITH,
|
||||
Species.DRILBUR,
|
||||
Species.EXCADRILL,
|
||||
Species.TIMBURR,
|
||||
@ -19128,28 +19150,44 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.SANDILE,
|
||||
Species.KROKOROK,
|
||||
Species.KROOKODILE,
|
||||
Species.DWEBBLE,
|
||||
Species.CRUSTLE,
|
||||
Species.SCRAGGY,
|
||||
Species.SCRAFTY,
|
||||
Species.YAMASK,
|
||||
Species.COFAGRIGUS,
|
||||
Species.COFAGRIGUS,
|
||||
Species.TRUBBISH,
|
||||
Species.GARBODOR,
|
||||
Species.SAWSBUCK,
|
||||
Species.FERROSEED,
|
||||
Species.FERROTHORN,
|
||||
Species.LITWICK,
|
||||
Species.LAMPENT,
|
||||
Species.CHANDELURE,
|
||||
Species.BEARTIC,
|
||||
Species.SHELMET,
|
||||
Species.ACCELGOR,
|
||||
Species.STUNFISK,
|
||||
Species.GOLETT,
|
||||
Species.GOLURK,
|
||||
Species.HEATMOR,
|
||||
Species.CHESPIN,
|
||||
Species.QUILLADIN,
|
||||
Species.CHESNAUGHT,
|
||||
Species.TYRUNT,
|
||||
Species.TYRANTRUM,
|
||||
Species.SYLVEON,
|
||||
Species.GOOMY,
|
||||
Species.SLIGGOO,
|
||||
Species.GOODRA,
|
||||
Species.PHANTUMP,
|
||||
Species.TREVENANT,
|
||||
Species.PUMPKABOO,
|
||||
Species.GOURGEIST,
|
||||
Species.BERGMITE,
|
||||
Species.AVALUGG,
|
||||
Species.ROWLET,
|
||||
Species.DARTRIX,
|
||||
Species.DECIDUEYE,
|
||||
Species.GUMSHOOS,
|
||||
Species.MUDBRAY,
|
||||
@ -19157,7 +19195,9 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.PASSIMIAN,
|
||||
Species.SANDYGAST,
|
||||
Species.PALOSSAND,
|
||||
Species.PYUKUMUKU,
|
||||
Species.KOMALA,
|
||||
Species.TURTONATOR,
|
||||
Species.MIMIKYU,
|
||||
Species.SKWOVET,
|
||||
Species.GREEDENT,
|
||||
@ -19169,6 +19209,7 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.SINISTEA,
|
||||
Species.POLTEAGEIST,
|
||||
Species.PERRSERKER,
|
||||
Species.CURSOLA,
|
||||
Species.RUNERIGUS,
|
||||
Species.PINCURCHIN,
|
||||
Species.STONJOURNER,
|
||||
@ -19236,6 +19277,7 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.GALAR_WEEZING,
|
||||
Species.GALAR_SLOWKING,
|
||||
Species.GALAR_YAMASK,
|
||||
Species.GALAR_STUNFISK,
|
||||
Species.HISUI_ELECTRODE,
|
||||
Species.HISUI_TYPHLOSION,
|
||||
Species.HISUI_QWILFISH,
|
||||
@ -67062,7 +67104,7 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.CHEWTLE,
|
||||
Species.DREDNAW,
|
||||
Species.YAMPER,
|
||||
Species.BOLTUND,
|
||||
Species.BOLTUND,
|
||||
Species.ROLYCOLY,
|
||||
Species.CARKOL,
|
||||
Species.COALOSSAL,
|
||||
@ -67079,7 +67121,7 @@ export const tmSpecies: TmSpecies = {
|
||||
Species.SIZZLIPEDE,
|
||||
Species.CENTISKORCH,
|
||||
Species.CLOBBOPUS,
|
||||
Species.GRAPPLOCT,
|
||||
Species.GRAPPLOCT,
|
||||
Species.SINISTEA,
|
||||
Species.POLTEAGEIST,
|
||||
Species.HATENNA,
|
||||
|
@ -5678,7 +5678,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
||||
|
||||
/**
|
||||
* Performs the action of clearing a Pokemon's status
|
||||
*
|
||||
*
|
||||
* This is a helper to {@linkcode resetStatus}, which should be called directly instead of this method
|
||||
*/
|
||||
public clearStatus(confusion: boolean, reloadAssets: boolean) {
|
||||
|
@ -145,8 +145,10 @@ const languageSettings: { [key: string]: LanguageSetting } = {
|
||||
starterInfoXPos: 33,
|
||||
},
|
||||
ko: {
|
||||
starterInfoTextSize: "52px",
|
||||
starterInfoTextSize: "60px",
|
||||
instructionTextSize: "38px",
|
||||
starterInfoYOffset: -0.5,
|
||||
starterInfoXPos: 30,
|
||||
},
|
||||
ja: {
|
||||
starterInfoTextSize: "51px",
|
||||
|
Loading…
Reference in New Issue
Block a user