White Herb doubles fix #5185

littlefoot22 · 2019-02-20T05:38:26Z

White Herb doesn't work with doubles.

Not sure if I have the right approach here...please comment if not,

Thanks!!

pyuk-bot · 2019-02-20T05:58:53Z

test/simulator/items/whiteherb.js

+		battle.destroy();
+	});
+
+	it('it should use white herb after both intimidate', function () {


You can leave off the extra “it” here; that’s what the function name is for.

Thanks !! Removed

Zarel · 2019-02-20T06:38:02Z

data/items.js

@@ -5978,14 +5978,18 @@ let BattleItems = {
 			let activate = false;
 			/**@type {{[k: string]: number}} */
 			let boosts = {};
+			//doubles
+			if (pokemon.side.foe.pokemon.length > 1 && pokemon.side.foe.battle.abilityOrder !== 4) {


Suggested change

if (pokemon.side.foe.pokemon.length > 1 && pokemon.side.foe.battle.abilityOrder !== 4) {

if (pokemon.side.active.length > 1 && this.abilityOrder !== 4) {

Marty-D · 2019-02-21T01:01:51Z

There are a few problems here; this kind of fix only works before Turn 1 and not when multiple Pokemon are replacing fainted ones at the end of a turn, but more importantly White Herb itself would only work while those four lead Pokemon are on the field and won't ever activate again for anything in Doubles. abilityOrder keeps counting up with every Ability change or switch in.

littlefoot22 · 2019-02-21T01:05:52Z

There are a few problems here; this kind of fix only works before Turn 1 and not when multiple Pokemon are replacing fainted ones at the end of a turn, but more importantly White Herb itself would only work while those four lead Pokemon are on the field and won't ever activate again for anything in Doubles. abilityOrder keeps counting up with every Ability change or switch in.

Thank you for the feed back!! I had a feeling I didn't fully understand the variables I was using, I will do more testing and work on this bug some more

pyuk-bot · 2019-02-21T01:19:02Z

What if we made the Update event only happen after all switching is finished?

pyuk-bot · 2019-02-21T01:20:22Z

If multiple Talonflames holding Sitrus Berries switch into Stealth Rock, do the berries wait until all Pokémon have switched in?

Marty-D · 2019-02-21T02:15:17Z

If multiple Talonflames holding Sitrus Berries switch into Stealth Rock, do the berries wait until all Pokémon have switched in?

Nope, Berries activate as soon as each one takes the hazard damage, like switch-in Abilities. That's actually why Unnerve activates before hazards, so it can stop faster Pokemon from healing in those situations.

Edit: Wow, I misread your question completely. Yes they wait until all Pokemon have switched in (but so does hazard damage).

littlefoot22 · 2019-02-25T04:46:20Z

@Marty-D @Zarel @MacChaeger updated the PR with a new approach, running the update after the queue is empty to make sure it happens after all switch-ins happen. Is there a better way to do this? Is there an issue with this approach?

littlefoot22 · 2019-02-27T17:14:00Z

There are a few problems here; this kind of fix only works before Turn 1 and not when multiple Pokemon are replacing fainted ones at the end of a turn, but more importantly White Herb itself would only work while those four lead Pokemon are on the field and won't ever activate again for anything in Doubles. abilityOrder keeps counting up with every Ability change or switch in.

Hi @Marty-D, updated the PR with a new solution and tests based on your feedback.

Marty-D · 2019-02-27T19:57:19Z

This new approach also doesn't work because the queue isn't empty during a turn, for example:

The opposing Gyarados used Sleep Talk!
But it failed!

The opposing Incineroar used Sleep Talk!
But it failed!

Clefable used Memento!
The opposing Incineroar's Attack fell harshly!
The opposing Incineroar's Special Attack fell harshly!

Clefable fainted!
Chansey used Memento!
The opposing Incineroar's Attack fell harshly!
The opposing Incineroar's Special Attack fell harshly!

Chansey fainted!

The opposing Incineroar returned its status to normal using its White Herb!

White Herb should activate before Chansey moves here.

littlefoot22 · 2019-02-27T20:17:43Z

This new approach also doesn't work because the queue isn't empty during a turn, for example:

The opposing Gyarados used Sleep Talk!
But it failed!

The opposing Incineroar used Sleep Talk!
But it failed!

Clefable used Memento!
The opposing Incineroar's Attack fell harshly!
The opposing Incineroar's Special Attack fell harshly!

Clefable fainted!
Chansey used Memento!
The opposing Incineroar's Attack fell harshly!
The opposing Incineroar's Special Attack fell harshly!

Chansey fainted!

The opposing Incineroar returned its status to normal using its White Herb!

White Herb should activate before Chansey moves here.

got it, will do more testing and work on it, appreciate you taking a look!

littlefoot22 · 2019-03-04T01:47:37Z

This new approach also doesn't work because the queue isn't empty during a turn, for example:

The opposing Gyarados used Sleep Talk!
But it failed!

The opposing Incineroar used Sleep Talk!
But it failed!

Clefable used Memento!
The opposing Incineroar's Attack fell harshly!
The opposing Incineroar's Special Attack fell harshly!

Clefable fainted!
Chansey used Memento!
The opposing Incineroar's Attack fell harshly!
The opposing Incineroar's Special Attack fell harshly!

Chansey fainted!

The opposing Incineroar returned its status to normal using its White Herb!

White Herb should activate before Chansey moves here.

@Marty-D I updated the PR, would something like this work? onResidual runs after both intimidates activate for doubles and we can keep the update to run only after moves that decrees stats like tailwhip/growl/stringshot etc ?

EDIT

updated the PR to include this code to just check if last move had a negative boost instead of hardcoding the moves in the conditional:

let lastMoveAttackDown = false;
if (this.lastMove && this.lastMove.boosts) {
	for (let i in this.lastMove.boosts) {
		// @ts-ignore
		if (this.lastMove.boosts[i] < 0) {
			lastMoveAttackDown = true;
			break;
		}
	}
}

Zarel · 2019-03-04T12:43:50Z

test/simulator/items/whiteherb.js

+
+let battle;
+
+describe('White Herb 5678765567', function () {


Debugging artifact, I presume?

Suggested change

describe('White Herb 5678765567', function () {

describe('White Herb', function () {

yup :D will remove

Marty-D · 2019-03-04T16:19:51Z

test/simulator/items/whiteherb.js

+		assert.false.holdsItem(holder);
+		assert.statStage(holder, 'atk', 0);
+	});
+	it('should use white herb after two intimidate switch in', function () {


Switching in during a turn (one at a time) is fundamentally different from switching in at the beginning of a battle or to replace fainted Pokemon (all at once). This test you're doing here should activate White Herb before the second Pokemon even switches out.

ah ok makes sense, will update the PR

Switching in during a turn (one at a time) is fundamentally different from switching in at the beginning of a battle or to replace fainted Pokemon (all at once). This test you're doing here should activate White Herb before the second Pokemon even switches out.

@Marty-D

It seems runSwitch remains in queue when Pokemon are switching in at start or after feint. Checking for this before the update leads to White Herb being called after all Pokemon switch in after start or after feint and calls it right away after a player switches during a turn. Is this correct behavior?

Suggested change

it('should use white herb after two intimidate switch in', function () {

it('should use white herb after two Intimidate switch in', function () {

urkerab · 2019-03-09T12:59:10Z

data/items.js

@@ -6009,9 +6009,17 @@ let BattleItems = {
 			},
 		},
 		onUpdate(pokemon) {
+			if ((this.gameType === "doubles")) {


This doesn't look like a good idea to me, since it's too specific, but do you even need it any more?

probably not I was going to add some tests for singles and test without the check

pyuk-bot · 2019-03-22T21:08:32Z

I wonder if it'd work to run the SwitchIn event the way we run spread moves. Could we pass all the currently switching Pokemon to runEvent in an array?

littlefoot22 · 2019-03-25T16:29:23Z

@MacChaeger not sure I understand what your proposing, would this be to check if more Pokemon are about to be switched in ?

AnnikaCodes · 2021-04-09T05:58:45Z

Old PR from someone who's no longer contributing.

littlefoot22 added 2 commits February 20, 2019 00:13

White Herb fix for doubles

33aa56e

White Herb fix for doubles

e903291

pyuk-bot reviewed Feb 20, 2019

View reviewed changes

littlefoot22 added 2 commits February 20, 2019 01:00

White Herb fix for doubles

64ed5eb

White Herb fix for doubles

9afb9b1

Zarel reviewed Feb 20, 2019

View reviewed changes

Zarel force-pushed the master branch from fa602b8 to 94b2d65 Compare February 20, 2019 08:59

Zarel force-pushed the master branch from 8091982 to 93a76f9 Compare February 21, 2019 08:03

littlefoot22 added 3 commits February 24, 2019 23:32

white herb fix for doubles

6a011e8

merge

cec77b1

white herb fix for doubles

0326489

littlefoot22 added 2 commits March 3, 2019 20:01

white herb fix

7890705

white herb fix

d005949

Zarel reviewed Mar 4, 2019

View reviewed changes

e088764 added 3 commits March 4, 2019 10:28

whiteherb fixtest/simulator/items/whiteherb.js

b086cf5

whiteherb fix

edcabe0

whiteherb fix

29837aa

Marty-D reviewed Mar 4, 2019

View reviewed changes

e088764 added 2 commits March 6, 2019 17:07

white herb fix

f4e9bb2

white herb

a5d8ad9

e088764 added 7 commits March 8, 2019 16:32

white herb fix

0f26d0c

white herb fix

d8ff962

white herb fix

5255e5c

white herb fix

ccad5b6

white herb fix

5fd9855

white herb fix

0c50303

white herb fix

3f305e4

urkerab reviewed Mar 9, 2019

View reviewed changes

spelling

976dbd9

e088764 added 6 commits March 11, 2019 16:10

add singles test remove doubles check

488ca68

add singles test remove doubles check

c615ae7

merge

bb1ad20

merge

0f13b95

mislabeled test

3cc1a30

mislabeled test

a230288

Zarel force-pushed the master branch 2 times, most recently from c7b57c2 to 1d09dd1 Compare February 20, 2020 23:58

Zarel force-pushed the master branch from 54d94d7 to 80634c6 Compare April 16, 2020 10:13

Zarel force-pushed the master branch 2 times, most recently from e75cc47 to 381bd75 Compare May 16, 2020 16:31

Zarel force-pushed the master branch from d9fd1b5 to 14218b1 Compare December 13, 2020 20:13

Zarel force-pushed the master branch from b7ac133 to d4b6ba4 Compare March 29, 2021 17:28

AnnikaCodes closed this Apr 9, 2021

SirenXD mentioned this pull request Jun 16, 2022

Fix White Herb interactions with Intimidate and KO stat-boosting Abilities #8815

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

White Herb doubles fix #5185

White Herb doubles fix #5185

littlefoot22 commented Feb 20, 2019

pyuk-bot Feb 20, 2019

littlefoot22 Feb 20, 2019

Zarel Feb 20, 2019

Marty-D commented Feb 21, 2019

littlefoot22 commented Feb 21, 2019

pyuk-bot commented Feb 21, 2019

pyuk-bot commented Feb 21, 2019

Marty-D commented Feb 21, 2019 •

edited

Loading

littlefoot22 commented Feb 25, 2019

littlefoot22 commented Feb 27, 2019

Marty-D commented Feb 27, 2019

littlefoot22 commented Feb 27, 2019

littlefoot22 commented Mar 4, 2019 •

edited

Loading

Zarel Mar 4, 2019

littlefoot22 Mar 4, 2019

Marty-D Mar 4, 2019

littlefoot22 Mar 4, 2019

littlefoot22 Mar 8, 2019

pyuk-bot Mar 8, 2019

urkerab Mar 9, 2019

littlefoot22 Mar 9, 2019

pyuk-bot commented Mar 22, 2019

littlefoot22 commented Mar 25, 2019

AnnikaCodes commented Apr 9, 2021

	if (pokemon.side.foe.pokemon.length > 1 && pokemon.side.foe.battle.abilityOrder !== 4) {
	if (pokemon.side.active.length > 1 && this.abilityOrder !== 4) {

	describe('White Herb 5678765567', function () {
	describe('White Herb', function () {

	it('should use white herb after two intimidate switch in', function () {
	it('should use white herb after two Intimidate switch in', function () {

White Herb doubles fix #5185

White Herb doubles fix #5185

Conversation

littlefoot22 commented Feb 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Marty-D commented Feb 21, 2019

littlefoot22 commented Feb 21, 2019

pyuk-bot commented Feb 21, 2019

pyuk-bot commented Feb 21, 2019

Marty-D commented Feb 21, 2019 • edited Loading

littlefoot22 commented Feb 25, 2019

littlefoot22 commented Feb 27, 2019

Marty-D commented Feb 27, 2019

littlefoot22 commented Feb 27, 2019

littlefoot22 commented Mar 4, 2019 • edited Loading

EDIT

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pyuk-bot commented Mar 22, 2019

littlefoot22 commented Mar 25, 2019

AnnikaCodes commented Apr 9, 2021

Marty-D commented Feb 21, 2019 •

edited

Loading

littlefoot22 commented Mar 4, 2019 •

edited

Loading