mirror of
https://github.com/kwsch/PKHeX.git
synced 2026-10-02 00:48:49 -05:00
Revise natureamp clicks
now behaves correctly without off-by-1 behavior
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using static PKHeX.Core.NatureAmpRequest;
|
||||
|
||||
namespace PKHeX.Core;
|
||||
@@ -25,7 +25,7 @@ public static int GetNewNature(this NatureAmpRequest type, int statIndex, int cu
|
||||
return GetNewNature(type, statIndex, up, dn);
|
||||
}
|
||||
|
||||
/// <inheritdoc cref="GetNewNature(PKHeX.Core.NatureAmpRequest,int,int)"/>
|
||||
/// <inheritdoc cref="GetNewNature(NatureAmpRequest,int,int)"/>
|
||||
public static int GetNewNature(NatureAmpRequest type, int statIndex, int up, int dn)
|
||||
{
|
||||
//
|
||||
@@ -65,8 +65,8 @@ public static int CreateNatureFromAmps(int up, int dn)
|
||||
/// </summary>
|
||||
public static (int up, int dn) GetNatureModification(int nature)
|
||||
{
|
||||
var up = (nature / 5) + 1;
|
||||
var dn = (nature % 5) + 1;
|
||||
var up = (nature / 5);
|
||||
var dn = (nature % 5);
|
||||
return (up, dn);
|
||||
}
|
||||
|
||||
@@ -99,8 +99,8 @@ public static void ModifyStatsForNature(Span<ushort> stats, int nature)
|
||||
var (up, dn) = GetNatureModification(nature);
|
||||
if (IsNeutralOrInvalid(nature, up, dn))
|
||||
return;
|
||||
stats[up] *= 11; stats[up] /= 10;
|
||||
stats[dn] *= 9; stats[dn] /= 10;
|
||||
stats[up + 1] *= 11; stats[up + 1] /= 10;
|
||||
stats[dn + 1] *= 9; stats[dn + 1] /= 10;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -481,8 +481,8 @@ public string UpdateNatureModification(int nature)
|
||||
if (NatureAmp.IsNeutralOrInvalid(nature, up, dn))
|
||||
return "-/-";
|
||||
|
||||
var incr = L_Stats[up];
|
||||
var decr = L_Stats[dn];
|
||||
var incr = L_Stats[up + 1];
|
||||
var decr = L_Stats[dn + 1];
|
||||
incr.ForeColor = StatIncreased;
|
||||
decr.ForeColor = StatDecreased;
|
||||
return $"+{incr.Text} / -{decr.Text}".Replace(":", "");
|
||||
|
||||
Reference in New Issue
Block a user