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

Add verbose export

Browse Source 
Partial commit error fixed
This commit is contained in:
Kaphotics
2016-04-03 17:11:58 -07:00
parent 87b65c4c5b
commit 09811c32e4
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Legality/Analysis.cs
View File

@@ -17,6 +17,7 @@ public partial class LegalityAnalysis
public LegalityCheck[] vMoves = new LegalityCheck[4];
public LegalityCheck[] vRelearn = new LegalityCheck[4];
public string Report => getLegalityReport();
public string VerboseReport => getVerboseLegalityReport();
public LegalityAnalysis(PK6 pk)
{
@@ -78,7 +79,16 @@ private string getLegalityReport()
// Build result string...
r += chks.Where(chk => !chk.Valid).Aggregate("", (current, chk) => current + $"{chk.Judgement}: {chk.Comment}{Environment.NewLine}");
return r;
return r.TrimEnd();
}
private string getVerboseLegalityReport()
{
string r = getLegalityReport() + Environment.NewLine;
r += "===" + Environment.NewLine + Environment.NewLine;
var chks = new[] { ECPID, Nickname, IVs, EVs, IDs, Encounter, Level, Ribbons, Ability, Ball, HandlerMemories };
r += chks.Where(chk => chk.Valid && chk.Comment != "Valid").Aggregate("", (current, chk) => current + $"{chk.Judgement}: {chk.Comment}{Environment.NewLine}");
return r.TrimEnd();
}
public int[] getSuggestedRelearn()

1
Legality/Data.cs
View File

@@ -204,6 +204,7 @@ public class EncounterLink
public int[] RelearnMoves = new int[4];
public bool XY = true;
public bool ORAS = true;
public bool? Shiny = false;
}
public enum Nature
{

13
PKX/f1-Main.cs
View File

@@ -142,7 +142,8 @@ public Main()
public static Color defaultControlText;
public static string eggname = "";
public const string DatabasePath = "db";
public const string WC6DatabasePath = "wc6";
private const string WC6DatabasePath = "wc6";
private const string BackupPath = "bak";
public static string[] gendersymbols = { "♂", "♀", "-" };
public static string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms,
memories, genloc, trainingbags, trainingstage, characteristics,
@@ -164,7 +165,6 @@ public Main()
private static bool HaX;
private LegalityAnalysis Legality = new LegalityAnalysis(new PK6());
private static readonly Image mixedHighlight = Util.ChangeOpacity(Properties.Resources.slotSet, 0.5);
private static readonly string BackupPath = "bak";
private static readonly string[] lang_val = { "en", "ja", "fr", "it", "de", "es", "ko", "zh", "pt" };
private static readonly string[] main_langlist =
{
@@ -1048,7 +1048,6 @@ public void populateFields(PK6 pk, bool focus = true)
// Reset a little.
bool oldInit = fieldsInitialized;
fieldsInitialized = fieldsLoaded = false;
CAL_EggDate.Value = new DateTime(2000, 01, 01);
if (focus)
Tab_Main.Focus();
@@ -1119,7 +1118,7 @@ public void populateFields(PK6 pk, bool focus = true)
try { CAL_EggDate.Value = new DateTime(pk6.Egg_Year + 2000, pk6.Egg_Month, pk6.Egg_Day); }
catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); }
}
else { CHK_AsEgg.Checked = GB_EggConditions.Enabled = false; CB_EggLocation.SelectedValue = 0; }
else { CAL_EggDate.Value = new DateTime(2000, 01, 01); CHK_AsEgg.Checked = GB_EggConditions.Enabled = false; CB_EggLocation.SelectedValue = 0; }
CB_MetLocation.SelectedValue = pk6.Met_Location;
@@ -2163,12 +2162,12 @@ private void removedropCB(object sender, KeyEventArgs e)
{
((ComboBox)sender).DroppedDown = false;
}
private void showLegality(PK6 pk, bool tabs)
private void showLegality(PK6 pk, bool tabs, bool verbose)
{
LegalityAnalysis la = new LegalityAnalysis(pk);
if (tabs)
updateLegality(la);
Util.Alert(la.Report); // temp
Util.Alert(verbose ? la.VerboseReport : la.Report);
}
private void updateLegality(LegalityAnalysis la = null)
{
@@ -2776,7 +2775,7 @@ private void clickLegality(object sender, EventArgs e)
if (pk.Species == 0 || !pk.ChecksumValid)
{ SystemSounds.Asterisk.Play(); return; }
showLegality(pk, slot < 0);
showLegality(pk, slot < 0, ModifierKeys == Keys.Control);
}
private void updateEggRNGSeed(object sender, EventArgs e)
{