Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-10-01 22:36:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

De-clutter: Group some buttons into dropdown buttons

Browse Source 
Move player house dump to subform

Not sure how to associate player -> playerhouse; for now, we'll just assume they're ordered the same way.
This commit is contained in:
Kurt
2020-04-26 20:45:41 -07:00
parent 01ae4793c9
commit 2b9d8b0c7a
6 changed files with 212 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NHSE.Core/Save/Files/MainSave.cs
View File

@@ -11,14 +11,12 @@ public sealed class MainSave : EncryptedFilePair
public readonly MainSaveOffsets Offsets;
public MainSave(string folder) : base(folder, "main") => Offsets = MainSaveOffsets.GetOffsets(Info);
public const int VillagerCount = 10;
public const int PlayerCount = 8;
public Villager GetVillager(int index) => Offsets.ReadVillager(Data, index);
public void SetVillager(Villager value, int index) => Offsets.WriteVillager(value, Data, index);
public Villager[] GetVillagers()
{
var villagers = new Villager[VillagerCount];
var villagers = new Villager[MainSaveOffsets.VillagerCount];
for (int i = 0; i < villagers.Length; i++)
villagers[i] = GetVillager(i);
return villagers;
@@ -77,7 +75,7 @@ public void SetVillagerHouse(VillagerHouse h, int index)
public VillagerHouse[] GetVillagerHouses()
{
var villagers = new VillagerHouse[VillagerCount];
var villagers = new VillagerHouse[MainSaveOffsets.VillagerCount];
for (int i = 0; i < villagers.Length; i++)
villagers[i] = GetVillagerHouse(i);
return villagers;
@@ -91,7 +89,7 @@ public void SetVillagerHouses(IReadOnlyList<VillagerHouse> houses)
public PlayerHouse[] GetPlayerHouses()
{
var villagers = new PlayerHouse[PlayerCount];
var villagers = new PlayerHouse[MainSaveOffsets.PlayerCount];
for (int i = 0; i < villagers.Length; i++)
villagers[i] = GetPlayerHouse(i);
return villagers;

22
NHSE.Core/Structures/GameFileDumper.cs
View File

@@ -53,6 +53,21 @@ private static void Dump(string path, byte[] data, string name)
File.WriteAllBytes(file, data);
}
/// <summary>
/// Dumps all villager houses to the requested <see cref="path"/>.
/// </summary>
/// <param name="houses"></param>
/// <param name="players"></param>
/// <param name="path">Path to dump to</param>
public static void DumpPlayerHouses(this IReadOnlyList<PlayerHouse> houses, IReadOnlyList<Player> players, string path)
{
for (int i = 0; i < houses.Count; i++)
{
var filename = i < players.Count ? players[i].Personal.PlayerName : $"House {i}";
houses[i].Dump(filename, path);
}
}
/// <summary>
/// Dumps all villager houses to the requested <see cref="path"/>.
/// </summary>
@@ -69,10 +84,11 @@ public static void DumpPlayerHouses(this HorizonSave sav, string path)
}
}
private static void Dump(this PlayerHouse h, string path, Personal p)
private static void Dump(this PlayerHouse h, string path, IVillagerOrigin p) => h.Dump(p.PlayerName, path);
private static void Dump(this PlayerHouse h, string player, string path)
{
var name = GameInfo.Strings.GetVillager(p.PlayerName);
var dest = Path.Combine(path, $"{name}.nhph");
var dest = Path.Combine(path, $"{player}.nhph");
var data = h.ToBytesClass();
File.WriteAllBytes(dest, data);
}

353
NHSE.WinForms/Editor.Designer.cs generated
View File

@@ -44,24 +44,26 @@ private void InitializeComponent()
this.CM_Picture = new System.Windows.Forms.ContextMenuStrip(this.components);
this.Menu_SavePNG = new System.Windows.Forms.ToolStripMenuItem();
this.Tab_Map = new System.Windows.Forms.TabPage();
this.B_EditMap = new System.Windows.Forms.Button();
this.CM_EditMap = new System.Windows.Forms.ContextMenuStrip(this.components);
this.B_EditTerrain = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditBuildings = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditAcres = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditFieldItems = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditPRODesigns = new System.Windows.Forms.Button();
this.B_EditPatterns = new System.Windows.Forms.Button();
this.B_EditLandFlags = new System.Windows.Forms.Button();
this.L_PlayerHouse = new System.Windows.Forms.Label();
this.NUD_PlayerHouse = new System.Windows.Forms.NumericUpDown();
this.B_LoadHouse = new System.Windows.Forms.Button();
this.B_DumpHouse = new System.Windows.Forms.Button();
this.B_EditFieldItems = new System.Windows.Forms.Button();
this.B_EditTerrain = new System.Windows.Forms.Button();
this.B_EditAcres = new System.Windows.Forms.Button();
this.B_EditTurnipExchange = new System.Windows.Forms.Button();
this.B_EditBuildings = new System.Windows.Forms.Button();
this.B_RecycleBin = new System.Windows.Forms.Button();
this.Tab_Villagers = new System.Windows.Forms.TabPage();
this.Tab_Players = new System.Windows.Forms.TabPage();
this.B_EditPlayer = new System.Windows.Forms.Button();
this.CM_EditPlayer = new System.Windows.Forms.ContextMenuStrip(this.components);
this.B_EditPlayerStorage = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditPlayerReceivedItems = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditAchievements = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditPlayerRecipes = new System.Windows.Forms.ToolStripMenuItem();
this.B_EditPlayerFlags = new System.Windows.Forms.Button();
this.B_EditAchievements = new System.Windows.Forms.Button();
this.B_EditPlayerReceivedItems = new System.Windows.Forms.Button();
this.B_EditPlayerStorage = new System.Windows.Forms.Button();
this.B_EditPlayerRecipes = new System.Windows.Forms.Button();
this.B_EditPlayerItems = new System.Windows.Forms.Button();
this.L_Wallet = new System.Windows.Forms.Label();
this.NUD_Wallet = new System.Windows.Forms.NumericUpDown();
@@ -76,13 +78,13 @@ private void InitializeComponent()
this.CB_Players = new System.Windows.Forms.ComboBox();
this.PB_Player = new System.Windows.Forms.PictureBox();
this.TC_Editors = new System.Windows.Forms.TabControl();
this.B_EditPatterns = new System.Windows.Forms.Button();
this.B_EditPRODesigns = new System.Windows.Forms.Button();
this.B_EditPlayerHouses = new System.Windows.Forms.Button();
this.Menu_Editor.SuspendLayout();
this.CM_Picture.SuspendLayout();
this.Tab_Map.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUD_PlayerHouse)).BeginInit();
this.CM_EditMap.SuspendLayout();
this.Tab_Players.SuspendLayout();
this.CM_EditPlayer.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUD_Wallet)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_NookMiles)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_BankBells)).BeginInit();
@@ -212,18 +214,12 @@ private void InitializeComponent()
//
// Tab_Map
//
this.Tab_Map.Controls.Add(this.B_EditPlayerHouses);
this.Tab_Map.Controls.Add(this.B_EditMap);
this.Tab_Map.Controls.Add(this.B_EditPRODesigns);
this.Tab_Map.Controls.Add(this.B_EditPatterns);
this.Tab_Map.Controls.Add(this.B_EditLandFlags);
this.Tab_Map.Controls.Add(this.L_PlayerHouse);
this.Tab_Map.Controls.Add(this.NUD_PlayerHouse);
this.Tab_Map.Controls.Add(this.B_LoadHouse);
this.Tab_Map.Controls.Add(this.B_DumpHouse);
this.Tab_Map.Controls.Add(this.B_EditFieldItems);
this.Tab_Map.Controls.Add(this.B_EditTerrain);
this.Tab_Map.Controls.Add(this.B_EditAcres);
this.Tab_Map.Controls.Add(this.B_EditTurnipExchange);
this.Tab_Map.Controls.Add(this.B_EditBuildings);
this.Tab_Map.Controls.Add(this.B_RecycleBin);
this.Tab_Map.Location = new System.Drawing.Point(4, 22);
this.Tab_Map.Name = "Tab_Map";
@@ -233,9 +229,78 @@ private void InitializeComponent()
this.Tab_Map.Text = "Map";
this.Tab_Map.UseVisualStyleBackColor = true;
//
// B_EditMap
//
this.B_EditMap.ContextMenuStrip = this.CM_EditMap;
this.B_EditMap.Location = new System.Drawing.Point(300, 168);
this.B_EditMap.Name = "B_EditMap";
this.B_EditMap.Size = new System.Drawing.Size(92, 40);
this.B_EditMap.TabIndex = 2;
this.B_EditMap.Text = "Edit Map...";
this.B_EditMap.UseVisualStyleBackColor = true;
this.B_EditMap.Click += new System.EventHandler(this.B_EditMap_Click);
//
// CM_EditMap
//
this.CM_EditMap.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.B_EditTerrain,
this.B_EditBuildings,
this.B_EditAcres,
this.B_EditFieldItems});
this.CM_EditMap.Name = "CM_EditMap";
this.CM_EditMap.Size = new System.Drawing.Size(155, 92);
//
// B_EditTerrain
//
this.B_EditTerrain.Name = "B_EditTerrain";
this.B_EditTerrain.Size = new System.Drawing.Size(154, 22);
this.B_EditTerrain.Text = "Edit Terrain";
this.B_EditTerrain.Click += new System.EventHandler(this.B_EditTerrain_Click);
//
// B_EditBuildings
//
this.B_EditBuildings.Name = "B_EditBuildings";
this.B_EditBuildings.Size = new System.Drawing.Size(154, 22);
this.B_EditBuildings.Text = "Edit Buildings";
this.B_EditBuildings.Click += new System.EventHandler(this.B_EditBuildings_Click);
//
// B_EditAcres
//
this.B_EditAcres.Name = "B_EditAcres";
this.B_EditAcres.Size = new System.Drawing.Size(154, 22);
this.B_EditAcres.Text = "Edit Acres";
this.B_EditAcres.Click += new System.EventHandler(this.B_EditAcres_Click);
//
// B_EditFieldItems
//
this.B_EditFieldItems.Name = "B_EditFieldItems";
this.B_EditFieldItems.Size = new System.Drawing.Size(154, 22);
this.B_EditFieldItems.Text = "Edit Field items";
this.B_EditFieldItems.Click += new System.EventHandler(this.B_EditFieldItems_Click);
//
// B_EditPRODesigns
//
this.B_EditPRODesigns.Location = new System.Drawing.Point(104, 52);
this.B_EditPRODesigns.Name = "B_EditPRODesigns";
this.B_EditPRODesigns.Size = new System.Drawing.Size(92, 40);
this.B_EditPRODesigns.TabIndex = 55;
this.B_EditPRODesigns.Text = "Edit PRO Designs";
this.B_EditPRODesigns.UseVisualStyleBackColor = true;
this.B_EditPRODesigns.Click += new System.EventHandler(this.B_EditPRODesigns_Click);
//
// B_EditPatterns
//
this.B_EditPatterns.Location = new System.Drawing.Point(104, 6);
this.B_EditPatterns.Name = "B_EditPatterns";
this.B_EditPatterns.Size = new System.Drawing.Size(92, 40);
this.B_EditPatterns.TabIndex = 54;
this.B_EditPatterns.Text = "Edit Patterns";
this.B_EditPatterns.UseVisualStyleBackColor = true;
this.B_EditPatterns.Click += new System.EventHandler(this.B_EditPatterns_Click);
//
// B_EditLandFlags
//
this.B_EditLandFlags.Location = new System.Drawing.Point(202, 76);
this.B_EditLandFlags.Location = new System.Drawing.Point(300, 122);
this.B_EditLandFlags.Name = "B_EditLandFlags";
this.B_EditLandFlags.Size = new System.Drawing.Size(92, 40);
this.B_EditLandFlags.TabIndex = 53;
@@ -243,85 +308,9 @@ private void InitializeComponent()
this.B_EditLandFlags.UseVisualStyleBackColor = true;
this.B_EditLandFlags.Click += new System.EventHandler(this.B_EditLandFlags_Click);
//
// L_PlayerHouse
//
this.L_PlayerHouse.Location = new System.Drawing.Point(16, 6);
this.L_PlayerHouse.Name = "L_PlayerHouse";
this.L_PlayerHouse.Size = new System.Drawing.Size(84, 20);
this.L_PlayerHouse.TabIndex = 52;
this.L_PlayerHouse.Text = "Player House:";
this.L_PlayerHouse.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// NUD_PlayerHouse
//
this.NUD_PlayerHouse.Location = new System.Drawing.Point(106, 6);
this.NUD_PlayerHouse.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.NUD_PlayerHouse.Name = "NUD_PlayerHouse";
this.NUD_PlayerHouse.Size = new System.Drawing.Size(45, 20);
this.NUD_PlayerHouse.TabIndex = 51;
this.NUD_PlayerHouse.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// B_LoadHouse
//
this.B_LoadHouse.Location = new System.Drawing.Point(104, 29);
this.B_LoadHouse.Name = "B_LoadHouse";
this.B_LoadHouse.Size = new System.Drawing.Size(92, 40);
this.B_LoadHouse.TabIndex = 50;
this.B_LoadHouse.Text = "Load House";
this.B_LoadHouse.UseVisualStyleBackColor = true;
this.B_LoadHouse.Click += new System.EventHandler(this.B_LoadHouse_Click);
//
// B_DumpHouse
//
this.B_DumpHouse.Location = new System.Drawing.Point(8, 29);
this.B_DumpHouse.Name = "B_DumpHouse";
this.B_DumpHouse.Size = new System.Drawing.Size(92, 40);
this.B_DumpHouse.TabIndex = 49;
this.B_DumpHouse.Text = "Dump House";
this.B_DumpHouse.UseVisualStyleBackColor = true;
this.B_DumpHouse.Click += new System.EventHandler(this.B_DumpHouse_Click);
//
// B_EditFieldItems
//
this.B_EditFieldItems.Location = new System.Drawing.Point(202, 122);
this.B_EditFieldItems.Name = "B_EditFieldItems";
this.B_EditFieldItems.Size = new System.Drawing.Size(92, 40);
this.B_EditFieldItems.TabIndex = 18;
this.B_EditFieldItems.Text = "Edit Field Items";
this.B_EditFieldItems.UseVisualStyleBackColor = true;
this.B_EditFieldItems.Click += new System.EventHandler(this.B_EditFieldItems_Click);
//
// B_EditTerrain
//
this.B_EditTerrain.Location = new System.Drawing.Point(300, 122);
this.B_EditTerrain.Name = "B_EditTerrain";
this.B_EditTerrain.Size = new System.Drawing.Size(92, 40);
this.B_EditTerrain.TabIndex = 17;
this.B_EditTerrain.Text = "Edit Terrain";
this.B_EditTerrain.UseVisualStyleBackColor = true;
this.B_EditTerrain.Click += new System.EventHandler(this.B_EditTerrain_Click);
//
// B_EditAcres
//
this.B_EditAcres.Location = new System.Drawing.Point(300, 168);
this.B_EditAcres.Name = "B_EditAcres";
this.B_EditAcres.Size = new System.Drawing.Size(92, 40);
this.B_EditAcres.TabIndex = 16;
this.B_EditAcres.Text = "Edit Acres";
this.B_EditAcres.UseVisualStyleBackColor = true;
this.B_EditAcres.Click += new System.EventHandler(this.B_EditAcres_Click);
//
// B_EditTurnipExchange
//
this.B_EditTurnipExchange.Location = new System.Drawing.Point(6, 122);
this.B_EditTurnipExchange.Location = new System.Drawing.Point(6, 6);
this.B_EditTurnipExchange.Name = "B_EditTurnipExchange";
this.B_EditTurnipExchange.Size = new System.Drawing.Size(92, 40);
this.B_EditTurnipExchange.TabIndex = 15;
@@ -329,19 +318,9 @@ private void InitializeComponent()
this.B_EditTurnipExchange.UseVisualStyleBackColor = true;
this.B_EditTurnipExchange.Click += new System.EventHandler(this.B_EditTurnipExchange_Click);
//
// B_EditBuildings
//
this.B_EditBuildings.Location = new System.Drawing.Point(300, 76);
this.B_EditBuildings.Name = "B_EditBuildings";
this.B_EditBuildings.Size = new System.Drawing.Size(92, 40);
this.B_EditBuildings.TabIndex = 14;
this.B_EditBuildings.Text = "Edit Buildings";
this.B_EditBuildings.UseVisualStyleBackColor = true;
this.B_EditBuildings.Click += new System.EventHandler(this.B_EditBuildings_Click);
//
// B_RecycleBin
//
this.B_RecycleBin.Location = new System.Drawing.Point(6, 168);
this.B_RecycleBin.Location = new System.Drawing.Point(6, 52);
this.B_RecycleBin.Name = "B_RecycleBin";
this.B_RecycleBin.Size = new System.Drawing.Size(92, 40);
this.B_RecycleBin.TabIndex = 13;
@@ -361,11 +340,8 @@ private void InitializeComponent()
//
// Tab_Players
//
this.Tab_Players.Controls.Add(this.B_EditPlayer);
this.Tab_Players.Controls.Add(this.B_EditPlayerFlags);
this.Tab_Players.Controls.Add(this.B_EditAchievements);
this.Tab_Players.Controls.Add(this.B_EditPlayerReceivedItems);
this.Tab_Players.Controls.Add(this.B_EditPlayerStorage);
this.Tab_Players.Controls.Add(this.B_EditPlayerRecipes);
this.Tab_Players.Controls.Add(this.B_EditPlayerItems);
this.Tab_Players.Controls.Add(this.L_Wallet);
this.Tab_Players.Controls.Add(this.NUD_Wallet);
@@ -387,9 +363,58 @@ private void InitializeComponent()
this.Tab_Players.Text = "Players";
this.Tab_Players.UseVisualStyleBackColor = true;
//
// B_EditPlayer
//
this.B_EditPlayer.ContextMenuStrip = this.CM_EditPlayer;
this.B_EditPlayer.Location = new System.Drawing.Point(300, 168);
this.B_EditPlayer.Name = "B_EditPlayer";
this.B_EditPlayer.Size = new System.Drawing.Size(92, 40);
this.B_EditPlayer.TabIndex = 18;
this.B_EditPlayer.Text = "Edit Player...";
this.B_EditPlayer.UseVisualStyleBackColor = true;
this.B_EditPlayer.Click += new System.EventHandler(this.B_EditPlayer_Click);
//
// CM_EditPlayer
//
this.CM_EditPlayer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.B_EditPlayerStorage,
this.B_EditPlayerReceivedItems,
this.B_EditAchievements,
this.B_EditPlayerRecipes});
this.CM_EditPlayer.Name = "CM_EditPlayer";
this.CM_EditPlayer.Size = new System.Drawing.Size(177, 92);
//
// B_EditPlayerStorage
//
this.B_EditPlayerStorage.Name = "B_EditPlayerStorage";
this.B_EditPlayerStorage.Size = new System.Drawing.Size(176, 22);
this.B_EditPlayerStorage.Text = "Edit Storage";
this.B_EditPlayerStorage.Click += new System.EventHandler(this.B_Storage_Click);
//
// B_EditPlayerReceivedItems
//
this.B_EditPlayerReceivedItems.Name = "B_EditPlayerReceivedItems";
this.B_EditPlayerReceivedItems.Size = new System.Drawing.Size(176, 22);
this.B_EditPlayerReceivedItems.Text = "Edit Received Items";
this.B_EditPlayerReceivedItems.Click += new System.EventHandler(this.B_EditPlayerReceivedItems_Click);
//
// B_EditAchievements
//
this.B_EditAchievements.Name = "B_EditAchievements";
this.B_EditAchievements.Size = new System.Drawing.Size(176, 22);
this.B_EditAchievements.Text = "Edit Achievements";
this.B_EditAchievements.Click += new System.EventHandler(this.B_EditAchievements_Click);
//
// B_EditPlayerRecipes
//
this.B_EditPlayerRecipes.Name = "B_EditPlayerRecipes";
this.B_EditPlayerRecipes.Size = new System.Drawing.Size(176, 22);
this.B_EditPlayerRecipes.Text = "Edit Recipes";
this.B_EditPlayerRecipes.Click += new System.EventHandler(this.B_EditPlayerRecipes_Click);
//
// B_EditPlayerFlags
//
this.B_EditPlayerFlags.Location = new System.Drawing.Point(202, 122);
this.B_EditPlayerFlags.Location = new System.Drawing.Point(300, 122);
this.B_EditPlayerFlags.Name = "B_EditPlayerFlags";
this.B_EditPlayerFlags.Size = new System.Drawing.Size(92, 40);
this.B_EditPlayerFlags.TabIndex = 17;
@@ -397,46 +422,6 @@ private void InitializeComponent()
this.B_EditPlayerFlags.UseVisualStyleBackColor = true;
this.B_EditPlayerFlags.Click += new System.EventHandler(this.B_EditPlayerFlags_Click);
//
// B_EditAchievements
//
this.B_EditAchievements.Location = new System.Drawing.Point(301, 122);
this.B_EditAchievements.Name = "B_EditAchievements";
this.B_EditAchievements.Size = new System.Drawing.Size(92, 40);
this.B_EditAchievements.TabIndex = 16;
this.B_EditAchievements.Text = "Edit Achievements";
this.B_EditAchievements.UseVisualStyleBackColor = true;
this.B_EditAchievements.Click += new System.EventHandler(this.B_EditAchievements_Click);
//
// B_EditPlayerReceivedItems
//
this.B_EditPlayerReceivedItems.Location = new System.Drawing.Point(300, 168);
this.B_EditPlayerReceivedItems.Name = "B_EditPlayerReceivedItems";
this.B_EditPlayerReceivedItems.Size = new System.Drawing.Size(92, 40);
this.B_EditPlayerReceivedItems.TabIndex = 15;
this.B_EditPlayerReceivedItems.Text = "Edit Received Items";
this.B_EditPlayerReceivedItems.UseVisualStyleBackColor = true;
this.B_EditPlayerReceivedItems.Click += new System.EventHandler(this.B_EditPlayerReceivedItems_Click);
//
// B_EditPlayerStorage
//
this.B_EditPlayerStorage.Location = new System.Drawing.Point(104, 168);
this.B_EditPlayerStorage.Name = "B_EditPlayerStorage";
this.B_EditPlayerStorage.Size = new System.Drawing.Size(92, 40);
this.B_EditPlayerStorage.TabIndex = 14;
this.B_EditPlayerStorage.Text = "Edit Storage";
this.B_EditPlayerStorage.UseVisualStyleBackColor = true;
this.B_EditPlayerStorage.Click += new System.EventHandler(this.B_Storage_Click);
//
// B_EditPlayerRecipes
//
this.B_EditPlayerRecipes.Location = new System.Drawing.Point(202, 168);
this.B_EditPlayerRecipes.Name = "B_EditPlayerRecipes";
this.B_EditPlayerRecipes.Size = new System.Drawing.Size(92, 40);
this.B_EditPlayerRecipes.TabIndex = 13;
this.B_EditPlayerRecipes.Text = "Edit Recipes";
this.B_EditPlayerRecipes.UseVisualStyleBackColor = true;
this.B_EditPlayerRecipes.Click += new System.EventHandler(this.B_EditPlayerRecipes_Click);
//
// B_EditPlayerItems
//
this.B_EditPlayerItems.Location = new System.Drawing.Point(6, 168);
@@ -575,25 +560,15 @@ private void InitializeComponent()
this.TC_Editors.Size = new System.Drawing.Size(404, 237);
this.TC_Editors.TabIndex = 1;
//
// B_EditPatterns
// B_EditPlayerHouses
//
this.B_EditPatterns.Location = new System.Drawing.Point(104, 122);
this.B_EditPatterns.Name = "B_EditPatterns";
this.B_EditPatterns.Size = new System.Drawing.Size(92, 40);
this.B_EditPatterns.TabIndex = 54;
this.B_EditPatterns.Text = "Edit Patterns";
this.B_EditPatterns.UseVisualStyleBackColor = true;
this.B_EditPatterns.Click += new System.EventHandler(this.B_EditPatterns_Click);
//
// B_EditPRODesigns
//
this.B_EditPRODesigns.Location = new System.Drawing.Point(104, 168);
this.B_EditPRODesigns.Name = "B_EditPRODesigns";
this.B_EditPRODesigns.Size = new System.Drawing.Size(92, 40);
this.B_EditPRODesigns.TabIndex = 55;
this.B_EditPRODesigns.Text = "Edit PRO Designs";
this.B_EditPRODesigns.UseVisualStyleBackColor = true;
this.B_EditPRODesigns.Click += new System.EventHandler(this.B_EditPRODesigns_Click);
this.B_EditPlayerHouses.Location = new System.Drawing.Point(6, 168);
this.B_EditPlayerHouses.Name = "B_EditPlayerHouses";
this.B_EditPlayerHouses.Size = new System.Drawing.Size(92, 40);
this.B_EditPlayerHouses.TabIndex = 56;
this.B_EditPlayerHouses.Text = "Edit Player Houses";
this.B_EditPlayerHouses.UseVisualStyleBackColor = true;
this.B_EditPlayerHouses.Click += new System.EventHandler(this.B_EditPlayerHouses_Click);
//
// Editor
//
@@ -612,9 +587,10 @@ private void InitializeComponent()
this.Menu_Editor.PerformLayout();
this.CM_Picture.ResumeLayout(false);
this.Tab_Map.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.NUD_PlayerHouse)).EndInit();
this.CM_EditMap.ResumeLayout(false);
this.Tab_Players.ResumeLayout(false);
this.Tab_Players.PerformLayout();
this.CM_EditPlayer.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.NUD_Wallet)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_NookMiles)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_BankBells)).EndInit();
@@ -642,23 +618,11 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem Menu_Settings;
private System.Windows.Forms.TabPage Tab_Map;
private System.Windows.Forms.Button B_EditLandFlags;
private System.Windows.Forms.Label L_PlayerHouse;
private System.Windows.Forms.NumericUpDown NUD_PlayerHouse;
private System.Windows.Forms.Button B_LoadHouse;
private System.Windows.Forms.Button B_DumpHouse;
private System.Windows.Forms.Button B_EditFieldItems;
private System.Windows.Forms.Button B_EditTerrain;
private System.Windows.Forms.Button B_EditAcres;
private System.Windows.Forms.Button B_EditTurnipExchange;
private System.Windows.Forms.Button B_EditBuildings;
private System.Windows.Forms.Button B_RecycleBin;
private System.Windows.Forms.TabPage Tab_Villagers;
private System.Windows.Forms.TabPage Tab_Players;
private System.Windows.Forms.Button B_EditPlayerFlags;
private System.Windows.Forms.Button B_EditAchievements;
private System.Windows.Forms.Button B_EditPlayerReceivedItems;
private System.Windows.Forms.Button B_EditPlayerStorage;
private System.Windows.Forms.Button B_EditPlayerRecipes;
private System.Windows.Forms.Button B_EditPlayerItems;
private System.Windows.Forms.Label L_Wallet;
private System.Windows.Forms.NumericUpDown NUD_Wallet;
@@ -675,6 +639,19 @@ private void InitializeComponent()
private System.Windows.Forms.TabControl TC_Editors;
private System.Windows.Forms.Button B_EditPatterns;
private System.Windows.Forms.Button B_EditPRODesigns;
private System.Windows.Forms.Button B_EditMap;
private System.Windows.Forms.ContextMenuStrip CM_EditMap;
private System.Windows.Forms.ToolStripMenuItem B_EditTerrain;
private System.Windows.Forms.ToolStripMenuItem B_EditBuildings;
private System.Windows.Forms.ToolStripMenuItem B_EditAcres;
private System.Windows.Forms.ToolStripMenuItem B_EditFieldItems;
private System.Windows.Forms.ContextMenuStrip CM_EditPlayer;
private System.Windows.Forms.ToolStripMenuItem B_EditPlayerStorage;
private System.Windows.Forms.ToolStripMenuItem B_EditPlayerReceivedItems;
private System.Windows.Forms.ToolStripMenuItem B_EditAchievements;
private System.Windows.Forms.ToolStripMenuItem B_EditPlayerRecipes;
private System.Windows.Forms.Button B_EditPlayer;
private System.Windows.Forms.Button B_EditPlayerHouses;
}
}

70
NHSE.WinForms/Editor.cs
View File

@@ -166,7 +166,6 @@ private void LoadPlayers()
PlayerIndex = -1;
CB_Players.SelectedIndex = 0;
NUD_PlayerHouse.Maximum = CB_Players.Items.Count;
}
private int PlayerIndex = -1;
@@ -370,63 +369,6 @@ private void B_EditFieldItems_Click(object sender, EventArgs e)
editor.ShowDialog();
}
private void B_DumpHouse_Click(object sender, EventArgs e)
{
if (ModifierKeys == Keys.Shift)
{
using var fbd = new FolderBrowserDialog();
if (fbd.ShowDialog() != DialogResult.OK)
return;
var dir = Path.GetDirectoryName(fbd.SelectedPath);
if (dir == null || !Directory.Exists(dir))
return;
SAV.DumpPlayerHouses(fbd.SelectedPath);
return;
}
var index = (int)(NUD_PlayerHouse.Value - 1);
var name = CB_Players.Items[index].ToString();
using var sfd = new SaveFileDialog
{
Filter = "New Horizons Player House (*.nhph)|*.nhph|All files (*.*)|*.*",
FileName = $"{name}.nhph",
};
if (sfd.ShowDialog() != DialogResult.OK)
return;
var h = SAV.Main.GetPlayerHouse(index);
var data = h.ToBytesClass();
File.WriteAllBytes(sfd.FileName, data);
}
private void B_LoadHouse_Click(object sender, EventArgs e)
{
var index = (int)(NUD_PlayerHouse.Value - 1);
var name = CB_Players.Items[index].ToString();
using var ofd = new OpenFileDialog
{
Filter = "New Horizons Player House (*.nhph)|*.nhph|All files (*.*)|*.*",
FileName = $"{name}.nhph",
};
if (ofd.ShowDialog() != DialogResult.OK)
return;
var file = ofd.FileName;
var fi = new FileInfo(file);
const int expectLength = PlayerHouse.SIZE;
if (fi.Length != expectLength)
{
var msg = string.Format(MessageStrings.MsgDataSizeMismatchImport, fi.Length, expectLength);
WinFormsUtil.Error(MessageStrings.MsgCanceling, msg);
return;
}
var data = File.ReadAllBytes(file);
var h = data.ToClass<PlayerHouse>();
SAV.Main.SetPlayerHouse(h, index);
}
private void B_EditLandFlags_Click(object sender, EventArgs e)
{
var flags = SAV.Main.GetEventFlagLand();
@@ -450,5 +392,17 @@ private void B_EditPRODesigns_Click(object sender, EventArgs e)
if (editor.ShowDialog() == DialogResult.OK)
SAV.Main.SetDesignsPRO(patterns);
}
private static void ShowContextMenuBelow(ToolStripDropDown c, Control n) => c.Show(n.PointToScreen(new Point(0, n.Height)));
private void B_EditPlayer_Click(object sender, EventArgs e) => ShowContextMenuBelow(CM_EditPlayer, B_EditPlayer);
private void B_EditMap_Click(object sender, EventArgs e) => ShowContextMenuBelow(CM_EditMap, B_EditMap);
private void B_EditPlayerHouses_Click(object sender, EventArgs e)
{
var houses = SAV.Main.GetPlayerHouses();
using var editor = new PlayerHouseEditor(houses, SAV.Players, PlayerIndex);
if (editor.ShowDialog() == DialogResult.OK)
SAV.Main.SetPlayerHouses(houses);
}
}
}

6
NHSE.WinForms/Editor.resx
View File

@@ -123,4 +123,10 @@
<metadata name="CM_Picture.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>137, 17</value>
</metadata>
<metadata name="CM_EditMap.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>250, 17</value>
</metadata>
<metadata name="CM_EditPlayer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>388, 17</value>
</metadata>
</root>

12
NHSE.WinForms/Subforms/Map/PlayerHouseEditor.cs
View File

@@ -8,17 +8,15 @@ namespace NHSE.WinForms
{
public partial class PlayerHouseEditor : Form
{
private readonly MainSave SAV;
public readonly PlayerHouse[] Houses;
private readonly IReadOnlyList<Player> Players;
private int Index;
public PlayerHouseEditor(PlayerHouse[] houses, IReadOnlyList<Player> players, MainSave sav, int index)
public PlayerHouseEditor(PlayerHouse[] houses, IReadOnlyList<Player> players, int index)
{
InitializeComponent();
this.TranslateInterface(GameInfo.CurrentLanguage);
SAV = sav;
Houses = houses;
Players = players;
DialogResult = DialogResult.Cancel;
@@ -52,7 +50,11 @@ private void PG_Item_PropertyValueChanged(object s, PropertyValueChangedEventArg
LB_Items.Items[Index] = GetHouseSummary(Houses[Index], Index);
}
private string GetHouseSummary(PlayerHouse house, int index) => $"{Players[index].Personal.PlayerName}'s House (lv {house.HouseLevel})";
private string GetHouseSummary(PlayerHouse house, int index)
{
var houseName = index >= Players.Count ? $"House {index}" : $"{Players[index].Personal.PlayerName}'s House";
return $"{houseName} (lv {house.HouseLevel})";
}
private void B_DumpHouse_Click(object sender, EventArgs e)
{
@@ -65,7 +67,7 @@ private void B_DumpHouse_Click(object sender, EventArgs e)
var dir = Path.GetDirectoryName(fbd.SelectedPath);
if (dir == null || !Directory.Exists(dir))
return;
SAV.DumpVillagerHouses(fbd.SelectedPath);
Houses.DumpPlayerHouses(Players, fbd.SelectedPath);
return;
}