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

remove characterfuncs

Browse Source
This commit is contained in:
Bitl 2021-09-10 14:56:07 -07:00
parent 3210bd74a2
commit 637bb1f4a5
8 changed files with 176 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
#region Usings
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
@ -219,7 +220,7 @@ class CharacterCustomizationShared
FaceList.Items.Clear();
ExtraItemList.Items.Clear();
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Hat1,
GlobalPaths.hatdir,
"NoHat",
@ -229,7 +230,7 @@ class CharacterCustomizationShared
true
);
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Hat2,
GlobalPaths.hatdir,
"NoHat",
@ -239,7 +240,7 @@ class CharacterCustomizationShared
true
);
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Hat3,
GlobalPaths.hatdir,
"NoHat",
@ -266,7 +267,7 @@ class CharacterCustomizationShared
PantsList.Items.Clear();
ExtraItemList.Items.Clear();
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Face,
GlobalPaths.facedir,
"DefaultFace",
@ -293,7 +294,7 @@ class CharacterCustomizationShared
FaceList.Items.Clear();
ExtraItemList.Items.Clear();
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.TShirt,
GlobalPaths.tshirtdir,
"NoTShirt",
@ -320,7 +321,7 @@ class CharacterCustomizationShared
FaceList.Items.Clear();
ExtraItemList.Items.Clear();
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Shirt,
GlobalPaths.shirtdir,
"NoShirt",
@ -347,7 +348,7 @@ class CharacterCustomizationShared
FaceList.Items.Clear();
ExtraItemList.Items.Clear();
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Pants,
GlobalPaths.pantsdir,
"NoPants",
@ -374,7 +375,7 @@ class CharacterCustomizationShared
FaceList.Items.Clear();
ExtraItemList.Items.Clear();
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Head,
GlobalPaths.headdir,
"DefaultHead",
@ -400,7 +401,7 @@ class CharacterCustomizationShared
PantsList.Items.Clear();
FaceList.Items.Clear();
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.extradir,
"NoExtra",
@ -412,7 +413,7 @@ class CharacterCustomizationShared
if (GlobalVars.UserCustomization.ShowHatsInExtra)
{
CustomizationFuncs.ChangeItem(
ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.hatdir,
"NoHat",
@ -630,6 +631,120 @@ class CharacterCustomizationShared
}
}
}
public void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, bool hatsinextra = false)
{
ChangeItem(item, itemdir, defaultitem, outputImage, outputString, box, initial, null, hatsinextra);
}
public void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, Provider provider, bool hatsinextra = false)
{
if (Directory.Exists(itemdir))
{
if (initial)
{
if (!hatsinextra)
{
box.Items.Clear();
}
DirectoryInfo dinfo = new DirectoryInfo(itemdir);
FileInfo[] Files = dinfo.GetFiles("*.rbxm");
foreach (FileInfo file in Files)
{
if (file.Name.Equals(string.Empty))
{
continue;
}
if (hatsinextra)
{
if (file.Name.Equals("NoHat.rbxm"))
{
continue;
}
}
box.Items.Add(file.Name);
}
//selecting items triggers the event.
try
{
box.SelectedItem = item;
}
catch (Exception)
{
box.SelectedItem = defaultitem + ".rbxm";
}
box.Enabled = true;
}
}
if (File.Exists(itemdir + @"\\" + item.Replace(".rbxm", "") + "_desc.txt"))
{
outputString.Text = File.ReadAllText(itemdir + @"\\" + item.Replace(".rbxm", "") + "_desc.txt");
}
else
{
outputString.Text = item;
}
if (provider != null && IsItemURL(item))
{
outputImage.Image = GetItemURLImageFromProvider(provider);
}
else
{
outputImage.Image = GlobalFuncs.LoadImage(itemdir + @"\\" + item.Replace(".rbxm", "") + ".png", itemdir + @"\\" + defaultitem + ".png");
}
}
public bool IsItemURL(string item)
{
if (item.Contains("http://") || item.Contains("https://"))
return true;
return false;
}
public Image GetItemURLImageFromProvider(Provider provider)
{
if (provider != null)
return GlobalFuncs.LoadImage(GlobalPaths.CustomPlayerDir + @"\\" + provider.Icon, GlobalPaths.extradir + @"\\NoExtra.png");
return GlobalFuncs.LoadImage(GlobalPaths.extradir + @"\\NoExtra.png");
}
//we launch the 3dview seperately from normal clients.
public void Launch3DView()
{
GlobalFuncs.ReloadLoadoutValue();
//HACK!
try
{
GlobalFuncs.ChangeGameSettings("2011E");
}
catch (Exception)
{
}
string luafile = "rbxasset://scripts\\\\CSView.lua";
string mapfile = GlobalPaths.BasePathLauncher + "\\preview\\content\\fonts\\3DView.rbxl";
string rbxexe = GlobalPaths.BasePathLauncher + "\\preview\\3DView.exe";
string quote = "\"";
string args = quote + mapfile + "\" -script \" dofile('" + luafile + "'); _G.CS3DView(0,'" + GlobalVars.UserConfiguration.PlayerName + "'," + GlobalVars.Loadout + ");" + quote;
try
{
Process client = new Process();
client.StartInfo.FileName = rbxexe;
client.StartInfo.Arguments = args;
client.Start();
client.PriorityClass = GlobalVars.UserConfiguration.Priority;
}
catch (Exception ex)
{
MessageBox.Show("Failed to launch Novetus. (Error: " + ex.Message + ")", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
#endregion
}
#endregion

127
Novetus/NovetusCore/CharCustom/CustomizationFuncs.cs
View File

@ -1,127 +0,0 @@
#region Usings
using System;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Windows.Forms;
#endregion
#region Customization Functions
class CustomizationFuncs
{
public static void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, bool hatsinextra = false)
{
ChangeItem(item, itemdir, defaultitem, outputImage, outputString, box, initial, null, hatsinextra);
}
public static void ChangeItem(string item, string itemdir, string defaultitem, PictureBox outputImage, TextBox outputString, ListBox box, bool initial, Provider provider, bool hatsinextra = false)
{
if (Directory.Exists(itemdir))
{
if (initial)
{
if (!hatsinextra)
{
box.Items.Clear();
}
DirectoryInfo dinfo = new DirectoryInfo(itemdir);
FileInfo[] Files = dinfo.GetFiles("*.rbxm");
foreach (FileInfo file in Files)
{
if (file.Name.Equals(string.Empty))
{
continue;
}
if (hatsinextra)
{
if (file.Name.Equals("NoHat.rbxm"))
{
continue;
}
}
box.Items.Add(file.Name);
}
//selecting items triggers the event.
try
{
box.SelectedItem = item;
}
catch (Exception)
{
box.SelectedItem = defaultitem + ".rbxm";
}
box.Enabled = true;
}
}
if (File.Exists(itemdir + @"\\" + item.Replace(".rbxm", "") + "_desc.txt"))
{
outputString.Text = File.ReadAllText(itemdir + @"\\" + item.Replace(".rbxm", "") + "_desc.txt");
}
else
{
outputString.Text = item;
}
if (provider != null && IsItemURL(item))
{
outputImage.Image = GetItemURLImageFromProvider(provider);
}
else
{
outputImage.Image = GlobalFuncs.LoadImage(itemdir + @"\\" + item.Replace(".rbxm", "") + ".png", itemdir + @"\\" + defaultitem + ".png");
}
}
public static bool IsItemURL(string item)
{
if (item.Contains("http://") || item.Contains("https://"))
return true;
return false;
}
public static Image GetItemURLImageFromProvider(Provider provider)
{
if (provider != null)
return GlobalFuncs.LoadImage(GlobalPaths.CustomPlayerDir + @"\\" + provider.Icon, GlobalPaths.extradir + @"\\NoExtra.png");
return GlobalFuncs.LoadImage(GlobalPaths.extradir + @"\\NoExtra.png");
}
//we launch the 3dview seperately from normal clients.
public static void Launch3DView()
{
GlobalFuncs.ReloadLoadoutValue();
//HACK!
try
{
GlobalFuncs.ChangeGameSettings("2011E");
}
catch(Exception)
{
}
string luafile = "rbxasset://scripts\\\\CSView.lua";
string mapfile = GlobalPaths.BasePathLauncher + "\\preview\\content\\fonts\\3DView.rbxl";
string rbxexe = GlobalPaths.BasePathLauncher + "\\preview\\3DView.exe";
string quote = "\"";
string args = quote + mapfile + "\" -script \" dofile('" + luafile + "'); _G.CS3DView(0,'" + GlobalVars.UserConfiguration.PlayerName + "'," + GlobalVars.Loadout + ");" + quote;
try
{
Process client = new Process();
client.StartInfo.FileName = rbxexe;
client.StartInfo.Arguments = args;
client.Start();
client.PriorityClass = GlobalVars.UserConfiguration.Priority;
}
catch (Exception ex)
{
MessageBox.Show("Failed to launch Novetus. (Error: " + ex.Message + ")", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
#endregion

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

@ -46,7 +46,7 @@ public partial class CharacterCustomizationCompact : Form
{
GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Hat1,
GlobalPaths.hatdir,
"NoHat",
@ -64,7 +64,7 @@ public partial class CharacterCustomizationCompact : Form
{
GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Hat2,
GlobalPaths.hatdir,
"NoHat",
@ -82,7 +82,7 @@ public partial class CharacterCustomizationCompact : Form
{
GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Hat3,
GlobalPaths.hatdir,
"NoHat",
@ -141,7 +141,7 @@ public partial class CharacterCustomizationCompact : Form
listBox4.SelectedItem = previtem;
GlobalVars.UserCustomization.Face = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Face,
GlobalPaths.facedir,
"DefaultFace",
@ -196,7 +196,7 @@ public partial class CharacterCustomizationCompact : Form
GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Face,
GlobalPaths.facedir,
"DefaultFace",
@ -221,7 +221,7 @@ public partial class CharacterCustomizationCompact : Form
if (!string.IsNullOrWhiteSpace(FaceIDBox.Text))
{
GlobalVars.UserCustomization.Face = characterCustomizationForm.Custom_Face_URL + FaceIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Face,
GlobalPaths.facedir,
"DefaultFace",
@ -254,7 +254,7 @@ public partial class CharacterCustomizationCompact : Form
listBox5.SelectedItem = previtem;
GlobalVars.UserCustomization.TShirt = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.TShirt,
GlobalPaths.tshirtdir,
"NoTShirt",
@ -309,7 +309,7 @@ public partial class CharacterCustomizationCompact : Form
GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.TShirt,
GlobalPaths.tshirtdir,
"NoTShirt",
@ -334,7 +334,7 @@ public partial class CharacterCustomizationCompact : Form
if (!string.IsNullOrWhiteSpace(TShirtsIDBox.Text))
{
GlobalVars.UserCustomization.TShirt = characterCustomizationForm.Custom_T_Shirt_URL + TShirtsIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.TShirt,
GlobalPaths.tshirtdir,
"NoTShirt",
@ -366,7 +366,7 @@ public partial class CharacterCustomizationCompact : Form
listBox6.SelectedItem = previtem;
GlobalVars.UserCustomization.Shirt = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Shirt,
GlobalPaths.shirtdir,
"NoShirt",
@ -421,7 +421,7 @@ public partial class CharacterCustomizationCompact : Form
GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Shirt,
GlobalPaths.shirtdir,
"NoShirt",
@ -446,7 +446,7 @@ public partial class CharacterCustomizationCompact : Form
if (!string.IsNullOrWhiteSpace(ShirtsIDBox.Text))
{
GlobalVars.UserCustomization.Shirt = characterCustomizationForm.Custom_Shirt_URL + ShirtsIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Shirt,
GlobalPaths.shirtdir,
"NoShirt",
@ -478,7 +478,7 @@ public partial class CharacterCustomizationCompact : Form
listBox7.SelectedItem = previtem;
GlobalVars.UserCustomization.Pants = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Pants,
GlobalPaths.pantsdir,
"NoPants",
@ -533,7 +533,7 @@ public partial class CharacterCustomizationCompact : Form
GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Pants,
GlobalPaths.pantsdir,
"NoPants",
@ -558,7 +558,7 @@ public partial class CharacterCustomizationCompact : Form
if (!string.IsNullOrWhiteSpace(PantsIDBox.Text))
{
GlobalVars.UserCustomization.Pants = characterCustomizationForm.Custom_Pants_URL + PantsIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Pants,
GlobalPaths.pantsdir,
"NoPants",
@ -580,7 +580,7 @@ public partial class CharacterCustomizationCompact : Form
{
GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Head,
GlobalPaths.headdir,
"DefaultHead",
@ -618,7 +618,7 @@ public partial class CharacterCustomizationCompact : Form
{
GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.extradir,
"NoExtra",
@ -630,7 +630,7 @@ public partial class CharacterCustomizationCompact : Form
if (GlobalVars.UserCustomization.ShowHatsInExtra)
{
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.hatdir,
"NoHat",
@ -667,7 +667,7 @@ public partial class CharacterCustomizationCompact : Form
GlobalVars.UserCustomization.ShowHatsInExtra = checkBox1.Checked;
listBox9.Items.Clear();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.extradir,
"NoExtra",
@ -679,7 +679,7 @@ public partial class CharacterCustomizationCompact : Form
if (GlobalVars.UserCustomization.ShowHatsInExtra)
{
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.hatdir,
"NoHat",
@ -828,7 +828,7 @@ public partial class CharacterCustomizationCompact : Form
void Button43Click(object sender, EventArgs e)
{
CustomizationFuncs.Launch3DView();
characterCustomizationForm.Launch3DView();
}
private void button71_Click(object sender, EventArgs e)

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

@ -49,7 +49,7 @@ public partial class CharacterCustomizationExtended : Form
{
GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Hat1,
GlobalPaths.hatdir,
"NoHat",
@ -67,7 +67,7 @@ public partial class CharacterCustomizationExtended : Form
{
GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Hat2,
GlobalPaths.hatdir,
"NoHat",
@ -85,7 +85,7 @@ public partial class CharacterCustomizationExtended : Form
{
GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Hat3,
GlobalPaths.hatdir,
"NoHat",
@ -144,7 +144,7 @@ public partial class CharacterCustomizationExtended : Form
listBox4.SelectedItem = previtem;
GlobalVars.UserCustomization.Face = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Face,
GlobalPaths.facedir,
"DefaultFace",
@ -199,7 +199,7 @@ public partial class CharacterCustomizationExtended : Form
GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Face,
GlobalPaths.facedir,
"DefaultFace",
@ -224,7 +224,7 @@ public partial class CharacterCustomizationExtended : Form
if (!string.IsNullOrWhiteSpace(FaceIDBox.Text))
{
GlobalVars.UserCustomization.Face = characterCustomizationForm.Custom_Face_URL + FaceIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Face,
GlobalPaths.facedir,
"DefaultFace",
@ -257,7 +257,7 @@ public partial class CharacterCustomizationExtended : Form
listBox5.SelectedItem = previtem;
GlobalVars.UserCustomization.TShirt = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.TShirt,
GlobalPaths.tshirtdir,
"NoTShirt",
@ -312,7 +312,7 @@ public partial class CharacterCustomizationExtended : Form
GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.TShirt,
GlobalPaths.tshirtdir,
"NoTShirt",
@ -337,7 +337,7 @@ public partial class CharacterCustomizationExtended : Form
if (!string.IsNullOrWhiteSpace(TShirtsIDBox.Text))
{
GlobalVars.UserCustomization.TShirt = characterCustomizationForm.Custom_T_Shirt_URL + TShirtsIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.TShirt,
GlobalPaths.tshirtdir,
"NoTShirt",
@ -369,7 +369,7 @@ public partial class CharacterCustomizationExtended : Form
listBox6.SelectedItem = previtem;
GlobalVars.UserCustomization.Shirt = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Shirt,
GlobalPaths.shirtdir,
"NoShirt",
@ -424,7 +424,7 @@ public partial class CharacterCustomizationExtended : Form
GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Shirt,
GlobalPaths.shirtdir,
"NoShirt",
@ -449,7 +449,7 @@ public partial class CharacterCustomizationExtended : Form
if (!string.IsNullOrWhiteSpace(ShirtsIDBox.Text))
{
GlobalVars.UserCustomization.Shirt = characterCustomizationForm.Custom_Shirt_URL + ShirtsIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Shirt,
GlobalPaths.shirtdir,
"NoShirt",
@ -481,7 +481,7 @@ public partial class CharacterCustomizationExtended : Form
listBox7.SelectedItem = previtem;
GlobalVars.UserCustomization.Pants = previtem;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Pants,
GlobalPaths.pantsdir,
"NoPants",
@ -536,7 +536,7 @@ public partial class CharacterCustomizationExtended : Form
GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString();
}
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Pants,
GlobalPaths.pantsdir,
"NoPants",
@ -561,7 +561,7 @@ public partial class CharacterCustomizationExtended : Form
if (!string.IsNullOrWhiteSpace(PantsIDBox.Text))
{
GlobalVars.UserCustomization.Pants = characterCustomizationForm.Custom_Pants_URL + PantsIDBox.Text;
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Pants,
GlobalPaths.pantsdir,
"NoPants",
@ -583,7 +583,7 @@ public partial class CharacterCustomizationExtended : Form
{
GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Head,
GlobalPaths.headdir,
"DefaultHead",
@ -621,7 +621,7 @@ public partial class CharacterCustomizationExtended : Form
{
GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.extradir,
"NoExtra",
@ -633,7 +633,7 @@ public partial class CharacterCustomizationExtended : Form
if (GlobalVars.UserCustomization.ShowHatsInExtra)
{
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.hatdir,
"NoHat",
@ -670,7 +670,7 @@ public partial class CharacterCustomizationExtended : Form
GlobalVars.UserCustomization.ShowHatsInExtra = checkBox1.Checked;
listBox9.Items.Clear();
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.extradir,
"NoExtra",
@ -682,7 +682,7 @@ public partial class CharacterCustomizationExtended : Form
if (GlobalVars.UserCustomization.ShowHatsInExtra)
{
CustomizationFuncs.ChangeItem(
characterCustomizationForm.ChangeItem(
GlobalVars.UserCustomization.Extra,
GlobalPaths.hatdir,
"NoHat",
@ -893,7 +893,7 @@ public partial class CharacterCustomizationExtended : Form
void Button43Click(object sender, EventArgs e)
{
CustomizationFuncs.Launch3DView();
characterCustomizationForm.Launch3DView();
}
private void button71_Click(object sender, EventArgs e)

1
Novetus/NovetusCore/NovetusCore.projitems
View File

@ -11,7 +11,6 @@
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)CharCustom\PartColors.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CharCustom\ContentProviders.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CharCustom\CustomizationFuncs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CharCustom\IconLoader.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\CommandLineArguments.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\CryptoRandom.cs" />

14
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs generated
View File

@ -922,6 +922,7 @@ namespace NovetusLauncher
this.tabPage5.Controls.Add(this.comboBox3);
this.tabPage5.Controls.Add(this.checkBox2);
this.tabPage5.Controls.Add(this.label18);
this.tabPage5.Controls.Add(this.label11);
this.tabPage5.Controls.Add(this.button26);
this.tabPage5.Controls.Add(this.label7);
this.tabPage5.Controls.Add(this.label10);
@ -1074,7 +1075,7 @@ namespace NovetusLauncher
this.richTextBox3.Location = new System.Drawing.Point(6, 70);
this.richTextBox3.Name = "richTextBox3";
this.richTextBox3.ReadOnly = true;
this.richTextBox3.Size = new System.Drawing.Size(389, 155);
this.richTextBox3.Size = new System.Drawing.Size(389, 149);
this.richTextBox3.TabIndex = 60;
this.richTextBox3.Text = "credits text";
//
@ -1227,10 +1228,10 @@ namespace NovetusLauncher
//
// label11
//
this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label11.Location = new System.Drawing.Point(4, 51);
this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label11.Location = new System.Drawing.Point(6, 222);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(47, 25);
this.label11.Size = new System.Drawing.Size(389, 15);
this.label11.TabIndex = 50;
this.label11.Text = "v1.0";
this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@ -1418,9 +1419,9 @@ namespace NovetusLauncher
//
this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N;
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pictureBox2.Location = new System.Drawing.Point(6, 12);
this.pictureBox2.Location = new System.Drawing.Point(2, 12);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(43, 41);
this.pictureBox2.Size = new System.Drawing.Size(51, 50);
this.pictureBox2.TabIndex = 7;
this.pictureBox2.TabStop = false;
//
@ -1435,7 +1436,6 @@ namespace NovetusLauncher
this.Controls.Add(this.label12);
this.Controls.Add(this.label28);
this.Controls.Add(this.button25);
this.Controls.Add(this.label11);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.button3);
this.Controls.Add(this.button8);

2
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx
View File

@ -136,7 +136,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
CQAAAk1TRnQBSQFMAgEBAgEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAgEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

1
Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
View File

@ -3,6 +3,7 @@ using Mono.Nat;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;