Merge branch 'beta' into Add-form-passives

This commit is contained in:
Xavion3 2025-01-27 17:04:49 +11:00 committed by GitHub
commit 6552687ce6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 1378 additions and 5086 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.4.3", "version": "1.5.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.4.3", "version": "1.5.0",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@material/material-color-utilities": "^0.2.7", "@material/material-color-utilities": "^0.2.7",

View File

@ -1,7 +1,7 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"private": true, "private": true,
"version": "1.4.3", "version": "1.5.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "vite", "start": "vite",

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 37 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 37 KiB

@ -1 +1 @@
Subproject commit e07ab625f2080afe36b61fad291b0ec5eff4000c Subproject commit 5ef993b95fa8248adc0fb7d9489baccf546bf8e3

View File

@ -3183,12 +3183,12 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
break; break;
} }
} }
const randItemIndex = pokemon.randSeedInt(tierItemModifiers.length); const randItemIndex = pokemon.randSeedInt(itemModifiers.length);
const randItem = tierItemModifiers[randItemIndex]; const randItem = itemModifiers[randItemIndex];
heldItemTransferPromises.push(globalScene.tryTransferHeldItemModifier(randItem, pokemon, false).then(success => { heldItemTransferPromises.push(globalScene.tryTransferHeldItemModifier(randItem, pokemon, false).then(success => {
if (success) { if (success) {
transferredModifierTypes.push(randItem.type); transferredModifierTypes.push(randItem.type);
tierItemModifiers.splice(randItemIndex, 1); itemModifiers.splice(randItemIndex, 1);
} }
})); }));
} }

View File

@ -111,7 +111,7 @@ export default class MenuUiHandler extends MessageUiHandler {
render() { render() {
const ui = this.getUi(); const ui = this.getUi();
this.excludedMenus = () => [ this.excludedMenus = () => [
{ condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST ]}, { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA ]},
{ condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]} { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]}
]; ];