mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-02-07 16:55:51 +00:00
Updated as per comments
This commit is contained in:
parent
09cfdf6f7f
commit
eeb0a8602e
@ -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];
|
||||
|
@ -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!;
|
||||
|
@ -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?
|
||||
|
Loading…
x
Reference in New Issue
Block a user