Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-19 20:28:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc style updates

Browse Source 
whitespace / brackets
This commit is contained in:
Kurt 2018-09-26 18:56:29 -07:00
parent 5760860c8e
commit 40a0206a5d
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PKHeX.Core/Editing/Saves/BoxManipulator.cs
View File

@ -30,7 +30,6 @@ public bool Execute(IBoxManip manip, int box, bool allBoxes, bool reverse = fals
if (!CanManipulateRegion(param.Start, param.Stop, prompt, fail))
return false;
var result = manip.Execute(SAV, param);
if (!result)
return false;

4
PKHeX.Core/Saves/SAV6.cs
View File

@ -881,8 +881,10 @@ public override bool GetSeen(int species)
+ 0x08; // Magic + Flags
for (int i = 1; i <= 4; i++) // check all 4 seen flags (gender/shiny)
{
if ((Data[ofs + bd + (i * brSize)] & mask) != 0)
return true;
}
return false;
}
@ -938,8 +940,10 @@ protected override bool[] MysteryGiftReceivedFlags
byte[] data = new byte[value.Length/8];
for (int i = 0; i < value.Length; i++)
{
if (value[i])
data[i>>3] |= (byte)(1 << (i&7));
}
data.CopyTo(Data, WondercardFlags);
Edited = true;

29
PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
View File

@ -17,6 +17,7 @@ public partial class SAV_MysteryGiftDB : Form
private readonly PKMEditor PKME_Tabs;
private readonly SaveFile SAV;
private readonly SAVEditor BoxView;
public SAV_MysteryGiftDB(PKMEditor tabs, SAVEditor sav)
{
InitializeComponent();
@ -91,6 +92,7 @@ public SAV_MysteryGiftDB(PKMEditor tabs, SAVEditor sav)
CB_Format.Items[0] = MsgAny;
CenterToParent();
}
private readonly PictureBox[] PKXBOXES;
private readonly string DatabasePath = Main.MGDatabasePath;
private List<MysteryGift> Results;
@ -115,6 +117,7 @@ private void ClickView(object sender, EventArgs e)
UpdateSlotColor(SCR_Box.Value);
L_Viewed.Text = string.Format(Viewed, Results[index].FileName);
}
private void ClickSavePK(object sender, EventArgs e)
{
int index = GetSenderIndex(sender);
@ -124,6 +127,7 @@ private void ClickSavePK(object sender, EventArgs e)
var pk = gift.ConvertToPKM(SAV);
WinFormsUtil.SavePKMDialog(pk);
}
private void ClickSaveMG(object sender, EventArgs e)
{
int index = GetSenderIndex(sender);
@ -155,6 +159,7 @@ private int GetSenderIndex(object sender)
}
return index;
}
private void PopulateComboBoxes()
{
// Set the Text
@ -187,6 +192,7 @@ private void PopulateComboBoxes()
ResetFilters(null, null);
B_Search.Enabled = true;
}
private void ResetFilters(object sender, EventArgs e)
{
CHK_Shiny.Checked = CHK_IsEgg.Checked = true;
@ -200,6 +206,7 @@ private void ResetFilters(object sender, EventArgs e)
if (sender != null)
System.Media.SystemSounds.Asterisk.Play();
}
private void LoadDatabase()
{
RawDB = new List<MysteryGift>(EncounterEvent.GetAllEvents());
@ -218,6 +225,7 @@ private void OpenDB(object sender, EventArgs e)
if (Directory.Exists(DatabasePath))
Process.Start("explorer.exe", DatabasePath);
}
private void Menu_Export_Click(object sender, EventArgs e)
{
if (Results == null || Results.Count == 0)
@ -295,6 +303,7 @@ private void UpdateScroll(object sender, ScrollEventArgs e)
if (e.OldValue != e.NewValue)
FillPKXBoxes(e.NewValue);
}
private void SetResults(List<MysteryGift> res)
{
Results = new List<MysteryGift>(res);
@ -307,6 +316,7 @@ private void SetResults(List<MysteryGift> res)
L_Count.Text = string.Format(Counter, Results.Count);
}
private void FillPKXBoxes(int start)
{
if (Results == null)
@ -316,27 +326,35 @@ private void FillPKXBoxes(int start)
return;
}
int begin = start * RES_MIN;
int end = Math.Min(RES_MAX, Results.Count - start * RES_MIN);
int end = Math.Min(RES_MAX, Results.Count - (start * RES_MIN));
for (int i = 0; i < end; i++)
PKXBOXES[i].Image = Results[i + begin].Sprite();
for (int i = end; i < RES_MAX; i++)
PKXBOXES[i].Image = null;
UpdateSlotColor(start);
}
private void UpdateSlotColor(int start)
{
for (int i = 0; i < RES_MAX; i++)
PKXBOXES[i].BackgroundImage = Properties.Resources.slotTrans;
if (slotSelected != -1 && slotSelected >= RES_MIN * start && slotSelected < RES_MIN * start + RES_MAX)
PKXBOXES[slotSelected - start * RES_MIN].BackgroundImage = slotColor ?? Properties.Resources.slotView;
if (slotSelected != -1 && slotSelected >= RES_MIN * start && slotSelected < (RES_MIN * start) + RES_MAX)
PKXBOXES[slotSelected - (start * RES_MIN)].BackgroundImage = slotColor ?? Properties.Resources.slotView;
}
private void Menu_SearchAdvanced_Click(object sender, EventArgs e)
{
if (!Menu_SearchAdvanced.Checked)
{ Size = MinimumSize; RTB_Instructions.Clear(); }
else Size = MaximumSize;
{
Size = MinimumSize;
RTB_Instructions.Clear();
}
else
{
Size = MaximumSize;
}
}
private void Menu_Import_Click(object sender, EventArgs e)
{
if (!BoxView.GetBulkImportSettings(out var clearAll, out var noSetb))
@ -355,6 +373,7 @@ private void Menu_Exit_Click(object sender, EventArgs e)
{
Close();
}
protected override void OnMouseWheel(MouseEventArgs e)
{
if (!PAN_Box.RectangleToScreen(PAN_Box.ClientRectangle).Contains(MousePosition))