From 92b357c660f93b48761e043bc6f7d37035f2ac53 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 27 Jun 2016 22:26:39 -0700 Subject: [PATCH] Simplify hidden power calc Calculate inline --- PKM/ShowdownSet.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PKM/ShowdownSet.cs b/PKM/ShowdownSet.cs index 36920b6f4..376791544 100644 --- a/PKM/ShowdownSet.cs +++ b/PKM/ShowdownSet.cs @@ -247,8 +247,14 @@ public string getText() foreach (int move in Moves.Where(move => move != 0 && move < moves.Length)) { MoveLines[movectr] += "- " + moves[move]; - if (move == 237) - MoveLines[movectr] += $" [{hptypes[PKX.getHPType(IVs)]}]"; + if (move == 237) // Hidden Power + { + int hp = 0; + for (int i = 0; i < 6; i++) + hp |= (IVs[i] & 1) << i; + hp *= 0xF; hp /= 0x3F; + MoveLines[movectr] += $" [{hptypes[hp]}]"; + } movectr++; } result += string.Join(Environment.NewLine, MoveLines.Take(movectr));