mirrors/Novetus_src
1
0
Fork 0
mirror of https://github.com/Novetus/Novetus_src.git synced 2025-01-31 09:41:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix extra panel not showing stats of extra items

Browse Source
This commit is contained in:
Bitl 2024-01-22 19:52:53 -07:00
parent 1cbdb9d13f
commit 4b70bf44c3
3 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs
View File

@ -441,12 +441,13 @@ class CharacterCustomizationShared
ChangeItem( ChangeItem(
GlobalVars.UserCustomization.ReadSetting("Extra"), GlobalVars.UserCustomization.ReadSetting("Extra"),
GlobalPaths.hatdir, GlobalPaths.hatdir,
"NoHat", "NoExtra",
ExtraItemImage, ExtraItemImage,
ExtraItemDesc, ExtraItemDesc,
ExtraItemList, ExtraItemList,
true, true,
GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra") GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra"),
GlobalPaths.extradir
); );
} }
break; break;
@ -661,12 +662,12 @@ class CharacterCustomizationShared
} }
} }
public void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, bool hatsinextra = false) public void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, bool hatsinextra = false, string itemdir2 = "")
{ {
ChangeItem(item, itemdir, defaultitem, outputImage, outputString, box, initial, null, hatsinextra); ChangeItem(item, itemdir, defaultitem, outputImage, outputString, box, initial, null, hatsinextra, itemdir);
} }
public void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, Provider provider, bool hatsinextra = false) public void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, Provider provider, bool hatsinextra = false, string itemdir2 = "")
{ {
if (Directory.Exists(itemdir)) if (Directory.Exists(itemdir))
{ {
@ -715,7 +716,17 @@ class CharacterCustomizationShared
} }
else else
{ {
outputString.Text = item; if (!string.IsNullOrWhiteSpace(itemdir2))
{
if (File.Exists(itemdir2 + @"\\" + item.Replace(".rbxm", "") + "_desc.txt"))
{
outputString.Text = File.ReadAllText(itemdir2 + @"\\" + item.Replace(".rbxm", "") + "_desc.txt");
}
}
else
{
outputString.Text = item;
}
} }
if (provider != null && IsItemURL(item)) if (provider != null && IsItemURL(item))
@ -724,7 +735,20 @@ class CharacterCustomizationShared
} }
else else
{ {
outputImage.Image = Util.LoadImage(itemdir + @"\\" + item.Replace(".rbxm", "") + ".png", itemdir + @"\\" + defaultitem + ".png"); if (File.Exists(itemdir + @"\\" + item.Replace(".rbxm", "") + ".png"))
{
outputImage.Image = Util.LoadImage(itemdir + @"\\" + item.Replace(".rbxm", "") + ".png", itemdir + @"\\" + defaultitem + ".png");
}
else
{
if (!string.IsNullOrWhiteSpace(itemdir2))
{
if (File.Exists(itemdir2 + @"\\" + item.Replace(".rbxm", "") + "_desc.txt"))
{
outputImage.Image = Util.LoadImage(itemdir2 + @"\\" + item.Replace(".rbxm", "") + ".png", itemdir2 + @"\\" + defaultitem + ".png");
}
}
}
} }
SaveOutfit(false); SaveOutfit(false);

10
Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs
View File

@ -632,12 +632,13 @@ public partial class CharacterCustomizationCompact : Form
characterCustomizationForm.ChangeItem( characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.ReadSetting("Extra"), GlobalVars.UserCustomization.ReadSetting("Extra"),
GlobalPaths.hatdir, GlobalPaths.hatdir,
"NoHat", "NoExtra",
pictureBox9, pictureBox9,
textBox10, textBox10,
listBox9, listBox9,
false, false,
GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra") GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra"),
GlobalPaths.extradir
); );
} }
} }
@ -681,12 +682,13 @@ public partial class CharacterCustomizationCompact : Form
characterCustomizationForm.ChangeItem( characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.ReadSetting("Extra"), GlobalVars.UserCustomization.ReadSetting("Extra"),
GlobalPaths.hatdir, GlobalPaths.hatdir,
"NoHat", "NoExtra",
pictureBox9, pictureBox9,
textBox10, textBox10,
listBox9, listBox9,
true, true,
GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra") GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra"),
GlobalPaths.extradir
); );
} }
else else

10
Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs
View File

@ -634,12 +634,13 @@ public partial class CharacterCustomizationExtended : Form
characterCustomizationForm.ChangeItem( characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.ReadSetting("Extra"), GlobalVars.UserCustomization.ReadSetting("Extra"),
GlobalPaths.hatdir, GlobalPaths.hatdir,
"NoHat", "NoExtra",
pictureBox9, pictureBox9,
textBox10, textBox10,
listBox9, listBox9,
false, false,
GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra") GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra"),
GlobalPaths.extradir
); );
} }
} }
@ -683,12 +684,13 @@ public partial class CharacterCustomizationExtended : Form
characterCustomizationForm.ChangeItem( characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.ReadSetting("Extra"), GlobalVars.UserCustomization.ReadSetting("Extra"),
GlobalPaths.hatdir, GlobalPaths.hatdir,
"NoHat", "NoExtra",
pictureBox9, pictureBox9,
textBox10, textBox10,
listBox9, listBox9,
true, true,
GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra") GlobalVars.UserCustomization.ReadSettingBool("ShowHatsInExtra"),
GlobalPaths.extradir
); );
} }
else else