[Visual] Achievement icons (#2617)

* Text Changes to MonoGen Challenges

* Item Texture Files

* MonoGen Ribbons added

* Resolving merge conflict

* Updated texture files? I think

* Changed image names and added new localizations for  syntax

* Removed unused ribbons

* [Feature] replace bug-report template with form (#2772)

* replace bug-report template with form

* update bug_report.yml

* add palceholders for data & session file

* Update item atlas

* Update item atlas again

This time, after merging main into the PR.

* [Sprite] Show Partner Eevee variants (#3097)

* [Sprite] Show Partner Eevee variants

Taken from non-partner Eevee

* [Sprite] Show Partner Eevee variants

Taken from non-partner Eevee

* [Sprite] Show Partner Eevee variants

* Merged with beta's new items

* Fixed typedoc issues

* Removing localizations

* Text Changes to MonoGen Challenges

* Item Texture Files

* MonoGen Ribbons added

* Resolving merge conflict

* Updated texture files? I think

* Changed image names and added new localizations for  syntax

* Removed unused ribbons

* Update item atlas

* [Feature] replace bug-report template with form (#2772)

* replace bug-report template with form

* update bug_report.yml

* add palceholders for data & session file

* Update item atlas again

This time, after merging main into the PR.

* Merged with beta's new items

* Fixed typedoc issues

* Removing localizations

* Allow Necrozma forms to play their special music (#3054)

* Allow Necrozma forms to play their special music (#3054)

* MonoGen Ribbons added

* Text Changes to MonoGen Challenges

* Item Texture Files

* MonoGen Ribbons added

* Updated texture files? I think

* Changed image names and added new localizations for  syntax

* Fixed typedoc issues

* Revert "Text Changes to MonoGen Challenges"

This reverts commit 3bf79acc6a.

* Text Changes to MonoGen Challenges

* Item Texture Files

* MonoGen Ribbons added

* Resolving merge conflict

* Updated texture files? I think

* Changed image names and added new localizations for  syntax

* Removed unused ribbons

* Update item atlas

* [Feature] replace bug-report template with form (#2772)

* replace bug-report template with form

* update bug_report.yml

* add palceholders for data & session file

* Update item atlas again

This time, after merging main into the PR.

* Merged with beta's new items

* Fixed typedoc issues

* Removing localizations

* Text Changes to MonoGen Challenges

* Item Texture Files

* MonoGen Ribbons added

* Resolving merge conflict

* Updated texture files? I think

* Changed image names and added new localizations for  syntax

* Removed unused ribbons

* Update item atlas

* Update item atlas again

This time, after merging main into the PR.

* Merged with beta's new items

* Fixed typedoc issues

* Removing localizations

* MonoGen Ribbons added

* Text Changes to MonoGen Challenges

* Item Texture Files

* MonoGen Ribbons added

* Updated texture files? I think

* Changed image names and added new localizations for  syntax

* Fixed typedoc issues

* Revert "Text Changes to MonoGen Challenges"

This reverts commit 3bf79acc6a.

* Please fix this.

* Revert "[Feature] replace bug-report template with form (#2772)"

This reverts commit aa69b10777.

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Co-authored-by: Madmadness65 <59298170+Madmadness65@users.noreply.github.com>
This commit is contained in:
Mumble 2024-07-22 11:17:51 -07:00 committed by GitHub
parent 5006d0401e
commit 3d2c2a14cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
26 changed files with 4293 additions and 4296 deletions

View File

@ -112,6 +112,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
- mangalos810 - mangalos810
- Involuntary-Twitch - Involuntary-Twitch
- selstar - selstar
- koda_want_to_sleep
### 🎨 Move Animations ### 🎨 Move Animations
- Pokémon Reborn - Pokémon Reborn

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 675 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 675 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

View File

@ -1,24 +0,0 @@
{
"1": {
"a5634a": "5982b7",
"734a4a": "334b7d",
"d69c4a": "90c1f1",
"000000": "000000",
"523121": "13235c",
"e6c594": "9db5d8",
"bd9c7b": "5f6f94",
"ffffff": "ffffff",
"ffe6ad": "d7ebff"
},
"2": {
"a5634a": "915ea3",
"734a4a": "5e3372",
"d69c4a": "bf88cb",
"000000": "000000",
"523121": "461144",
"e6c594": "d7b8ba",
"bd9c7b": "a07c83",
"ffffff": "ffffff",
"ffe6ad": "f3e6e3"
}
}

View File

@ -364,11 +364,6 @@
1, 1,
1 1
], ],
"133-partner": [
0,
1,
1
],
"134": [ "134": [
0, 0,
1, 1,
@ -3737,11 +3732,6 @@
1, 1,
1 1
], ],
"133-partner": [
0,
1,
1
],
"134": [ "134": [
0, 0,
1, 1,

View File

@ -1,22 +0,0 @@
{
"1": {
"734a4a": "13235c",
"523121": "0b1145",
"d69c4a": "90c1f1",
"a5634a": "5982b7",
"000000": "000000",
"ffe6ad": "d7ebff",
"bd9c7b": "5f6f94",
"e6c594": "8ca8d2"
},
"2": {
"734a4a": "5e3372",
"523121": "461144",
"d69c4a": "bf88cb",
"a5634a": "915ea3",
"000000": "000000",
"ffe6ad": "f3e6e3",
"bd9c7b": "a07c83",
"e6c594": "cfa7a9"
}
}

View File

@ -294,20 +294,9 @@ export default class Battle {
if (pokemon.species.speciesId === Species.TAPU_KOKO || pokemon.species.speciesId === Species.TAPU_LELE || pokemon.species.speciesId === Species.TAPU_BULU || pokemon.species.speciesId === Species.TAPU_FINI) { if (pokemon.species.speciesId === Species.TAPU_KOKO || pokemon.species.speciesId === Species.TAPU_LELE || pokemon.species.speciesId === Species.TAPU_BULU || pokemon.species.speciesId === Species.TAPU_FINI) {
return "battle_legendary_tapu"; return "battle_legendary_tapu";
} }
if (pokemon.species.speciesId === Species.COSMOG || pokemon.species.speciesId === Species.COSMOEM || pokemon.species.speciesId === Species.SOLGALEO || pokemon.species.speciesId === Species.LUNALA) { if (pokemon.species.speciesId === Species.COSMOG || pokemon.species.speciesId === Species.COSMOEM || pokemon.species.speciesId === Species.SOLGALEO || pokemon.species.speciesId === Species.LUNALA || pokemon.species.speciesId === Species.NECROZMA) {
return "battle_legendary_sol_lun"; return "battle_legendary_sol_lun";
} }
if (pokemon.species.speciesId === Species.NECROZMA) {
if (pokemon.getFormKey() === "") {
return "battle_legendary_sol_lun";
}
if (pokemon.getFormKey() === "dusk-mane" || pokemon.getFormKey() === "dawn-wings") {
return "battle_legendary_dusk_dawn";
}
if (pokemon.getFormKey() === "ultra") {
return "battle_legendary_ultra_nec";
}
}
if (pokemon.species.speciesId === Species.NIHILEGO || pokemon.species.speciesId === Species.BUZZWOLE || pokemon.species.speciesId === Species.PHEROMOSA || pokemon.species.speciesId === Species.XURKITREE || pokemon.species.speciesId === Species.CELESTEELA || pokemon.species.speciesId === Species.KARTANA || pokemon.species.speciesId === Species.GUZZLORD || pokemon.species.speciesId === Species.POIPOLE || pokemon.species.speciesId === Species.NAGANADEL || pokemon.species.speciesId === Species.STAKATAKA || pokemon.species.speciesId === Species.BLACEPHALON) { if (pokemon.species.speciesId === Species.NIHILEGO || pokemon.species.speciesId === Species.BUZZWOLE || pokemon.species.speciesId === Species.PHEROMOSA || pokemon.species.speciesId === Species.XURKITREE || pokemon.species.speciesId === Species.CELESTEELA || pokemon.species.speciesId === Species.KARTANA || pokemon.species.speciesId === Species.GUZZLORD || pokemon.species.speciesId === Species.POIPOLE || pokemon.species.speciesId === Species.NAGANADEL || pokemon.species.speciesId === Species.STAKATAKA || pokemon.species.speciesId === Species.BLACEPHALON) {
return "battle_legendary_ub"; return "battle_legendary_ub";
} }

View File

@ -325,15 +325,15 @@ export const achvs = {
HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY","", "HIDDEN_ABILITY.description","ability_charm", 75), HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY","", "HIDDEN_ABILITY.description","ability_charm", 75),
PERFECT_IVS: new Achv("PERFECT_IVS","", "PERFECT_IVS.description","blunder_policy", 100), PERFECT_IVS: new Achv("PERFECT_IVS","", "PERFECT_IVS.description","blunder_policy", 100),
CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY","", "CLASSIC_VICTORY.description","relic_crown", 150), CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY","", "CLASSIC_VICTORY.description","relic_crown", 150),
MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE","", "MONO_GEN_ONE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 1), MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE","", "MONO_GEN_ONE.description", "ribbon_gen1", 100, c => c instanceof SingleGenerationChallenge && c.value === 1),
MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO","", "MONO_GEN_TWO.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 2), MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO","", "MONO_GEN_TWO.description", "ribbon_gen2", 100, c => c instanceof SingleGenerationChallenge && c.value === 2),
MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE","", "MONO_GEN_THREE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 3), MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE","", "MONO_GEN_THREE.description", "ribbon_gen3", 100, c => c instanceof SingleGenerationChallenge && c.value === 3),
MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR","", "MONO_GEN_FOUR.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 4), MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR","", "MONO_GEN_FOUR.description", "ribbon_gen4", 100, c => c instanceof SingleGenerationChallenge && c.value === 4),
MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE","", "MONO_GEN_FIVE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 5), MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE","", "MONO_GEN_FIVE.description", "ribbon_gen5", 100, c => c instanceof SingleGenerationChallenge && c.value === 5),
MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX","", "MONO_GEN_SIX.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 6), MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX","", "MONO_GEN_SIX.description", "ribbon_gen6", 100, c => c instanceof SingleGenerationChallenge && c.value === 6),
MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN","", "MONO_GEN_SEVEN.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 7), MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN","", "MONO_GEN_SEVEN.description", "ribbon_gen7", 100, c => c instanceof SingleGenerationChallenge && c.value === 7),
MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT","", "MONO_GEN_EIGHT.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 8), MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT","", "MONO_GEN_EIGHT.description", "ribbon_gen8", 100, c => c instanceof SingleGenerationChallenge && c.value === 8),
MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE","", "MONO_GEN_NINE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 9), MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE","", "MONO_GEN_NINE.description", "ribbon_gen9", 100, c => c instanceof SingleGenerationChallenge && c.value === 9),
MONO_NORMAL: new ChallengeAchv("MONO_NORMAL","", "MONO_NORMAL.description", "silk_scarf", 100, c => c instanceof SingleTypeChallenge && c.value === 1), MONO_NORMAL: new ChallengeAchv("MONO_NORMAL","", "MONO_NORMAL.description", "silk_scarf", 100, c => c instanceof SingleTypeChallenge && c.value === 1),
MONO_FIGHTING: new ChallengeAchv("MONO_FIGHTING","", "MONO_FIGHTING.description", "black_belt", 100, c => c instanceof SingleTypeChallenge && c.value === 2), MONO_FIGHTING: new ChallengeAchv("MONO_FIGHTING","", "MONO_FIGHTING.description", "black_belt", 100, c => c instanceof SingleTypeChallenge && c.value === 2),
MONO_FLYING: new ChallengeAchv("MONO_FLYING","", "MONO_FLYING.description", "sharp_beak", 100, c => c instanceof SingleTypeChallenge && c.value === 3), MONO_FLYING: new ChallengeAchv("MONO_FLYING","", "MONO_FLYING.description", "sharp_beak", 100, c => c instanceof SingleTypeChallenge && c.value === 3),