Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-18 00:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
7177 commits 3 branches 76 tags 119 MiB
Commit graph

885 commits

Author SHA1 Message Date
Kurt
816f35d042 Split file 2020-08-22 11:59:43 -07:00
Kurt
a62324a5a1
Refactoring some IEncounterable-type'd object initialization and original-generation evo chain (#2974) 2020-08-21 16:35:49 -07:00
Kurt
adb55c9e7b Make CanToggleGigantamax have a form argument 
no more meowth-1/2 and or perrserker
Closes #2973
 2020-08-16 23:06:49 -07:00
Kurt
12d9397c8c Split GO from "GG" gameversion 
Make Gen7b as the combined ver for that expression
 2020-08-06 18:24:20 -07:00
Lusamine
f611d0b780
pika pi (#2960) 2020-08-05 19:10:35 -07:00
Kurt
ad6728fb5c Minor tweaks 
Check egg encounter for state rather than re-deriving some properties on the fly
Only check memories if memories are exposed
Remove debug assert (not always true?)
 2020-08-04 22:56:55 -07:00
Kurt
497639d48e 7/31 distribution raids 2020-07-31 18:13:29 -07:00
Kurt
e84ce77008 Split memories from main pkm class to interface 
pk6/7/8, not pb7
 2020-07-31 17:25:14 -07:00
Kurt
b7211000b0 Split Country/Region/ConsoleRegion from ITrainerInfo 
Only present in mainline gen6/7 game pairs, so it's not wise to have it for all games
 2020-07-31 13:53:42 -07:00
Kurt
36684ab867 Minor clean 
Simplify some expressions
 2020-07-31 11:20:48 -07:00
Kurt
27f15d2f20 Split Country/Region/ConsoleRegion to interface 2020-07-31 11:17:31 -07:00
Kurt
05ac8acb5f Phenac City Hexagon Brothers rebattle 
Closes #2951
 2020-07-29 13:45:33 -07:00
Kurt
7bd36ca0c8 Minor clean 
Fix xmldoc, revert ??= because whatever nullable logic plugin I have isn't detecting this right
 2020-07-26 08:54:52 -07:00
Matt
3a02bf457f
Update GO minimum Level requirements (#2953) 
GO Fest 2020 made Alolan Marowak available in wild spawns, and further testing has proved that Raid/Research PKM can be  downleveled to 15 after trading to low-level accounts.

This'll probably end up being deprecated in the future when we have GO->HOME transfer checks, in addition to IV checking.
 2020-07-26 08:27:21 -07:00
Kurt
d3863f9c63 Minor tweaks 
verify relearn: move split check before method call
movelist: don't capture pkm in local method; meowstic ID
pkm: flip argument for easier understanding
 2020-07-19 18:30:46 -05:00
Kurt
a6a3c6eaaa Refactoring 
change some expressions for better perf/readability
 2020-07-19 17:48:45 -05:00
Kurt
40ce63873d Reduce gen1 encounter legality startup alloc by 5KB 
Use precomputed counts to remove the need to store a cache of read values

rename some variables in ReadSlots1FishingYellow
 2020-07-19 14:08:56 -05:00
Kurt
eb7ed44b29 Finish splitting gen1/2 encounter types from parent class 
Results in a little more code, but each path is less tangled
simplify some expressions
remove RBDragonair content in favor of a strict filter for catch rate

Move gen1 trade trainer names to stringconverter, since pk1/pk2 shouldn't refer to legality classes
 2020-07-19 13:32:40 -05:00
Kurt
35435b539e Refactoring 
move some logic around
 2020-07-18 21:51:38 -05:00
Kurt
085889d419 Pass evolution to trade match check 2020-07-18 21:50:28 -05:00
Kurt
705822c965 Abstract some gen1/2 encounter types from their parent class 2020-07-18 15:36:30 -05:00
Kurt
8fae396b76 Inject matching dexlevel for form comparison 2020-07-18 13:29:16 -05:00
Kurt
1ecafd8db3
Update Encounters8NestDist.cs 
Puts the new encounters in the correct array; the new encounters should now be recognized on the other game version.
 2020-07-17 12:18:28 -05:00
Kurt
8c52932bbe Under da sea 
did they just give up on version exclusive raids?
get yo shiny wailord
 2020-07-16 21:18:37 -05:00
Kurt
ea609d43a5 Move soup to gmax class (extension methods), fix home gmax starters 
Directly accessing CanEatMaxSoup is now forbidden :)

Fixes home galar starters being flagged when gmax-final evos
 2020-07-16 21:04:27 -05:00
Kurt
4d3fd395e1 Add bypass for DP rotom, skip splitbreed if chain doesn't have splitbreed 2020-07-13 22:30:20 -05:00
Kurt
e04b96a9b3 Fix dizzy punch egg recognition & gen2 hatch conter verification 
Closes #2939
Fixes #2938

Inline some logic where appropriate for egg levels
 2020-07-12 20:58:07 -05:00
Kurt
53e2432818 Fix gen2 egg species get 
feraligatr isn't in gen8 evolution table yet
Closes #2937
 2020-07-11 11:40:20 -05:00
Lusamine
fdfa10e881
Add a few static/crossover encounters (#2932) 2020-07-08 22:59:08 -05:00
Matt
fa7c8929b1
Update SWSH enc binaries, fix Rotom form/move issues (#2927) 
Some zone names were mislabeled in pkNX -- Staryu are not scripted encounters!
Remove altform specific moves from distro/static Rotom, which would erroneously allow illegal mismatches (e.g. Hydro Pump Rotom-1); thanks Abyzab (Discord)!
 2020-07-05 11:45:53 -05:00
Lusamine
39040358c1
Add a Whiscash (#2921) 2020-07-03 14:31:19 -05:00
Kurt
e207031920 Shuckle Magic Coat -> Encore 
Nice typo! Ty sora10pls(matt) & too salty (via discord)
 2020-07-03 10:48:31 -05:00
Kurt
0198179133 Add fixed raid news content 
no change in species/form from the crownite ore one afaik; common for both games???

fix type of rigel encount so it shows up in block editor, with correct name (ty matt)
 2020-06-29 21:10:12 -05:00
Kurt
993673f0de Minor clean 
no functional change
 2020-06-27 23:36:53 -05:00
Kurt
3138fb20c6 Refactor some method signatures 
vs -> chain (clarity on what it is; an evolution chain, rather than e.v.o.s - vs)
Clamp origin chain for transferred where we can use the max origin level
 2020-06-27 22:18:29 -05:00
Kurt
065c1cc6d4 Specify version on all defined wc3 
rearrange some setters for visual appearances

Closes #2904
 2020-06-27 14:21:45 -05:00
Kurt
d2ef98f7d4 Add underground staryu encounters 
not in any of our dumps, like crabrawler?
why gf
Closes #2913
 2020-06-27 13:56:29 -05:00
Kurt
294d861f86 Set StatNature on IEncounterable->PKM 
Mystery Gift formats already set it appropriately in their individual implementations

Closes #2901
 2020-06-27 11:46:23 -05:00
Lusamine
565c9a590e
Add some cross boundary encounters (#2910) 2020-06-26 23:31:23 -05:00
Matt
3f09afd4cb
Update TradeGift_R1 (#2909) 
Both games have a pair of version exclusive trades on The Isle of Armor, as noted on Bulbapedia.
 2020-06-26 11:00:45 -05:00
Kurt
ce5a09055a Merge branch 'master' of https://github.com/kwsch/PKHeX 2020-06-24 18:59:30 -05:00
Kurt
1ae9cb7602 Handle pika/meow soup evolutions 
Can lose gmax flag if its current species is able to eat soup, or its origin species could eat soup

this handles stuff like charmander->charizard, as charmeleon would not pass

hopefully there's never a mid-stage evo that has a gmax form, and its final evo doesn't... (don't get any ideas, gamefreak)
 2020-06-24 18:59:26 -05:00
Lusamine
bc1538efa5
Add some IoA cross-boundary encounters (#2902) 2020-06-24 07:34:26 -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
Matt
dcb5c1e936
Update IsMatchLocation to allow Isle of Armor Dens (#2895) 2020-06-22 10:07:50 -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
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
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
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
8f24477197
Weezing ingame trade can be any ability 2020-06-20 11:37:37 -05:00
ReignOfComputer
2e584f43fc
Additional Statics (#2883) 2020-06-20 07:51:04 -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
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
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
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
16c9865505 Update EncounterStatic8N.cs 2020-06-01 14:07:26 -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
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
afa368823e Minor clean 
handle some compiler messages
 2020-05-26 16:59:47 -07:00
Matt
9b6190a3e9
Add Gigantamax Meowth Distribution Raids (#2842) 2020-05-25 17:39:07 -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
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
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
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
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
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
Kurt
2e390573bc Add new meta distribution raids 2020-04-27 17:44:36 -07:00
Kurt
913d2773bf Pass form when form doesn't match encounter 
This is still a horrible hack, needs to be done similar to encounter slots

handle the galar NFE formchange cases
 2020-04-23 20:53:57 -07:00
Kurt
b8814d2448 Split GG into LGPE (GP/GE), GG (LGPE||GO) 
Update usages
 2020-04-16 12:48:18 -07:00
Kurt
a9a748e82d Update EncounterTradeGenerator.cs 2020-04-16 11:06:54 -07:00
Kurt
ba30f33045 Update EncounterStatic.cs 
Closes #2810
 2020-04-16 09:30:20 -07:00
Kurt
9b56eef821 Add deferral case for shiny type 2020-04-15 18:30:29 -07:00
Kurt
0ada4cbd77 Remove some unnecessary null checks 2020-04-12 13:20:40 -07:00
Kurt
30d21e4532 Extract out showdown set interface 2020-04-12 13:05:29 -07:00
Kurt
a94c754c3f More shedinja edge cases 
Don't allow shedinja evolution moves if it wasn't evolved in that generation
 2020-04-12 11:28:03 -07:00
Kurt
2e0aba55b2 Add Easter distribution raids 
No difference in sword exclusives
 2020-04-09 23:04:29 -07:00
Kurt
270d984130 Minor clean 
Remove unnecessary null checks
Mark some methods with nullable type
 2020-04-04 19:30:50 -07:00
Matt
f7a83dea2c
Force Ability 1 for SWSH Gift Charmander (#2800) 
As per new findings with latest commit of pkNX: 5016baf9ea
 2020-03-27 17:47:13 -07:00
Kurt
d73457a395 Update Encounters8NestDist.cs 2020-03-26 08:40:16 -07:00
Kurt
84abc04d07 3/25 Wild Area News 
Restrict abilities for crystal raids (corviknight always hidden, everything else can be anything-except-hidden).
 2020-03-25 19:02:09 -07:00
Kurt
a7026236cc Fix order of operations 
underflow behavior is desired; (uint)(10-15/10) results in zero
 2020-03-25 14:37:41 -07:00
Kurt
f4952faa6f Add zh2 trade localization 
ye it's different from the zh strings, resulting in different nick/OT

ty @Lusamine !

add another gyarados location while we're here
 2020-03-21 10:48:26 -07:00
Kurt
aaf6642d31 Rename Data -> BinLinker 2020-03-20 15:18:59 -07:00
Kurt
799e4852cf Minor clean 2020-03-20 13:33:15 -07:00
Kurt
dbfcef2efe Move files to group subfolder 2020-03-20 12:13:37 -07:00
Kurt
61cbf04c2e Fix comparison to watchtower, not wild area 
unshuffle the IVs for comparison, oops
 2020-03-19 21:04:17 -07:00