From f3d3832dd4a95fff6d2ded281b60ea9afbc33f1a Mon Sep 17 00:00:00 2001 From: drgoku282 Date: Sat, 25 Mar 2017 13:49:06 -0600 Subject: [PATCH] Change capitalization --- PKMN-NTR/Bot/Bot.cs | 8 ++++---- PKMN-NTR/Bot/Bot_Breeding6.cs | 6 +++--- PKMN-NTR/Bot/Bot_Breeding7.cs | 4 ++-- PKMN-NTR/Bot/Bot_SoftReset6.cs | 2 +- PKMN-NTR/Bot/Bot_SoftReset7.cs | 2 +- PKMN-NTR/Bot/Bot_WonderTrade6.cs | 14 +++++++------- PKMN-NTR/Bot/Bot_WonderTrade7.cs | 14 +++++++------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/PKMN-NTR/Bot/Bot.cs b/PKMN-NTR/Bot/Bot.cs index 2920892..b1e00be 100644 --- a/PKMN-NTR/Bot/Bot.cs +++ b/PKMN-NTR/Bot/Bot.cs @@ -14,7 +14,7 @@ public static void Report(string message) Program.gCmdWindow.addtoLog(message); } - public static bool isLegal(PKM poke) + public static bool IsLegal(PKM poke) { if (poke.GenNumber >= 6) { @@ -27,12 +27,12 @@ public static bool isLegal(PKM poke) } } - public static uint getBoxOff(uint startOff, NumericUpDown boxSource, NumericUpDown slotSource) + public static uint GetBoxOff(uint startOff, NumericUpDown boxSource, NumericUpDown slotSource) { return startOff + (uint)(boxSource.Value - 1) * 30 * 232 + (uint)(slotSource.Value - 1) * 232; } - public static int getIndex(NumericUpDown ctrl) + public static int GetIndex(NumericUpDown ctrl) { return (int)ctrl.Value - 1; } @@ -251,7 +251,7 @@ private static bool IVCheck(int refiv, int actualiv, int logic) } } - public static void showResult(string source, ErrorMessage message, int[] info = null) + public static void ShowResult(string source, ErrorMessage message, int[] info = null) { switch (message) { diff --git a/PKMN-NTR/Bot/Bot_Breeding6.cs b/PKMN-NTR/Bot/Bot_Breeding6.cs index bb7ed13..38a8fe2 100644 --- a/PKMN-NTR/Bot/Bot_Breeding6.cs +++ b/PKMN-NTR/Bot/Bot_Breeding6.cs @@ -795,7 +795,7 @@ public async void RunBot() case breedbotstates.touchnewbox: Report("Bot: Touch New Box"); await Task.Delay(commanddelay); - waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[getIndex(Box)], LookupTable.boxposY6[getIndex(Box)]); + waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[GetIndex(Box)], LookupTable.boxposY6[GetIndex(Box)]); if (await waitTaskbool) { attempts = 0; @@ -861,7 +861,7 @@ public async void RunBot() case breedbotstates.moveegg: Report("Move Egg"); await Task.Delay(commanddelay); - waitTaskbool = Program.helper.waitholdtouch(LookupTable.pokeposX6[getIndex(Slot)], LookupTable.pokeposY6[getIndex(Slot)]); + waitTaskbool = Program.helper.waitholdtouch(LookupTable.pokeposX6[GetIndex(Slot)], LookupTable.pokeposY6[GetIndex(Slot)]); if (await waitTaskbool) { botState = breedbotstates.releaseegg; @@ -1257,7 +1257,7 @@ public async void RunBot() { botresult = ErrorMessage.Disconnect; } - showResult("Breeding bot", botresult, finishmessage); + ShowResult("Breeding bot", botresult, finishmessage); Delg.SetText(RunStop, "Start Bot"); Program.gCmdWindow.botMode(false); EnableControls(); diff --git a/PKMN-NTR/Bot/Bot_Breeding7.cs b/PKMN-NTR/Bot/Bot_Breeding7.cs index 5f4ac47..d36ee0b 100644 --- a/PKMN-NTR/Bot/Bot_Breeding7.cs +++ b/PKMN-NTR/Bot/Bot_Breeding7.cs @@ -159,7 +159,7 @@ public async void RunBot() case breedbotstates.selectbox: Report("Bot: Set start box"); - waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)getIndex(Box), Program.gCmdWindow.pid); + waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)GetIndex(Box), Program.gCmdWindow.pid); if (await waitTaskbool) { attempts = 0; @@ -536,7 +536,7 @@ public async void RunBot() { botresult = ErrorMessage.Disconnect; } - showResult("Breeding bot", botresult, finishmessage); + ShowResult("Breeding bot", botresult, finishmessage); Delg.SetText(RunStop, "Start Bot"); Program.gCmdWindow.botMode(false); EnableControls(); diff --git a/PKMN-NTR/Bot/Bot_SoftReset6.cs b/PKMN-NTR/Bot/Bot_SoftReset6.cs index 08b6597..674d5df 100644 --- a/PKMN-NTR/Bot/Bot_SoftReset6.cs +++ b/PKMN-NTR/Bot/Bot_SoftReset6.cs @@ -977,7 +977,7 @@ public async void RunBot() { botresult = ErrorMessage.Disconnect; } - showResult("Soft-reset bot", botresult, finishmessage); + ShowResult("Soft-reset bot", botresult, finishmessage); Delg.SetText(RunStop, "Start Bot"); Program.gCmdWindow.botMode(false); EnableControls(); diff --git a/PKMN-NTR/Bot/Bot_SoftReset7.cs b/PKMN-NTR/Bot/Bot_SoftReset7.cs index e2f9b0e..556b2d4 100644 --- a/PKMN-NTR/Bot/Bot_SoftReset7.cs +++ b/PKMN-NTR/Bot/Bot_SoftReset7.cs @@ -900,7 +900,7 @@ public async void RunBot() { botresult = ErrorMessage.Disconnect; } - showResult("Soft-reset bot", botresult, finishmessage); + ShowResult("Soft-reset bot", botresult, finishmessage); Delg.SetText(RunStop, "Start Bot"); Program.gCmdWindow.botMode(false); EnableControls(); diff --git a/PKMN-NTR/Bot/Bot_WonderTrade6.cs b/PKMN-NTR/Bot/Bot_WonderTrade6.cs index 760c240..9b79d9c 100644 --- a/PKMN-NTR/Bot/Bot_WonderTrade6.cs +++ b/PKMN-NTR/Bot/Bot_WonderTrade6.cs @@ -250,7 +250,7 @@ public async void RunBot() else { // Valid pkm, check legality attempts = 0; - if (isLegal(WTpoke) || Program.gCmdWindow.enableillegal) + if (IsLegal(WTpoke) || Program.gCmdWindow.enableillegal) { if (Program.gCmdWindow.enableillegal) { @@ -279,7 +279,7 @@ public async void RunBot() if (temp.Length == 232) { PK6 pkmn = new PK6(temp); - if (isLegal(pkmn) || Program.gCmdWindow.enableillegal) + if (IsLegal(pkmn) || Program.gCmdWindow.enableillegal) { // Legal pkm Report("Bot: Illegal pokémon, will write it anyways"); pklist.Add(pkmn); @@ -313,7 +313,7 @@ public async void RunBot() { // Select a random file currentfile = RNG.Next() % pklist.Count; } - waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid); + waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid); if (await waitTaskbool) { Program.gCmdWindow.updateDumpBoxes(Box, Slot); @@ -479,7 +479,7 @@ public async void RunBot() case botstates.touchnewbox: Report("Bot: Touch New Box"); await Task.Delay(delaytime); - waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[getIndex(Box)], LookupTable.boxposY6[getIndex(Box)]); + waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[GetIndex(Box)], LookupTable.boxposY6[GetIndex(Box)]); if (await waitTaskbool) { attempts = 0; @@ -528,7 +528,7 @@ public async void RunBot() case botstates.touchpoke: Report("Bot: Touch Pokémon"); await Task.Delay(delaytime); - waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX6[getIndex(Slot)], LookupTable.pokeposY6[getIndex(Slot)]); + waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX6[GetIndex(Slot)], LookupTable.pokeposY6[GetIndex(Slot)]); if (await waitTaskbool) { attempts = 0; @@ -738,7 +738,7 @@ public async void RunBot() { Program.gCmdWindow.SAV.BlankPKM.EncryptedBoxData.CopyTo(deletearray, i * 232); } - waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid); + waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid); if (await waitTaskbool) { attempts = 0; @@ -809,7 +809,7 @@ public async void RunBot() { botresult = ErrorMessage.Disconnect; } - showResult("Wonder Trade bot", botresult); + ShowResult("Wonder Trade bot", botresult); Delg.SetText(RunStop, "Start Bot"); Program.gCmdWindow.botMode(false); EnableControls(); diff --git a/PKMN-NTR/Bot/Bot_WonderTrade7.cs b/PKMN-NTR/Bot/Bot_WonderTrade7.cs index 156c7c0..3da1f31 100644 --- a/PKMN-NTR/Bot/Bot_WonderTrade7.cs +++ b/PKMN-NTR/Bot/Bot_WonderTrade7.cs @@ -266,7 +266,7 @@ public async void RunBot() else { // Valid pkm, check legality attempts = 0; - if (isLegal(WTpoke) || Program.gCmdWindow.enableillegal) + if (IsLegal(WTpoke) || Program.gCmdWindow.enableillegal) { if (Program.gCmdWindow.enableillegal) { @@ -295,7 +295,7 @@ public async void RunBot() if (temp.Length == 232) { PK7 pkmn = new PK7(temp); - if (isLegal(pkmn)) + if (IsLegal(pkmn)) { // Legal pkm Report("Bot: Illegal pokémon, will write it anyways"); pklist.Add(pkmn); @@ -329,7 +329,7 @@ public async void RunBot() { // Select a random file currentfile = RNG.Next() % pklist.Count; } - waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid); + waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid); if (await waitTaskbool) { Program.gCmdWindow.updateDumpBoxes(Box, Slot); @@ -358,7 +358,7 @@ public async void RunBot() if (boxchange) { Report("Bot: Set current box"); - waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)getIndex(Box), Program.gCmdWindow.pid); + waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)GetIndex(Box), Program.gCmdWindow.pid); if (await waitTaskbool) { attempts = 0; @@ -465,7 +465,7 @@ public async void RunBot() case botstates.touchpoke: Report("Bot: Touch pokémon"); await Task.Delay(4 * delaytime); - waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX7[getIndex(Slot)], LookupTable.pokeposY7[getIndex(Slot)]); + waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX7[GetIndex(Slot)], LookupTable.pokeposY7[GetIndex(Slot)]); if (await waitTaskbool) { botstate = botstates.testpoke; @@ -824,7 +824,7 @@ public async void RunBot() { Program.gCmdWindow.SAV.BlankPKM.EncryptedBoxData.CopyTo(deletearray, i * 232); } - waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid); + waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid); if (await waitTaskbool) { attempts = 0; @@ -897,7 +897,7 @@ public async void RunBot() { botresult = ErrorMessage.Disconnect; } - showResult("Wonder Trade bot", botresult); + ShowResult("Wonder Trade bot", botresult); Delg.SetText(RunStop, "Start Bot"); Program.gCmdWindow.botMode(false); EnableControls();