From b20020fbe643d9882cf517651d3f0d4807f46f3d Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 10 Sep 2018 19:10:28 -0700 Subject: [PATCH] Update 18.09.11 Update event binaries with latest from the Event Gallery --- PKHeX.Core/PKM/Util/Experience.cs | 25 ++++++++++++-------- PKHeX.Core/Resources/byte/wc6full.pkl | Bin 303408 -> 303408 bytes PKHeX.Core/Resources/byte/wc7.pkl | Bin 28776 -> 28776 bytes PKHeX.Core/Resources/byte/wc7full.pkl | Bin 486864 -> 503328 bytes PKHeX.WinForms/Resources/text/changelog.txt | 20 ++++++++++++++++ PKHeX.WinForms/Resources/text/version.txt | 2 +- 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/PKHeX.Core/PKM/Util/Experience.cs b/PKHeX.Core/PKM/Util/Experience.cs index 60cb76f69..bddfa8928 100644 --- a/PKHeX.Core/PKM/Util/Experience.cs +++ b/PKHeX.Core/PKM/Util/Experience.cs @@ -1,5 +1,8 @@ namespace PKHeX.Core { + /// + /// Calculations for and . + /// public static class Experience { /// @@ -12,12 +15,12 @@ public static int GetLevel(int species, uint exp) { int growth = PKX.Personal[species].EXPGrowth; int tl = 1; // Initial Level. Iterate upwards to find the level - while (ExpTable[++tl, growth] <= exp) + while (ExpTable[tl, growth] <= exp) { - if (tl == 100) - return 100; + if (++tl == 100) + break; } - return --tl; + return tl; } /// @@ -32,7 +35,7 @@ public static uint GetEXP(int level, int species) return 0; if (level > 100) level = 100; - return ExpTable[level, PKX.Personal[species].EXPGrowth]; + return ExpTable[level - 1, PKX.Personal[species].EXPGrowth]; } /// @@ -53,8 +56,8 @@ public static uint GetEXPToLevelUp(int level, int species) if (level >= 100) return 0; var growth = PKX.Personal[species].EXPGrowth; - var current = ExpTable[level, growth]; - var next = ExpTable[level + 1, growth]; + var current = ExpTable[level - 1, growth]; + var next = ExpTable[level, growth]; return next - current; } @@ -70,8 +73,8 @@ public static double GetEXPToLevelUpPercentage(int level, int species, uint exp) if (level >= 100) return 0; var growth = PKX.Personal[species].EXPGrowth; - var current = ExpTable[level, growth]; - var next = ExpTable[level + 1, growth]; + var current = ExpTable[level - 1, growth]; + var next = ExpTable[level, growth]; var amount = next - current; double progress = exp - current; return progress / amount; @@ -79,9 +82,11 @@ public static double GetEXPToLevelUpPercentage(int level, int species, uint exp) #region ExpTable + /// + /// Experience required for next level [0,99] + /// private static readonly uint[,] ExpTable = { - {0000000, 0000000, 0000000, 0000000, 0000000, 0000000}, {0000000, 0000000, 0000000, 0000000, 0000000, 0000000}, {0000008, 0000015, 0000004, 0000009, 0000006, 0000010}, {0000027, 0000052, 0000013, 0000057, 0000021, 0000033}, diff --git a/PKHeX.Core/Resources/byte/wc6full.pkl b/PKHeX.Core/Resources/byte/wc6full.pkl index 296ed05929c177e706d5d1e756ce7401fcecede0..d012954c33599000848ae3c469f9a5b8e1663120 100644 GIT binary patch delta 37 rcmdmRNNB?$p@tU5ElfqpOwXQ9FG*%v%E-_zmBIwX%-f|>Sj21rAZra5 delta 37 rcmdmRNNB?$p@tU5ElfqpOj;S!OOlzEGBUSIr7!_8^LD8e7BO1@1ojKz diff --git a/PKHeX.Core/Resources/byte/wc7.pkl b/PKHeX.Core/Resources/byte/wc7.pkl index b30578fef4e2290ebcafeb4ccce307fa1e55bef2..f548e8ee481790d9a41d4a9cbada42290bb934da 100644 GIT binary patch delta 31 ncmaFyfbqox#tlMDo28f|xF>Tl8ccR#x-q$mzhd(%zPdyJ$kPlZ delta 32 ocmaFyfbqox#tlMDo3nU17$-|HS8VQLdcZZgioas>E55o!0Nol4`2YX_ diff --git a/PKHeX.Core/Resources/byte/wc7full.pkl b/PKHeX.Core/Resources/byte/wc7full.pkl index 0aa0a9d1adb68e05dbb33994ce465caa79747773..aaf1f86d38cc317899a67fa9fd8b7a80664661c8 100644 GIT binary patch delta 7842 zcmeHMZERat89w*Axrwr-az4DRq;8#NA?>=gxT~Nj5}MOB%Lv^9+q9yJwvIoNXpZB? zcDqE3v_skep^k9X9z@wjr2YUVO&Jqv`7xDhQdLcY7Wl)LwiYI!MV(qE251xEdCu#b z_{K>|%l^O;>)Q8xzvp?+`#k5Iod0e3yT4mKb?`+uGEfsfpaxZ16;wpURaPbOn^zf? z!sl^ym%DG^?(tgn8I%=JZy03}{PH_)zSHJcT1y$<=nv9M%a*7MYP%vyGG5(1=LEJwuzE$*|MHw>_N;S zWomPlY*CAGhwzLcO}jYT9O|UZ%sm8h7%2riI1kP`>&81?Xg>0iQe9n#?T6JYW+h~F zOOM??G1cS_RNcPn=@;JrsPg_ILAf$UsI1rt#)YdW5a=lI3{z*wz{^hhFI2 z_dmBD*WSc>ToqVXf?;Mo{vgTqDA)jrR}Q`y4Cu(;s;YM)jL3i~6EGvCa1o9vBD_)v z9tO!MLaK=09D*W_6a$M4ltNA|Y6xTPKstk(Nj2)8UK#3;R0`z_Oozl;qvR6(_Ew@)H z9eq8}w0c@?PF!sFXzQQ~s*trw?Y6I4t@c-JMC`rOwhAb<>pPpJ(!ZwpryeubWnfoc zMb%cX1N@fiDX$kUu3%urE6>05)SK>wT~0^Lz?pzqd1ER?C5KPk&@cIj1b@kZ$48DM9_7+8J5nVY^98uIn0(~M%RiF9Es_; z+P@L63B2w%U9dYgi{N30?D`VQ%a!R!TP!RAP>zQH#r2fNV0m@Po&0HZ0cQ5;lkR@P zDiGEDQ&!RYm4FN3F4?k;d2*48e(3VhrN%An2PMC@~*N5(~;;qle{9w~00h_)y ziU_FhSpaHJ?>y4ccg8HA3VyS1DKI{;zr=nfSG(;M?P!n=w8%p3Ig2D`X z*Z=IaH|;3rMmeF7PgyyOuq8tdBb^763>bDH_lR-|y^~KyFw{m;xZV@8qvMeh|FH=x zao2LdOhjoorz~0DfumP{t;anQ$=j*KfmGradF;uKvvmaShj>=>9n(K z0gCgh$+vp!3N>jgsfj^>KEiI>aO!R^zpV&k)&8!v)JKnehiX>Rm*9Hu{Gu&W=XJU69H4iA2! z;jB%&Q+o0pDB|)uyP^I;{LwI1LQa0xu9T1uS2#rd$lhQ$%%cOS)B;3 zw`xv25x2LV*XNzUmT)=slLr2bxFemLyAvJzqum(hnV^(m2*EoU467DZr{l#yi~h;) z?cf8m8(!|nh3ZMsLiF5TkQjJR#hth8UgbiC-|QDTj&r z!NUo=U!`|+V+Nf;*5 zT?9hJQgl>Y!g>wKI5l zbwi@y-3j@8%;d4xaw1M5H)-yUw&QBVI^%@u*`0TTGzdl?*0EzwXq-oaE9T}&)FJ{a z`;a%Q6&#l~^Jare!T*kUopC#wMIOiVZX0PG?ctRQt*6bNXv{D*+VNszbUD6e6hfaq z<4m+ozbxLHRF9(XnT@F7G~s$+saxLQ|21kC;3fY~f8Dg>Bl`-H0=Y#xs%CpdF#j|gQy5di>{Zz6aA diff --git a/PKHeX.WinForms/Resources/text/changelog.txt b/PKHeX.WinForms/Resources/text/changelog.txt index 97694924b..40d400763 100644 --- a/PKHeX.WinForms/Resources/text/changelog.txt +++ b/PKHeX.WinForms/Resources/text/changelog.txt @@ -1,6 +1,26 @@ PKHeX - By Kaphotics http://projectpokemon.org/pkhex/ +18/09/11 - New Update: + - Legality: + - - Changed: Another round of legality check updates. Thanks HaxAras, @sora10pls, ICanSnake, Omnipotent Arceus, Raptor385, PF649, PrometheusG, @Narithegreat, Yami_Wheeler, crzyc, ThePunish3D, @Lusamine! + - - Added: Poké Pelago status legality checks have been enabled, which can detect improperly transferred files. + - Added: Clicking on the "Ball" label now brings up a list of all balls, with background color indicating legality. + - Added: Gen6 X/Y Trainer appearance can now be modified directly (instead of via raw hex editing). + - Added: Gen6 Trainer Stats can now be edited (full list of stats added). + - Added: Gen4 Misc Editor can now grant all Pokéball Seals. Thanks @sora10pls! + - Added: Custom Backup Paths are now included in the autodetect save file search. Thanks @ReignOfComputer! + - Added: User Settings can now hide sensitive pkm details (PID/EC text fields). + - Added: User Settings can now hide sensitive savefile details (program title bar, game sync fields). + - Added: Gen6/7 Can now unlock Mega Rayquaza early in the Trainer Editor. + - Changed: Species / Form cries are now generation specific (Cosplay Pikachu) and follow the same rules as sprites. + - Changed: Legality is now shown for Database slots. + - Changed: Legality string variable names are now much more descriptive (instead of V###). + - Changed: Key item sprite now shows instead of "?" for key item mystery gifts. + - Changed: Spanish translations updated. Thanks @ajtudela! + - Fixed: PK1<->PK2 transfers now set current level & hp. Thanks HaxAras & Vladcik! + - Fixed: Clicking Relearn Moves groupbox under certain conditions no longer causes an error message. Thanks @ajtudela! + 18/08/03 - New Update: - Legality: - - Changed: Another round of legality check updates. Thanks @iiippppk, @WEERSOQUEER, @PrometheusG, @NinFanBoyFTW, paf, Cloud AC! diff --git a/PKHeX.WinForms/Resources/text/version.txt b/PKHeX.WinForms/Resources/text/version.txt index 3e73d7dbb..7d4d99ec9 100644 --- a/PKHeX.WinForms/Resources/text/version.txt +++ b/PKHeX.WinForms/Resources/text/version.txt @@ -1 +1 @@ -20180803 \ No newline at end of file +20180911 \ No newline at end of file