Merge branch 'beta' into deep-sea-items
This commit is contained in:
commit
c83845e3b9
|
@ -6186,7 +6186,8 @@ export function initAbilities() {
|
|||
.attr(ProtectStatAbAttr, Stat.ATK)
|
||||
.ignorable(),
|
||||
new Ability(Abilities.PICKUP, 3)
|
||||
.attr(PostBattleLootAbAttr),
|
||||
.attr(PostBattleLootAbAttr)
|
||||
.attr(UnsuppressableAbilityAbAttr),
|
||||
new Ability(Abilities.TRUANT, 3)
|
||||
.attr(PostSummonAddBattlerTagAbAttr, BattlerTagType.TRUANT, 1, false),
|
||||
new Ability(Abilities.HUSTLE, 3)
|
||||
|
@ -6378,7 +6379,8 @@ export function initAbilities() {
|
|||
.attr(PostSummonWeatherChangeAbAttr, WeatherType.SNOW)
|
||||
.attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.SNOW),
|
||||
new Ability(Abilities.HONEY_GATHER, 4)
|
||||
.attr(MoneyAbAttr),
|
||||
.attr(MoneyAbAttr)
|
||||
.attr(UnsuppressableAbilityAbAttr),
|
||||
new Ability(Abilities.FRISK, 4)
|
||||
.attr(FriskAbAttr),
|
||||
new Ability(Abilities.RECKLESS, 4)
|
||||
|
|
|
@ -889,7 +889,7 @@ export default class RunInfoUiHandler extends UiHandler {
|
|||
/**
|
||||
* Takes input from the user to perform a desired action.
|
||||
* @param button - Button object to be processed
|
||||
* Button.CANCEL - removes all containers related to RunInfo and returns the user to Run History
|
||||
* Button.CANCEL, Button.LEFT - removes all containers related to RunInfo and returns the user to Run History
|
||||
* Button.CYCLE_FORM, Button.CYCLE_SHINY, Button.CYCLE_ABILITY - runs the function buttonCycleOption()
|
||||
*/
|
||||
override processInput(button: Button): boolean {
|
||||
|
@ -900,6 +900,7 @@ export default class RunInfoUiHandler extends UiHandler {
|
|||
|
||||
switch (button) {
|
||||
case Button.CANCEL:
|
||||
case Button.LEFT:
|
||||
success = true;
|
||||
if (this.pageMode === RunInfoUiMode.MAIN) {
|
||||
this.runInfoContainer.removeAll(true);
|
||||
|
|
Loading…
Reference in New Issue