Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 06:34:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

GB stats: Ceil instead of +1

Browse source 
Wrong: #2265
Edge case (exact sqrt); Closes #3841
This commit is contained in:
Kurt 2023-03-19 12:18:10 -07:00
parent 66d897c41a
commit c8909a4326
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
PKHeX.Core/PKM/Shared/GBPKM.cs
View file

@ -214,7 +214,12 @@ public abstract class GBPKM : PKM
protected static ushort GetStat(int baseStat, int iv, int effort, int level) protected static ushort GetStat(int baseStat, int iv, int effort, int level)
{ {
effort = (ushort)Math.Min(255, Math.Sqrt(effort) + 1) >> 2; // The games store a precomputed ushort[256] i*i table for all ushort->byte square root calcs.
// The game then iterates to find the lowest index with a value >= input (effort).
// With modern CPUs we can just call sqrt->ceil directly.
byte firstSquare = (byte)Math.Ceiling(Math.Sqrt(effort));
effort = firstSquare >> 2;
return (ushort)((((2 * (baseStat + iv)) + effort) * level / 100) + 5); return (ushort)((((2 * (baseStat + iv)) + effort) * level / 100) + 5);
} }

39
Tests/PKHeX.Core.Tests/PKM/StatTest.cs
View file

@ -1,3 +1,4 @@
using System;
using FluentAssertions; using FluentAssertions;
using Xunit; using Xunit;
@ -36,6 +37,44 @@ public class StatTest
pk.Move2_PP.Should().Be(54, "pp calc oddity"); pk.Move2_PP.Should().Be(54, "pp calc oddity");
pk.Move3_PP.Should().Be(61, "pp calc oddity"); pk.Move3_PP.Should().Be(61, "pp calc oddity");
} }
[Fact]
public void CalcStatsGBPidgeot()
{
var pk = new PK2
{
Species = (ushort)Species.Pidgeot,
CurrentLevel = 100,
IV_HP = 15,
IV_ATK = 15,
IV_DEF = 15,
IV_SPC = 15,
IV_SPE = 15,
EV_HP = 63504,
EV_ATK = 63504,
EV_DEF = 63504,
EV_SPC = 63504,
EV_SPE = 63001,
};
ushort effort = 63001;
effort = (ushort)(Math.Min((ushort)255, (ushort)Math.Ceiling(Math.Sqrt(effort))) >> 2);
var iv = 15;
var level = 100;
var baseStat = 91;
var expect = (ushort)((((2 * (baseStat + iv)) + effort) * level / 100) + 5);
expect.Should().Be(279);
pk.ResetPartyStats();
pk.Stat_Level.Should().Be(pk.CurrentLevel, "stat level");
pk.Stat_HPCurrent.Should().Be(369, "stat re-calculation");
pk.Stat_HPMax.Should().Be(369, "stat re-calculation");
pk.Stat_ATK.Should().Be(258, "stat re-calculation");
pk.Stat_DEF.Should().Be(248, "stat re-calculation");
pk.Stat_SPA.Should().Be(238, "stat re-calculation");
pk.Stat_SPE.Should().Be(279, "stat re-calculation");
}
} }
public class BelugaTests public class BelugaTests