From 2bfb5759bde43a02c429ce48a3d20b33622ace1c Mon Sep 17 00:00:00 2001 From: "Josh (vector_cmdr)" Date: Thu, 12 Feb 2026 23:47:34 +1100 Subject: [PATCH] Add: Tour Hemisphere + Weather (#748) Added the offset for tour weather area + offsets for tour hemisphere and tour weather seed. Added to UI. --- NHSE.Core/Save/Files/MainSave.cs | 6 ++ NHSE.Core/Save/Offsets/MainSaveOffsets.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets10.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets11.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets110.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets111.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets12.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets13.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets14.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets15.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets16.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets17.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets18.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets19.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets20.cs | 4 + NHSE.Core/Save/Offsets/MainSaveOffsets30.cs | 4 + NHSE.WinForms/Editor.Designer.cs | 107 ++++++++++++++----- NHSE.WinForms/Editor.cs | 5 + NHSE.WinForms/Resources/text/lang_de.txt | 2 + NHSE.WinForms/Resources/text/lang_en.txt | 4 +- NHSE.WinForms/Resources/text/lang_es.txt | 2 + NHSE.WinForms/Resources/text/lang_fr.txt | 2 + NHSE.WinForms/Resources/text/lang_it.txt | 2 + NHSE.WinForms/Resources/text/lang_jp.txt | 2 + NHSE.WinForms/Resources/text/lang_ko.txt | 2 + NHSE.WinForms/Resources/text/lang_zhs.txt | 2 + NHSE.WinForms/Resources/text/lang_zht.txt | 2 + 27 files changed, 171 insertions(+), 27 deletions(-) diff --git a/NHSE.Core/Save/Files/MainSave.cs b/NHSE.Core/Save/Files/MainSave.cs index f08b34f..a47e8dc 100644 --- a/NHSE.Core/Save/Files/MainSave.cs +++ b/NHSE.Core/Save/Files/MainSave.cs @@ -14,12 +14,18 @@ public sealed class MainSave : EncryptedFilePair public MainSave(ISaveFileProvider provider) : base(provider, "main") => Offsets = MainSaveOffsets.GetOffsets(Info); public Hemisphere Hemisphere { get => (Hemisphere)Data[Offsets.WeatherArea]; set => Data[Offsets.WeatherArea] = (byte)value; } + public Hemisphere TourHemisphere { get => (Hemisphere)Data[Offsets.TourHemisphere]; set => Data[Offsets.TourHemisphere] = (byte)value; } public AirportColor AirportThemeColor { get => (AirportColor)Data[Offsets.AirportThemeColor]; set => Data[Offsets.AirportThemeColor] = (byte)value; } public uint WeatherSeed { get => ReadUInt32LittleEndian(Data[Offsets.WeatherRandSeed..]); set => WriteUInt32LittleEndian(Data[Offsets.WeatherRandSeed..], value); } + public uint TourWeatherSeed + { + get => ReadUInt32LittleEndian(Data[Offsets.TourWeatherRandSeed..]); + set => WriteUInt32LittleEndian(Data[Offsets.TourWeatherRandSeed..], value); + } public byte CampsiteStatus { get => Data[Offsets.GSaveCampSite]; set => Data[Offsets.GSaveCampSite] = value; } public byte CampsiteVillagerVariantID { get => Data[Offsets.GSaveNpcCamp]; set => Data[Offsets.GSaveNpcCamp] = value; } diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets.cs index acb41b8..fb18206 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets.cs @@ -57,6 +57,10 @@ public abstract class MainSaveOffsets public abstract int LostItemBox { get; } public abstract int LastSavedTime { get; } + public abstract int TourWeatherArea { get; } + public abstract int TourHemisphere { get; } + public abstract int TourWeatherRandSeed { get; } + public abstract int VillagerSize { get; } public abstract int VillagerHouseSize { get; } public abstract int PlayerHouseSize { get; } diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets10.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets10.cs index bc079e2..a756da7 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets10.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets10.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets10 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x5C1E20; public override int LastSavedTime => GSaveLandOtherStart + 0x5C6748; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x5c6598; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager1.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets11.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets11.cs index e7f986f..c3c4a49 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets11.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets11.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets11 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x5C33F0; public override int LastSavedTime => GSaveLandOtherStart + 0x5C7D48; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x5c7b98; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager1.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets110.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets110.cs index 9b48068..70e3cb1 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets110.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets110.cs @@ -61,6 +61,10 @@ public sealed class MainSaveOffsets110 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x3408c0; public override int LastSavedTime => GSaveLandOtherStart + 0x345220; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x34500c; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets111.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets111.cs index 4c8a7b4..892f9c4 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets111.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets111.cs @@ -62,6 +62,10 @@ public sealed class MainSaveOffsets111 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x3408c0; public override int LastSavedTime => GSaveLandOtherStart + 0x345220; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x34500c; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets12.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets12.cs index 49f022e..4fce2f5 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets12.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets12.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets12 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x5CF370; public override int LastSavedTime => GSaveLandOtherStart + 0x5D3CC8; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x5d3b18; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager1.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets13.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets13.cs index 02865b7..c4866ee 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets13.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets13.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets13 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x5CF3F0; public override int LastSavedTime => GSaveLandOtherStart + 0x5D3D48; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x5d3b98; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager1.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets14.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets14.cs index 6809d37..701c63b 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets14.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets14.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets14 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x605E70; public override int LastSavedTime => GSaveLandOtherStart + 0x60A708; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x60a558; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager1.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets15.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets15.cs index 903eea1..ecfbb5e 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets15.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets15.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets15 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x6159f0; public override int LastSavedTime => GSaveLandOtherStart + 0x61a288; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x61a0d8; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets16.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets16.cs index 75300ed..84e0504 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets16.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets16.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets16 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x61a4f0; public override int LastSavedTime => GSaveLandOtherStart + 0x61ed88; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x61ebd8; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets17.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets17.cs index 7704845..d1819af 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets17.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets17.cs @@ -59,6 +59,10 @@ public sealed class MainSaveOffsets17 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x340680; public override int LastSavedTime => GSaveLandOtherStart + 0x344f18; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x344d68; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets18.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets18.cs index c260903..51effbd 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets18.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets18.cs @@ -60,6 +60,10 @@ public sealed class MainSaveOffsets18 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x340680; public override int LastSavedTime => GSaveLandOtherStart + 0x344f18; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x344d68; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets19.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets19.cs index b201510..ebf59cb 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets19.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets19.cs @@ -61,6 +61,10 @@ public sealed class MainSaveOffsets19 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x3408c0; public override int LastSavedTime => GSaveLandOtherStart + 0x345220; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x34500c; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets20.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets20.cs index b63cb10..efff512 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets20.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets20.cs @@ -62,6 +62,10 @@ public sealed class MainSaveOffsets20 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x3726c0; public override int LastSavedTime => GSaveLandOtherStart + 0x377020; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x376e0c; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.Core/Save/Offsets/MainSaveOffsets30.cs b/NHSE.Core/Save/Offsets/MainSaveOffsets30.cs index 9aac9f9..4ded6f3 100644 --- a/NHSE.Core/Save/Offsets/MainSaveOffsets30.cs +++ b/NHSE.Core/Save/Offsets/MainSaveOffsets30.cs @@ -86,6 +86,10 @@ public sealed class MainSaveOffsets30 : MainSaveOffsets public override int LostItemBox => GSaveLandOtherStart + 0x3c4fc0; public override int LastSavedTime => GSaveLandOtherStart + 0x3c9920; + + public override int TourWeatherArea => GSaveLandOtherStart + 0x3c970c; + public override int TourHemisphere => TourWeatherArea + 0x14; + public override int TourWeatherRandSeed => TourWeatherArea + 0x18; #endregion public override int VillagerSize => Villager2.SIZE; diff --git a/NHSE.WinForms/Editor.Designer.cs b/NHSE.WinForms/Editor.Designer.cs index e0bc700..481dc42 100644 --- a/NHSE.WinForms/Editor.Designer.cs +++ b/NHSE.WinForms/Editor.Designer.cs @@ -49,9 +49,12 @@ private void InitializeComponent() CM_Picture = new System.Windows.Forms.ContextMenuStrip(components); Menu_SavePNG = new System.Windows.Forms.ToolStripMenuItem(); Tab_Map = new System.Windows.Forms.TabPage(); + NUD_Tour_WeatherSeed = new System.Windows.Forms.NumericUpDown(); + L_Tour_WeatherSeed = new System.Windows.Forms.Label(); + L_Tour_Hemisphere = new System.Windows.Forms.Label(); + CB_Tour_Hemisphere = new System.Windows.Forms.ComboBox(); B_EditFruitFlower = new System.Windows.Forms.Button(); B_EditCampsite = new System.Windows.Forms.Button(); - B_EditPlayerPostBox = new System.Windows.Forms.ToolStripMenuItem(); NUD_WeatherSeed = new System.Windows.Forms.NumericUpDown(); L_WeatherSeed = new System.Windows.Forms.Label(); B_EditDesignsTailor = new System.Windows.Forms.Button(); @@ -72,6 +75,7 @@ private void InitializeComponent() B_EditPatterns = new System.Windows.Forms.Button(); B_EditTurnipExchange = new System.Windows.Forms.Button(); B_RecycleBin = new System.Windows.Forms.Button(); + B_EditPlayerPostBox = new System.Windows.Forms.ToolStripMenuItem(); Tab_Villagers = new System.Windows.Forms.TabPage(); Tab_Players = new System.Windows.Forms.TabPage(); L_HotelTickets = new System.Windows.Forms.Label(); @@ -112,6 +116,7 @@ private void InitializeComponent() Menu_Editor.SuspendLayout(); CM_Picture.SuspendLayout(); Tab_Map.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)NUD_Tour_WeatherSeed).BeginInit(); ((System.ComponentModel.ISupportInitialize)NUD_WeatherSeed).BeginInit(); CM_EditMap.SuspendLayout(); Tab_Players.SuspendLayout(); @@ -271,6 +276,10 @@ private void InitializeComponent() // // Tab_Map // + Tab_Map.Controls.Add(NUD_Tour_WeatherSeed); + Tab_Map.Controls.Add(L_Tour_WeatherSeed); + Tab_Map.Controls.Add(L_Tour_Hemisphere); + Tab_Map.Controls.Add(CB_Tour_Hemisphere); Tab_Map.Controls.Add(B_EditFruitFlower); Tab_Map.Controls.Add(B_EditCampsite); Tab_Map.Controls.Add(NUD_WeatherSeed); @@ -296,6 +305,47 @@ private void InitializeComponent() Tab_Map.Text = "Map"; Tab_Map.UseVisualStyleBackColor = true; // + // NUD_Tour_WeatherSeed + // + NUD_Tour_WeatherSeed.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + NUD_Tour_WeatherSeed.Location = new System.Drawing.Point(236, 89); + NUD_Tour_WeatherSeed.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + NUD_Tour_WeatherSeed.Maximum = new decimal(new int[] { -1, 0, 0, 0 }); + NUD_Tour_WeatherSeed.Name = "NUD_Tour_WeatherSeed"; + NUD_Tour_WeatherSeed.Size = new System.Drawing.Size(107, 20); + NUD_Tour_WeatherSeed.TabIndex = 71; + NUD_Tour_WeatherSeed.Value = new decimal(new int[] { 1234567890, 0, 0, 0 }); + // + // L_Tour_WeatherSeed + // + L_Tour_WeatherSeed.AutoSize = true; + L_Tour_WeatherSeed.Location = new System.Drawing.Point(346, 91); + L_Tour_WeatherSeed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_Tour_WeatherSeed.Name = "L_Tour_WeatherSeed"; + L_Tour_WeatherSeed.Size = new System.Drawing.Size(106, 15); + L_Tour_WeatherSeed.TabIndex = 70; + L_Tour_WeatherSeed.Text = "Tour Weather Seed"; + // + // L_Tour_Hemisphere + // + L_Tour_Hemisphere.AutoSize = true; + L_Tour_Hemisphere.Location = new System.Drawing.Point(346, 64); + L_Tour_Hemisphere.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_Tour_Hemisphere.Name = "L_Tour_Hemisphere"; + L_Tour_Hemisphere.Size = new System.Drawing.Size(98, 15); + L_Tour_Hemisphere.TabIndex = 69; + L_Tour_Hemisphere.Text = "Tour Hemisphere"; + // + // CB_Tour_Hemisphere + // + CB_Tour_Hemisphere.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + CB_Tour_Hemisphere.FormattingEnabled = true; + CB_Tour_Hemisphere.Location = new System.Drawing.Point(236, 60); + CB_Tour_Hemisphere.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CB_Tour_Hemisphere.Name = "CB_Tour_Hemisphere"; + CB_Tour_Hemisphere.Size = new System.Drawing.Size(107, 23); + CB_Tour_Hemisphere.TabIndex = 68; + // // B_EditFruitFlower // B_EditFruitFlower.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; @@ -323,27 +373,27 @@ private void InitializeComponent() // NUD_WeatherSeed // NUD_WeatherSeed.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); - NUD_WeatherSeed.Location = new System.Drawing.Point(236, 68); + NUD_WeatherSeed.Location = new System.Drawing.Point(236, 34); NUD_WeatherSeed.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_WeatherSeed.Maximum = new decimal(new int[] { -1, 0, 0, 0 }); NUD_WeatherSeed.Name = "NUD_WeatherSeed"; - NUD_WeatherSeed.Size = new System.Drawing.Size(108, 20); + NUD_WeatherSeed.Size = new System.Drawing.Size(107, 20); NUD_WeatherSeed.TabIndex = 65; NUD_WeatherSeed.Value = new decimal(new int[] { 1234567890, 0, 0, 0 }); // // L_WeatherSeed // L_WeatherSeed.AutoSize = true; - L_WeatherSeed.Location = new System.Drawing.Point(351, 70); + L_WeatherSeed.Location = new System.Drawing.Point(346, 36); L_WeatherSeed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_WeatherSeed.Name = "L_WeatherSeed"; - L_WeatherSeed.Size = new System.Drawing.Size(79, 15); + L_WeatherSeed.Size = new System.Drawing.Size(113, 15); L_WeatherSeed.TabIndex = 64; - L_WeatherSeed.Text = "Weather Seed"; + L_WeatherSeed.Text = "Island Weather Seed"; // // B_EditDesignsTailor // - B_EditDesignsTailor.Location = new System.Drawing.Point(350, 113); + B_EditDesignsTailor.Location = new System.Drawing.Point(350, 116); B_EditDesignsTailor.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_EditDesignsTailor.Name = "B_EditDesignsTailor"; B_EditDesignsTailor.Size = new System.Drawing.Size(107, 56); @@ -354,7 +404,7 @@ private void InitializeComponent() // // B_EditPatternFlag // - B_EditPatternFlag.Location = new System.Drawing.Point(236, 113); + B_EditPatternFlag.Location = new System.Drawing.Point(236, 116); B_EditPatternFlag.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_EditPatternFlag.Name = "B_EditPatternFlag"; B_EditPatternFlag.Size = new System.Drawing.Size(107, 56); @@ -367,7 +417,7 @@ private void InitializeComponent() // CB_AirportColor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; CB_AirportColor.FormattingEnabled = true; - CB_AirportColor.Location = new System.Drawing.Point(236, 37); + CB_AirportColor.Location = new System.Drawing.Point(121, 28); CB_AirportColor.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_AirportColor.Name = "CB_AirportColor"; CB_AirportColor.Size = new System.Drawing.Size(107, 23); @@ -376,7 +426,7 @@ private void InitializeComponent() // L_AirportColor // L_AirportColor.AutoSize = true; - L_AirportColor.Location = new System.Drawing.Point(350, 40); + L_AirportColor.Location = new System.Drawing.Point(122, 10); L_AirportColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_AirportColor.Name = "L_AirportColor"; L_AirportColor.Size = new System.Drawing.Size(76, 15); @@ -386,18 +436,18 @@ private void InitializeComponent() // L_Hemisphere // L_Hemisphere.AutoSize = true; - L_Hemisphere.Location = new System.Drawing.Point(350, 10); + L_Hemisphere.Location = new System.Drawing.Point(346, 10); L_Hemisphere.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_Hemisphere.Name = "L_Hemisphere"; - L_Hemisphere.Size = new System.Drawing.Size(71, 15); + L_Hemisphere.Size = new System.Drawing.Size(105, 15); L_Hemisphere.TabIndex = 58; - L_Hemisphere.Text = "Hemisphere"; + L_Hemisphere.Text = "Island Hemisphere"; // // CB_Hemisphere // CB_Hemisphere.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; CB_Hemisphere.FormattingEnabled = true; - CB_Hemisphere.Location = new System.Drawing.Point(236, 7); + CB_Hemisphere.Location = new System.Drawing.Point(236, 6); CB_Hemisphere.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Hemisphere.Name = "CB_Hemisphere"; CB_Hemisphere.Size = new System.Drawing.Size(107, 23); @@ -472,7 +522,7 @@ private void InitializeComponent() // // B_EditPRODesigns // - B_EditPRODesigns.Location = new System.Drawing.Point(121, 113); + B_EditPRODesigns.Location = new System.Drawing.Point(121, 116); B_EditPRODesigns.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_EditPRODesigns.Name = "B_EditPRODesigns"; B_EditPRODesigns.Size = new System.Drawing.Size(107, 56); @@ -483,7 +533,7 @@ private void InitializeComponent() // // B_EditPatterns // - B_EditPatterns.Location = new System.Drawing.Point(7, 113); + B_EditPatterns.Location = new System.Drawing.Point(7, 116); B_EditPatterns.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_EditPatterns.Name = "B_EditPatterns"; B_EditPatterns.Size = new System.Drawing.Size(107, 56); @@ -505,7 +555,7 @@ private void InitializeComponent() // // B_RecycleBin // - B_RecycleBin.Location = new System.Drawing.Point(7, 60); + B_RecycleBin.Location = new System.Drawing.Point(7, 61); B_RecycleBin.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_RecycleBin.Name = "B_RecycleBin"; B_RecycleBin.Size = new System.Drawing.Size(107, 46); @@ -514,13 +564,20 @@ private void InitializeComponent() B_RecycleBin.UseVisualStyleBackColor = true; B_RecycleBin.Click += B_RecycleBin_Click; // + // B_EditPlayerPostBox + // + B_EditPlayerPostBox.Name = "B_EditPlayerPostBox"; + B_EditPlayerPostBox.Size = new System.Drawing.Size(176, 22); + B_EditPlayerPostBox.Text = "Edit Post Box"; + B_EditPlayerPostBox.Click += B_EditPlayerPostBox_Click; + // // Tab_Villagers // Tab_Villagers.Location = new System.Drawing.Point(4, 34); Tab_Villagers.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); Tab_Villagers.Name = "Tab_Villagers"; Tab_Villagers.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - Tab_Villagers.Size = new System.Drawing.Size(463, 299); + Tab_Villagers.Size = new System.Drawing.Size(463, 297); Tab_Villagers.TabIndex = 0; Tab_Villagers.Text = "Villagers"; Tab_Villagers.UseVisualStyleBackColor = true; @@ -562,13 +619,6 @@ private void InitializeComponent() Tab_Players.Text = "Players"; Tab_Players.UseVisualStyleBackColor = true; // - // B_EditPostBox - // - B_EditPlayerPostBox.Name = "B_EditPlayerPostBox"; - B_EditPlayerPostBox.Size = new System.Drawing.Size(107, 56); - B_EditPlayerPostBox.Text = "Edit Post Box"; - B_EditPlayerPostBox.Click += B_EditPlayerPostBox_Click; - // // L_HotelTickets // L_HotelTickets.Location = new System.Drawing.Point(166, 273); @@ -708,7 +758,7 @@ private void InitializeComponent() CM_EditPlayer.ImageScalingSize = new System.Drawing.Size(20, 20); CM_EditPlayer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { B_EditPlayerStorage, B_EditPlayerReceivedItems, B_EditAchievements, B_EditPlayerRecipes, B_EditPlayerPostBox, B_EditPlayerFlags, B_EditPlayerReactions, B_EditPlayerMisc }); CM_EditPlayer.Name = "CM_EditPlayer"; - CM_EditPlayer.Size = new System.Drawing.Size(177, 158); + CM_EditPlayer.Size = new System.Drawing.Size(177, 180); // // B_EditPlayerStorage // @@ -920,6 +970,7 @@ private void InitializeComponent() CM_Picture.ResumeLayout(false); Tab_Map.ResumeLayout(false); Tab_Map.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)NUD_Tour_WeatherSeed).EndInit(); ((System.ComponentModel.ISupportInitialize)NUD_WeatherSeed).EndInit(); CM_EditMap.ResumeLayout(false); Tab_Players.ResumeLayout(false); @@ -1022,6 +1073,10 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_Theme_Classic; private System.Windows.Forms.ToolStripMenuItem Menu_Theme_Dark; private System.Windows.Forms.Button B_EditFruitFlower; + private System.Windows.Forms.Label L_Tour_Hemisphere; + private System.Windows.Forms.ComboBox CB_Tour_Hemisphere; + private System.Windows.Forms.NumericUpDown NUD_Tour_WeatherSeed; + private System.Windows.Forms.Label L_Tour_WeatherSeed; } } diff --git a/NHSE.WinForms/Editor.cs b/NHSE.WinForms/Editor.cs index 2d3b4c7..a48af49 100644 --- a/NHSE.WinForms/Editor.cs +++ b/NHSE.WinForms/Editor.cs @@ -262,19 +262,24 @@ private void LoadMain() var names = Enum.GetNames(); CB_Hemisphere.Items.AddRange(names); CB_Hemisphere.SelectedIndex = (int)m.Hemisphere; + CB_Tour_Hemisphere.Items.AddRange(names); + CB_Tour_Hemisphere.SelectedIndex = (int)m.TourHemisphere; names = Enum.GetNames(); CB_AirportColor.Items.AddRange(names); CB_AirportColor.SelectedIndex = (int)m.AirportThemeColor; NUD_WeatherSeed.Value = m.WeatherSeed; + NUD_Tour_WeatherSeed.Value = m.TourWeatherSeed; } private void SaveMain() { var m = SAV.Main; m.Hemisphere = (Hemisphere)CB_Hemisphere.SelectedIndex; + m.TourHemisphere = (Hemisphere)CB_Tour_Hemisphere.SelectedIndex; m.AirportThemeColor = (AirportColor)CB_AirportColor.SelectedIndex; m.WeatherSeed = (uint)NUD_WeatherSeed.Value; + m.TourWeatherSeed = (uint)NUD_Tour_WeatherSeed.Value; } #region Player Editing diff --git a/NHSE.WinForms/Resources/text/lang_de.txt b/NHSE.WinForms/Resources/text/lang_de.txt index cc24b1b..f7ba8e3 100644 --- a/NHSE.WinForms/Resources/text/lang_de.txt +++ b/NHSE.WinForms/Resources/text/lang_de.txt @@ -95,6 +95,8 @@ Editor.L_PocketCount1=Pocket Count 1: Editor.L_PocketCount2=Pocket Count 2: Editor.L_Species=Species: Editor.L_StorageCount=Storage Count +Editor.L_Tour_Hemisphere=Tour Hemisphere +Editor.L_Tour_WeatherSeed=Tour Weather Seed Editor.L_TownName=Town Name: Editor.L_Variant=Variant: Editor.L_VillagerID=Villager Index: diff --git a/NHSE.WinForms/Resources/text/lang_en.txt b/NHSE.WinForms/Resources/text/lang_en.txt index 91d175a..9a5826f 100644 --- a/NHSE.WinForms/Resources/text/lang_en.txt +++ b/NHSE.WinForms/Resources/text/lang_en.txt @@ -87,7 +87,7 @@ Editor.L_AirportColor=Airport Color Editor.L_BankBells=Bank Bells: Editor.L_Catchphrase=Catchphrase: Editor.L_EarnedMiles=Earned Miles: -Editor.L_Hemisphere=Hemisphere +Editor.L_Hemisphere=Island Hemisphere Editor.L_NookMiles=Nook Miles: Editor.L_Personality=Personality: Editor.L_PlayerName=Player Name: @@ -95,6 +95,8 @@ Editor.L_PocketCount1=Pocket Count 1: Editor.L_PocketCount2=Pocket Count 2: Editor.L_Species=Species: Editor.L_StorageCount=Storage Count +Editor.L_Tour_Hemisphere=Tour Hemisphere +Editor.L_Tour_WeatherSeed=Tour Weather Seed Editor.L_TownName=Town Name: Editor.L_Variant=Variant: Editor.L_VillagerID=Villager Index: diff --git a/NHSE.WinForms/Resources/text/lang_es.txt b/NHSE.WinForms/Resources/text/lang_es.txt index 0658143..98ee25f 100644 --- a/NHSE.WinForms/Resources/text/lang_es.txt +++ b/NHSE.WinForms/Resources/text/lang_es.txt @@ -94,6 +94,8 @@ Editor.L_PocketCount1=Cuenta Bolsillo 1: Editor.L_PocketCount2=Cuenta Bolsillo 2: Editor.L_Species=Especies: Editor.L_StorageCount=Cuenta de Almacenamiento +Editor.L_Tour_Hemisphere=Tour Hemisferio +Editor.L_Tour_WeatherSeed=Tour Weather Seed Editor.L_TownName=Nombre de la Ciudad: Editor.L_Variant=Variantes: Editor.L_VillagerID=Index de Ciudadanos: diff --git a/NHSE.WinForms/Resources/text/lang_fr.txt b/NHSE.WinForms/Resources/text/lang_fr.txt index df827db..223fa7c 100644 --- a/NHSE.WinForms/Resources/text/lang_fr.txt +++ b/NHSE.WinForms/Resources/text/lang_fr.txt @@ -95,6 +95,8 @@ Editor.L_PocketCount1=Pocket Count 1: Editor.L_PocketCount2=Pocket Count 2: Editor.L_Species=Species: Editor.L_StorageCount=Storage Count +Editor.L_Tour_Hemisphere=Tour Hemisphere +Editor.L_Tour_WeatherSeed=Tour Weather Seed Editor.L_TownName=Town Name: Editor.L_Variant=Variant: Editor.L_VillagerID=Villager Index: diff --git a/NHSE.WinForms/Resources/text/lang_it.txt b/NHSE.WinForms/Resources/text/lang_it.txt index 8ac97ea..787f69e 100644 --- a/NHSE.WinForms/Resources/text/lang_it.txt +++ b/NHSE.WinForms/Resources/text/lang_it.txt @@ -95,6 +95,8 @@ Editor.L_PocketCount1=Valore Tasca 1: Editor.L_PocketCount2=Valore Tasca 2: Editor.L_Species=Specie: Editor.L_StorageCount=Valore Sgabuzzino +Editor.L_Tour_Hemisphere=Tour Emisfero +Editor.L_Tour_WeatherSeed=Tour Weather Seed Editor.L_TownName=Nome Isola: Editor.L_Variant=Variante: Editor.L_VillagerID=Numero Villager: diff --git a/NHSE.WinForms/Resources/text/lang_jp.txt b/NHSE.WinForms/Resources/text/lang_jp.txt index 31225b1..6419a73 100644 --- a/NHSE.WinForms/Resources/text/lang_jp.txt +++ b/NHSE.WinForms/Resources/text/lang_jp.txt @@ -95,6 +95,8 @@ Editor.L_PocketCount1=Pocket Count 1: Editor.L_PocketCount2=Pocket Count 2: Editor.L_Species=Species: Editor.L_StorageCount=Storage Count +Editor.L_Tour_Hemisphere=Tour Hemisphere +Editor.L_Tour_WeatherSeed=Tour Weather Seed Editor.L_TownName=Town Name: Editor.L_Variant=Variant: Editor.L_VillagerID=Villager Index: diff --git a/NHSE.WinForms/Resources/text/lang_ko.txt b/NHSE.WinForms/Resources/text/lang_ko.txt index 9175610..6afa242 100644 --- a/NHSE.WinForms/Resources/text/lang_ko.txt +++ b/NHSE.WinForms/Resources/text/lang_ko.txt @@ -95,6 +95,8 @@ Editor.L_PocketCount1=소지품 칸 수 1: Editor.L_PocketCount2=소지품 칸 수 2: Editor.L_Species=종족: Editor.L_StorageCount=보관함 칸 수 +Editor.L_Tour_Hemisphere=Tour 반구 +Editor.L_Tour_WeatherSeed=Tour 날씨 시드 Editor.L_TownName=섬 이름: Editor.L_Variant=변형: Editor.L_VillagerID=주민 인덱스: diff --git a/NHSE.WinForms/Resources/text/lang_zhs.txt b/NHSE.WinForms/Resources/text/lang_zhs.txt index 0b833d0..851d8a4 100644 --- a/NHSE.WinForms/Resources/text/lang_zhs.txt +++ b/NHSE.WinForms/Resources/text/lang_zhs.txt @@ -95,6 +95,8 @@ Editor.L_PocketCount1=口袋1容量: Editor.L_PocketCount2=口袋2容量: Editor.L_Species=种族: Editor.L_StorageCount=仓库容量 +Editor.L_Tour_Hemisphere=Tour 半球 +Editor.L_Tour_WeatherSeed=Tour 气象种子 Editor.L_TownName=岛屿名称: Editor.L_Variant=外型: Editor.L_VillagerID=岛民索引值: diff --git a/NHSE.WinForms/Resources/text/lang_zht.txt b/NHSE.WinForms/Resources/text/lang_zht.txt index 9145e28..5f83d32 100644 --- a/NHSE.WinForms/Resources/text/lang_zht.txt +++ b/NHSE.WinForms/Resources/text/lang_zht.txt @@ -95,6 +95,8 @@ Editor.L_PocketCount1=口袋1容量: Editor.L_PocketCount2=口袋2容量: Editor.L_Species=種族: Editor.L_StorageCount=倉庫容量 +Editor.L_Tour_Hemisphere=Tour 半球 +Editor.L_Tour_WeatherSeed=Tour Weather Seed Editor.L_TownName=島嶼名稱: Editor.L_Variant=外型: Editor.L_VillagerID=島民索引值: