Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add setting to apply nature to statnature on import

Browse source 
Co-Authored-By: toim22 <toim22@users.noreply.github.com>

#2794
This commit is contained in:
Kurt 2020-03-19 13:47:25 -07:00
parent df09868470
commit 5e32e9203e
13 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PKHeX.Core/Editing/CommonEdits.cs
View file

@ -13,6 +13,11 @@ namespace PKHeX.Core
/// </summary>
public static bool ShowdownSetIVMarkings { get; set; } = true;
/// <summary>
/// Setting which causes the <see cref="PKM.StatNature"/> to the <see cref="PKM.Nature"/> in Gen8+ formats.
/// </summary>
public static bool ShowdownSetBehaviorNature { get; set; } = false;
/// <summary>
/// Sets the <see cref="PKM.Nickname"/> to the provided value.
/// </summary>
@ -224,6 +229,9 @@ namespace PKHeX.Core
pk.ClearRecordFlags();
pk.SetRecordFlags(Set.Moves);
if (ShowdownSetBehaviorNature && pk.Format >= 8)
pk.Nature = pk.StatNature;
var legal = new LegalityAnalysis(pk);
if (legal.Parsed && legal.Info.Relearn.Any(z => !z.Valid))
pk.SetRelearnMoves(legal.GetSuggestedRelearnMoves());

2
PKHeX.Core/Resources/text/zh/LegalityCheckStrings_zh.txt
View file

@ -203,7 +203,7 @@ LItemEgg = 蛋不能有持有物。
LItemUnreleased = 持有物未解禁。
LIVAllEqual = 所有个体值相等。
LIVF_COUNT0_31 = 至少有 {0} 项个体值 = 31。
LIVNotCorrect =个体值与相遇要求不匹配
LIVNotCorrect = 个体值与相遇要求不匹配
LLevelEXPThreshold = 当前经验与等级匹配。
LLevelMetBelow = 当前等级低于相遇等级。
LLevelMetGift = 相遇等级与神秘礼物等级不一致。

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

@ -429,6 +429,7 @@ namespace PKHeX.WinForms
SaveFile.SetUpdatePKM = settings.SetUpdatePKM ? PKMImportSetting.Update : PKMImportSetting.Skip;
C_SAV.ModifyPKM = PKME_Tabs.ModifyPKM = settings.SetUpdatePKM;
CommonEdits.ShowdownSetIVMarkings = settings.ApplyMarkings;
CommonEdits.ShowdownSetBehaviorNature = settings.ApplyNature;
C_SAV.FlagIllegal = settings.FlagIllegal;
C_SAV.M.Hover.GlowHover = settings.HoverSlotGlowEdges;
SpriteBuilder.ShowEggSpriteAsItem = settings.ShowEggSpriteAsHeldItem;

12
PKHeX.WinForms/Properties/Settings.Designer.cs generated
View file

@ -334,5 +334,17 @@ namespace PKHeX.WinForms.Properties {
this["FlagMissingTracker"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ApplyNature {
get {
return ((bool)(this["ApplyNature"]));
}
set {
this["ApplyNature"] = value;
}
}
}
}

3
PKHeX.WinForms/Properties/Settings.settings
View file

@ -80,5 +80,8 @@
<Setting Name="FlagMissingTracker" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ApplyNature" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

1
PKHeX.WinForms/Resources/text/lang_de.txt
View file

@ -1362,6 +1362,7 @@ SAV_ZygardeCell.L_Cells=Stored:
SAV_ZygardeCell.L_Collected=Collected:
SettingsEditor.AllowGen1Tradeback=AllowGen1Tradeback
SettingsEditor.ApplyMarkings=Apply Markings on Import
SettingsEditor.ApplyNature=Apply StatNature to Nature on Import
SettingsEditor.B_Reset=Reset All
SettingsEditor.BAKEnabled=Automatic Save File Backups Enabled
SettingsEditor.DetectSaveOnStartup=Automatically Detect Save File on Program Startup

1
PKHeX.WinForms/Resources/text/lang_en.txt
View file

@ -1358,6 +1358,7 @@ SAV_ZygardeCell.L_Cells=Stored:
SAV_ZygardeCell.L_Collected=Collected:
SettingsEditor.AllowGen1Tradeback=GB: Allow Generation 2 tradeback learnsets
SettingsEditor.ApplyMarkings=Apply Markings on Import
SettingsEditor.ApplyNature=Apply StatNature to Nature on Import
SettingsEditor.B_Reset=Reset All
SettingsEditor.BAKEnabled=Automatic Save File Backups Enabled
SettingsEditor.DetectSaveOnStartup=Automatically Detect Save File on Program Startup

1
PKHeX.WinForms/Resources/text/lang_es.txt
View file

@ -1358,6 +1358,7 @@ SAV_ZygardeCell.L_Cells=Almacenado:
SAV_ZygardeCell.L_Collected=Coleccionado:
SettingsEditor.AllowGen1Tradeback=GB: Permitir intercambio de movimientos desde la Generación 2.
SettingsEditor.ApplyMarkings=Aplicar marcadores al importar
SettingsEditor.ApplyNature=Aplicar StatNature a la naturaleza al importar
SettingsEditor.B_Reset=Reiniciar Todo
SettingsEditor.BAKEnabled=Respaldo Automático de archivos de guardado habilitado
SettingsEditor.DetectSaveOnStartup=Detectar automáticamente el archivo de guardado al inicio del programa

1
PKHeX.WinForms/Resources/text/lang_fr.txt
View file

@ -1362,6 +1362,7 @@ SAV_ZygardeCell.L_Cells=Conservé :
SAV_ZygardeCell.L_Collected=Obtenu :
SettingsEditor.AllowGen1Tradeback=GB: Permettre les movepools de revenants de la Gén. 2
SettingsEditor.ApplyMarkings=Appliquer des marques de l'import
SettingsEditor.ApplyNature=Appliquer StatNature à la nature lors de l'import
SettingsEditor.B_Reset=Reset All
SettingsEditor.BAKEnabled=Automatic Save File Backups Enabled
SettingsEditor.DetectSaveOnStartup=Automatically Detect Save File on Program Startup

1
PKHeX.WinForms/Resources/text/lang_it.txt
View file

@ -1368,6 +1368,7 @@ SAV_ZygardeCell.L_Cells=Stored:
SAV_ZygardeCell.L_Collected=Collected:
SettingsEditor.AllowGen1Tradeback=GB: Allow Generation 2 tradeback learnsets
SettingsEditor.ApplyMarkings=Apply Markings on Import
SettingsEditor.ApplyNature=Apply StatNature to Nature on Import
SettingsEditor.B_Reset=Reset All
SettingsEditor.BAKEnabled=Automatic Save File Backups Enabled
SettingsEditor.DetectSaveOnStartup=Automatically Detect Save File on Program Startup

1
PKHeX.WinForms/Resources/text/lang_ja.txt
View file

@ -1362,6 +1362,7 @@ SAV_ZygardeCell.L_Cells=キューブ内
SAV_ZygardeCell.L_Collected=回収
SettingsEditor.AllowGen1Tradeback=GB: Allow Generation 2 tradeback learnsets
SettingsEditor.ApplyMarkings=Apply Markings on Import
SettingsEditor.ApplyNature=Apply StatNature to Nature on Import
SettingsEditor.B_Reset=Reset All
SettingsEditor.BAKEnabled=Automatic Save File Backups Enabled
SettingsEditor.DetectSaveOnStartup=Automatically Detect Save File on Program Startup

1
PKHeX.WinForms/Resources/text/lang_ko.txt
View file

@ -1358,6 +1358,7 @@ SAV_ZygardeCell.L_Cells=보관됨:
SAV_ZygardeCell.L_Collected=회수함:
SettingsEditor.AllowGen1Tradeback=GB: 2세대에서 옮겨온 1세대 기술 허용
SettingsEditor.ApplyMarkings=가져오기 시 마킹하기
SettingsEditor.ApplyNature=임포트시 자연에 StatNature 적용
SettingsEditor.B_Reset=초기화
SettingsEditor.BAKEnabled=세이브 파일 자동 백업 사용
SettingsEditor.DetectSaveOnStartup=프로그램 시작 시 세이브 파일 자동 감지

3
PKHeX.WinForms/Resources/text/lang_zh.txt
View file

@ -258,6 +258,7 @@ Main.mnu_DeletePastGen=清理前代宝可梦
Main.mnu_DeleteUntrained=清理无努力值宝可梦
Main.mnu_Modify=编辑
Main.mnu_ModifyHatchEggs=使蛋孵化
Main.mnu_ModifyHeal=修复(能力/PP)
Main.mnu_ModifyHyperTrain=进行极限训练
Main.mnu_ModifyMaxFriendship=使亲密度最大
Main.mnu_ModifyMaxLevel=使等级最大
@ -268,7 +269,6 @@ Main.mnu_ModifyResetMoves=填入建议招式
Main.mnu_Sort=排序
Main.mnu_SortAdvanced=排序(高级)
Main.mnu_SortBST=按种族值和
Main.mnu_ModifyHeal=修复(能力/PP)
Main.mnu_SortCP=CP
Main.mnu_SortDate=按相遇日期
Main.mnu_SortEncounterType=按相遇类型
@ -1358,6 +1358,7 @@ SAV_ZygardeCell.L_Cells=储存了:
SAV_ZygardeCell.L_Collected=收集了:
SettingsEditor.AllowGen1Tradeback=GB 允许二代传回的招式组合
SettingsEditor.ApplyMarkings=导入时标记
SettingsEditor.ApplyNature=在导入时将StatNature应用于自然
SettingsEditor.B_Reset=重置
SettingsEditor.BAKEnabled=自动保存文件备份已启用
SettingsEditor.DetectSaveOnStartup=在程序启动时自动检测保存文件