random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-02-17 01:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated as per comments

Browse Source
This commit is contained in:
Opaque02 2024-09-20 01:44:30 +10:00
parent 09cfdf6f7f
commit eeb0a8602e
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/field/pokemon.ts
View File

@ -3784,12 +3784,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return rootForm.getAbility(abilityIndex) === rootForm.getAbility(currentAbilityIndex);
}
/* Checks whether or not the pokemon's pokeball will be tinted.
* This checks the dex attributes (gender, shiny/non shiny, variant and forms)
* These values are checked against the exact pokemon you're catching (i.e. catching charizard won't compare against charmander)
* It also checks your abilities against the starter version
* If any are "new", the pokemon's pokeball is tinted
* @returns true if the pokemon's pokeball should be tinted, meaning at least one thing is new
/*
* Checks whether or not the pokemon's pokeball icon will be tinted.
* This checks the dex attributes (gender, shiny/non shiny, variant and forms).
* These values are checked against the exact pokemon you're catching (i.e. catching charizard won't compare against charmander).
* It also checks your abilities against the starter version.
* If you are missing any, the pokemon's pokeball icon is tinted.
* @returns `true` if the pokemon's pokeball icon should be tinted, meaning at least one thing is new
*/
isTintedPokeball(): boolean {
const dexEntry = this.scene.gameData.dexData[this.species.speciesId];

6
src/modifier/modifier-type.ts
View File

@ -185,7 +185,7 @@ export class AddPokeballModifierType extends ModifierType {
});
}
addAmount(currentAmount: number) {
setAmount(currentAmount: number) {
this.currentAmount = currentAmount;
}
@ -2157,13 +2157,13 @@ function getModifierTypeOptionWithRetry(existingOptions: ModifierTypeOption[], r
allowLuckUpgrades = allowLuckUpgrades ?? true;
let candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, tier, undefined, 0, allowLuckUpgrades);
if (candidate?.type instanceof AddPokeballModifierType) {
candidate.type.addAmount(party[0].scene.pokeballCounts[candidate.type.getPokeballType()]);
candidate.type.setAmount(party[0].scene.pokeballCounts[candidate.type.getPokeballType()]);
}
let r = 0;
while (existingOptions.length && ++r < retryCount && existingOptions.filter(o => o.type.name === candidate?.type.name || o.type.group === candidate?.type.group).length) {
candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, candidate?.type.tier ?? tier, candidate?.upgradeCount, 0, allowLuckUpgrades);
if (candidate?.type instanceof AddPokeballModifierType) {
candidate.type.addAmount(party[0].scene.pokeballCounts[candidate.type.getPokeballType()]);
candidate.type.setAmount(party[0].scene.pokeballCounts[candidate.type.getPokeballType()]);
}
}
return candidate!;

2
src/ui/modifier-select-ui-handler.ts
View File

@ -678,7 +678,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
}
if (this.modifierTypeOption.type instanceof AddPokeballModifierType) {
this.modifierTypeOption.type.addAmount((this.scene as BattleScene).pokeballCounts[this.modifierTypeOption.type.getPokeballType()]);
this.modifierTypeOption.type.setAmount((this.scene as BattleScene).pokeballCounts[this.modifierTypeOption.type.getPokeballType()]);
}
this.itemText = addTextObject(this.scene, 0, 35, this.modifierTypeOption.type?.name!, TextStyle.PARTY, { align: "center" }); // TODO: is this bang correct?