misc cleanup

add german forme names
truncate some forme names
fix nidoran gender symbols

adds null check for invalid (caught error) pkm

disables accessory giving (needs more research)
This commit is contained in:
Kurt 2017-11-08 22:56:42 -08:00
parent 9f2899617d
commit 665e94b0aa
16 changed files with 26 additions and 16 deletions

View file

@ -1,4 +1,4 @@
#define SUPPRESS
//#define SUPPRESS
using System;
using System.Collections.Generic;
@ -294,7 +294,7 @@ namespace PKHeX.Core
}
private string GetLegalityReport()
{
if (!Parsed || pkm == null)
if (!Parsed || pkm == null || Info == null)
return V189;
var lines = new List<string>();
@ -323,7 +323,7 @@ namespace PKHeX.Core
}
private string GetVerboseLegalityReport()
{
if (!Parsed || pkm == null)
if (!Parsed || pkm == null || Info == null)
return V189;
const string separator = "===";

View file

@ -444,7 +444,7 @@ namespace PKHeX.Core
}
}
private static string[] GetFormsAlolan (int generation, IReadOnlyList<string> types, IReadOnlyList<string> forms, int species)
private static string[] GetFormsAlolan(int generation, IReadOnlyList<string> types, IReadOnlyList<string> forms, int species)
{
if (generation < 7)
return new[] { "" };

View file

@ -1061,3 +1061,8 @@ Entlarvte
Original
Partner
Abend
Abend
Morgen
Ultra

View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandan
Sandamer
Nidoran
Nidoran
Nidorina
Nidoqueen
Nidoran
Nidoran
Nidorino
Nidoking
Piepi

View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandshrew
Sandslash
Nidoran
Nidoran
Nidorina
Nidoqueen
Nidoran
Nidoran
Nidorino
Nidoking
Clefairy

View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandshrew
Sandslash
Nidoran
Nidoran
Nidorina
Nidoqueen
Nidoran
Nidoran
Nidorino
Nidoking
Clefairy

View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sabelette
Sablaireau
Nidoran
Nidoran
Nidorina
Nidoqueen
Nidoran
Nidoran
Nidorino
Nidoking
Mélofée

View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandshrew
Sandslash
Nidoran
Nidoran
Nidorina
Nidoqueen
Nidoran
Nidoran
Nidorino
Nidoking
Clefairy

View file

@ -27,10 +27,10 @@
라이츄
모래두지
고지
니드런
니드런
니드리나
니드퀸
니드런
니드런
니드리노
니드킹
삐삐

View file

@ -399,6 +399,11 @@ namespace PKHeX.WinForms
}
private void B_Fashion_Click(object sender, EventArgs e)
{
if (SAV.USUM)
{
WinFormsUtil.Alert("Temporarily disabled, needs research for permissible values.");
return;
}
var prompt = WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Modifying Fashion Items will clear existing data", "Continue?");
if (DialogResult.Yes != prompt)
return;