From 9bcaee6fc9bce5aa424229ae1fc02a663211e339 Mon Sep 17 00:00:00 2001 From: "Josh (vector_cmdr)" Date: Sat, 24 Jan 2026 01:30:00 +1100 Subject: [PATCH] Relocate Fruits/Flowers + cleanup strings (#711) Relocated island/sister fruit/flower functionality to new FruitsFlowersEditor out of MiscPlayer to better follow existing layout. Added new button for this editor to Map tab for the new form. MiscPlayer fruit now sets passport only, FruitsFlowersEditor sets both. Other functionality remains as before. Retired FieldGoods from the Map button in favour of above. Adjusted UI anchors and open positions for new forms + cleaned up recent lang_xx string additions. --- NHSE.WinForms/Editor.Designer.cs | 56 +++--- NHSE.WinForms/Editor.cs | 10 +- NHSE.WinForms/Resources/text/lang_de.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_en.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_es.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_fr.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_it.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_jp.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_ko.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_zhs.txt | 34 ++-- NHSE.WinForms/Resources/text/lang_zht.txt | 34 ++-- .../Subforms/Map/CampsiteEditor.Designer.cs | 4 +- NHSE.WinForms/Subforms/Map/CampsiteEditor.cs | 2 + .../Map/FruitsFlowersEditor.Designer.cs | 181 ++++++++++++++++++ .../Subforms/Map/FruitsFlowersEditor.cs | 103 ++++++++++ .../Subforms/Map/FruitsFlowersEditor.resx | 120 ++++++++++++ .../Player/MiscPlayerEditor.Designer.cs | 92 +-------- .../Subforms/Player/MiscPlayerEditor.cs | 47 +---- 18 files changed, 630 insertions(+), 291 deletions(-) create mode 100644 NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.Designer.cs create mode 100644 NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.cs create mode 100644 NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.resx diff --git a/NHSE.WinForms/Editor.Designer.cs b/NHSE.WinForms/Editor.Designer.cs index 14289ac..403dc2a 100644 --- a/NHSE.WinForms/Editor.Designer.cs +++ b/NHSE.WinForms/Editor.Designer.cs @@ -41,14 +41,15 @@ private void InitializeComponent() Menu_ItemImages = new System.Windows.Forms.ToolStripMenuItem(); Menu_Options = new System.Windows.Forms.ToolStripMenuItem(); Menu_Language = new System.Windows.Forms.ToolStripComboBox(); - Menu_Settings = new System.Windows.Forms.ToolStripMenuItem(); Menu_Theme = new System.Windows.Forms.ToolStripMenuItem(); Menu_Theme_System = new System.Windows.Forms.ToolStripMenuItem(); Menu_Theme_Classic = new System.Windows.Forms.ToolStripMenuItem(); Menu_Theme_Dark = new System.Windows.Forms.ToolStripMenuItem(); + Menu_Settings = new System.Windows.Forms.ToolStripMenuItem(); CM_Picture = new System.Windows.Forms.ContextMenuStrip(components); Menu_SavePNG = new System.Windows.Forms.ToolStripMenuItem(); Tab_Map = new System.Windows.Forms.TabPage(); + B_EditFruitFlower = new System.Windows.Forms.Button(); B_EditCampsite = new System.Windows.Forms.Button(); NUD_WeatherSeed = new System.Windows.Forms.NumericUpDown(); L_WeatherSeed = new System.Windows.Forms.Label(); @@ -64,7 +65,6 @@ private void InitializeComponent() B_EditLandFlags = new System.Windows.Forms.ToolStripMenuItem(); B_EditFieldItems = new System.Windows.Forms.ToolStripMenuItem(); B_EditBulletin = new System.Windows.Forms.ToolStripMenuItem(); - B_EditFieldGoods = new System.Windows.Forms.ToolStripMenuItem(); B_EditMuseum_Click = new System.Windows.Forms.ToolStripMenuItem(); B_EditVisitors = new System.Windows.Forms.ToolStripMenuItem(); B_EditPRODesigns = new System.Windows.Forms.Button(); @@ -217,42 +217,42 @@ private void InitializeComponent() Menu_Language.Size = new System.Drawing.Size(115, 23); Menu_Language.SelectedIndexChanged += Menu_Language_SelectedIndexChanged; // - // Menu_Settings - // - Menu_Settings.Name = "Menu_Settings"; - Menu_Settings.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P; - Menu_Settings.Size = new System.Drawing.Size(180, 22); - Menu_Settings.Text = "Settings"; - Menu_Settings.Click += Menu_Settings_Click; - // // Menu_Theme // Menu_Theme.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { Menu_Theme_System, Menu_Theme_Classic, Menu_Theme_Dark }); Menu_Theme.Name = "Menu_Theme"; - Menu_Theme.Size = new System.Drawing.Size(180, 22); + Menu_Theme.Size = new System.Drawing.Size(175, 22); Menu_Theme.Text = "Theme"; // // Menu_Theme_System // Menu_Theme_System.Name = "Menu_Theme_System"; - Menu_Theme_System.Size = new System.Drawing.Size(180, 22); + Menu_Theme_System.Size = new System.Drawing.Size(152, 22); Menu_Theme_System.Text = "System Theme"; Menu_Theme_System.Click += Menu_Theme_System_Click; // // Menu_Theme_Classic // Menu_Theme_Classic.Name = "Menu_Theme_Classic"; - Menu_Theme_Classic.Size = new System.Drawing.Size(180, 22); + Menu_Theme_Classic.Size = new System.Drawing.Size(152, 22); Menu_Theme_Classic.Text = "Light (Classic)"; Menu_Theme_Classic.Click += Menu_Theme_Classic_Click; // // Menu_Theme_Dark // Menu_Theme_Dark.Name = "Menu_Theme_Dark"; - Menu_Theme_Dark.Size = new System.Drawing.Size(180, 22); + Menu_Theme_Dark.Size = new System.Drawing.Size(152, 22); Menu_Theme_Dark.Text = "Dark"; Menu_Theme_Dark.Click += Menu_Theme_Dark_Click; // + // Menu_Settings + // + Menu_Settings.Name = "Menu_Settings"; + Menu_Settings.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P; + Menu_Settings.Size = new System.Drawing.Size(175, 22); + Menu_Settings.Text = "Settings"; + Menu_Settings.Click += Menu_Settings_Click; + // // CM_Picture // CM_Picture.ImageScalingSize = new System.Drawing.Size(20, 20); @@ -270,6 +270,7 @@ private void InitializeComponent() // // Tab_Map // + Tab_Map.Controls.Add(B_EditFruitFlower); Tab_Map.Controls.Add(B_EditCampsite); Tab_Map.Controls.Add(NUD_WeatherSeed); Tab_Map.Controls.Add(L_WeatherSeed); @@ -294,6 +295,18 @@ private void InitializeComponent() Tab_Map.Text = "Map"; Tab_Map.UseVisualStyleBackColor = true; // + // B_EditFruitFlower + // + B_EditFruitFlower.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + B_EditFruitFlower.Location = new System.Drawing.Point(236, 194); + B_EditFruitFlower.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_EditFruitFlower.Name = "B_EditFruitFlower"; + B_EditFruitFlower.Size = new System.Drawing.Size(107, 46); + B_EditFruitFlower.TabIndex = 67; + B_EditFruitFlower.Text = "Edit Island Fruits + Flowers"; + B_EditFruitFlower.UseVisualStyleBackColor = true; + B_EditFruitFlower.Click += B_EditFruitFlower_Click; + // // B_EditCampsite // B_EditCampsite.Location = new System.Drawing.Point(121, 195); @@ -319,7 +332,7 @@ private void InitializeComponent() // L_WeatherSeed // L_WeatherSeed.AutoSize = true; - L_WeatherSeed.Location = new System.Drawing.Point(351, 76); + L_WeatherSeed.Location = new System.Drawing.Point(351, 70); 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); @@ -415,9 +428,9 @@ private void InitializeComponent() // CM_EditMap // CM_EditMap.ImageScalingSize = new System.Drawing.Size(20, 20); - CM_EditMap.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { B_EditLandFlags, B_EditFieldItems, B_EditBulletin, B_EditFieldGoods, B_EditMuseum_Click, B_EditVisitors }); + CM_EditMap.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { B_EditLandFlags, B_EditFieldItems, B_EditBulletin, B_EditMuseum_Click, B_EditVisitors }); CM_EditMap.Name = "CM_EditMap"; - CM_EditMap.Size = new System.Drawing.Size(172, 136); + CM_EditMap.Size = new System.Drawing.Size(172, 114); // // B_EditLandFlags // @@ -440,13 +453,6 @@ private void InitializeComponent() B_EditBulletin.Text = "Edit Bulletin Board"; B_EditBulletin.Click += B_EditBulletin_Click; // - // B_EditFieldGoods - // - B_EditFieldGoods.Name = "B_EditFieldGoods"; - B_EditFieldGoods.Size = new System.Drawing.Size(171, 22); - B_EditFieldGoods.Text = "Edit Field Goods"; - B_EditFieldGoods.Click += B_EditFieldGoods_Click; - // // B_EditMuseum_Click // B_EditMuseum_Click.Name = "B_EditMuseum_Click"; @@ -982,7 +988,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Hemisphere; private System.Windows.Forms.ComboBox CB_Hemisphere; private System.Windows.Forms.ToolStripMenuItem B_EditPlayerReactions; - private System.Windows.Forms.ToolStripMenuItem B_EditFieldGoods; private System.Windows.Forms.ToolStripMenuItem B_EditLandFlags; private System.Windows.Forms.ToolStripMenuItem B_EditPlayerMisc; private System.Windows.Forms.Label L_AirportColor; @@ -1003,6 +1008,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_Theme_System; private System.Windows.Forms.ToolStripMenuItem Menu_Theme_Classic; private System.Windows.Forms.ToolStripMenuItem Menu_Theme_Dark; + private System.Windows.Forms.Button B_EditFruitFlower; } } diff --git a/NHSE.WinForms/Editor.cs b/NHSE.WinForms/Editor.cs index 84c4f68..5a93cb8 100644 --- a/NHSE.WinForms/Editor.cs +++ b/NHSE.WinForms/Editor.cs @@ -216,7 +216,7 @@ private void ThemeChangeDialog(int theme) WinFormsUtil.SetApplicationTheme(theme); Application.Restart(); } - else if(resultButton == noButton) + else if (resultButton == noButton) { WinFormsUtil.SetApplicationTheme(theme); Application.Restart(); @@ -561,6 +561,14 @@ private void B_EditCampsite_Click(object sender, EventArgs e) editor.ShowDialog(); } + private void B_EditFruitFlower_Click(object sender, EventArgs e) + { + var player = SAV.Players[PlayerIndex]; + var save = SAV.Main; + using var editor = new FruitsFlowersEditor(player, save); + editor.ShowDialog(); + } + private void B_EditBulletin_Click(object sender, EventArgs e) { var boxed = SAV.Main.Bulletin; diff --git a/NHSE.WinForms/Resources/text/lang_de.txt b/NHSE.WinForms/Resources/text/lang_de.txt index 29a7ae3..19234a4 100644 --- a/NHSE.WinForms/Resources/text/lang_de.txt +++ b/NHSE.WinForms/Resources/text/lang_de.txt @@ -1,8 +1,10 @@ AchievementEditor=Record Editor BuildingHelp=Building Help BulkSpawn=Bulk Spawn +CampsiteEditor=Campingplatz Editor FieldItemEditor=Field Item Editor FlagEditor=Flag Editor +FruitsFlowersEditor=Obst und Blumen-Editor ItemReceivedEditor=Received Item List Editor LandFlagEditor=Flag Editor MiscPlayerEditor=Misc Player Detail Editor @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=Dump Villager Editor.B_EditAchievements=Edit Achievements Editor.B_EditBulletin=Edit Bulletin Board +Editor.B_EditCampsite=Edit Campsite Editor.B_EditDesignsTailor=Edit Tailor Designs Editor.B_EditDIYTimer=Edit DIY Timer Editor.B_EditFieldGoods=Edit Field Goods Editor.B_EditFieldItems=Edit Field Items +Editor.B_EditFruitFlower=Inselfrüchte und blumen bearbeiten Editor.B_EditFurniture=Edit Furniture Editor.B_EditHouses=Edit House Editor.B_EditLandFlags=Edit Flags @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=Box All Villagers Editor.B_RecycleBin=Edit Recycle Bin Editor.B_ReplaceVillager=Replace Villager Editor.B_SetPhraseOriginal=Original -Editor.B_EditCampsite=Edit Campsite Editor.CHK_VillagerMovingOut=Moving Out Editor.L_AirportColor=Airport Color Editor.L_BankBells=Bank Bells: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=Dark Editor.Tab_Map=Map Editor.Tab_Players=Players Editor.Tab_Villagers=Villagers +CampsiteEditor.B_Cancel=Stornieren +CampsiteEditor.B_Save=Speichern +CampsiteEditor.L_Variant=Variante: +CampsiteEditor.L_Species=Spezies: +CampsiteEditor.L_Camper_ExternalName=Name des Besuchers: +CampsiteEditor.L_Camper_InternalName=Dorfbewohner-Code: +CampsiteEditor.L_Camper_Edit=Besucher bearbeiten: +CampsiteEditor.L_CampsiteUnlockStatus=Der Campingplatz ist in diesem Speicherstand derzeit nicht freigeschaltet. +CampsiteEditor.L_CampDate=Termin für den Campbesuch festlegen: FieldItemEditor.B_Cancel=Cancel FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=Dump Acre @@ -227,6 +239,10 @@ FlagEditor.B_Dump=Dump FlagEditor.B_Load=Load FlagEditor.B_Save=Save FlagEditor.L_Count=Value: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=Obst (Lokal + Reisepass) +FruitsFlowersEditor.L_ProfileSisterFruit=Obst (Schwester) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=Blume (Lokal) +FruitsFlowersEditor.L_ProfileSisterFlower=Blume (Schwester) ItemReceivedEditor.B_AllArt=Give All Art ItemReceivedEditor.B_AllBugs=Give All Bugs ItemReceivedEditor.B_AllDive=Give All Dive @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=Save MiscPlayerEditor.CHK_CustomItem=Custom MiscPlayerEditor.CHK_ProfileMadeVillage=Made Village MiscPlayerEditor.L_Birthday=Birthday (M/D): -MiscPlayerEditor.L_ProfileSpecialtyFruit=Obst (Lokal) -MiscPlayerEditor.L_ProfileSisterFruit=Obst (Schwester) -MiscPlayerEditor.L_ProfileSpecialtyFlower=Blume (Lokal) -MiscPlayerEditor.L_ProfileSisterFlower=Blume (Schwester) +MiscPlayerEditor.L_ProfileSpecialtyFruit=Obst (Reisepass) MiscPlayerEditor.L_ProfileTimestamp=Timestamp MiscPlayerEditor.Tab_Misc=Misc MiscPlayerEditor.Tab_Profile=Profile @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=Island: VillagerMemoryEditor.LBL_Name=Name: VillagerMemoryEditor.Tab_Flags=Flags VillagerMemoryEditor.Tab_Greet=Greet -VillagerMemoryEditor.Tab_Misc=Misc -CampsiteEditor.B_Cancel=Stornieren -CampsiteEditor.B_Save=Speichern -CampsiteEditor.L_Variant=Variante: -CampsiteEditor.L_Species=Spezies: -CampsiteEditor.L_Camper_ExternalName=Name des Besuchers: -CampsiteEditor.L_Camper_InternalName=Dorfbewohner-Code: -CampsiteEditor.L_Camper_Edit=Besucher bearbeiten: -CampsiteEditor.L_CampsiteUnlockStatus=Der Campingplatz ist in diesem Speicherstand derzeit nicht freigeschaltet. -CampsiteEditor.L_CampDate=Termin für den Campbesuch festlegen: +VillagerMemoryEditor.Tab_Misc=Misc \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_en.txt b/NHSE.WinForms/Resources/text/lang_en.txt index 440653c..bcb1895 100644 --- a/NHSE.WinForms/Resources/text/lang_en.txt +++ b/NHSE.WinForms/Resources/text/lang_en.txt @@ -1,8 +1,10 @@ AchievementEditor=Record Editor BuildingHelp=Building Help BulkSpawn=Bulk Spawn +CampsiteEditor=Campsite Editor FieldItemEditor=Field Item Editor FlagEditor=Flag Editor +FruitsFlowersEditor=Fruits and Flowers Editor ItemReceivedEditor=Received Item List Editor LandFlagEditor=Flag Editor MiscPlayerEditor=Misc Player Detail Editor @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=Dump Villager Editor.B_EditAchievements=Edit Achievements Editor.B_EditBulletin=Edit Bulletin Board +Editor.B_EditCampsite=Edit Campsite Editor.B_EditDesignsTailor=Edit Tailor Designs Editor.B_EditDIYTimer=Edit DIY Timer Editor.B_EditFieldGoods=Edit Field Goods Editor.B_EditFieldItems=Edit Field Items +Editor.B_EditFruitFlower=Edit Island Fruits + Flowers Editor.B_EditFurniture=Edit Furniture Editor.B_EditHouses=Edit House Editor.B_EditLandFlags=Edit Flags @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=Box All Villagers Editor.B_RecycleBin=Edit Recycle Bin Editor.B_ReplaceVillager=Replace Villager Editor.B_SetPhraseOriginal=Original -Editor.B_EditCampsite=Edit Campsite Editor.CHK_VillagerMovingOut=Moving Out Editor.L_AirportColor=Airport Color Editor.L_BankBells=Bank Bells: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=Dark Editor.Tab_Map=Map Editor.Tab_Players=Players Editor.Tab_Villagers=Villagers +CampsiteEditor.B_Cancel=Cancel +CampsiteEditor.B_Save=Save +CampsiteEditor.L_Variant=Variant: +CampsiteEditor.L_Species=Species: +CampsiteEditor.L_Camper_ExternalName=Visitor Name: +CampsiteEditor.L_Camper_InternalName=Villager Code: +CampsiteEditor.L_Camper_Edit=Edit Visitor: +CampsiteEditor.L_CampsiteUnlockStatus=Campsite is not currently unlocked on this save. +CampsiteEditor.L_CampDate=Set Camp Visit Date: FieldItemEditor.B_Cancel=Cancel FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=Dump Acre @@ -227,6 +239,10 @@ FlagEditor.B_Dump=Dump FlagEditor.B_Load=Load FlagEditor.B_Save=Save FlagEditor.L_Count=Value: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=Fruit (Local + Passport) +FruitsFlowersEditor.L_ProfileSisterFruit=Fruit (Sister) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=Flower (Local) +FruitsFlowersEditor.L_ProfileSisterFlower=Flower (Sister) ItemReceivedEditor.B_AllArt=Give All Art ItemReceivedEditor.B_AllBugs=Give All Bugs ItemReceivedEditor.B_AllDive=Give All Dive @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=Save MiscPlayerEditor.CHK_CustomItem=Custom MiscPlayerEditor.CHK_ProfileMadeVillage=Made Village MiscPlayerEditor.L_Birthday=Birthday (M/D): -MiscPlayerEditor.L_ProfileSpecialtyFruit=Fruit (Local) -MiscPlayerEditor.L_ProfileSisterFruit=Fruit (Sister) -MiscPlayerEditor.L_ProfileSpecialtyFlower=Flower (Local) -MiscPlayerEditor.L_ProfileSisterFlower=Flower (Sister) +MiscPlayerEditor.L_ProfileSpecialtyFruit=Fruit (Passport) MiscPlayerEditor.L_ProfileTimestamp=Timestamp MiscPlayerEditor.Tab_Misc=Misc MiscPlayerEditor.Tab_Profile=Profile @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=Island: VillagerMemoryEditor.LBL_Name=Name: VillagerMemoryEditor.Tab_Flags=Flags VillagerMemoryEditor.Tab_Greet=Greet -VillagerMemoryEditor.Tab_Misc=Misc -CampsiteEditor.B_Cancel=Cancel -CampsiteEditor.B_Save=Save -CampsiteEditor.L_Variant=Variant: -CampsiteEditor.L_Species=Species: -CampsiteEditor.L_Camper_ExternalName=Visitor Name: -CampsiteEditor.L_Camper_InternalName=Villager Code: -CampsiteEditor.L_Camper_Edit=Edit Visitor: -CampsiteEditor.L_CampsiteUnlockStatus=Campsite is not currently unlocked on this save. -CampsiteEditor.L_CampDate=Set Camp Visit Date: +VillagerMemoryEditor.Tab_Misc=Misc \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_es.txt b/NHSE.WinForms/Resources/text/lang_es.txt index 23f443b..f65048d 100644 --- a/NHSE.WinForms/Resources/text/lang_es.txt +++ b/NHSE.WinForms/Resources/text/lang_es.txt @@ -1,8 +1,10 @@ AchievementEditor=Editor de Récords BuildingHelp=Ayuda de Construcción BulkSpawn=Aumentar Spawn +CampsiteEditor=Editor de Camping FieldItemEditor=Editor de Objetos (Terreno) FlagEditor=Editor de Flags +FruitsFlowersEditor=Editor de Frutas y Flores ItemReceivedEditor=Editor de Objetos Recibidos LandFlagEditor= Editor de Flags MuseumEditor=Editor de Flags @@ -43,10 +45,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=Respaldar Ciudadano Editor.B_EditAchievements=Editar Logros Editor.B_EditBulletin=Editar Tablón de Anuncios +Editor.B_EditCampsite=Edit Campsite Editor.B_EditDesignsTailor=Editar Diseños de Sastre Editor.B_EditDIYTimer=Edit DIY Timer Editor.B_EditFieldGoods=Editar Bienes (Terreno) Editor.B_EditFieldItems=Editar Objetos (Terreno) +Editor.B_EditFruitFlower=Editar Frutas y Flores de la Isla Editor.B_EditFurniture=Editar Muebles Editor.B_EditHouses=Editar Casa Editor.B_EditLandFlags=Editar Flags @@ -77,7 +81,6 @@ Editor.B_MoveOutAllVillagers=Box All Villagers Editor.B_RecycleBin=Editar Papelera de Reciclaje Editor.B_ReplaceVillager=Replace Villager Editor.B_SetPhraseOriginal=Original -Editor.B_EditCampsite=Edit Campsite Editor.CHK_VillagerMovingOut=Moviebdo Afuera Editor.L_AirportColor=Color de Aeropuerto Editor.L_BankBells=Bayas (Banco): @@ -114,6 +117,15 @@ Editor.Menu_Theme_Dark=Dark Editor.Tab_Map=Mapa Editor.Tab_Players=Jugadores Editor.Tab_Villagers=Ciudadanos +CampsiteEditor.B_Cancel=Cancelar +CampsiteEditor.B_Save=Guardar +CampsiteEditor.L_Variant=Variante: +CampsiteEditor.L_Species=Especies: +CampsiteEditor.L_Camper_ExternalName=Nombre del visitante: +CampsiteEditor.L_Camper_InternalName=Código de aldeano: +CampsiteEditor.L_Camper_Edit=Editar Visitante: +CampsiteEditor.L_CampsiteUnlockStatus=El camping no está desbloqueado actualmente en este guardado. +CampsiteEditor.L_CampDate=Establecer fecha de visita al campamento: FieldItemEditor.B_Cancel=Cancelar FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=Guardar Acre @@ -226,6 +238,10 @@ FlagEditor.B_Dump=Respaldar FlagEditor.B_Load=Cargar FlagEditor.B_Save=Guardar FlagEditor.L_Count=Valor: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=Fruta (Local + Pasaporte) +FruitsFlowersEditor.L_ProfileSisterFruit=Fruta (Sister) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=Flor (Local) +FruitsFlowersEditor.L_ProfileSisterFlower=Flor (Sister) ItemReceivedEditor.B_AllArt=Far Toda el Arte ItemReceivedEditor.B_AllBugs=Dar Todos los Bichos ItemReceivedEditor.B_AllDive=Give All Dive @@ -246,10 +262,7 @@ MiscPlayerEditor.B_Save=Guardar MiscPlayerEditor.CHK_CustomItem=Custom MiscPlayerEditor.CHK_ProfileMadeVillage=Ciudadano Hecho MiscPlayerEditor.L_Birthday=Cumpleaños (M/D): -MiscPlayerEditor.L_ProfileSpecialtyFruit=Fruta (Local) -MiscPlayerEditor.L_ProfileSisterFruit=Fruta (Sister) -MiscPlayerEditor.L_ProfileSpecialtyFlower=Flor (Local) -MiscPlayerEditor.L_ProfileSisterFlower=Flor (Sister) +MiscPlayerEditor.L_ProfileSpecialtyFruit=Fruta (Pasaporte) MiscPlayerEditor.L_ProfileTimestamp=Timestamp MiscPlayerEditor.Tab_Misc=Misc. MiscPlayerEditor.Tab_Profile=Perfil @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=Island: VillagerMemoryEditor.LBL_Name=Name: VillagerMemoryEditor.Tab_Flags=Flags VillagerMemoryEditor.Tab_Greet=Saludo -VillagerMemoryEditor.Tab_Misc=Misc. -CampsiteEditor.B_Cancel=Cancelar -CampsiteEditor.B_Save=Guardar -CampsiteEditor.L_Variant=Variante: -CampsiteEditor.L_Species=Especies: -CampsiteEditor.L_Camper_ExternalName=Nombre del visitante: -CampsiteEditor.L_Camper_InternalName=Código de aldeano: -CampsiteEditor.L_Camper_Edit=Editar Visitante: -CampsiteEditor.L_CampsiteUnlockStatus=El camping no está desbloqueado actualmente en este guardado. -CampsiteEditor.L_CampDate=Establecer fecha de visita al campamento: +VillagerMemoryEditor.Tab_Misc=Misc. \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_fr.txt b/NHSE.WinForms/Resources/text/lang_fr.txt index 5eb49be..7eeaab4 100644 --- a/NHSE.WinForms/Resources/text/lang_fr.txt +++ b/NHSE.WinForms/Resources/text/lang_fr.txt @@ -1,8 +1,10 @@ AchievementEditor=Éditeur d'enregistrement BuildingHelp=Aide à la construction BulkSpawn=Spawn en vrac +CampsiteEditor=Éditeur de camping FieldItemEditor=Éditeur d'élément de champ FlagEditor=Éditeur de drapeau +FruitsFlowersEditor=Éditeur de fruits et fleurs ItemReceivedEditor=Éditeur de liste d'articles reçus LandFlagEditor=Éditeur de drapeau MiscPlayerEditor=Éditeur de détails du lecteur divers @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=Dump Villager Editor.B_EditAchievements=Edit Achievements Editor.B_EditBulletin=Edit Bulletin Board +Editor.B_EditCampsite=Edit Campsite Editor.B_EditDesignsTailor=Edit Tailor Designs Editor.B_EditDIYTimer=Edit DIY Timer Editor.B_EditFieldGoods=Edit Field Goods Editor.B_EditFieldItems=Edit Field Items +Editor.B_EditFruitFlower=Modifier les fruits et fleurs de l'île Editor.B_EditFurniture=Edit Furniture Editor.B_EditHouses=Edit House Editor.B_EditLandFlags=Edit Flags @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=Box All Villagers Editor.B_RecycleBin=Edit Recycle Bin Editor.B_ReplaceVillager=Replace Villager Editor.B_SetPhraseOriginal=Original -Editor.B_EditCampsite=Edit Campsite Editor.CHK_VillagerMovingOut=Moving Out Editor.L_AirportColor=Airport Color Editor.L_BankBells=Bank Bells: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=Dark Editor.Tab_Map=Map Editor.Tab_Players=Players Editor.Tab_Villagers=Villagers +CampsiteEditor.B_Cancel=Annuler +CampsiteEditor.B_Save=Enregistrer +CampsiteEditor.L_Variant=Variante: +CampsiteEditor.L_Species=Espèces: +CampsiteEditor.L_Camper_ExternalName=Nom du visiteur: +CampsiteEditor.L_Camper_InternalName=Code villageois: +CampsiteEditor.L_Camper_Edit=Modifier le visiteur: +CampsiteEditor.L_CampsiteUnlockStatus=Le camping n'est pas débloqué pour le moment dans cette sauvegarde. +CampsiteEditor.L_CampDate=Fixez la date de visite du camp: FieldItemEditor.B_Cancel=Cancel FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=Dump Acre @@ -227,6 +239,10 @@ FlagEditor.B_Dump=Dump FlagEditor.B_Load=Load FlagEditor.B_Save=Save FlagEditor.L_Count=Value: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=Fruit (Local + Passeport) +FruitsFlowersEditor.L_ProfileSisterFruit=Fruit (Sœur) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=Fleur (Local) +FruitsFlowersEditor.L_ProfileSisterFlower=Fleur (Sœur) ItemReceivedEditor.B_AllArt=Give All Art ItemReceivedEditor.B_AllBugs=Give All Bugs ItemReceivedEditor.B_AllDive=Give All Dive @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=Save MiscPlayerEditor.CHK_CustomItem=Custom MiscPlayerEditor.CHK_ProfileMadeVillage=Made Village MiscPlayerEditor.L_Birthday=Birthday (M/D): -MiscPlayerEditor.L_ProfileSpecialtyFruit=Fruit (Local) -MiscPlayerEditor.L_ProfileSisterFruit=Fruit (Sœur) -MiscPlayerEditor.L_ProfileSpecialtyFlower=Fleur (Local) -MiscPlayerEditor.L_ProfileSisterFlower=Fleur (Sœur) +MiscPlayerEditor.L_ProfileSpecialtyFruit=Fruit (Passeport) MiscPlayerEditor.L_ProfileTimestamp=Timestamp MiscPlayerEditor.Tab_Misc=Misc MiscPlayerEditor.Tab_Profile=Profile @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=Island: VillagerMemoryEditor.LBL_Name=Name: VillagerMemoryEditor.Tab_Flags=Flags VillagerMemoryEditor.Tab_Greet=Greet -VillagerMemoryEditor.Tab_Misc=Misc -CampsiteEditor.B_Cancel=Annuler -CampsiteEditor.B_Save=Enregistrer -CampsiteEditor.L_Variant=Variante: -CampsiteEditor.L_Species=Espèces: -CampsiteEditor.L_Camper_ExternalName=Nom du visiteur: -CampsiteEditor.L_Camper_InternalName=Code villageois: -CampsiteEditor.L_Camper_Edit=Modifier le visiteur: -CampsiteEditor.L_CampsiteUnlockStatus=Le camping n'est pas débloqué pour le moment dans cette sauvegarde. -CampsiteEditor.L_CampDate=Fixez la date de visite du camp: +VillagerMemoryEditor.Tab_Misc=Misc \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_it.txt b/NHSE.WinForms/Resources/text/lang_it.txt index ce2fa1b..d9f786f 100644 --- a/NHSE.WinForms/Resources/text/lang_it.txt +++ b/NHSE.WinForms/Resources/text/lang_it.txt @@ -1,8 +1,10 @@ AchievementEditor=Modifica Record BuildingHelp=Aiuto Costruzione BulkSpawn=Genera in massa +CampsiteEditor=Editore Campeggio FieldItemEditor=Modifica oggetti sul terreno FlagEditor=Modifica Flag +FruitsFlowersEditor=Editore Frutta e Fiori ItemReceivedEditor=Modifica catalogo LandFlagEditor=Modifica Flag MiscPlayerEditor=Modifica dettagli giocatore @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=Esporta Residente Editor.B_EditAchievements=Modifica Achievement Editor.B_EditBulletin=Modifica Albo +Editor.B_EditCampsite=Modifica Campeggio Editor.B_EditDesignsTailor=Modifica Modelli Stilista Editor.B_EditDIYTimer=Edit DIY Timer Editor.B_EditFieldGoods=Modifica Beni Terreni Editor.B_EditFieldItems=Modifica Oggetti Sul Terreno +Editor.B_EditFruitFlower=Modifica Frutta e Fiori dell'Isola Editor.B_EditFurniture=Modifica Oggetto Di Arredo Editor.B_EditHouses=Modifica Casa Editor.B_EditLandFlags=Modifica Flag Terreno @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=Box All Villagers Editor.B_RecycleBin=Modifica Cestino Editor.B_ReplaceVillager=Replace Villager Editor.B_SetPhraseOriginal=Original -Editor.B_EditCampsite=Modifica Campeggio Editor.CHK_VillagerMovingOut=Trasloco Residente Editor.L_AirportColor=Colore Aeroporto Editor.L_BankBells=Stelline Banca: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=Scuro Editor.Tab_Map=Mappa Editor.Tab_Players=Giocatori Editor.Tab_Villagers=Residenti +CampsiteEditor.B_Cancel=Cancellare +CampsiteEditor.B_Save=Salva +CampsiteEditor.L_Variant=Variante: +CampsiteEditor.L_Species=Specie: +CampsiteEditor.L_Camper_ExternalName=Nome del visitatore: +CampsiteEditor.L_Camper_InternalName=Codice del villico: +CampsiteEditor.L_Camper_Edit=Modifica visitatore: +CampsiteEditor.L_CampsiteUnlockStatus=Al momento, il campeggio non è sbloccato in questo salvataggio. +CampsiteEditor.L_CampDate=Imposta la data della visita al campo: FieldItemEditor.B_Cancel=Indietro FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=Esporta Sezione @@ -227,6 +239,10 @@ FlagEditor.B_Dump=Esporta FlagEditor.B_Load=Carica FlagEditor.B_Save=Salva FlagEditor.L_Count=Valore: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=Frutto (Locale + Passaporto) +FruitsFlowersEditor.L_ProfileSisterFruit=Frutto (Sorella) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=Fiore (Locale) +FruitsFlowersEditor.L_ProfileSisterFlower=Fiore (Sorella) ItemReceivedEditor.B_AllArt=Tutte le opere d'arte ItemReceivedEditor.B_AllBugs=Tutti gli insetti ItemReceivedEditor.B_AllDive=Give All Dive @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=Salva MiscPlayerEditor.CHK_CustomItem=Personale MiscPlayerEditor.CHK_ProfileMadeVillage=Isola Creata MiscPlayerEditor.L_Birthday=Compleanno (M/G): -MiscPlayerEditor.L_ProfileSpecialtyFruit=Frutto (Locale) -MiscPlayerEditor.L_ProfileSisterFruit=Frutto (Sorella) -MiscPlayerEditor.L_ProfileSpecialtyFlower=Fiore (Locale) -MiscPlayerEditor.L_ProfileSisterFlower=Fiore (Sorella) +MiscPlayerEditor.L_ProfileSpecialtyFruit=Frutto (Passaporto) MiscPlayerEditor.L_ProfileTimestamp=Registrazione MiscPlayerEditor.Tab_Misc=Altro MiscPlayerEditor.Tab_Profile=Profilo @@ -498,13 +511,4 @@ VillagerMemoryEditor.LBL_Name=Name: VillagerMemoryEditor.Tab_Flags=Flags VillagerMemoryEditor.Tab_Greet=Saluti VillagerMemoryEditor.Tab_Misc=Altro -VillagmoderMemoryEditor.L_Greeting3=Saluto 3: -CampsiteEditor.B_Cancel=Cancellare -CampsiteEditor.B_Save=Salva -CampsiteEditor.L_Variant=Variante: -CampsiteEditor.L_Species=Specie: -CampsiteEditor.L_Camper_ExternalName=Nome del visitatore: -CampsiteEditor.L_Camper_InternalName=Codice del villico: -CampsiteEditor.L_Camper_Edit=Modifica visitatore: -CampsiteEditor.L_CampsiteUnlockStatus=Al momento, il campeggio non è sbloccato in questo salvataggio. -CampsiteEditor.L_CampDate=Imposta la data della visita al campo: +VillagmoderMemoryEditor.L_Greeting3=Saluto 3: \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_jp.txt b/NHSE.WinForms/Resources/text/lang_jp.txt index b69df31..d0e2578 100644 --- a/NHSE.WinForms/Resources/text/lang_jp.txt +++ b/NHSE.WinForms/Resources/text/lang_jp.txt @@ -1,8 +1,10 @@ AchievementEditor=Record Editor BuildingHelp=Building Help BulkSpawn=Bulk Spawn +CampsiteEditor=キャンプ場エディター FieldItemEditor=Field Item Editor FlagEditor=Flag Editor +FruitsFlowersEditor=フルーツと花エディター ItemReceivedEditor=Received Item List Editor LandFlagEditor=Flag Editor MiscPlayerEditor=Misc Player Detail Editor @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=Dump Villager Editor.B_EditAchievements=Edit Achievements Editor.B_EditBulletin=Edit Bulletin Board +Editor.B_EditCampsite=キャンプ場を編集 Editor.B_EditDesignsTailor=Edit Tailor Designs Editor.B_EditDIYTimer=Edit DIY Timer Editor.B_EditFieldGoods=Edit Field Goods Editor.B_EditFieldItems=Edit Field Items +Editor.B_EditFruitFlower=島のフルーツと花を編集 Editor.B_EditFurniture=Edit Furniture Editor.B_EditHouses=Edit House Editor.B_EditLandFlags=Edit Flags @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=Box All Villagers Editor.B_RecycleBin=Edit Recycle Bin Editor.B_ReplaceVillager=Replace Villager Editor.B_SetPhraseOriginal=Original -Editor.B_EditCampsite=キャンプ場を編集 Editor.CHK_VillagerMovingOut=Moving Out Editor.L_AirportColor=Airport Color Editor.L_BankBells=Bank Bells: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=ダークモード Editor.Tab_Map=Map Editor.Tab_Players=Players Editor.Tab_Villagers=Villagers +CampsiteEditor.B_Cancel=キャンセル +CampsiteEditor.B_Save=保存 +CampsiteEditor.L_Variant=変異体： +CampsiteEditor.L_Species=種： +CampsiteEditor.L_Camper_ExternalName=村人の名前: +CampsiteEditor.L_Camper_InternalName=村人コード: +CampsiteEditor.L_Camper_Edit=訪問者を編集: +CampsiteEditor.L_CampsiteUnlockStatus=このセーブではキャンプ場は現在ロック解除されていません。 +CampsiteEditor.L_CampDate=キャンプ訪問日を設定: FieldItemEditor.B_Cancel=Cancel FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=Dump Acre @@ -227,6 +239,10 @@ FlagEditor.B_Dump=Dump FlagEditor.B_Load=Load FlagEditor.B_Save=Save FlagEditor.L_Count=Value: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=果物（地元+パスポート） +FruitsFlowersEditor.L_ProfileSisterFruit=果物 (姉妹) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=花 (地元) +FruitsFlowersEditor.L_ProfileSisterFlower=花 (姉妹) ItemReceivedEditor.B_AllArt=Give All Art ItemReceivedEditor.B_AllBugs=Give All Bugs ItemReceivedEditor.B_AllDive=Give All Dive @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=Save MiscPlayerEditor.CHK_CustomItem=Custom MiscPlayerEditor.CHK_ProfileMadeVillage=Made Village MiscPlayerEditor.L_Birthday=Birthday (M/D): -MiscPlayerEditor.L_ProfileSpecialtyFruit=果物（地元） -MiscPlayerEditor.L_ProfileSisterFruit=果物 (姉妹) -MiscPlayerEditor.L_ProfileSpecialtyFlower=花 (地元) -MiscPlayerEditor.L_ProfileSisterFlower=花 (姉妹) +MiscPlayerEditor.L_ProfileSpecialtyFruit=果物（パスポート） MiscPlayerEditor.L_ProfileTimestamp=Timestamp MiscPlayerEditor.Tab_Misc=Misc MiscPlayerEditor.Tab_Profile=Profile @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=Island: VillagerMemoryEditor.LBL_Name=Name: VillagerMemoryEditor.Tab_Flags=Flags VillagerMemoryEditor.Tab_Greet=Greet -VillagerMemoryEditor.Tab_Misc=Misc -CampsiteEditor.B_Cancel=キャンセル -CampsiteEditor.B_Save=保存 -CampsiteEditor.L_Variant=変異体： -CampsiteEditor.L_Species=種： -CampsiteEditor.L_Camper_ExternalName=村人の名前: -CampsiteEditor.L_Camper_InternalName=村人コード: -CampsiteEditor.L_Camper_Edit=訪問者を編集: -CampsiteEditor.L_CampsiteUnlockStatus=このセーブではキャンプ場は現在ロック解除されていません。 -CampsiteEditor.L_CampDate=キャンプ訪問日を設定: +VillagerMemoryEditor.Tab_Misc=Misc \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_ko.txt b/NHSE.WinForms/Resources/text/lang_ko.txt index c327f3c..22ae1ec 100644 --- a/NHSE.WinForms/Resources/text/lang_ko.txt +++ b/NHSE.WinForms/Resources/text/lang_ko.txt @@ -1,8 +1,10 @@ AchievementEditor=업적 편집기 BuildingHelp=건물 도움말 BulkSpawn=대량 생성 +CampsiteEditor=캠프장 편집기 FieldItemEditor=필드 아이템 편집기 FlagEditor=플래그 편집기 +FruitsFlowersEditor=과일 및 꽃 편집기 ItemReceivedEditor=수령 아이템 목록 편집기 LandFlagEditor=플래그 편집기 MiscPlayerEditor=기타 플레이어 상세 편집기 @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=주민 덤프 Editor.B_EditAchievements=업적 편집 Editor.B_EditBulletin=게시판 편집 +Editor.B_EditCampsite=캠핑장 편집 Editor.B_EditDesignsTailor=재봉소 디자인 편집 Editor.B_EditDIYTimer=DIY 타이머 편집 Editor.B_EditFieldGoods=필드 물품 편집 Editor.B_EditFieldItems=필드 아이템 편집 +Editor.B_EditFruitFlower=섬 과일 및 꽃 편집 Editor.B_EditFurniture=가구 편집 Editor.B_EditHouses=집 편집 Editor.B_EditLandFlags=플래그 편집 @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=모든 주민 짐싸기 Editor.B_RecycleBin=재활용함 편집 Editor.B_ReplaceVillager=주민 교체 Editor.B_SetPhraseOriginal=원본 -Editor.B_EditCampsite=캠핑장 편집 Editor.CHK_VillagerMovingOut=이사 준비 Editor.L_AirportColor=공항 색상 Editor.L_BankBells=은행 벨: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=다크 모드 Editor.Tab_Map=지도 Editor.Tab_Players=플레이어 Editor.Tab_Villagers=주민 +CampsiteEditor.B_Cancel=취소 +CampsiteEditor.B_Save=구하다 +CampsiteEditor.L_Variant=변종: +CampsiteEditor.L_Species=종: +CampsiteEditor.L_Camper_ExternalName=방문자 이름: +CampsiteEditor.L_Camper_InternalName=마을 주민 코드: +CampsiteEditor.L_Camper_Edit=방문자 정보 수정: +CampsiteEditor.L_CampsiteUnlockStatus=현재 이 저장 파일에서는 캠프장이 잠금 해제되지 않았습니다. +CampsiteEditor.L_CampDate=캠프 방문 날짜를 정하세요: FieldItemEditor.B_Cancel=취소 FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=에이커 덤프 @@ -227,6 +239,10 @@ FlagEditor.B_Dump=덤프 FlagEditor.B_Load=불러오기 FlagEditor.B_Save=저장 FlagEditor.L_Count=값: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=과일(현지+여권) +FruitsFlowersEditor.L_ProfileSisterFruit=과일 (자매) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=꽃 (현지) +FruitsFlowersEditor.L_ProfileSisterFlower=꽃 (자매) ItemReceivedEditor.B_AllArt=모든 미술품 지급 ItemReceivedEditor.B_AllBugs=모든 벌레 지급 ItemReceivedEditor.B_AllDive=모든 해산물 지급 @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=저장 MiscPlayerEditor.CHK_CustomItem=사용자 지정 MiscPlayerEditor.CHK_ProfileMadeVillage=마을 생성 MiscPlayerEditor.L_Birthday=생일 (월/일): -MiscPlayerEditor.L_ProfileSpecialtyFruit=과일(현지) -MiscPlayerEditor.L_ProfileSisterFruit=과일 (자매) -MiscPlayerEditor.L_ProfileSpecialtyFlower=꽃 (현지) -MiscPlayerEditor.L_ProfileSisterFlower=꽃 (자매) +MiscPlayerEditor.L_ProfileSpecialtyFruit=과일(여권) MiscPlayerEditor.L_ProfileTimestamp=타임스탬프 MiscPlayerEditor.Tab_Misc=기타 MiscPlayerEditor.Tab_Profile=프로필 @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=섬: VillagerMemoryEditor.LBL_Name=이름: VillagerMemoryEditor.Tab_Flags=플래그 VillagerMemoryEditor.Tab_Greet=인사 -VillagerMemoryEditor.Tab_Misc=기타 -CampsiteEditor.B_Cancel=취소 -CampsiteEditor.B_Save=구하다 -CampsiteEditor.L_Variant=변종: -CampsiteEditor.L_Species=종: -CampsiteEditor.L_Camper_ExternalName=방문자 이름: -CampsiteEditor.L_Camper_InternalName=마을 주민 코드: -CampsiteEditor.L_Camper_Edit=방문자 정보 수정: -CampsiteEditor.L_CampsiteUnlockStatus=현재 이 저장 파일에서는 캠프장이 잠금 해제되지 않았습니다. -CampsiteEditor.L_CampDate=캠프 방문 날짜를 정하세요: +VillagerMemoryEditor.Tab_Misc=기타 \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_zhs.txt b/NHSE.WinForms/Resources/text/lang_zhs.txt index c28011c..9b4ba98 100644 --- a/NHSE.WinForms/Resources/text/lang_zhs.txt +++ b/NHSE.WinForms/Resources/text/lang_zhs.txt @@ -1,8 +1,10 @@ AchievementEditor=记录编辑器 BuildingHelp=建筑帮助 BulkSpawn=Bulk Spawn +CampsiteEditor=营地编辑器 FieldItemEditor=地皮编辑器 FlagEditor=属性编辑器 +FruitsFlowersEditor=水果和鲜花编辑器 ItemReceivedEditor=收藏清单编辑器 LandFlagEditor=参数编辑器 MiscPlayerEditor=杂项编辑器 @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=导出岛民 Editor.B_EditAchievements=编辑成就 Editor.B_EditBulletin=编辑布告栏 +Editor.B_EditCampsite=编辑露营地 Editor.B_EditDesignsTailor=编辑裁缝设计 Editor.B_EditDIYTimer=编辑DIY时间 Editor.B_EditFieldGoods=编辑地表物品 Editor.B_EditFieldItems=编辑地皮 +Editor.B_EditFruitFlower=编辑岛屿水果和鲜花 Editor.B_EditFurniture=编辑家具 Editor.B_EditHouses=编辑房屋 Editor.B_EditLandFlags=编辑属性 @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=赶走所有岛民 Editor.B_RecycleBin=编辑回收箱 Editor.B_ReplaceVillager=替换村民 Editor.B_SetPhraseOriginal=初始口头禅 -Editor.B_EditCampsite=编辑露营地 Editor.CHK_VillagerMovingOut=赶走岛民 Editor.L_AirportColor=机场颜色 Editor.L_BankBells=银行存款: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=深色模式 Editor.Tab_Map=地图 Editor.Tab_Players=玩家 Editor.Tab_Villagers=岛民 +CampsiteEditor.B_Cancel=取消 +CampsiteEditor.B_Save=节省 +CampsiteEditor.L_Variant=变体: +CampsiteEditor.L_Species=物种： +CampsiteEditor.L_Camper_ExternalName=访客姓名： +CampsiteEditor.L_Camper_InternalName=村民代码： +CampsiteEditor.L_Camper_Edit=编辑访客： +CampsiteEditor.L_CampsiteUnlockStatus=此存档中露营地尚未解锁。 +CampsiteEditor.L_CampDate=确定营地参观日期： FieldItemEditor.B_Cancel=取消 FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=导出耕地 @@ -227,6 +239,10 @@ FlagEditor.B_Dump=导出 FlagEditor.B_Load=导入 FlagEditor.B_Save=保存 FlagEditor.L_Count=数值: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=水果（当地+护照） +FruitsFlowersEditor.L_ProfileSisterFruit=水果 (姐妹) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=花 (当地) +FruitsFlowersEditor.L_ProfileSisterFlower=花 (姐妹) ItemReceivedEditor.B_AllArt=获得所有美术品 ItemReceivedEditor.B_AllBugs=获得所有虫子 ItemReceivedEditor.B_AllDive=获得所有潜水服 @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=保存 MiscPlayerEditor.CHK_CustomItem=自定义 MiscPlayerEditor.CHK_ProfileMadeVillage=已建立村庄 MiscPlayerEditor.L_Birthday=生日 (月/日): -MiscPlayerEditor.L_ProfileSpecialtyFruit=水果（当地） -MiscPlayerEditor.L_ProfileSisterFruit=水果 (姐妹) -MiscPlayerEditor.L_ProfileSpecialtyFlower=花 (当地) -MiscPlayerEditor.L_ProfileSisterFlower=花 (姐妹) +MiscPlayerEditor.L_ProfileSpecialtyFruit=水果（护照） MiscPlayerEditor.L_ProfileTimestamp=登岛日 MiscPlayerEditor.Tab_Misc=杂项 MiscPlayerEditor.Tab_Profile=个人信息 @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=岛屿名称: VillagerMemoryEditor.LBL_Name=玩家名称: VillagerMemoryEditor.Tab_Flags=参数 VillagerMemoryEditor.Tab_Greet=打招呼 -VillagerMemoryEditor.Tab_Misc=杂项 -CampsiteEditor.B_Cancel=取消 -CampsiteEditor.B_Save=节省 -CampsiteEditor.L_Variant=变体: -CampsiteEditor.L_Species=物种： -CampsiteEditor.L_Camper_ExternalName=访客姓名： -CampsiteEditor.L_Camper_InternalName=村民代码： -CampsiteEditor.L_Camper_Edit=编辑访客： -CampsiteEditor.L_CampsiteUnlockStatus=此存档中露营地尚未解锁。 -CampsiteEditor.L_CampDate=确定营地参观日期： +VillagerMemoryEditor.Tab_Misc=杂项 \ No newline at end of file diff --git a/NHSE.WinForms/Resources/text/lang_zht.txt b/NHSE.WinForms/Resources/text/lang_zht.txt index a9304d5..bd2704b 100644 --- a/NHSE.WinForms/Resources/text/lang_zht.txt +++ b/NHSE.WinForms/Resources/text/lang_zht.txt @@ -1,8 +1,10 @@ AchievementEditor=成就編輯器 BuildingHelp=建築說明 BulkSpawn=Bulk Spawn +CampsiteEditor=營地編輯器 FieldItemEditor=地皮編輯器 FlagEditor=屬性編輯器 +FruitsFlowersEditor=水果和鮮花編輯器 ItemReceivedEditor=目錄清單編輯器 LandFlagEditor=參數編輯器 MiscPlayerEditor=雜項編輯器 @@ -44,10 +46,12 @@ BulkSpawn.L_Y=Y: Editor.B_DumpVillager=導出島民 Editor.B_EditAchievements=編輯成就 Editor.B_EditBulletin=編輯佈告欄 +Editor.B_EditCampsite=編輯露營地 Editor.B_EditDesignsTailor=編輯裁縫設計 Editor.B_EditDIYTimer=Edit DIY Timer Editor.B_EditFieldGoods=編輯地表物品 Editor.B_EditFieldItems=編輯地皮 +Editor.B_EditFruitFlower=編輯島嶼水果和鮮花 Editor.B_EditFurniture=編輯家具 Editor.B_EditHouses=編輯房屋 Editor.B_EditLandFlags=編輯屬性 @@ -78,7 +82,6 @@ Editor.B_MoveOutAllVillagers=Box All Villagers Editor.B_RecycleBin=編輯回收箱 Editor.B_ReplaceVillager=Replace Villager Editor.B_SetPhraseOriginal=Original -Editor.B_EditCampsite=編輯露營地 Editor.CHK_VillagerMovingOut=趕走島民 Editor.L_AirportColor=機場顏色 Editor.L_BankBells=銀行存款: @@ -115,6 +118,15 @@ Editor.Menu_Theme_Dark=深色模式 Editor.Tab_Map=地圖 Editor.Tab_Players=玩家 Editor.Tab_Villagers=島民 +CampsiteEditor.B_Cancel=取消 +CampsiteEditor.B_Save=節省 +CampsiteEditor.L_Variant=變體： +CampsiteEditor.L_Species=物種： +CampsiteEditor.L_Camper_ExternalName=訪客姓名： +CampsiteEditor.L_Camper_InternalName=村民代碼： +CampsiteEditor.L_Camper_Edit=編輯訪客 +CampsiteEditor.L_CampsiteUnlockStatus=此存檔中露營地尚未解鎖。 +CampsiteEditor.L_CampDate=確定營地參觀日期： FieldItemEditor.B_Cancel=取消 FieldItemEditor.B_Down=↓ FieldItemEditor.B_DumpAcre=導出耕地 @@ -227,6 +239,10 @@ FlagEditor.B_Dump=導出 FlagEditor.B_Load=導入 FlagEditor.B_Save=儲存 FlagEditor.L_Count=數值: +FruitsFlowersEditor.L_ProfileSpecialtyFruit=水果（当地+護照） +FruitsFlowersEditor.L_ProfileSisterFruit=水果 (姊妹) +FruitsFlowersEditor.L_ProfileSpecialtyFlower=花 (当地) +FruitsFlowersEditor.L_ProfileSisterFlower=花 (姊妹) ItemReceivedEditor.B_AllArt=獲得所有美術品 ItemReceivedEditor.B_AllBugs=獲得所有蟲子 ItemReceivedEditor.B_AllDive=Give All Dive @@ -247,10 +263,7 @@ MiscPlayerEditor.B_Save=儲存 MiscPlayerEditor.CHK_CustomItem=自訂 MiscPlayerEditor.CHK_ProfileMadeVillage=已建立村莊 MiscPlayerEditor.L_Birthday=生日 (月/日): -MiscPlayerEditor.L_ProfileSpecialtyFruit=水果（当地） -MiscPlayerEditor.L_ProfileSisterFruit=水果 (姊妹) -MiscPlayerEditor.L_ProfileSpecialtyFlower=花 (当地) -MiscPlayerEditor.L_ProfileSisterFlower=花 (姊妹) +MiscPlayerEditor.L_ProfileSpecialtyFruit=水果（護照） MiscPlayerEditor.L_ProfileTimestamp=Timestamp MiscPlayerEditor.Tab_Misc=雜項 MiscPlayerEditor.Tab_Profile=個人資訊 @@ -497,13 +510,4 @@ VillagerMemoryEditor.LBL_IslandName=Island: VillagerMemoryEditor.LBL_Name=Name: VillagerMemoryEditor.Tab_Flags=參數 VillagerMemoryEditor.Tab_Greet=打招呼 -VillagerMemoryEditor.Tab_Misc=雜項 -CampsiteEditor.B_Cancel=取消 -CampsiteEditor.B_Save=節省 -CampsiteEditor.L_Variant=變體： -CampsiteEditor.L_Species=物種： -CampsiteEditor.L_Camper_ExternalName=訪客姓名： -CampsiteEditor.L_Camper_InternalName=村民代碼： -CampsiteEditor.L_Camper_Edit=編輯訪客 -CampsiteEditor.L_CampsiteUnlockStatus=此存檔中露營地尚未解鎖。 -CampsiteEditor.L_CampDate=確定營地參觀日期： +VillagerMemoryEditor.Tab_Misc=雜項 \ No newline at end of file diff --git a/NHSE.WinForms/Subforms/Map/CampsiteEditor.Designer.cs b/NHSE.WinForms/Subforms/Map/CampsiteEditor.Designer.cs index 1712c85..f36fe72 100644 --- a/NHSE.WinForms/Subforms/Map/CampsiteEditor.Designer.cs +++ b/NHSE.WinForms/Subforms/Map/CampsiteEditor.Designer.cs @@ -244,9 +244,11 @@ private void InitializeComponent() Controls.Add(NUD_Species); Controls.Add(L_Species); Controls.Add(PB_Villager); + FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; Icon = Properties.Resources.icon; + MaximizeBox = false; Name = "CampsiteEditor"; - SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; Text = "Campsite Editor"; ((System.ComponentModel.ISupportInitialize)PB_Villager).EndInit(); ((System.ComponentModel.ISupportInitialize)NUD_Variant).EndInit(); diff --git a/NHSE.WinForms/Subforms/Map/CampsiteEditor.cs b/NHSE.WinForms/Subforms/Map/CampsiteEditor.cs index e5037f6..be0df1d 100644 --- a/NHSE.WinForms/Subforms/Map/CampsiteEditor.cs +++ b/NHSE.WinForms/Subforms/Map/CampsiteEditor.cs @@ -22,6 +22,8 @@ private void ChangeVillager() public CampsiteEditor(HorizonSave sav) { InitializeComponent(); + this.TranslateInterface(GameInfo.CurrentLanguage); + SAV = sav; CheckCampsiteStatus(); diff --git a/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.Designer.cs b/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.Designer.cs new file mode 100644 index 0000000..2b4596c --- /dev/null +++ b/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.Designer.cs @@ -0,0 +1,181 @@ +namespace NHSE.WinForms +{ + partial class FruitsFlowersEditor + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + CB_SisterFlower = new System.Windows.Forms.ComboBox(); + CB_ProfileFlower = new System.Windows.Forms.ComboBox(); + L_ProfileSisterFlower = new System.Windows.Forms.Label(); + L_ProfileSpecialtyFlower = new System.Windows.Forms.Label(); + RIS_SisterFruit = new RestrictedItemSelect(); + L_ProfileSisterFruit = new System.Windows.Forms.Label(); + RIS_ProfileFruit = new RestrictedItemSelect(); + L_ProfileSpecialtyFruit = new System.Windows.Forms.Label(); + B_Cancel = new System.Windows.Forms.Button(); + B_Save = new System.Windows.Forms.Button(); + SuspendLayout(); + // + // CB_SisterFlower + // + CB_SisterFlower.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + CB_SisterFlower.FormattingEnabled = true; + CB_SisterFlower.Location = new System.Drawing.Point(186, 106); + CB_SisterFlower.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CB_SisterFlower.Name = "CB_SisterFlower"; + CB_SisterFlower.Size = new System.Drawing.Size(162, 23); + CB_SisterFlower.TabIndex = 71; + // + // CB_ProfileFlower + // + CB_ProfileFlower.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + CB_ProfileFlower.FormattingEnabled = true; + CB_ProfileFlower.Location = new System.Drawing.Point(9, 106); + CB_ProfileFlower.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CB_ProfileFlower.Name = "CB_ProfileFlower"; + CB_ProfileFlower.Size = new System.Drawing.Size(164, 23); + CB_ProfileFlower.TabIndex = 70; + // + // L_ProfileSisterFlower + // + L_ProfileSisterFlower.AutoSize = true; + L_ProfileSisterFlower.Location = new System.Drawing.Point(183, 88); + L_ProfileSisterFlower.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_ProfileSisterFlower.Name = "L_ProfileSisterFlower"; + L_ProfileSisterFlower.Size = new System.Drawing.Size(81, 15); + L_ProfileSisterFlower.TabIndex = 69; + L_ProfileSisterFlower.Text = "Flower (Sister)"; + // + // L_ProfileSpecialtyFlower + // + L_ProfileSpecialtyFlower.AutoSize = true; + L_ProfileSpecialtyFlower.Location = new System.Drawing.Point(6, 88); + L_ProfileSpecialtyFlower.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_ProfileSpecialtyFlower.Name = "L_ProfileSpecialtyFlower"; + L_ProfileSpecialtyFlower.Size = new System.Drawing.Size(81, 15); + L_ProfileSpecialtyFlower.TabIndex = 68; + L_ProfileSpecialtyFlower.Text = "Flower (Local)"; + // + // RIS_SisterFruit + // + RIS_SisterFruit.Location = new System.Drawing.Point(186, 26); + RIS_SisterFruit.Margin = new System.Windows.Forms.Padding(5, 3, 5, 3); + RIS_SisterFruit.Name = "RIS_SisterFruit"; + RIS_SisterFruit.Size = new System.Drawing.Size(167, 55); + RIS_SisterFruit.TabIndex = 67; + // + // L_ProfileSisterFruit + // + L_ProfileSisterFruit.AutoSize = true; + L_ProfileSisterFruit.Location = new System.Drawing.Point(182, 8); + L_ProfileSisterFruit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_ProfileSisterFruit.Name = "L_ProfileSisterFruit"; + L_ProfileSisterFruit.Size = new System.Drawing.Size(70, 15); + L_ProfileSisterFruit.TabIndex = 66; + L_ProfileSisterFruit.Text = "Fruit (Sister)"; + // + // RIS_ProfileFruit + // + RIS_ProfileFruit.Location = new System.Drawing.Point(9, 26); + RIS_ProfileFruit.Margin = new System.Windows.Forms.Padding(5, 3, 5, 3); + RIS_ProfileFruit.Name = "RIS_ProfileFruit"; + RIS_ProfileFruit.Size = new System.Drawing.Size(167, 55); + RIS_ProfileFruit.TabIndex = 65; + // + // L_ProfileSpecialtyFruit + // + L_ProfileSpecialtyFruit.AutoSize = true; + L_ProfileSpecialtyFruit.Location = new System.Drawing.Point(6, 8); + L_ProfileSpecialtyFruit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_ProfileSpecialtyFruit.Name = "L_ProfileSpecialtyFruit"; + L_ProfileSpecialtyFruit.Size = new System.Drawing.Size(70, 15); + L_ProfileSpecialtyFruit.TabIndex = 64; + L_ProfileSpecialtyFruit.Text = "Fruit (Local)"; + // + // B_Cancel + // + B_Cancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + B_Cancel.Location = new System.Drawing.Point(173, 157); + B_Cancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_Cancel.Name = "B_Cancel"; + B_Cancel.Size = new System.Drawing.Size(84, 27); + B_Cancel.TabIndex = 73; + B_Cancel.Text = "Cancel"; + B_Cancel.UseVisualStyleBackColor = true; + B_Cancel.Click += B_Cancel_Click; + // + // B_Save + // + B_Save.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + B_Save.Location = new System.Drawing.Point(264, 157); + B_Save.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_Save.Name = "B_Save"; + B_Save.Size = new System.Drawing.Size(84, 27); + B_Save.TabIndex = 72; + B_Save.Text = "Save"; + B_Save.UseVisualStyleBackColor = true; + B_Save.Click += B_Save_Click; + // + // FruitsFlowersEditor + // + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + ClientSize = new System.Drawing.Size(361, 196); + Controls.Add(B_Cancel); + Controls.Add(B_Save); + Controls.Add(CB_SisterFlower); + Controls.Add(CB_ProfileFlower); + Controls.Add(L_ProfileSisterFlower); + Controls.Add(L_ProfileSpecialtyFlower); + Controls.Add(RIS_SisterFruit); + Controls.Add(L_ProfileSisterFruit); + Controls.Add(RIS_ProfileFruit); + Controls.Add(L_ProfileSpecialtyFruit); + FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + Icon = Properties.Resources.icon; + MaximizeBox = false; + Name = "FruitsFlowersEditor"; + StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + Text = "Fruits Flowers Editor"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private System.Windows.Forms.ComboBox CB_SisterFlower; + private System.Windows.Forms.ComboBox CB_ProfileFlower; + private System.Windows.Forms.Label L_ProfileSisterFlower; + private System.Windows.Forms.Label L_ProfileSpecialtyFlower; + private RestrictedItemSelect RIS_SisterFruit; + private System.Windows.Forms.Label L_ProfileSisterFruit; + private RestrictedItemSelect RIS_ProfileFruit; + private System.Windows.Forms.Label L_ProfileSpecialtyFruit; + private System.Windows.Forms.Button B_Cancel; + private System.Windows.Forms.Button B_Save; + } +} \ No newline at end of file diff --git a/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.cs b/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.cs new file mode 100644 index 0000000..3501aa7 --- /dev/null +++ b/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.cs @@ -0,0 +1,103 @@ +using NHSE.Core; +using NHSE.Sprites; +using System; +using System.Runtime.Intrinsics.Arm; +using System.Windows.Forms; + +namespace NHSE.WinForms; + +public partial class FruitsFlowersEditor : Form +{ + private readonly Player Player; + private readonly MainSave Save; + + public FruitsFlowersEditor(Player p, MainSave s) + { + InitializeComponent(); + this.TranslateInterface(GameInfo.CurrentLanguage); + Player = p; + Save = s; + + var fruitsSpecialty = ComboItemUtil.GetArray(GameLists.Fruits, GameInfo.Strings.itemlistdisplay); + RIS_ProfileFruit.Initialize(fruitsSpecialty); + + var fruitsSister = ComboItemUtil.GetArray(GameLists.Fruits, GameInfo.Strings.itemlistdisplay); + RIS_SisterFruit.Initialize(fruitsSister); + + LoadFruitsFlowers(); + } + + private void LoadFruitsFlowers() + { + var p = Player; + var pers = p.Personal; + + var sav = Save; + + RIS_ProfileFruit.Value = pers.ProfileFruit; + RIS_SisterFruit.Value = sav.SisterFruit; + + var flowersProfile = Enum.GetNames(); + CB_ProfileFlower.Items.AddRange(flowersProfile); + CB_ProfileFlower.SelectedIndex = (int)sav.SpecialtyFlower; + + var flowersSister = Enum.GetNames(); + CB_SisterFlower.Items.AddRange(flowersSister); + CB_SisterFlower.SelectedIndex = (int)sav.SisterFlower; + } + + private void B_Cancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void B_Save_Click(object sender, EventArgs e) + { + SaveFruitsFlowers(); + + DialogResult = DialogResult.OK; + Close(); + } + + public void UpdateFruitFlags(MainSave sav) + { + var fruit = new byte[] { 00, 00, 00, 00, 00 }; + switch (sav.SpecialtyFruit) + { + case 2213: // Apple + fruit[0] = 01; + break; + case 2287: // Cherry + fruit[4] = 01; + break; + case 2214: // Orange + fruit[1] = 01; + break; + case 2286: // Peach + fruit[3] = 01; + break; + case 2285: // Pear + fruit[2] = 01; + break; + } + sav.FruitFlags = fruit; + } + + private void SaveFruitsFlowers() + { + var p = Player; + var pers = p.Personal; + + var sav = Save; + + pers.ProfileFruit = RIS_ProfileFruit.Value; + sav.SpecialtyFruit = RIS_ProfileFruit.Value; + sav.SisterFruit = RIS_SisterFruit.Value; + UpdateFruitFlags(sav); + + sav.SpecialtyFlower = (IslandFlowers)CB_ProfileFlower.SelectedIndex; + sav.SisterFlower = (IslandFlowers)CB_SisterFlower.SelectedIndex; + } +} + diff --git a/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.resx b/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/NHSE.WinForms/Subforms/Map/FruitsFlowersEditor.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.Designer.cs b/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.Designer.cs index 631ad46..7728177 100644 --- a/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.Designer.cs +++ b/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.Designer.cs @@ -36,12 +36,6 @@ private void InitializeComponent() tabControl1 = new System.Windows.Forms.TabControl(); Tab_Misc = new System.Windows.Forms.TabPage(); Tab_Profile = new System.Windows.Forms.TabPage(); - CB_SisterFlower = new System.Windows.Forms.ComboBox(); - CB_ProfileFlower = new System.Windows.Forms.ComboBox(); - L_ProfileSisterFlower = new System.Windows.Forms.Label(); - L_ProfileSpecialtyFlower = new System.Windows.Forms.Label(); - RIS_SisterFruit = new RestrictedItemSelect(); - L_ProfileSisterFruit = new System.Windows.Forms.Label(); RIS_ProfileFruit = new RestrictedItemSelect(); CAL_ProfileTimestamp = new System.Windows.Forms.DateTimePicker(); CHK_ProfileMadeVillage = new System.Windows.Forms.CheckBox(); @@ -57,7 +51,7 @@ private void InitializeComponent() // B_Cancel // B_Cancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; - B_Cancel.Location = new System.Drawing.Point(211, 279); + B_Cancel.Location = new System.Drawing.Point(211, 233); B_Cancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_Cancel.Name = "B_Cancel"; B_Cancel.Size = new System.Drawing.Size(84, 27); @@ -69,7 +63,7 @@ private void InitializeComponent() // B_Save // B_Save.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; - B_Save.Location = new System.Drawing.Point(302, 279); + B_Save.Location = new System.Drawing.Point(302, 233); B_Save.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_Save.Name = "B_Save"; B_Save.Size = new System.Drawing.Size(84, 27); @@ -117,7 +111,7 @@ private void InitializeComponent() tabControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); tabControl1.Name = "tabControl1"; tabControl1.SelectedIndex = 0; - tabControl1.Size = new System.Drawing.Size(372, 258); + tabControl1.Size = new System.Drawing.Size(372, 212); tabControl1.TabIndex = 12; // // Tab_Misc @@ -136,12 +130,6 @@ private void InitializeComponent() // // Tab_Profile // - Tab_Profile.Controls.Add(CB_SisterFlower); - Tab_Profile.Controls.Add(CB_ProfileFlower); - Tab_Profile.Controls.Add(L_ProfileSisterFlower); - Tab_Profile.Controls.Add(L_ProfileSpecialtyFlower); - Tab_Profile.Controls.Add(RIS_SisterFruit); - Tab_Profile.Controls.Add(L_ProfileSisterFruit); Tab_Profile.Controls.Add(RIS_ProfileFruit); Tab_Profile.Controls.Add(CAL_ProfileTimestamp); Tab_Profile.Controls.Add(CHK_ProfileMadeVillage); @@ -151,69 +139,11 @@ private void InitializeComponent() Tab_Profile.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); Tab_Profile.Name = "Tab_Profile"; Tab_Profile.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - Tab_Profile.Size = new System.Drawing.Size(364, 230); + Tab_Profile.Size = new System.Drawing.Size(364, 184); Tab_Profile.TabIndex = 1; Tab_Profile.Text = "Profile"; Tab_Profile.UseVisualStyleBackColor = true; // - // CB_SisterFlower - // - CB_SisterFlower.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - CB_SisterFlower.FormattingEnabled = true; - CB_SisterFlower.Location = new System.Drawing.Point(187, 162); - CB_SisterFlower.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - CB_SisterFlower.Name = "CB_SisterFlower"; - CB_SisterFlower.Size = new System.Drawing.Size(162, 23); - CB_SisterFlower.TabIndex = 63; - // - // CB_ProfileFlower - // - CB_ProfileFlower.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - CB_ProfileFlower.FormattingEnabled = true; - CB_ProfileFlower.Location = new System.Drawing.Point(10, 162); - CB_ProfileFlower.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - CB_ProfileFlower.Name = "CB_ProfileFlower"; - CB_ProfileFlower.Size = new System.Drawing.Size(164, 23); - CB_ProfileFlower.TabIndex = 62; - // - // L_ProfileSisterFlower - // - L_ProfileSisterFlower.AutoSize = true; - L_ProfileSisterFlower.Location = new System.Drawing.Point(184, 144); - L_ProfileSisterFlower.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - L_ProfileSisterFlower.Name = "L_ProfileSisterFlower"; - L_ProfileSisterFlower.Size = new System.Drawing.Size(81, 15); - L_ProfileSisterFlower.TabIndex = 21; - L_ProfileSisterFlower.Text = "Flower (Sister)"; - // - // L_ProfileSpecialtyFlower - // - L_ProfileSpecialtyFlower.AutoSize = true; - L_ProfileSpecialtyFlower.Location = new System.Drawing.Point(7, 144); - L_ProfileSpecialtyFlower.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - L_ProfileSpecialtyFlower.Name = "L_ProfileSpecialtyFlower"; - L_ProfileSpecialtyFlower.Size = new System.Drawing.Size(42, 15); - L_ProfileSpecialtyFlower.TabIndex = 20; - L_ProfileSpecialtyFlower.Text = "Flower (Local)"; - // - // RIS_SisterFruit - // - RIS_SisterFruit.Location = new System.Drawing.Point(187, 82); - RIS_SisterFruit.Margin = new System.Windows.Forms.Padding(5, 3, 5, 3); - RIS_SisterFruit.Name = "RIS_SisterFruit"; - RIS_SisterFruit.Size = new System.Drawing.Size(167, 55); - RIS_SisterFruit.TabIndex = 19; - // - // L_ProfileSisterFruit - // - L_ProfileSisterFruit.AutoSize = true; - L_ProfileSisterFruit.Location = new System.Drawing.Point(183, 64); - L_ProfileSisterFruit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - L_ProfileSisterFruit.Name = "L_ProfileSisterFruit"; - L_ProfileSisterFruit.Size = new System.Drawing.Size(70, 15); - L_ProfileSisterFruit.TabIndex = 18; - L_ProfileSisterFruit.Text = "Fruit (Sister)"; - // // RIS_ProfileFruit // RIS_ProfileFruit.Location = new System.Drawing.Point(10, 82); @@ -233,7 +163,7 @@ private void InitializeComponent() // CHK_ProfileMadeVillage // CHK_ProfileMadeVillage.AutoSize = true; - CHK_ProfileMadeVillage.Location = new System.Drawing.Point(10, 203); + CHK_ProfileMadeVillage.Location = new System.Drawing.Point(10, 157); CHK_ProfileMadeVillage.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CHK_ProfileMadeVillage.Name = "CHK_ProfileMadeVillage"; CHK_ProfileMadeVillage.Size = new System.Drawing.Size(94, 19); @@ -247,9 +177,9 @@ private void InitializeComponent() L_ProfileSpecialtyFruit.Location = new System.Drawing.Point(7, 64); L_ProfileSpecialtyFruit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_ProfileSpecialtyFruit.Name = "L_ProfileSpecialtyFruit"; - L_ProfileSpecialtyFruit.Size = new System.Drawing.Size(89, 15); + L_ProfileSpecialtyFruit.Size = new System.Drawing.Size(76, 15); L_ProfileSpecialtyFruit.TabIndex = 14; - L_ProfileSpecialtyFruit.Text = "Fruit (Local)"; + L_ProfileSpecialtyFruit.Text = "Fruit (Profile)"; // // L_ProfileTimestamp // @@ -265,7 +195,7 @@ private void InitializeComponent() // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - ClientSize = new System.Drawing.Size(400, 319); + ClientSize = new System.Drawing.Size(400, 273); Controls.Add(tabControl1); Controls.Add(B_Cancel); Controls.Add(B_Save); @@ -301,12 +231,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_ProfileMadeVillage; private System.Windows.Forms.DateTimePicker CAL_ProfileTimestamp; private RestrictedItemSelect RIS_ProfileFruit; - private RestrictedItemSelect RIS_SisterFruit; private System.Windows.Forms.Label L_ProfileSpecialtyFruit; - private System.Windows.Forms.Label L_ProfileSisterFruit; - private System.Windows.Forms.Label L_ProfileSisterFlower; - private System.Windows.Forms.Label L_ProfileSpecialtyFlower; - private System.Windows.Forms.ComboBox CB_SisterFlower; - private System.Windows.Forms.ComboBox CB_ProfileFlower; } } diff --git a/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.cs b/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.cs index ee74cbb..a8348d5 100644 --- a/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.cs +++ b/NHSE.WinForms/Subforms/Player/MiscPlayerEditor.cs @@ -18,11 +18,8 @@ public MiscPlayerEditor(Player p, MainSave s) Player = p; Save = s; - var fruitsSpecialty = ComboItemUtil.GetArray(GameLists.Fruits, GameInfo.Strings.itemlistdisplay); - RIS_ProfileFruit.Initialize(fruitsSpecialty); - - var fruitsSister = ComboItemUtil.GetArray(GameLists.Fruits, GameInfo.Strings.itemlistdisplay); - RIS_SisterFruit.Initialize(fruitsSister); + var profileFruit = ComboItemUtil.GetArray(GameLists.Fruits, GameInfo.Strings.itemlistdisplay); + RIS_ProfileFruit.Initialize(profileFruit); LoadPlayer(); } @@ -41,15 +38,6 @@ private void LoadPlayer() CHK_ProfileMadeVillage.Checked = pers.ProfileIsMakeVillage; RIS_ProfileFruit.Value = pers.ProfileFruit; - RIS_SisterFruit.Value = sav.SisterFruit; - - var flowersProfile = Enum.GetNames(); - CB_ProfileFlower.Items.AddRange(flowersProfile); - CB_ProfileFlower.SelectedIndex = (int)sav.SpecialtyFlower; - - var flowersSister = Enum.GetNames(); - CB_SisterFlower.Items.AddRange(flowersSister); - CB_SisterFlower.SelectedIndex = (int)sav.SisterFlower; CAL_ProfileTimestamp.Value = pers.ProfileTimestamp; } @@ -62,30 +50,6 @@ private void B_Save_Click(object sender, EventArgs e) Close(); } - public void UpdateFruitFlags(MainSave sav) - { - var fruit = new byte[] { 00, 00, 00, 00, 00 }; - switch (sav.SpecialtyFruit) - { - case 2213: // Apple - fruit[0] = 01; - break; - case 2287: // Cherry - fruit[4] = 01; - break; - case 2214: // Orange - fruit[1] = 01; - break; - case 2286: // Peach - fruit[3] = 01; - break; - case 2285: // Pear - fruit[2] = 01; - break; - } - sav.FruitFlags = fruit; - } - private void SavePlayer() { var p = Player; @@ -102,13 +66,6 @@ private void SavePlayer() pers.ProfileIsMakeVillage = CHK_ProfileMadeVillage.Checked; pers.ProfileFruit = RIS_ProfileFruit.Value; - sav.SpecialtyFruit = RIS_ProfileFruit.Value; - sav.SisterFruit = RIS_SisterFruit.Value; - - UpdateFruitFlags(sav); - - sav.SpecialtyFlower = (IslandFlowers)CB_ProfileFlower.SelectedIndex; - sav.SisterFlower = (IslandFlowers)CB_SisterFlower.SelectedIndex; pers.ProfileTimestamp = CAL_ProfileTimestamp.Value; }