-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feature] Named Evil Team Admins #3384
Merged
Merged
Changes from 43 commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
bf783b1
Hardcoded Pokemon should have proper names
Tempo-anon 0ae5ad5
Add evil admin placeholder images
Tempo-anon 1b96adb
Add admin names to locale files
Tempo-anon a636ec8
Add evil team admin dialogue
Tempo-anon f228ae3
current things.
CodeTappert 41e4fb4
rename
CodeTappert f8e029f
team galactic wants to be special
CodeTappert bd640bf
Revert debug changes
CodeTappert 0000e2b
Added Trainer Names and Titles
CodeTappert a8adfc2
[Hotfix] Fix interactions of some moves not changing types (#3183)
torranx f25d4e1
[Hotfix] Fix wild spawns not having their HA (#3190)
DayKev 2687d08
Add evil admin placeholder images
Tempo-anon 117061c
Add admin names to locale files
Tempo-anon 7664ba6
Add evil team admin dialogue
Tempo-anon 0a0c17d
Added new sprites
Tempo-anon fe44eec
Make simple admin trainer pools
Tempo-anon 692805e
Add Korean localization
Tempo-anon c4b4258
Merge branch 'beta' of https://github.com/TempsRay/pokerogue into beta
Tempo-anon 7b16b75
Merge branch 'beta' into evilTeamAdmin3
Tempo-anon 41fa47d
Merge remote-tracking branch 'github-desktop-Tempo-anon/evilTeamAdmin…
CodeTappert 50dbaf6
Revert this
CodeTappert 1b0c305
Merge branch 'beta' into evilTeamAdmins
CodeTappert 4f14bc1
[Feature] Named Evil Team Admins
CodeTappert e8e4f36
Dateien removed
CodeTappert c547acc
Revert override
CodeTappert 62db487
French only needs one pair of evil team bosses :)
CodeTappert d69937d
Some things Temp Mentioned in the PR
CodeTappert dd5191e
Removed NoDuplicates again...Because it only works on the speciality …
CodeTappert 939926b
German dialogue
CodeTappert c60a644
Offset
CodeTappert 6170318
Jördis just better
CodeTappert f7ee1bc
Credit for the artists (see https://www.deviantart.com/icejkai/art/Ma…
CodeTappert eb2c058
Order
CodeTappert 98ab8f1
Added tsdoc and named it more clear
CodeTappert c4783fb
Fixed formatting and made it a void function
CodeTappert e0832b4
Changed offset to number and updated tsdoch
CodeTappert ed38cbc
Improve readability
CodeTappert 11841ab
Removed extra lines
CodeTappert ce69b42
Fix this
CodeTappert 5062fc3
Revert override
CodeTappert b2ace41
colress gets his own pool because @blitzy wants it (and i agree)
CodeTappert 2a0251f
Added Rood (some plasma sage guy)
CodeTappert 9ed2a1e
has voucher is not false by default. So only it will be set true for …
CodeTappert 57c9dc8
Apply suggestions from code review
CodeTappert d8f4606
Merge branch 'beta' into evilTeamAdmins
CodeTappert afccce7
Added the localization also to japanese
CodeTappert 5b90498
Update src/locales/ko/trainers.ts
CodeTappert 5dc6007
Merge branch 'beta' into evilTeamAdmins
CodeTappert b300b32
Merge remote-tracking branch 'origin/evilTeamAdmins' into evilTeamAdmins
CodeTappert 899b17d
CA
CodeTappert ae3379c
Removed Colress
CodeTappert 22c3c07
Colress Last Stand
CodeTappert File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
2 changes: 1 addition & 1 deletion
2
public/images/trainer/rocket_admin_m.json → public/images/trainer/ariana.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "courtney.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 52, | ||
| "h": 80 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 52, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 52, | ||
| "h": 80 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 52, | ||
| "h": 80 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "mars.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 80, | ||
| "h": 80 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$" | ||
| } | ||
| } |
File renamed without changes
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason why Rocket has all 4 admins while Flare only has 2 when Aliana, Celosia, and Mable also exist? I do think that Bryony is the most iconic one though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could not have found sprites for the other flare admins.
If you have them i can add them