diff --git a/FModel/App.config b/FModel/App.config index 82951680..c32c8ca7 100644 --- a/FModel/App.config +++ b/FModel/App.config @@ -76,6 +76,9 @@ Default + + True + diff --git a/FModel/Forms/Settings.Designer.cs b/FModel/Forms/Settings.Designer.cs index f3c56f1f..79c15454 100644 --- a/FModel/Forms/Settings.Designer.cs +++ b/FModel/Forms/Settings.Designer.cs @@ -33,6 +33,7 @@ namespace FModel.Forms this.textBox2 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.OKButton = new System.Windows.Forms.Button(); @@ -104,6 +105,7 @@ namespace FModel.Forms // groupBox2 // this.groupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.groupBox2.Controls.Add(this.checkBox1); this.groupBox2.Controls.Add(this.textBox1); this.groupBox2.Controls.Add(this.label1); this.groupBox2.Location = new System.Drawing.Point(12, 67); @@ -113,11 +115,21 @@ namespace FModel.Forms this.groupBox2.TabStop = false; this.groupBox2.Text = "Extraction"; // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(443, 21); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(116, 17); + this.checkBox1.TabIndex = 4; + this.checkBox1.Text = "Auto Open Sounds"; + this.checkBox1.UseVisualStyleBackColor = true; + // // textBox1 // this.textBox1.Location = new System.Drawing.Point(54, 19); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(500, 20); + this.textBox1.Size = new System.Drawing.Size(383, 20); this.textBox1.TabIndex = 2; // // label1 @@ -515,5 +527,6 @@ namespace FModel.Forms private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.Label label2; private System.Windows.Forms.Button button5; + private System.Windows.Forms.CheckBox checkBox1; } } diff --git a/FModel/Forms/Settings.cs b/FModel/Forms/Settings.cs index 64e10659..06ebf3b3 100644 --- a/FModel/Forms/Settings.cs +++ b/FModel/Forms/Settings.cs @@ -87,6 +87,8 @@ namespace FModel.Forms wPictureBox.Image = bmp; } + checkBox1.Checked = Properties.Settings.Default.openSound; + _oldLanguage = Properties.Settings.Default.IconLanguage; comboBox1.SelectedIndex = comboBox1.FindStringExact(Properties.Settings.Default.IconLanguage); @@ -137,6 +139,8 @@ namespace FModel.Forms LoadLocRes.LoadMySelectedLocRes(Properties.Settings.Default.IconLanguage); } + Properties.Settings.Default.openSound = checkBox1.Checked; + Properties.Settings.Default.Save(); //SAVE bmp.Dispose(); Close(); diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 2943de7f..8749b854 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -1049,6 +1049,7 @@ namespace FModel private void CreateBundleChallengesIcon(JToken theItem, string extractedBundlePath) { BundleInfos.getBundleData(theItem); + if (!BundleInfos.BundleData.Any()) { throw new ArgumentException("Not even one quest could be extracted, can't generate more about this bundle"); } bool isFortbyte = false; Bitmap bmp = new Bitmap(1024, 10000); @@ -1186,13 +1187,16 @@ namespace FModel new UpdateMyState(ThePak.CurrentUsedItem + " is a Sound", "Success").ChangeProcessState(); string soundPathToConvert = Checking.ExtractedFilePath.Substring(0, Checking.ExtractedFilePath.LastIndexOf('\\')) + "\\" + ThePak.CurrentUsedItem + ".uexp"; - string soundPathConverted = UnrealEngineDataToOgg.ConvertToOgg(soundPathToConvert); new UpdateMyState("Converting " + ThePak.CurrentUsedItem, "Processing").ChangeProcessState(); + string soundPathConverted = UnrealEngineDataToOgg.ConvertToOgg(soundPathToConvert); if (File.Exists(soundPathConverted)) { - new UpdateMyState("Opening " + ThePak.CurrentUsedItem + ".ogg", "Success").ChangeProcessState(); - Utilities.OpenWithDefaultProgramAndNoFocus(soundPathConverted); + if (Settings.Default.openSound) + { + new UpdateMyState("Opening " + ThePak.CurrentUsedItem + ".ogg", "Success").ChangeProcessState(); + Utilities.OpenWithDefaultProgramAndNoFocus(soundPathConverted); + } } else new UpdateMyState("Couldn't convert " + ThePak.CurrentUsedItem, "Error").ChangeProcessState(); diff --git a/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs b/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs index b3407b01..c61f9d03 100644 --- a/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs +++ b/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs @@ -284,7 +284,7 @@ namespace FModel } catch (KeyNotFoundException) { - new UpdateMyConsole("Can't extract " + questFile, Color.CornflowerBlue, true); + new UpdateMyConsole("Can't extract " + questFile, Color.Crimson, true).AppendToConsole(); } } } diff --git a/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs b/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs index 7b8fa37b..91802b89 100644 --- a/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs +++ b/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs @@ -65,6 +65,21 @@ namespace FModel { DrawBackground(toDrawOn, Color.FromArgb(255, 203, 35, 45), Color.FromArgb(255, 127, 14, 29), Color.FromArgb(255, 255, 67, 61)); } + else if (theSeries.Equals("CUBESeries")) + { + DrawBackground(toDrawOn, Color.FromArgb(255, 157, 0, 108), Color.FromArgb(255, 97, 0, 100), Color.FromArgb(255, 175, 27, 185)); + string cubeBG = JohnWick.AssetToTexture2D("T-Cube-Background"); + if (!string.IsNullOrEmpty(cubeBG)) + { + Image itemIcon; + using (var bmpTemp = new Bitmap(cubeBG)) + { + itemIcon = new Bitmap(bmpTemp); + } + Image opacityImage = ImageUtilities.SetImageOpacity(itemIcon, (float)0.2); + toDrawOn.DrawImage(ImageUtilities.ResizeImage(opacityImage, 512, 512), new Point(5, 5)); + } + } else { DrawRarityBackground(theItem, toDrawOn); diff --git a/FModel/Properties/Settings.Designer.cs b/FModel/Properties/Settings.Designer.cs index d570c49b..19ce5f15 100644 --- a/FModel/Properties/Settings.Designer.cs +++ b/FModel/Properties/Settings.Designer.cs @@ -286,5 +286,17 @@ namespace FModel.Properties { this["rarityDesign"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool openSound { + get { + return ((bool)(this["openSound"])); + } + set { + this["openSound"] = value; + } + } } } diff --git a/FModel/Properties/Settings.settings b/FModel/Properties/Settings.settings index 81b66002..ab320600 100644 --- a/FModel/Properties/Settings.settings +++ b/FModel/Properties/Settings.settings @@ -68,5 +68,8 @@ Default + + True + \ No newline at end of file