Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-04-25 07:16:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add tutor move editing

Browse Source
This commit is contained in:
sora10pls 2021-03-13 14:54:34 -05:00
parent 64d04182ef
commit dfeaf76908
4 changed files with 90 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkNX.Structures/Dumpers/PersonalDumper.cs
View File

@ -70,8 +70,6 @@ public class PersonalDumper
private static readonly string[] AbilitySuffix = { " (1)", " (2)", " (H)" };
private static readonly string[] ItemPrefix = { "Item 1 (50%)", "Item 2 (5%)", "Item 3 (1%)" };
private static readonly int[] ArmorTutorIndexes = { 0x325, 0x327, 0x32C, 0x324, 0x323, 0x32D, 0x32B, 0x32A, 0x32F, 0x32E, 0x31D, 0x326, 0x320, 0x329, 0x31F, 0x328, 0x31E, 0x322 };
public IReadOnlyList<List<string>> MoveSpeciesLearn { get; private set; }
public PersonalDumperSettings Settings = new();
@ -161,7 +159,7 @@ protected virtual void AddArmorTutors(List<string> lines, PersonalInfo pi, strin
{
if (!armor[i])
continue;
var move = ArmorTutorIndexes[i];
var move = Legal.Tutors_SWSH_1[i];
lines.Add($"- {Moves[move]}");
count++;

17
pkNX.Structures/Legality/Tables8.cs
View File

@ -180,6 +180,23 @@ public static partial class Legal
internal static readonly ushort[] HeldItems_SWSH = new ushort[1].Concat(Pouch_Items_SWSH).Concat(Pouch_Berries_SWSH).Concat(Pouch_Medicine_SWSH).Concat(Pouch_Ingredients_SWSH).Concat(Pouch_Treasure_SWSH).Concat(TR_SWSH).ToArray();
public static readonly int[] TypeTutor8 =
{
520, 519, 518, // Pledge
338, 307, 308, // Elemental Beam
434, // Draco Meteor
796, // Steel Beam
};
public static readonly int[] Tutors_SWSH_1 =
{
805, 807, 812, 804,
803, 813, 811, 810,
815, 814, 797, 806,
800, 809, 799, 808,
798, 802,
};
internal static readonly HashSet<int> GalarOriginForms = new()
{
(int)Species.Meowth,

78
pkNX.WinForms/Subforms/PokeDataUI.Designer.cs generated
View File

@ -123,7 +123,10 @@ private void InitializeComponent()
this.L_EVYield = new System.Windows.Forms.Label();
this.L_BaseStats = new System.Windows.Forms.Label();
this.Tab_Learn = new System.Windows.Forms.TabPage();
this.CLB_SpecialTutor = new System.Windows.Forms.CheckedListBox();
this.L_TypeTutors = new System.Windows.Forms.Label();
this.L_TM = new System.Windows.Forms.Label();
this.CLB_TypeTutor = new System.Windows.Forms.CheckedListBox();
this.CLB_TM = new System.Windows.Forms.CheckedListBox();
this.L_LevelUp = new System.Windows.Forms.Label();
this.dgv = new System.Windows.Forms.DataGridView();
@ -172,7 +175,7 @@ private void InitializeComponent()
// B_Save
//
this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.B_Save.Location = new System.Drawing.Point(456, -1);
this.B_Save.Location = new System.Drawing.Point(514, -1);
this.B_Save.Name = "B_Save";
this.B_Save.Size = new System.Drawing.Size(75, 23);
this.B_Save.TabIndex = 0;
@ -190,7 +193,7 @@ private void InitializeComponent()
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(534, 766);
this.tabControl1.Size = new System.Drawing.Size(592, 766);
this.tabControl1.TabIndex = 1;
//
// Tab_Personal
@ -283,7 +286,7 @@ private void InitializeComponent()
this.Tab_Personal.Location = new System.Drawing.Point(4, 22);
this.Tab_Personal.Name = "Tab_Personal";
this.Tab_Personal.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Personal.Size = new System.Drawing.Size(526, 740);
this.Tab_Personal.Size = new System.Drawing.Size(584, 740);
this.Tab_Personal.TabIndex = 0;
this.Tab_Personal.Text = "Personal";
this.Tab_Personal.UseVisualStyleBackColor = true;
@ -1170,18 +1173,40 @@ private void InitializeComponent()
//
// Tab_Learn
//
this.Tab_Learn.Controls.Add(this.CLB_SpecialTutor);
this.Tab_Learn.Controls.Add(this.L_TypeTutors);
this.Tab_Learn.Controls.Add(this.L_TM);
this.Tab_Learn.Controls.Add(this.CLB_TypeTutor);
this.Tab_Learn.Controls.Add(this.CLB_TM);
this.Tab_Learn.Controls.Add(this.L_LevelUp);
this.Tab_Learn.Controls.Add(this.dgv);
this.Tab_Learn.Location = new System.Drawing.Point(4, 22);
this.Tab_Learn.Name = "Tab_Learn";
this.Tab_Learn.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Learn.Size = new System.Drawing.Size(526, 740);
this.Tab_Learn.Size = new System.Drawing.Size(584, 740);
this.Tab_Learn.TabIndex = 1;
this.Tab_Learn.Text = "Learnset";
this.Tab_Learn.UseVisualStyleBackColor = true;
//
// CLB_SpecialTutor
//
this.CLB_SpecialTutor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.CLB_SpecialTutor.FormattingEnabled = true;
this.CLB_SpecialTutor.Location = new System.Drawing.Point(433, 176);
this.CLB_SpecialTutor.Name = "CLB_SpecialTutor";
this.CLB_SpecialTutor.Size = new System.Drawing.Size(147, 304);
this.CLB_SpecialTutor.TabIndex = 10;
//
// L_TypeTutors
//
this.L_TypeTutors.AutoSize = true;
this.L_TypeTutors.Location = new System.Drawing.Point(430, 18);
this.L_TypeTutors.Name = "L_TypeTutors";
this.L_TypeTutors.Size = new System.Drawing.Size(70, 13);
this.L_TypeTutors.TabIndex = 9;
this.L_TypeTutors.Text = "Tutor Moves:";
//
// L_TM
//
this.L_TM.AutoSize = true;
@ -1191,6 +1216,16 @@ private void InitializeComponent()
this.L_TM.TabIndex = 7;
this.L_TM.Text = "TMs:";
//
// CLB_TypeTutor
//
this.CLB_TypeTutor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.CLB_TypeTutor.FormattingEnabled = true;
this.CLB_TypeTutor.Location = new System.Drawing.Point(433, 34);
this.CLB_TypeTutor.Name = "CLB_TypeTutor";
this.CLB_TypeTutor.Size = new System.Drawing.Size(147, 139);
this.CLB_TypeTutor.TabIndex = 8;
//
// CLB_TM
//
this.CLB_TM.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -1219,7 +1254,7 @@ private void InitializeComponent()
this.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgv.Location = new System.Drawing.Point(0, 34);
this.dgv.Name = "dgv";
this.dgv.Size = new System.Drawing.Size(282, 669);
this.dgv.Size = new System.Drawing.Size(282, 664);
this.dgv.TabIndex = 1;
//
// Tab_Evo
@ -1227,7 +1262,7 @@ private void InitializeComponent()
this.Tab_Evo.Controls.Add(this.flowLayoutPanel1);
this.Tab_Evo.Location = new System.Drawing.Point(4, 22);
this.Tab_Evo.Name = "Tab_Evo";
this.Tab_Evo.Size = new System.Drawing.Size(526, 740);
this.Tab_Evo.Size = new System.Drawing.Size(584, 740);
this.Tab_Evo.TabIndex = 2;
this.Tab_Evo.Text = "Evolve";
this.Tab_Evo.UseVisualStyleBackColor = true;
@ -1237,7 +1272,7 @@ private void InitializeComponent()
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(526, 740);
this.flowLayoutPanel1.Size = new System.Drawing.Size(584, 740);
this.flowLayoutPanel1.TabIndex = 0;
//
// Tab_Extra
@ -1246,7 +1281,7 @@ private void InitializeComponent()
this.Tab_Extra.Location = new System.Drawing.Point(4, 22);
this.Tab_Extra.Name = "Tab_Extra";
this.Tab_Extra.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Extra.Size = new System.Drawing.Size(526, 740);
this.Tab_Extra.Size = new System.Drawing.Size(584, 740);
this.Tab_Extra.TabIndex = 3;
this.Tab_Extra.Text = "Enhancements";
this.Tab_Extra.UseVisualStyleBackColor = true;
@ -1260,7 +1295,7 @@ private void InitializeComponent()
this.TC_Rand.Location = new System.Drawing.Point(3, 3);
this.TC_Rand.Name = "TC_Rand";
this.TC_Rand.SelectedIndex = 0;
this.TC_Rand.Size = new System.Drawing.Size(520, 734);
this.TC_Rand.Size = new System.Drawing.Size(578, 734);
this.TC_Rand.TabIndex = 0;
//
// Tab_RStats
@ -1272,7 +1307,7 @@ private void InitializeComponent()
this.Tab_RStats.Location = new System.Drawing.Point(4, 22);
this.Tab_RStats.Name = "Tab_RStats";
this.Tab_RStats.Padding = new System.Windows.Forms.Padding(3);
this.Tab_RStats.Size = new System.Drawing.Size(512, 708);
this.Tab_RStats.Size = new System.Drawing.Size(570, 708);
this.Tab_RStats.TabIndex = 1;
this.Tab_RStats.Text = "Randomize Personal";
this.Tab_RStats.UseVisualStyleBackColor = true;
@ -1332,7 +1367,7 @@ private void InitializeComponent()
| System.Windows.Forms.AnchorStyles.Right)));
this.PG_Personal.Location = new System.Drawing.Point(6, 35);
this.PG_Personal.Name = "PG_Personal";
this.PG_Personal.Size = new System.Drawing.Size(503, 670);
this.PG_Personal.Size = new System.Drawing.Size(561, 670);
this.PG_Personal.TabIndex = 0;
this.PG_Personal.ToolbarVisible = false;
//
@ -1344,7 +1379,7 @@ private void InitializeComponent()
this.Tab_RLearn.Controls.Add(this.B_RandLearn);
this.Tab_RLearn.Location = new System.Drawing.Point(4, 22);
this.Tab_RLearn.Name = "Tab_RLearn";
this.Tab_RLearn.Size = new System.Drawing.Size(512, 708);
this.Tab_RLearn.Size = new System.Drawing.Size(570, 708);
this.Tab_RLearn.TabIndex = 2;
this.Tab_RLearn.Text = "Randomize Learn";
this.Tab_RLearn.UseVisualStyleBackColor = true;
@ -1359,7 +1394,7 @@ private void InitializeComponent()
this.tabControl2.Location = new System.Drawing.Point(6, 32);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(503, 673);
this.tabControl2.Size = new System.Drawing.Size(561, 673);
this.tabControl2.TabIndex = 6;
//
// Tab_Learnset
@ -1368,7 +1403,7 @@ private void InitializeComponent()
this.Tab_Learnset.Location = new System.Drawing.Point(4, 22);
this.Tab_Learnset.Name = "Tab_Learnset";
this.Tab_Learnset.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Learnset.Size = new System.Drawing.Size(495, 647);
this.Tab_Learnset.Size = new System.Drawing.Size(553, 647);
this.Tab_Learnset.TabIndex = 0;
this.Tab_Learnset.Text = "Learn Settings";
this.Tab_Learnset.UseVisualStyleBackColor = true;
@ -1378,7 +1413,7 @@ private void InitializeComponent()
this.PG_Learn.Dock = System.Windows.Forms.DockStyle.Fill;
this.PG_Learn.Location = new System.Drawing.Point(3, 3);
this.PG_Learn.Name = "PG_Learn";
this.PG_Learn.Size = new System.Drawing.Size(489, 641);
this.PG_Learn.Size = new System.Drawing.Size(547, 641);
this.PG_Learn.TabIndex = 2;
this.PG_Learn.ToolbarVisible = false;
//
@ -1388,7 +1423,7 @@ private void InitializeComponent()
this.Tab_Moveset.Location = new System.Drawing.Point(4, 22);
this.Tab_Moveset.Name = "Tab_Moveset";
this.Tab_Moveset.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Moveset.Size = new System.Drawing.Size(495, 647);
this.Tab_Moveset.Size = new System.Drawing.Size(553, 647);
this.Tab_Moveset.TabIndex = 1;
this.Tab_Moveset.Text = "Moveset Settings";
this.Tab_Moveset.UseVisualStyleBackColor = true;
@ -1398,7 +1433,7 @@ private void InitializeComponent()
this.PG_Move.Dock = System.Windows.Forms.DockStyle.Fill;
this.PG_Move.Location = new System.Drawing.Point(3, 3);
this.PG_Move.Name = "PG_Move";
this.PG_Move.Size = new System.Drawing.Size(489, 641);
this.PG_Move.Size = new System.Drawing.Size(547, 641);
this.PG_Move.TabIndex = 3;
this.PG_Move.ToolbarVisible = false;
//
@ -1440,7 +1475,7 @@ private void InitializeComponent()
this.Tab_REvo.Controls.Add(this.PG_Evolution);
this.Tab_REvo.Location = new System.Drawing.Point(4, 22);
this.Tab_REvo.Name = "Tab_REvo";
this.Tab_REvo.Size = new System.Drawing.Size(512, 708);
this.Tab_REvo.Size = new System.Drawing.Size(570, 708);
this.Tab_REvo.TabIndex = 3;
this.Tab_REvo.Text = "Randomize Evo";
this.Tab_REvo.UseVisualStyleBackColor = true;
@ -1482,7 +1517,7 @@ private void InitializeComponent()
| System.Windows.Forms.AnchorStyles.Right)));
this.PG_Evolution.Location = new System.Drawing.Point(6, 32);
this.PG_Evolution.Name = "PG_Evolution";
this.PG_Evolution.Size = new System.Drawing.Size(503, 673);
this.PG_Evolution.Size = new System.Drawing.Size(561, 673);
this.PG_Evolution.TabIndex = 2;
this.PG_Evolution.ToolbarVisible = false;
//
@ -1501,7 +1536,7 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(534, 766);
this.ClientSize = new System.Drawing.Size(592, 766);
this.Controls.Add(this.CB_Species);
this.Controls.Add(this.B_Save);
this.Controls.Add(this.tabControl1);
@ -1658,5 +1693,8 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox TB_CrownDex;
private System.Windows.Forms.Label L_CrownDex;
private System.Windows.Forms.Button B_EveryLevel;
private System.Windows.Forms.Label L_TypeTutors;
private System.Windows.Forms.CheckedListBox CLB_TypeTutor;
private System.Windows.Forms.CheckedListBox CLB_SpecialTutor;
}
}

15
pkNX.WinForms/Subforms/PokeDataUI.cs
View File

@ -102,6 +102,10 @@ public void InitPersonal()
CLB_TM.Items.Add($"TM{i:00} {movelist[TMs[i]]}");
for (int i = TMs.Count / 2; i < TMs.Count; i++)
CLB_TM.Items.Add($"TR{i-100:00} {movelist[TMs[i]]}");
for (int i = 0; i < Legal.TypeTutor8.Length; i++)
CLB_TypeTutor.Items.Add(movelist[Legal.TypeTutor8[i]]);
for (int i = 0; i < Legal.Tutors_SWSH_1.Length; i++)
CLB_SpecialTutor.Items.Add(movelist[Legal.Tutors_SWSH_1[i]]);
}
else
{
@ -300,11 +304,12 @@ public void LoadPersonal(PersonalInfo pkm)
{
MT_GoID.Text = gg.GoSpecies.ToString("000");
CHK_Variant.Checked = gg.LocalVariant;
GB_ZMove.Visible = CHK_IsPresentInGame.Visible = CHK_CanNotDynamax.Visible =
GB_ZMove.Visible = CHK_IsPresentInGame.Visible = CHK_CanNotDynamax.Visible = L_TypeTutors.Visible = CLB_TypeTutor.Visible = CLB_SpecialTutor.Visible =
L_RegionalDex.Visible = L_ArmorDex.Visible = L_CrownDex.Visible = TB_RegionalDex.Visible = TB_ArmorDex.Visible = TB_CrownDex.Visible = false;
}
if (pkm is PersonalInfoSWSH swsh)
{
L_TM.Text = "TMs/TRs:";
MT_GoID.Text = swsh.SpriteIndex.ToString("000");
TB_RegionalDex.Text = swsh.PokeDexIndex.ToString("000");
TB_ArmorDex.Text = swsh.ArmorDexIndex.ToString("000");
@ -317,6 +322,10 @@ public void LoadPersonal(PersonalInfo pkm)
for (int i = 0; i < CLB_TM.Items.Count; i++)
CLB_TM.SetItemChecked(i, pkm.TMHM[i]); // Bitflags for TM
for (int i = 0; i < CLB_TypeTutor.Items.Count; i++)
CLB_TypeTutor.SetItemChecked(i, pkm.TypeTutors[i]);
for (int i = 0; i < CLB_SpecialTutor.Items.Count; i++)
CLB_SpecialTutor.SetItemChecked(i, pkm.SpecialTutors[0][i]);
}
public void SavePersonal()
@ -384,6 +393,10 @@ public void SavePersonal()
for (int i = 0; i < CLB_TM.Items.Count; i++)
pkm.TMHM[i] = CLB_TM.GetItemChecked(i);
for (int i = 0; i < CLB_TypeTutor.Items.Count; i++)
pkm.TypeTutors[i] = CLB_TypeTutor.GetItemChecked(i);
for (int i = 0; i < CLB_SpecialTutor.Items.Count; i++)
pkm.SpecialTutors[0][i] = CLB_SpecialTutor.GetItemChecked(i);
}
public void LoadLearnset(Learnset pkm)