mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-20 15:22:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into beta

Browse Source
This commit is contained in:
NightKev 2025-03-18 20:50:06 -07:00 committed by GitHub
commit a81267c4df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1,2 +1,3 @@
# Auto detect text files and perform LF normalization # Auto detect text files and perform LF normalization
* text=auto * text=auto
* -crlf

50
src/ui/pokedex-ui-handler.ts
View File

@ -1742,36 +1742,26 @@ export default class PokedexUiHandler extends MessageUiHandler {
container.icon.setTint(0); container.icon.setTint(0);
} }
if (data.eggMove1) { const pairs: [boolean | undefined, Phaser.GameObjects.Image][] = [
container.eggMove1Icon.setVisible(true); [data.eggMove1, container.eggMove1Icon],
} else { [data.eggMove2, container.eggMove2Icon],
container.eggMove1Icon.setVisible(false); [data.tmMove1, container.tmMove1Icon],
} [data.tmMove2, container.tmMove2Icon],
if (data.eggMove2) { [data.passive1, container.passive1Icon],
container.eggMove2Icon.setVisible(true); [data.passive2, container.passive2Icon],
} else { ];
container.eggMove2Icon.setVisible(false);
} pairs.forEach(([unlocked, icon]) => {
if (data.tmMove1) { if (unlocked) {
container.tmMove1Icon.setVisible(true); icon.setVisible(true);
} else { icon.clearTint();
container.tmMove1Icon.setVisible(false); } else if (unlocked === false) {
} icon.setVisible(true);
if (data.tmMove2) { icon.setTint(0x808080);
container.tmMove2Icon.setVisible(true); } else {
} else { icon.setVisible(false);
container.tmMove2Icon.setVisible(false); }
} });
if (data.passive1) {
container.passive1Icon.setVisible(true);
} else {
container.passive1Icon.setVisible(false);
}
if (data.passive2) {
container.passive2Icon.setVisible(true);
} else {
container.passive2Icon.setVisible(false);
}
if (this.showDecorations) { if (this.showDecorations) {
if (this.pokerusSpecies.includes(data.species)) { if (this.pokerusSpecies.includes(data.species)) {