diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
index bfdd211e..ad662a2e 100644
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -91,8 +91,8 @@
..\packages\TweetMoaSharp.6.0.0\lib\4.5\Hammock.ClientProfile.dll
-
- ..\packages\HtmlAgilityPack.1.11.8\lib\Net45\HtmlAgilityPack.dll
+
+ ..\packages\HtmlAgilityPack.1.11.9\lib\Net45\HtmlAgilityPack.dll
..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
diff --git a/FModel/Forms/AESManager.Designer.cs b/FModel/Forms/AESManager.Designer.cs
index c05c6cc6..bf94107c 100644
--- a/FModel/Forms/AESManager.Designer.cs
+++ b/FModel/Forms/AESManager.Designer.cs
@@ -106,6 +106,7 @@
//
// linkLabel1
//
+ this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(12, 296);
this.linkLabel1.Name = "linkLabel1";
@@ -125,9 +126,11 @@
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.OKButton);
this.Controls.Add(this.groupBox3);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
+ this.MinimumSize = new System.Drawing.Size(605, 364);
this.Name = "AESManager";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "AES Manager";
diff --git a/FModel/Methods/IconGenerator/DrawText.cs b/FModel/Methods/IconGenerator/DrawText.cs
index b22917bc..4263675c 100644
--- a/FModel/Methods/IconGenerator/DrawText.cs
+++ b/FModel/Methods/IconGenerator/DrawText.cs
@@ -350,15 +350,15 @@ namespace FModel
Parser.Weapons.WeaponStatParser statParsed = Parser.Weapons.WeaponStatParser.FromJson(token.ToString());
Image bulletImage = Resources.dmg64;
- myGraphic.DrawImage(ImageUtilities.ResizeImage(bulletImage, 15, 15), new Point(5, 500));
+ myGraphic.DrawImage(ImageUtilities.ResizeImage(bulletImage, 15, 15), new Point(5, 502));
DrawToLeft(" " + statParsed.DmgPb, myGraphic); //damage per bullet
Image clipSizeImage = Resources.clipSize64;
- myGraphic.DrawImage(ImageUtilities.ResizeImage(clipSizeImage, 15, 15), new Point(52, 500));
+ myGraphic.DrawImage(ImageUtilities.ResizeImage(clipSizeImage, 15, 15), new Point(52, 502));
myGraphic.DrawString(" " + statParsed.ClipSize, new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(50, 503));
Image reload = Resources.reload64;
- myGraphic.DrawImage(ImageUtilities.ResizeImage(reload, 15, 15), new Point(50 + (statParsed.ClipSize.ToString().Length * 7) + 47, 500)); //50=clipsize text position | for each clipsize letter we add 7 to x | 47=difference between 2 icons
+ myGraphic.DrawImage(ImageUtilities.ResizeImage(reload, 15, 15), new Point(50 + (statParsed.ClipSize.ToString().Length * 7) + 47, 502)); //50=clipsize text position | for each clipsize letter we add 7 to x | 47=difference between 2 icons
myGraphic.DrawString(statParsed.ReloadTime + " " + SearchResource.getTextByKey("6BA53D764BA5CC13E821D2A807A72365", "seconds"), new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(64 + (statParsed.ClipSize.ToString().Length * 7) + 47, 503)); //64=50+icon size (-1 because that wasn't perfectly at the position i wanted)
DrawToRight(weaponName, myGraphic);
diff --git a/FModel/Methods/IconGenerator/ItemIcon.cs b/FModel/Methods/IconGenerator/ItemIcon.cs
index 9ed9ee1f..22ac92cc 100644
--- a/FModel/Methods/IconGenerator/ItemIcon.cs
+++ b/FModel/Methods/IconGenerator/ItemIcon.cs
@@ -211,7 +211,6 @@ namespace FModel
{
try
{
- ThePak.CurrentUsedItem = catName;
string catalogFilePath = (ThePak.CurrentUsedPakGuid != null && ThePak.CurrentUsedPakGuid != "0-0-0-0")
? catalogFilePath = JohnWick.ExtractAsset(ThePak.CurrentUsedPak, catName)
: catalogFilePath = JohnWick.ExtractAsset(ThePak.AllpaksDictionary[catName], catName);
@@ -226,6 +225,7 @@ namespace FModel
{
if (JohnWick.MyAsset.GetSerialized() != null)
{
+ ThePak.CurrentUsedItem = catName;
string parsedJson = JToken.Parse(JohnWick.MyAsset.GetSerialized()).ToString();
var featuredId = FeaturedParser.FromJson(parsedJson);
for (int i = 0; i < featuredId.Length; i++)
diff --git a/FModel/packages.config b/FModel/packages.config
index 78e1bac3..09ed13dc 100644
--- a/FModel/packages.config
+++ b/FModel/packages.config
@@ -1,7 +1,7 @@
-
+