Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-16 21:38:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Continue extracting logic

Browse source
This commit is contained in:
Kurt 2018-09-16 12:44:00 -07:00
parent 41408a235c
commit 3cd45cf5c4
4 changed files with 70 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Saves/SaveFile.cs
View file

@ -735,7 +735,7 @@ namespace PKHeX.Core
}
public byte[] PCBinary => BoxData.SelectMany(pk => pk.EncryptedBoxData).ToArray();
public byte[] GetBoxBinary(int box) => BoxData.Skip(box*BoxSlotCount).Take(BoxSlotCount).SelectMany(pk => pk.EncryptedBoxData).ToArray();
public byte[] GetBoxBinary(int box) => GetBoxData(box).SelectMany(pk => pk.EncryptedBoxData).ToArray();
public bool SetPCBinary(byte[] data)
{

37
PKHeX.Core/Util/FileUtil.cs
View file

@ -179,5 +179,42 @@ namespace PKHeX.Core
mg = MysteryGift.GetMysteryGift(data, ext);
return mg != null;
}
/// <summary>
/// Gets a Temp location File Name for the <see cref="PKM"/>.
/// </summary>
/// <param name="pk">Data to be exported</param>
/// <param name="encrypt">Data is to be encrypted</param>
/// <returns>Path to temporary file location to write to.</returns>
public static string GetPKMTempFileName(PKM pk, bool encrypt)
{
string fn = pk.FileNameWithoutExtension;
string filename = fn + (encrypt ? $".ek{pk.Format}" : $".{pk.Extension}");
return Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename));
}
/// <summary>
/// Gets a <see cref="PKM"/> from the provided <see cref="file"/> path, which is to be loaded to the <see cref="SaveFile"/>.
/// </summary>
/// <param name="file"><see cref="PKM"/> or <see cref="MysteryGift"/> file path.</param>
/// <param name="SAV">Generation Info</param>
/// <returns>New <see cref="PKM"/> reference from the file.</returns>
public static PKM GetSingleFromPath(string file, ITrainerInfo SAV)
{
var fi = new FileInfo(file);
if (!fi.Exists)
return null;
if (!PKX.IsPKM(fi.Length) && !MysteryGift.IsMysteryGift(fi.Length))
return null;
var data = File.ReadAllBytes(file);
var ext = fi.Extension;
var mg = MysteryGift.GetMysteryGift(data, ext);
var gift = mg?.ConvertToPKM(SAV);
if (gift != null)
return gift;
int prefer = PKX.GetPKMFormatFromExtension(ext, SAV.Generation);
return PKMConverter.GetPKMfromBytes(data, prefer: prefer);
}
}
}

60
PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Media;
using System.Threading.Tasks;
using System.Windows.Forms;
@ -217,10 +218,8 @@ namespace PKHeX.WinForms.Controls
ShowSet.RemoveAll();
return;
}
var set = new ShowdownSet(pk);
if (pk.Format <= 2) // Nature preview from IVs
set.Nature = Experience.GetNatureVC(pk.EXP);
ShowSet.SetToolTip(pb, set.LocalizedText(Settings.Default.Language));
var text = GetLocalizedPreviewText(pk);
ShowSet.SetToolTip(pb, text);
}
private void PlayCry(PKM pk)
@ -279,12 +278,10 @@ namespace PKHeX.WinForms.Controls
{
byte[] dragdata = SAV.DecryptPKM(DragInfo.Source.OriginalData);
Array.Resize(ref dragdata, SAV.SIZE_STORED);
PKM pkx = SAV.GetPKM(dragdata);
string fn = pkx.FileName; fn = fn.Substring(0, fn.LastIndexOf('.'));
string filename = fn + (encrypt ? $".ek{pkx.Format}" : $".{pkx.Extension}");
// Make File
string newfile = Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename));
PKM pkx = SAV.GetPKM(dragdata);
string newfile = FileUtil.GetPKMTempFileName(pkx, encrypt);
try
{
TryMakeDragDropPKM(pb, encrypt, pkx, newfile, out external);
@ -369,26 +366,18 @@ namespace PKHeX.WinForms.Controls
WinFormsUtil.Alert(msg);
}
private bool TryLoadFiles(string[] files, DragEventArgs e, bool noEgg)
private bool TryLoadFiles(IReadOnlyList<string> files, DragEventArgs e, bool noEgg)
{
if (files.Length <= 0)
if (files.Count == 0)
return false;
string file = files[0];
FileInfo fi = new FileInfo(file);
if (!fi.Exists)
return false;
if (!PKX.IsPKM(fi.Length) && !MysteryGift.IsMysteryGift(fi.Length))
var temp = FileUtil.GetSingleFromPath(files[0], SAV);
if (temp == null)
{
RequestExternalDragDrop?.Invoke(this, e); // pass thru
return true; // treat as handled
}
byte[] data = File.ReadAllBytes(file);
MysteryGift mg = MysteryGift.GetMysteryGift(data, fi.Extension);
if (fi.Extension.Length > 0 || !int.TryParse(fi.Extension[fi.Extension.Length - 1].ToString(), out var prefer))
prefer = SAV.Generation;
PKM temp = mg?.ConvertToPKM(SAV) ?? PKMConverter.GetPKMfromBytes(data, prefer: prefer);
PKM pk = PKMConverter.ConvertToType(temp, SAV.PKMType, out string c);
if (pk == null)
{
@ -565,14 +554,7 @@ namespace PKHeX.WinForms.Controls
if (index == other)
return;
SAV.SwapBox(index, other);
foreach (var box in Boxes)
{
if (box.CurrentBox != index && box.CurrentBox != other)
continue;
box.ResetSlots();
box.ResetBoxNames(box.CurrentBox);
}
UpdateBoxViewAtBoxIndexes(index, other);
}
public void Dispose()
@ -583,5 +565,25 @@ namespace PKHeX.WinForms.Controls
CurrentBackground?.Dispose();
ColorizedColor?.Dispose();
}
private void UpdateBoxViewAtBoxIndexes(params int[] boxIndexes)
{
foreach (var box in Boxes)
{
var current = box.CurrentBox;
if (!boxIndexes.Contains(current))
continue;
box.ResetSlots();
box.ResetBoxNames(current);
}
}
private static string GetLocalizedPreviewText(PKM pk)
{
var set = new ShowdownSet(pk);
if (pk.Format <= 2) // Nature preview from IVs
set.Nature = Experience.GetNatureVC(pk.EXP);
return set.LocalizedText(Settings.Default.Language);
}
}
}

2
PKHeX.WinForms/MainWindow/Main.cs
View file

@ -1089,7 +1089,7 @@ namespace PKHeX.WinForms
// Create Temp File to Drag
PKM pkx = PreparePKM();
bool encrypt = ModifierKeys == Keys.Control;
string fn = pkx.FileName; fn = fn.Substring(0, fn.LastIndexOf('.'));
string fn = pkx.FileNameWithoutExtension;
string filename = fn + (encrypt ? $".ek{pkx.Format}" : $".{pkx.Extension}");
byte[] dragdata = encrypt ? pkx.EncryptedBoxData : pkx.DecryptedBoxData;
// Make file