[Move] Fully implement Rage #3667

ElizaAlex · 2024-08-20T15:28:15Z

What are the changes the user will see?

Rage now correctly applies an attack boost when a Pokémon is hit and Rage is the last move they used.

Some important notes about Rage's intended behavior:

A pokemon starts raging and gains the RageTag tag if it successfully hits a non-immune target with Rage.
A pokemon stops raging and loses the RageTag tag if it successfully uses a move that is not Rage, even if that move misses and/or fails.
A pokemon does NOT stop raging if
- It uses rage and misses or the target is immune.
- It was commanded to use a different move but has not acted yet
- The Run or Ball options are selected in battle
- It attempts to use a different move but is unable to act (via being flinched, asleep, confused, etc)

Why am I making these changes?

Rage is not fully implemented #3503

What are the changes from a developer perspective?

data/battler-tags: Added new RageTag to mark that the holder is raging. Uses MOVE_EFFECT and CUSTOM lapse types, to check if the tag should be removed because the holder used a different move, and to apply the attack boost when hit respectively.
phases/move-effect-phase: Added code to lapse a target's RageTagwhen they are hit, in line with the implementations of Shell Trap and Beak Blast.
data/move: Added AddBattlerTagAttr to Rage to apply a RageTag to the user on a successful hit.
test/moves/rage.test: New test file to test that rage gives attack boosts as intended
locales: Rage uses a custom message for its attack boosts, and since there's no other indicator I also added a separate message that doesn't exist in game for when a Pokémon successfully enters a rage. All non-English text is placeholder, and is just a copy of the English text.

(Added to the main post from a comment so people don't miss it):
The "rage is starting to build" text is not present in the mainline games, I added it tentatively in part because otherwise there is no in-game indicator that a pokemon has successfully started raging, and mostly because I needed to test things and record example videos and it saved me from having to play through an extra turn every time to check if the tag was/wasn't applied correctly.

It's a slight deviation from cartridge, but since Rage is a bit unintuitive, I figured I'd leave it in until people wanted it gone.

Screenshots/Videos

A raging pokemon gains an attack boost when hit:
A pokemon stays raging between turns:
A pokemon does not stop raging until it uses a non-rage move:

FastRage-SlowOther.mp4

A pokemon does not start raging until it hits a target with rage:

SlowRage.mp4

A pokemon does not start raging if the target is immune:

RageImmune.mp4

A Pokémon does not start raging if the initial Rage misses:

RageMiss.mp4

A Pokémon does not stop raging if the Player selects Run or Ball:

RageRunBall.mp4

Rage provides an attack boost per instance of damage:

DoublesRage.mp4

How to test the changes?

There are unit tests written in tests/moves/rage.test.ts that should hopefully cover most functionality! Currently I am aware that there are not tests for:

When the player selects Run or Ball
When Rage just misses normally
Comprehensive checks for any discrepancy in behavior between Player and Enemy Pokemon. (Most tests cover one or the other, but rarely both)
In addition, the testing for when Rage fails or has no effect includes specific tests against Ghost types and against Pokemon who are semi-invulnerable through the use of Fly, but may not be exhaustive.

For the tests, just make sure that they look right and are running without issue, and potentially double check them using overrides, otherwise, you can check for any edge cases I may have missed also using the options in overrides.ts. I described Rage's expected behavior further up, and it can be cross referenced here

Checklist

src/data/move.ts

src/locales/en/battler-tags.ts

src/data/battler-tags.ts

Adri1 · 2024-08-20T17:58:24Z

Does the text tied to "rageOnAdd" in the locales really exists? Can't find it anywhere

ElizaAlex · 2024-08-20T20:24:59Z

Does the text tied to "rageOnAdd" in the locales really exists? Can't find it anywere

I don't think it does! (and the main post now says that) I tentatively added it partially because otherwise there is no in-game indicator that a pokemon has successfully started raging, and mostly because I needed to record example videos and it saved me from having to play through an extra turn every time to check if the tag was/wasn't applied correctly.

It's a slight deviation from cartridge, but since Rage is a bit unintuitive, I figured I'd leave it in until people wanted it gone.

Adri1 · 2024-08-20T20:31:55Z

Does the text tied to "rageOnAdd" in the locales really exists? Can't find it anywere

I don't think it does! (and the main post now says that) I tentatively added it partially because otherwise there is no in-game indicator that a pokemon has successfully started raging, and mostly because I needed to record example videos and it saved me from having to play through an extra turn every time to check if the tag was/wasn't applied correctly.

It's a slight deviation from cartridge, but since Rage is a bit unintuitive, I figured I'd leave it in until people wanted it gone.

Thanks for your answer! As from the main crew of the translation team it was to know if it's just a mistake (if so I would I waited for its removal to translate) or on purpose 🫡

src/locales/fr/battler-tags.ts

NicusPulcis

italian localization done

src/locales/it/battler-tags.ts

src/locales/pt_BR/battler-tags.ts

# Conflicts: # src/test/moves/rage.test.ts

Added spacing inside of function calls Co-authored-by: schmidtc1 <[email protected]>

Added pt_BR, it, and fr translations. Co-authored-by: Lugiad' <[email protected]> Co-authored-by: Niccolò <[email protected]> Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

40chyan

zh

src/locales/zh_CN/battler-tags.ts

src/locales/zh_TW/battler-tags.ts

CodeTappert · 2024-08-21T04:46:19Z

So there is a problem.
In German the "rageOnHit" Message is " verfällt in Raserei!" in the official games.
Which means something like " goes into a frenzy!" or " begins to rage".

So i dont really know what to put for "rageOnAdd"

src/locales/ko/battler-tags.ts

src/data/battler-tags.ts

src/test/moves/rage.test.ts

AsdarDevelops

Couldn't find the "starting to build" as an official text, at least not in the newer games.

Added ES, and I also checked every other translation and suggestion commits before mine for typos regarding the use of \n and {{}}.

src/locales/es/battler-tags.ts

Co-authored-by: Yonmaru40 <[email protected]>

src/data/battler-tags.ts

src/test/moves/rage.test.ts

Co-authored-by: NightKev <[email protected]>

schmidtc1 · 2024-09-09T21:45:46Z

src/data/battler-tags.ts

+
+  /**
+   * Displays a message to show that the user has started Raging.
+   * This is message isn't displayed on cartridge, and was included for clarity during gameplay and while testing.


Suggested change

* This is message isn't displayed on cartridge, and was included for clarity during gameplay and while testing.

* This message isn't displayed on cartridge, and was included for clarity during gameplay and while testing.

schmidtc1 · 2024-09-09T21:48:53Z

src/test/moves/rage.test.ts

+  /**
+   * Ally Attack-Boost Test.
+   *
+   * Checks that Rage provides an attack boost if the user it hit after use.


Suggested change

* Checks that Rage provides an attack boost if the user it hit after use.

* Checks that Rage provides an attack boost if the user is hit after use.

schmidtc1 · 2024-09-09T21:51:29Z

src/test/moves/rage.test.ts

+
+      const leadPokemon = game.scene.getPlayerPokemon()!;
+
+      // Regieliki uses Fly. Boltund uses Rage, but Regieleki is invulnerable


Suggested change

// Regieliki uses Fly. Boltund uses Rage, but Regieleki is invulnerable

// Regieliki uses Phantom Force. Boltund uses Rage, but Regieleki is invulnerable

schmidtc1 · 2024-09-09T21:51:50Z

src/test/moves/rage.test.ts

+      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
+      expect(leadPokemon.getTag(RageTag)).toBeNull;
+
+      // Regieleki finishes Fly, Boltund uses Rage


Suggested change

// Regieleki finishes Fly, Boltund uses Rage

// Regieleki finishes Phantom Force. Boltund uses Rage

[Move] Implement Rage

9e018f4

flx-sta added Move Affects a move Enhancement New feature or request labels Aug 20, 2024

RageTag now displays message onAdd

3407d11

schmidtc1 reviewed Aug 20, 2024

View reviewed changes

src/data/move.ts Outdated Show resolved Hide resolved

schmidtc1 reviewed Aug 20, 2024

View reviewed changes

src/locales/en/battler-tags.ts Outdated Show resolved Hide resolved

schmidtc1 reviewed Aug 20, 2024

View reviewed changes

src/data/battler-tags.ts Outdated Show resolved Hide resolved

Added placeholder text for other locales

249f2ca

Adri1 reviewed Aug 20, 2024

View reviewed changes

src/locales/fr/battler-tags.ts Outdated Show resolved Hide resolved

NicusPulcis previously approved these changes Aug 20, 2024

View reviewed changes

src/locales/it/battler-tags.ts Outdated Show resolved Hide resolved

josericardo-fo reviewed Aug 20, 2024

View reviewed changes

src/locales/pt_BR/battler-tags.ts Outdated Show resolved Hide resolved

ElizaAlex and others added 7 commits August 20, 2024 18:56

Updated unit tests

d63126a

Updated unit tests

3d8762c

Merge branch 'rage' of https://github.com/ElizaAlex/pokerogue into rage

57d3072

# Conflicts: # src/test/moves/rage.test.ts

Updated unit tests

8a53784

Apply suggestions from code review

256ebc4

Added spacing inside of function calls Co-authored-by: schmidtc1 <[email protected]>

Add translations from localization team

ea234f9

Added pt_BR, it, and fr translations. Co-authored-by: Lugiad' <[email protected]> Co-authored-by: Niccolò <[email protected]> Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

Style changes

ab6af5f

ElizaAlex marked this pull request as ready for review August 20, 2024 23:39

40chyan reviewed Aug 21, 2024

View reviewed changes

src/locales/zh_CN/battler-tags.ts Outdated Show resolved Hide resolved

src/locales/zh_TW/battler-tags.ts Outdated Show resolved Hide resolved

EnochG1 reviewed Aug 21, 2024

View reviewed changes

src/locales/ko/battler-tags.ts Outdated Show resolved Hide resolved

torranx reviewed Aug 21, 2024

View reviewed changes

src/data/battler-tags.ts Show resolved Hide resolved

src/test/moves/rage.test.ts Outdated Show resolved Hide resolved

schmidtc1 reviewed Aug 21, 2024

View reviewed changes

src/test/moves/rage.test.ts Outdated Show resolved Hide resolved

schmidtc1 reviewed Aug 21, 2024

View reviewed changes

src/test/moves/rage.test.ts Outdated Show resolved Hide resolved

AsdarDevelops reviewed Aug 22, 2024

View reviewed changes

src/locales/es/battler-tags.ts Outdated Show resolved Hide resolved

Update src/locales/zh_CN/battler-tags.ts

1a07c7b

Co-authored-by: Yonmaru40 <[email protected]>

ElizaAlex dismissed NicusPulcis’s stale review via 2d478aa August 25, 2024 17:12

SangaraSorama added the Localization Provides or updates translation efforts label Aug 26, 2024

innerthunder mentioned this pull request Aug 27, 2024

List of Partial / Unimplemented Moves and Abilities #3503

Open

58 tasks

Merge branch 'beta' into rage

18316e2

ElizaAlex requested review from a team as code owners September 6, 2024 16:38

sodaMelon previously approved these changes Sep 6, 2024

View reviewed changes

Updated tests and localization to new framework/syntax

24117d1

ElizaAlex dismissed sodaMelon’s stale review via 24117d1 September 6, 2024 17:57

DayKev reviewed Sep 7, 2024

View reviewed changes

src/data/battler-tags.ts Outdated Show resolved Hide resolved

Fix merge issue

48b3730

DayKev force-pushed the rage branch from 856c089 to 48b3730 Compare September 7, 2024 05:35

DayKev reviewed Sep 7, 2024

View reviewed changes

src/data/battler-tags.ts Outdated Show resolved Hide resolved

src/data/battler-tags.ts Outdated Show resolved Hide resolved

DayKev reviewed Sep 7, 2024

View reviewed changes

src/test/moves/rage.test.ts Show resolved Hide resolved

ElizaAlex and others added 3 commits September 9, 2024 14:14

Update src/data/battler-tags.ts

2d9bc82

Co-authored-by: NightKev <[email protected]>

Update src/data/battler-tags.ts

4423dfd

Co-authored-by: NightKev <[email protected]>

Update src/data/battler-tags.ts

0051279

Co-authored-by: NightKev <[email protected]>

schmidtc1 reviewed Sep 9, 2024

View reviewed changes

Adri1 removed the Localization Provides or updates translation efforts label Sep 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Move] Fully implement Rage #3667

[Move] Fully implement Rage #3667

ElizaAlex commented Aug 20, 2024 •

edited

Loading

Adri1 commented Aug 20, 2024 •

edited

Loading

ElizaAlex commented Aug 20, 2024

Adri1 commented Aug 20, 2024 •

edited

Loading

NicusPulcis left a comment

40chyan left a comment

CodeTappert commented Aug 21, 2024

AsdarDevelops left a comment

schmidtc1 Sep 9, 2024

schmidtc1 Sep 9, 2024

schmidtc1 Sep 9, 2024

schmidtc1 Sep 9, 2024

	* This is message isn't displayed on cartridge, and was included for clarity during gameplay and while testing.
	* This message isn't displayed on cartridge, and was included for clarity during gameplay and while testing.

	* Checks that Rage provides an attack boost if the user it hit after use.
	* Checks that Rage provides an attack boost if the user is hit after use.


		const leadPokemon = game.scene.getPlayerPokemon()!;

		// Regieliki uses Fly. Boltund uses Rage, but Regieleki is invulnerable

	// Regieliki uses Fly. Boltund uses Rage, but Regieleki is invulnerable
	// Regieliki uses Phantom Force. Boltund uses Rage, but Regieleki is invulnerable

	// Regieleki finishes Fly, Boltund uses Rage
	// Regieleki finishes Phantom Force. Boltund uses Rage

[Move] Fully implement Rage #3667

Are you sure you want to change the base?

[Move] Fully implement Rage #3667

Conversation

ElizaAlex commented Aug 20, 2024 • edited Loading

What are the changes the user will see?

Why am I making these changes?

What are the changes from a developer perspective?

Screenshots/Videos

How to test the changes?

Checklist

Adri1 commented Aug 20, 2024 • edited Loading

ElizaAlex commented Aug 20, 2024

Adri1 commented Aug 20, 2024 • edited Loading

NicusPulcis left a comment

Choose a reason for hiding this comment

40chyan left a comment

Choose a reason for hiding this comment

CodeTappert commented Aug 21, 2024

AsdarDevelops left a comment

Choose a reason for hiding this comment

schmidtc1 Sep 9, 2024

Choose a reason for hiding this comment

schmidtc1 Sep 9, 2024

Choose a reason for hiding this comment

schmidtc1 Sep 9, 2024

Choose a reason for hiding this comment

schmidtc1 Sep 9, 2024

Choose a reason for hiding this comment

ElizaAlex commented Aug 20, 2024 •

edited

Loading

Adri1 commented Aug 20, 2024 •

edited

Loading

Adri1 commented Aug 20, 2024 •

edited

Loading