Commit graph

3075 commits

Author SHA1 Message Date
Lusamine
bc1538efa5
Add some IoA cross-boundary encounters (#2902) 2020-06-24 07:34:26 -05:00
CanoeHope
5b8d1cb681
Added IoA Restricted Sparring Blocks (#2900)
If you edit in a number of 5 or greater as one of your streaks you'll get a crown mark next to that type in-game, and doing it for all should allow for you to get Mustard's uniform when you talk to the receptionist.
2020-06-23 12:02:33 -05:00
Archit Date
fd48938c8e
fix encounter criteria ability via number (#2898) 2020-06-22 22:41:15 -05:00
Kurt
a2d9f06350 Differentiate AbilityType from AbilityNumber
invert ability index favoring so that the first ability index is most favored

ability num:
-1=>0/1/2
0=>0/1,
1=>0
2 =>1
4=>2

Ability Type:
0,1,2=>0,1,2
3=>0/1
4=>0/1/2

Should probably get rid of AbilityNumber definition usage but it's so entwined in the trade/static definitions...
2020-06-22 22:01:42 -05:00
Kurt
93308ca4ae Account for losing/gaining gmax for comparison
Don't defer for static, and don't skip for WC8

skip home gifts with player OT when SID7 not 0 (all home OTs have 6digit TID and 0 SID)
2020-06-22 21:29:21 -05:00
Kurt
4a5abab51f Fix raid dump syntax
Closes #2896
2020-06-22 21:28:02 -05:00
Matt
ed7d32f9bb
Fix Gigantamax1 get/set in Zukan8 (#2897)
Bit 0, not bit 1.
2020-06-22 13:06:25 -05:00
Matt
dcb5c1e936
Update IsMatchLocation to allow Isle of Armor Dens (#2895) 2020-06-22 10:07:50 -05:00
Kurt
6574732380 Update 20.06.22
Update wc8 binary with events from past month
2020-06-21 23:06:52 -05:00
Kurt
6fb2ebe039 Minor clean
add some xmldoc
2020-06-21 19:46:06 -05:00
Kurt
7e69202669 Use criteria for getting ability 2020-06-21 18:16:34 -05:00
Kurt
fc4ba1df35 Bounds check ability requested
no longer exception's on RefreshAbility(negative number)
2020-06-21 18:16:18 -05:00
Abyzab
a797459543
Additional Cross Boundary Edge Cases (#2891)
* Additional Cross Boundary Edge Cases

The static spawn point right outside Brawlers' cave, all of the pokemon are able to chase the player into the cave and be caught

https://cdn.discordapp.com/attachments/401014193211441161/724112694088695918/a0f06577821f60edf119308675de7894.png
https://cdn.discordapp.com/attachments/401014193211441161/724117077698281502/JPEG_20200621_002242.jpg

Unsure if there were more that spawn in this point that have the same behaviour, but these were the ones I found (w/ Ano0onymouse
 for Shield ones)
2020-06-21 09:33:29 -05:00
CanoeHope
3dcf24dade
New SWSH Block Data (#2890)
* New SWSH Block Data

Found these pretty useful blocks for IoA. I'll maybe look into Restricted Sparring data in the next week or so if no one else does by then.
2020-06-20 21:50:50 -05:00
Kurt
523f101c82 Add barraskewda location
Closes #2889

Co-Authored-By: Abyzab <abyzab@users.noreply.github.com>
2020-06-20 20:26:54 -05:00
Kurt
b53a29a0af Add flag for urshifu-1 gmax pokedex
ty @sora10pls
2020-06-20 20:00:35 -05:00
Kurt
645db23706 Extract EvoBase and MoveList from Core
These are really old bloated parts of the original legality checking logic; separating for now to rewrite.
2020-06-20 19:44:05 -05:00
Kurt
4f7845547e Minor clean
Remove met location dynamic sizing for C/XD (already resized for SWSH)
add some xmldoc comments
rename some parameters
2020-06-20 18:23:03 -05:00
Kurt
17f8ad97a9 Fix neutral mint index
hardy is index 0. and isn't a mint
2020-06-20 15:05:34 -05:00
Kurt
1ab7c916ce Clear mega slowbro seen 2020-06-20 14:31:47 -05:00
Kurt
c36c233e1d Fix galarian slowbro form compare
Really should be doing this with evo chain compares rather than edge cases, but whatever
2020-06-20 13:38:12 -05:00
Kurt
4c7c6532bb Check ability deferral with more scrutiny 2020-06-20 13:14:44 -05:00
Kurt
eedaca8712 Fix mistake
oops lol
2020-06-20 12:09:03 -05:00
Kurt
3e21924adc Document some save sizes 2020-06-20 12:08:51 -05:00
Kurt
8f24477197
Weezing ingame trade can be any ability 2020-06-20 11:37:37 -05:00
NPC-C83H
64be77f46c
Update legal raid counts (#2878) 2020-06-20 08:16:36 -05:00
ReignOfComputer
41aff36d50
Unblock IoA Mons Auto Dynamax (#2879)
Probably easier to blacklist this way?
2020-06-20 07:52:54 -05:00
ReignOfComputer
19d0f4572c
Unlock IoA Egg Locations (#2880)
Fixes https://github.com/kwsch/PKHeX/issues/2877.
2020-06-20 07:51:28 -05:00
ReignOfComputer
2e584f43fc
Additional Statics (#2883) 2020-06-20 07:51:04 -05:00
NPC-C83H
541909b999
fix Chinese Translation out of index range (#2875)
* fix Chinese Translation out of index range

* Update text_Forms_zh.txt
2020-06-19 23:50:58 -05:00
Chris
63add7d929
Fix Master Rank Ribbon (#2874) 2020-06-19 23:20:19 -05:00
Kurt
6002dfb739 Revise master rank ribbon again
ty terry & chris
2020-06-19 21:51:57 -05:00
Kurt
69dbde1bb4 Check battleversion state for past-gen master rank ribbon 2020-06-19 21:24:58 -05:00
Easy World
c0ee00cb7a
Update Chinese Localization (#2871)
* Update LegalityCheckStrings_zh.txt

* Update lang_zh.txt
2020-06-19 21:18:40 -05:00
XxPhoenix1996xX
0839882fda
Update Spanish Localization (#2870)
* Update LegalityCheckStrings_es.txt

* Update lang_es.txt
2020-06-19 20:53:21 -05:00
Kurt
e72a58bdee Dump latest translatable strings 2020-06-19 20:18:37 -05:00
Kurt
808ca8f307 Add a temp size that isn't 100% dlc sized
dunno what RoC did but it exists?
2020-06-19 19:58:56 -05:00
Kurt
5dd98cc9b0 Fix mystic/aurora ticket flag name inversion
Closes #2862
2020-06-19 19:00:40 -05:00
Kurt
36dd5ece21 Initial Isle of Armor support
Co-Authored-By: sciresm <sciresm@users.noreply.github.com>
Co-Authored-By: Matt <sora10pls@users.noreply.github.com>
Co-Authored-By: Archit Date <architdate@gmail.com>
2020-06-19 18:51:15 -05:00
Kurt
db30170cc5 Update EncounterArea7g.cs
Kinda ugly but works for now
Closes #2861
2020-06-16 22:40:43 -05:00
Kurt
27cce4dcd2 Disallow galar master rank ribbon on legends
Closes #2858
2020-06-16 22:16:21 -05:00
Kurt
f51e3673da Update AbilityVerifier.cs
incorrectly edited (ability number needs to be bit0/1/2 not none/any other permutation)
Closes #2860
2020-06-16 22:13:21 -05:00
Kurt
2cdb5d26db Clean up some method signatures
rename things to be a little more consistent in naming conventions
2020-06-16 21:46:22 -05:00
Kurt
bfef634a1a Set shiny type regardless of format
Don't loop if not required to loop
2020-06-12 11:45:56 -07:00
Kurt
efb628c002 PID Rand: Handle ability bits for gen34 differently from gen5
quite an old method we have here; used to just maintain both low bits from u16. Need to handle things differently for g34/g5.

Rearrange some variable init for slightly better perf, and clean up parameter names

https://projectpokemon.org/home/forums/topic/55750-pkhex-square-shiny/
2020-06-11 09:32:43 -07:00
Kurt
fe0ef71e67 Add zh flag names for emerald
Closes #2848

Co-Authored-By: hard <kamisama6866@users.noreply.github.com>
2020-06-11 09:29:01 -07:00
XxPhoenix1996xX
2bd33dd7de
Update Spanish Translation (#2850)
* Update MessageStrings_es.txt

* Update lang_es.txt
2020-06-06 17:11:35 -07:00
Kurt
f7d2101500 Update Encounters8NestDist.cs 2020-06-06 09:53:14 -07:00
Kurt
9b89ee09ec Fix downlevel comparison
(for good? pls)
https://i.redd.it/7g2c4d3kisc41.png
ty anubis

remove GetMinimalLevel override, as it's doing the same thing as LevelMin. When regenerating the pkm, we aren't doing anything downlevel related.
2020-06-06 09:00:52 -07:00
Kurt
c3215083c2 Update ShowdownSet.cs 2020-06-05 09:55:00 -07:00
Kurt
3af369c152 ★Sgr6879 (Copperajah) 2020-06-05 07:31:40 -07:00
Kurt
321a2d120f Add new distribution raids
Add Copperajah crystal (commented); uncomment when released?
2020-06-02 07:09:49 -07:00
Kurt
a2996e6b55 Unban gen8 bred HA starters
HOME gift -> breed
2020-06-02 07:09:17 -07:00
Kurt
16c9865505 Update EncounterStatic8N.cs 2020-06-01 14:07:26 -07:00
Kurt
ff849b9c5b Allow fullness values for format8
ty anubis
this totally isn't fullness, but the toys increase the value (saturation?)
2020-05-31 13:29:13 -07:00
Kurt
5c0d6d0f31 Extract downlevel check for reuse; clamp edge moves to max raid lvl 2020-05-31 13:28:14 -07:00
Kurt
3fcb29e68a Remove some reliance on GenNumber 2020-05-31 12:12:48 -07:00
Kurt
9ff01bccc6 Add ToString override for debugging 2020-05-31 12:12:20 -07:00
Kurt
6aab8ca449 Minor renaming/type change of passed args
Next commit will have more changes where we remove some reliance on PKM.GenNumber, in favor of the passed encounter's generation
2020-05-31 12:12:07 -07:00
Kurt
97d8bcebfe Only check Korean if game isn't recognized as Crystal
https://projectpokemon.org/home/forums/topic/57203-pkhex-error-crystal-save-dont-load/
2020-05-31 09:18:45 -07:00
Kurt
51a4001ce6
Update RaidSpawnList8.cs 2020-05-29 11:20:28 -07:00
Kurt
7f1039d155
Update RaidSpawnList8.cs 2020-05-29 11:19:49 -07:00
Matt
4d47e4ab83
Pretty up GP1 summary/filename (#2846) 2020-05-29 11:13:49 -07:00
XxPhoenix1996xX
fe8001f991
Update Spanish Translation (#2845)
* Update LegalityCheckStrings_es.txt

* Update MessageStrings_es.txt

* Update LegalityCheckStrings_es.txt
2020-05-28 23:30:57 -07:00
Kurt
dc5af9ea57 Add zh frlg event flags
Closes #2844
Closes #2843 via prior commit

Co-Authored-By: kamisama6866 <kamisama6866@users.noreply.github.com>
2020-05-28 22:06:33 -07:00
Kurt
940a9cb269 Add zh rs event flags
Closes #2843

Co-Authored-By: kamisama6866 <kamisama6866@users.noreply.github.com>
2020-05-28 14:48:44 -07:00
Kurt
afa368823e Minor clean
handle some compiler messages
2020-05-26 16:59:47 -07:00
Kurt
043ba3b6f0 Add ability to sideload key names 2020-05-26 15:58:48 -07:00
Matt
9b6190a3e9
Add Gigantamax Meowth Distribution Raids (#2842) 2020-05-25 17:39:07 -07:00
Kurt
46b443903d Fix SM dex form fetch for spewpa
Closes #2826

It doesn't find it in the SM table, but didn't return -1
rework logic flow to return when found, rather than after loop finishes.

Also fix display off-by-1 since we're not using zero indexing for our entry numbers.

Thanks @Ammako !
2020-05-24 20:42:45 -07:00
Kurt
7c6ea78c63 Add fullness legality check
Closes #2836

Co-Authored-By: Matt <sora10pls@users.noreply.github.com>
2020-05-24 20:00:32 -07:00
Kurt
9619306a8f Update BattleTree7.cs 2020-05-24 18:42:08 -07:00
Kurt
09cbe47240 Add battle tree scout edits
Closes #2833
2020-05-24 18:31:52 -07:00
Kurt
053eef2767 Add encount block
Closes #2840 -- access via Block Editor "Encount"
Tons of undecipherable junk in the roamer struct; looks like a mishmash of past gen code repurposed for their pseudo-stationary|roamer encounter.

ORAS has the same structure (same size/block), but the roamer portion isn't used
2020-05-24 17:31:10 -07:00
Kurt
8ce4f64239 Move files to their correct location 2020-05-24 17:11:39 -07:00
Kurt
bbe1cf3ee1 Fix gen6 gamesync ID read 2020-05-24 17:10:55 -07:00
Kurt
c4326698a5 Add prompt for loading new save with unsaved changes
Closes #2823

remove old gen6 powersaves decrypted-xorpad strings (unused logic)
remove gen8 save fixing beta-pkhex-caused corruption (behaved for 6months)
2020-05-24 11:03:23 -07:00
Kurt
d8cd75908b Handle gen2 gift egg collision with low hatch cycle req
Closes #2824
ty @KR1dude !

change miscverifier to use OT_Friendship instead of CurrentFriendship.
2020-05-24 10:46:08 -07:00
Kurt
4a5a913142 Handle downleveled cases correctly
Downleveled shared nest can't go below 20
Downleveled self nest can only happen for 1 or 3 badges and certain star counts, and the result can't be shiny
2020-05-23 22:17:47 -07:00
Kurt
64428539bd Fix sav4 active block detect
Closes #2697 ty @Ammako !

lazy slice check has flaws; just compare the major/minor counters in the save footer and check the uninitialized cases

nobody is gonna save the game 2^32 times, but check for the overflow case too!
first ff'd is preferred when the second is ff'd-1!
2020-05-23 22:17:03 -07:00
Kurt
0cdc225224 Kecleon: Comment out static in favor of dexnav encounterslot
Encounter Generator stops yielding if anything was yielded (assumes things that are static encounters can't have anything else that would match).

DexNav boosts the wild level (from 25/27) up to the same level 30 of the static encounter.

Thanks @KR1dude !

Co-Authored-By: KR1dude <kr1dude@users.noreply.github.com>
2020-05-20 18:24:55 -07:00
Kurt
6970c3a5fb Remove IVersion.set property, as separate interface
I don't want people to mutate IEncounterable.Version; it's only intended to be set on-load
2020-05-19 21:46:05 -07:00
Kurt
301350d32b Make IEncounterable expose IVersion get 2020-05-19 21:07:30 -07:00
Kurt
cce3d5d9f5 Handle race condition on get->set new cached string
overwrite add if it somehow was added from another thread in between lock checks
2020-05-19 20:40:51 -07:00
Kurt
232a9de32e Add gmax ev 2020-05-18 17:04:31 -07:00
Kurt
6164884700 Merge IGeneration into IEncounterable
all but egg exposed it; now, just make egg expose it and remove the unnecessary interface

we still need to Set generation for non-eggs/mgift, so have a separate Settable interface for internal purposes.
2020-05-17 12:32:28 -07:00
Kurt
4f40330af9 Add Dynamax Level = 10 to showdownset if legal
Closes #2835 ; zacian/zamazenta/eternatus can't have a DynamaxLevel other than 0.

Co-Authored-By: Mikewando <mikewando@users.noreply.github.com>
2020-05-16 15:15:41 -07:00
Kurt
1b5292cb04 append shared egg-moves rather than early return
dl[0].Species is the same as pk.Species; more clear && array access might be slower

only append shared egg moves if shared egg moves exist
2020-05-15 22:49:11 -07:00
Kurt
c8a141534c make enc move gen tree fetch non-pkm specific
just need to get all evo chains possible

fetching a GO leafeon, need to reverse leafeon->eevee, but the LGPE evo chains don't know about leafeon

works fine now
2020-05-15 21:59:06 -07:00
ultima-soul
496a3a45ff
Add flag for Foreign DexNav Encounters Unlocked. (#2834) 2020-05-12 11:57:56 -07:00
Kurt
3210ced006 Add new gmax-pikachu distribution details
can be shiny
can be any ability
still can't evolve

can't wait for gmax-eevee when this bcat expires ;)
2020-05-11 17:17:27 -07:00
Kurt
045e289c0a Account for antishiny skip on the NPC mon right before shadow
pretty much a copy from the other method with simplifications
2020-05-11 16:52:09 -07:00
Kurt
9b0e74dd2a Update ContestStatVerifier.cs 2020-05-11 16:51:10 -07:00
Kirk Scheibelhut
0aa84f3456
Fix minor typos in FormConverter comments (#2831) 2020-05-10 14:27:12 -07:00
Kurt
4decaa73f7 Verify Contest stats on gen5 origin
extract to separate logic class; only gen3+ call this (was originally called by gen6+); only really needs to include gen5
2020-05-09 20:47:32 -07:00
Kurt
8650b5ceb2 Verify g4 tower ribbons as invalid on >=g5 origin
https://projectpokemon.org/home/forums/topic/57026-gen-5-contest-stats-ribbons-bugissue/
2020-05-09 20:45:19 -07:00
Kurt
5fc15dc9c8 Correctly prevent xd locked shinies
oops, 7fd7a86074 was not correct (only handled lockless) -- the verifier doesn't check the final shadow pokemon (not a lock).

https://projectpokemon.org/home/forums/topic/57014-shiny-shadow-pok%C3%A9mon-from-xd-shown-as-legal-pkhex-legality-check-error/
2020-05-08 10:07:21 -07:00
Matt
383cf3e514
Unban GO Shiny Voltorb (#2829)
Philadelphia Safari Zone.
2020-05-08 07:48:24 -07:00
Matt
333693775e
Update GO Shiny Banlist (#2827)
Remove Venonat (Throwback Challenge 2020: Kanto).
Also switch to using enum like SWSH Hidden Ability banlist -- evolution families all on one line.
2020-04-30 17:05:44 -07:00
Kurt
67b19f7244 Update Encounters8NestDist.cs
Bye bye invalid drilbur, nice meme GF

The first rotom2 in Shield had its moves changed too. Keep that rotom-2 since Discharge can't be learned at that level.

since sw and sh have the same drilbur, it moves from sw -> common.
2020-04-28 11:36:03 -07:00