From f685ee29f6dc38294f773ae00af9d5eb2d2afd51 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Fri, 12 Apr 2024 20:39:19 +0200 Subject: [PATCH] AddFilePrompt - Fix Unused file type being selectable --- .../AddFilePrompt.Designer.cs | 3 +-- .../Forms/Additional-Popups/AddFilePrompt.cs | 2 +- .../Additional-Popups/AddFilePrompt.resx | 23 ++++++++----------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs index a134f856..94cfb1f4 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs @@ -105,8 +105,7 @@ resources.GetString("FileTypeComboBox.Items10"), resources.GetString("FileTypeComboBox.Items11"), resources.GetString("FileTypeComboBox.Items12"), - resources.GetString("FileTypeComboBox.Items13"), - resources.GetString("FileTypeComboBox.Items14")}); + resources.GetString("FileTypeComboBox.Items13")}); this.FileTypeComboBox.Name = "FileTypeComboBox"; this.FileTypeComboBox.Style = MetroFramework.MetroColorStyle.Blue; this.FileTypeComboBox.Theme = MetroFramework.MetroThemeStyle.Dark; diff --git a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs index 29d80d57..9e4bb343 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs @@ -12,7 +12,7 @@ namespace PckStudio.Popups /// otherwise /// public string Filepath => DialogResult == DialogResult.OK ? InputTextBox.Text : string.Empty; - public PckFileType Filetype => (PckFileType)FileTypeComboBox.SelectedIndex; + public PckFileType Filetype => (PckFileType)(FileTypeComboBox.SelectedIndex + (FileTypeComboBox.SelectedIndex >= 3 ? 1 : 0)); public AddFilePrompt(string initialText) : this(initialText, -1) { } diff --git a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.resx b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.resx index 00b928ed..fa2571de 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.resx @@ -262,39 +262,36 @@ TextureFile (*.png) - UIDataFile (UNUSED) - - InfoFile (0) - + TexturePackInfoFile (x<Resolution>Info.pck) - + LocalisationFile (languages.loc/localisation.loc) - + GameRulesFile (*.grf) - + AudioFile (*.pck) - + ColourTableFile (colours.col) - + GameRulesHeader (*.grh) - + SkinDataFile (*.pck) - + ModelsFile (models.bin) - + BehavioursFile (behaviours.bin) - + MaterialFile (entityMaterials.bin)