Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-22 01:34:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added Dark rarity + fixed unextractable quests not being displayed + Auto open sounds settings is back

Browse Source
This commit is contained in:
Asval 2019-09-11 21:58:49 +02:00
parent f1585cf51a
commit c1df41bc65
8 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FModel/App.config
View File

@ -76,6 +76,9 @@
<setting name="rarityDesign" serializeAs="String">
<value>Default</value>
</setting>
<setting name="openSound" serializeAs="String">
<value>True</value>
</setting>
</FModel.Properties.Settings>
</userSettings>
<runtime>

15
FModel/Forms/Settings.Designer.cs generated
View File

@ -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;
}
}

4
FModel/Forms/Settings.cs
View File

@ -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();

10
FModel/MainWindow.cs
View File

@ -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();

2
FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs
View File

@ -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();
}
}
}

15
FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs
View File

@ -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);

12
FModel/Properties/Settings.Designer.cs generated
View File

@ -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;
}
}
}
}

3
FModel/Properties/Settings.settings
View File

@ -68,5 +68,8 @@
<Setting Name="rarityDesign" Type="System.String" Scope="User">
<Value Profile="(Default)">Default</Value>
</Setting>
<Setting Name="openSound" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>