diff --git a/NovetusLauncher/NovetusFuncs/ClientScript.cs b/NovetusLauncher/NovetusFuncs/ClientScript.cs index 1d4a02f..83ec9f3 100644 --- a/NovetusLauncher/NovetusFuncs/ClientScript.cs +++ b/NovetusLauncher/NovetusFuncs/ClientScript.cs @@ -90,7 +90,7 @@ public class ClientScript public static int ConvertIconStringToInt() { - switch (GlobalVars.Custom_Icon_Offline) + switch (GlobalVars.UserCustomization.Icon) { case "BC": return 1; @@ -143,55 +143,56 @@ public class ClientScript string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'"; string compiled = extractedCode.Replace("%mapfile%", mapfile) .Replace("%luafile%", luafile) - .Replace("%charapp%", GlobalVars.CharacterID) + .Replace("%charapp%", GlobalVars.UserCustomization.CharacterID) .Replace("%ip%", GlobalVars.IP) .Replace("%port%", GlobalVars.RobloxPort.ToString()) .Replace("%name%", GlobalVars.PlayerName) .Replace("%icone%", ConvertIconStringToInt().ToString()) - .Replace("%icon%", GlobalVars.Custom_Icon_Offline) + .Replace("%icon%", GlobalVars.UserCustomization.Icon) .Replace("%id%", GlobalVars.UserID.ToString()) - .Replace("%face%", GlobalVars.Custom_Face_Offline) - .Replace("%head%", GlobalVars.Custom_Head_Offline) - .Replace("%tshirt%", GlobalVars.Custom_T_Shirt_Offline) - .Replace("%shirt%", GlobalVars.Custom_Shirt_Offline) - .Replace("%pants%", GlobalVars.Custom_Pants_Offline) - .Replace("%hat1%", GlobalVars.Custom_Hat1ID_Offline) - .Replace("%hat2%", GlobalVars.Custom_Hat2ID_Offline) - .Replace("%hat3%", GlobalVars.Custom_Hat3ID_Offline) - .Replace("%faced%", GlobalVars.faceGameDir + GlobalVars.Custom_Face_Offline) - .Replace("%headd%", GlobalVars.headGameDir + GlobalVars.Custom_Head_Offline) - .Replace("%tshirtd%", GlobalVars.Custom_T_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_T_Shirt_Offline : GlobalVars.tshirtGameDir + GlobalVars.Custom_T_Shirt_Offline) - .Replace("%shirtd%", GlobalVars.Custom_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_Shirt_Offline : GlobalVars.shirtGameDir + GlobalVars.Custom_Shirt_Offline) - .Replace("%pantsd%", GlobalVars.Custom_Pants_Offline.Contains("http://") ? GlobalVars.Custom_Pants_Offline : GlobalVars.pantsGameDir + GlobalVars.Custom_Pants_Offline) - .Replace("%hat1d%", GlobalVars.hatGameDir + GlobalVars.Custom_Hat1ID_Offline) - .Replace("%hat2d%", GlobalVars.hatGameDir + GlobalVars.Custom_Hat2ID_Offline) - .Replace("%hat3d%", GlobalVars.hatGameDir + GlobalVars.Custom_Hat3ID_Offline) - .Replace("%headcolor%", GlobalVars.HeadColorID.ToString()) - .Replace("%torsocolor%", GlobalVars.TorsoColorID.ToString()) - .Replace("%larmcolor%", GlobalVars.LeftArmColorID.ToString()) - .Replace("%llegcolor%", GlobalVars.LeftLegColorID.ToString()) - .Replace("%rarmcolor%", GlobalVars.RightArmColorID.ToString()) - .Replace("%rlegcolor%", GlobalVars.RightLegColorID.ToString()) + .Replace("%face%", GlobalVars.UserCustomization.Face) + .Replace("%head%", GlobalVars.UserCustomization.Head) + .Replace("%tshirt%", GlobalVars.UserCustomization.TShirt) + .Replace("%shirt%", GlobalVars.UserCustomization.Shirt) + .Replace("%pants%", GlobalVars.UserCustomization.Pants) + .Replace("%hat1%", GlobalVars.UserCustomization.Hat1) + .Replace("%hat2%", GlobalVars.UserCustomization.Hat2) + .Replace("%hat3%", GlobalVars.UserCustomization.Hat3) + .Replace("%faced%", GlobalVars.faceGameDir + GlobalVars.UserCustomization.Face) + .Replace("%headd%", GlobalVars.headGameDir + GlobalVars.UserCustomization.Head) + .Replace("%tshirtd%", GlobalVars.UserCustomization.TShirt.Contains("http://") ? GlobalVars.UserCustomization.TShirt : GlobalVars.tshirtGameDir + GlobalVars.UserCustomization.TShirt) + .Replace("%shirtd%", GlobalVars.UserCustomization.Shirt.Contains("http://") ? GlobalVars.UserCustomization.Shirt : GlobalVars.shirtGameDir + GlobalVars.UserCustomization.Shirt) + .Replace("%pantsd%", GlobalVars.UserCustomization.Pants.Contains("http://") ? GlobalVars.UserCustomization.Pants : GlobalVars.pantsGameDir + GlobalVars.UserCustomization.Pants) + .Replace("%hat1d%", GlobalVars.hatGameDir + GlobalVars.UserCustomization.Hat1) + .Replace("%hat2d%", GlobalVars.hatGameDir + GlobalVars.UserCustomization.Hat2) + .Replace("%hat3d%", GlobalVars.hatGameDir + GlobalVars.UserCustomization.Hat3) + .Replace("%headcolor%", GlobalVars.UserCustomization.HeadColorID.ToString()) + .Replace("%torsocolor%", GlobalVars.UserCustomization.TorsoColorID.ToString()) + .Replace("%larmcolor%", GlobalVars.UserCustomization.LeftArmColorID.ToString()) + .Replace("%llegcolor%", GlobalVars.UserCustomization.LeftLegColorID.ToString()) + .Replace("%rarmcolor%", GlobalVars.UserCustomization.RightArmColorID.ToString()) + .Replace("%rlegcolor%", GlobalVars.UserCustomization.RightLegColorID.ToString()) .Replace("%md5launcher%", md5dir) .Replace("%md5script%", GlobalVars.SelectedClientInfo.ClientMD5) .Replace("%md5exe%", GlobalVars.SelectedClientInfo.ScriptMD5) .Replace("%md5scriptd%", md5script) .Replace("%md5exed%", md5exe) .Replace("%limit%", GlobalVars.PlayerLimit.ToString()) - .Replace("%extra%", GlobalVars.Custom_Extra) - .Replace("%extrad%", GlobalVars.extraGameDir + GlobalVars.Custom_Extra) - .Replace("%hat4d%", GlobalVars.hatGameDir + GlobalVars.Custom_Extra) + .Replace("%extra%", GlobalVars.UserCustomization.Extra) + .Replace("%hat4%", GlobalVars.UserCustomization.Extra) + .Replace("%extrad%", GlobalVars.extraGameDir + GlobalVars.UserCustomization.Extra) + .Replace("%hat4d%", GlobalVars.hatGameDir + GlobalVars.UserCustomization.Extra) .Replace("%args%", GetRawArgsFromTag(tag, md5s, luafile)) - .Replace("%facews%", GlobalVars.WebServer_FaceDir + GlobalVars.Custom_Face_Offline) - .Replace("%headws%", GlobalVars.WebServer_HeadDir + GlobalVars.Custom_Head_Offline) - .Replace("%tshirtws%", GlobalVars.Custom_T_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_T_Shirt_Offline : GlobalVars.WebServer_TShirtDir + GlobalVars.Custom_T_Shirt_Offline) - .Replace("%shirtws%", GlobalVars.Custom_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_Shirt_Offline : GlobalVars.WebServer_ShirtDir + GlobalVars.Custom_Shirt_Offline) - .Replace("%pantsws%", GlobalVars.Custom_Pants_Offline.Contains("http://") ? GlobalVars.Custom_Pants_Offline : GlobalVars.WebServer_PantsDir + GlobalVars.Custom_Pants_Offline) - .Replace("%hat1ws%", GlobalVars.WebServer_HatDir + GlobalVars.Custom_Hat1ID_Offline) - .Replace("%hat2ws%", GlobalVars.WebServer_HatDir + GlobalVars.Custom_Hat2ID_Offline) - .Replace("%hat3ws%", GlobalVars.WebServer_HatDir + GlobalVars.Custom_Hat3ID_Offline) - .Replace("%extraws%", GlobalVars.WebServer_ExtraDir + GlobalVars.Custom_Extra) - .Replace("%hat4ws%", GlobalVars.WebServer_HatDir + GlobalVars.Custom_Extra) + .Replace("%facews%", GlobalVars.WebServer_FaceDir + GlobalVars.UserCustomization.Face) + .Replace("%headws%", GlobalVars.WebServer_HeadDir + GlobalVars.UserCustomization.Head) + .Replace("%tshirtws%", GlobalVars.UserCustomization.TShirt.Contains("http://") ? GlobalVars.UserCustomization.TShirt : GlobalVars.WebServer_TShirtDir + GlobalVars.UserCustomization.TShirt) + .Replace("%shirtws%", GlobalVars.UserCustomization.Shirt.Contains("http://") ? GlobalVars.UserCustomization.Shirt : GlobalVars.WebServer_ShirtDir + GlobalVars.UserCustomization.Shirt) + .Replace("%pantsws%", GlobalVars.UserCustomization.Pants.Contains("http://") ? GlobalVars.UserCustomization.Pants : GlobalVars.WebServer_PantsDir + GlobalVars.UserCustomization.Pants) + .Replace("%hat1ws%", GlobalVars.WebServer_HatDir + GlobalVars.UserCustomization.Hat1) + .Replace("%hat2ws%", GlobalVars.WebServer_HatDir + GlobalVars.UserCustomization.Hat2) + .Replace("%hat3ws%", GlobalVars.WebServer_HatDir + GlobalVars.UserCustomization.Hat3) + .Replace("%extraws%", GlobalVars.WebServer_ExtraDir + GlobalVars.UserCustomization.Extra) + .Replace("%hat4ws%", GlobalVars.WebServer_HatDir + GlobalVars.UserCustomization.Extra) .Replace("%mapfiled%", GlobalVars.BaseGameDir + GlobalVars.MapPathSnip.Replace(@"\\", @"\")) .Replace("%tripcode%", GlobalVars.PlayerTripcode) .Replace("%addonscriptpath%", GlobalVars.AddonScriptPath); diff --git a/NovetusLauncher/NovetusFuncs/GlobalVars.cs b/NovetusLauncher/NovetusFuncs/GlobalVars.cs index 8ca88ba..87e8d32 100644 --- a/NovetusLauncher/NovetusFuncs/GlobalVars.cs +++ b/NovetusLauncher/NovetusFuncs/GlobalVars.cs @@ -179,34 +179,10 @@ public static class GlobalVars public static string RegisterClient2 = ""; public static string DefaultMap = ""; //charcustom - public static string Custom_Hat1ID_Offline = "NoHat.rbxm"; - public static string Custom_Hat2ID_Offline = "NoHat.rbxm"; - public static string Custom_Hat3ID_Offline = "NoHat.rbxm"; - public static string Custom_Face_Offline = "DefaultFace.rbxm"; - public static string Custom_Head_Offline = "DefaultHead.rbxm"; - public static string Custom_T_Shirt_Offline = "NoTShirt.rbxm"; - public static string Custom_Shirt_Offline = "NoShirt.rbxm"; - public static string Custom_Pants_Offline = "NoPants.rbxm"; - public static string Custom_Icon_Offline = "NBC"; - public static int HeadColorID = 24; - public static int TorsoColorID = 23; - public static int LeftArmColorID = 24; - public static int RightArmColorID = 24; - public static int LeftLegColorID = 119; - public static int RightLegColorID = 119; - public static string loadtext = ""; + public static CustomizationConfig UserCustomization = new CustomizationConfig(); + public static string loadtext = ""; public static string sololoadtext = ""; - public static string CharacterID = ""; - public static string Custom_Extra = "NoExtra.rbxm"; - public static bool Custom_Extra_ShowHats = false; - public static bool Custom_Extra_SelectionIsHat = false; //color menu. - public static string ColorMenu_HeadColor = "Color [A=255, R=245, G=205, B=47]"; - public static string ColorMenu_TorsoColor = "Color [A=255, R=13, G=105, B=172]"; - public static string ColorMenu_LeftArmColor = "Color [A=255, R=245, G=205, B=47]"; - public static string ColorMenu_RightArmColor = "Color [A=255, R=245, G=205, B=47]"; - public static string ColorMenu_LeftLegColor = "Color [A=255, R=164, G=189, B=71]"; - public static string ColorMenu_RightLegColor = "Color [A=255, R=164, G=189, B=71]"; public static bool AdminMode = false; public static string important = ""; //discord diff --git a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs index 8afae00..ac3f123 100644 --- a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs +++ b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs @@ -176,7 +176,6 @@ public class LauncherFuncs ini.IniWriteValue(section, "Map", GlobalVars.Map.ToString()); ini.IniWriteValue(section, "RobloxPort", GlobalVars.RobloxPort.ToString()); ini.IniWriteValue(section, "PlayerLimit", GlobalVars.PlayerLimit.ToString()); - ini.IniWriteValue(section, "ShowHatsOnExtra", GlobalVars.Custom_Extra_ShowHats.ToString()); ini.IniWriteValue(section, "UPnP", GlobalVars.UPnP.ToString()); ini.IniWriteValue(section, "ItemMakerDisableHelpMessage", GlobalVars.DisabledHelp.ToString()); ini.IniWriteValue(section, "PlayerTripcode", SecurityFuncs.Base64Encode(GlobalVars.PlayerTripcode.ToString())); @@ -192,7 +191,7 @@ public class LauncherFuncs { //READ string closeonlaunch, userid, name, selectedclient, - map, port, limit, showhatsonextra, upnp, + map, port, limit, upnp, disablehelpmessage, tripcode, discord, mappath, mapsnip, graphics, reshade, qualitylevel, oldlayout; @@ -207,7 +206,6 @@ public class LauncherFuncs map = ini.IniReadValue(section, "Map", GlobalVars.Map.ToString()); port = ini.IniReadValue(section, "RobloxPort", GlobalVars.RobloxPort.ToString()); limit = ini.IniReadValue(section, "PlayerLimit", GlobalVars.PlayerLimit.ToString()); - showhatsonextra = ini.IniReadValue(section, "ShowHatsOnExtra", GlobalVars.Custom_Extra_ShowHats.ToString()); upnp = ini.IniReadValue(section, "UPnP", GlobalVars.UPnP.ToString()); disablehelpmessage = ini.IniReadValue(section, "ItemMakerDisableHelpMessage", GlobalVars.DisabledHelp.ToString()); tripcode = ini.IniReadValue(section, "PlayerTripcode", GenerateAndReturnTripcode()); @@ -247,9 +245,6 @@ public class LauncherFuncs int iline7 = Convert.ToInt32(limit); GlobalVars.PlayerLimit = iline7; - bool bline9 = Convert.ToBoolean(showhatsonextra); - GlobalVars.Custom_Extra_ShowHats = bline9; - bool bline10 = Convert.ToBoolean(upnp); GlobalVars.UPnP = bline10; @@ -308,36 +303,37 @@ public class LauncherFuncs string section = "Items"; - ini.IniWriteValue(section, "Hat1", GlobalVars.Custom_Hat1ID_Offline.ToString()); - ini.IniWriteValue(section, "Hat2", GlobalVars.Custom_Hat2ID_Offline.ToString()); - ini.IniWriteValue(section, "Hat3", GlobalVars.Custom_Hat3ID_Offline.ToString()); - ini.IniWriteValue(section, "Face", GlobalVars.Custom_Face_Offline.ToString()); - ini.IniWriteValue(section, "Head", GlobalVars.Custom_Head_Offline.ToString()); - ini.IniWriteValue(section, "TShirt", GlobalVars.Custom_T_Shirt_Offline.ToString()); - ini.IniWriteValue(section, "Shirt", GlobalVars.Custom_Shirt_Offline.ToString()); - ini.IniWriteValue(section, "Pants", GlobalVars.Custom_Pants_Offline.ToString()); - ini.IniWriteValue(section, "Icon", GlobalVars.Custom_Icon_Offline.ToString()); - ini.IniWriteValue(section, "Extra", GlobalVars.Custom_Extra.ToString()); + ini.IniWriteValue(section, "Hat1", GlobalVars.UserCustomization.Hat1.ToString()); + ini.IniWriteValue(section, "Hat2", GlobalVars.UserCustomization.Hat2.ToString()); + ini.IniWriteValue(section, "Hat3", GlobalVars.UserCustomization.Hat3.ToString()); + ini.IniWriteValue(section, "Face", GlobalVars.UserCustomization.Face.ToString()); + ini.IniWriteValue(section, "Head", GlobalVars.UserCustomization.Head.ToString()); + ini.IniWriteValue(section, "TShirt", GlobalVars.UserCustomization.TShirt.ToString()); + ini.IniWriteValue(section, "Shirt", GlobalVars.UserCustomization.Shirt.ToString()); + ini.IniWriteValue(section, "Pants", GlobalVars.UserCustomization.Pants.ToString()); + ini.IniWriteValue(section, "Icon", GlobalVars.UserCustomization.Icon.ToString()); + ini.IniWriteValue(section, "Extra", GlobalVars.UserCustomization.Extra.ToString()); string section2 = "Colors"; - - ini.IniWriteValue(section2, "HeadColorID", GlobalVars.HeadColorID.ToString()); - ini.IniWriteValue(section2, "HeadColorString", GlobalVars.ColorMenu_HeadColor.ToString()); - ini.IniWriteValue(section2, "TorsoColorID", GlobalVars.TorsoColorID.ToString()); - ini.IniWriteValue(section2, "TorsoColorString", GlobalVars.ColorMenu_TorsoColor.ToString()); - ini.IniWriteValue(section2, "LeftArmColorID", GlobalVars.LeftArmColorID.ToString()); - ini.IniWriteValue(section2, "LeftArmColorString", GlobalVars.ColorMenu_LeftArmColor.ToString()); - ini.IniWriteValue(section2, "RightArmColorID", GlobalVars.RightArmColorID.ToString()); - ini.IniWriteValue(section2, "RightArmColorString", GlobalVars.ColorMenu_RightArmColor.ToString()); - ini.IniWriteValue(section2, "LeftLegColorID", GlobalVars.LeftLegColorID.ToString()); - ini.IniWriteValue(section2, "LeftLegColorString", GlobalVars.ColorMenu_LeftLegColor.ToString()); - ini.IniWriteValue(section2, "RightLegColorID", GlobalVars.RightLegColorID.ToString()); - ini.IniWriteValue(section2, "RightLegColorString", GlobalVars.ColorMenu_RightLegColor.ToString()); + + ini.IniWriteValue(section2, "HeadColorID", GlobalVars.UserCustomization.HeadColorID.ToString()); + ini.IniWriteValue(section2, "HeadColorString", GlobalVars.UserCustomization.HeadColorString.ToString()); + ini.IniWriteValue(section2, "TorsoColorID", GlobalVars.UserCustomization.TorsoColorID.ToString()); + ini.IniWriteValue(section2, "TorsoColorString", GlobalVars.UserCustomization.TorsoColorString.ToString()); + ini.IniWriteValue(section2, "LeftArmColorID", GlobalVars.UserCustomization.LeftArmColorID.ToString()); + ini.IniWriteValue(section2, "LeftArmColorString", GlobalVars.UserCustomization.LeftArmColorString.ToString()); + ini.IniWriteValue(section2, "RightArmColorID", GlobalVars.UserCustomization.RightArmColorID.ToString()); + ini.IniWriteValue(section2, "RightArmColorString", GlobalVars.UserCustomization.RightArmColorString.ToString()); + ini.IniWriteValue(section2, "LeftLegColorID", GlobalVars.UserCustomization.LeftLegColorID.ToString()); + ini.IniWriteValue(section2, "LeftLegColorString", GlobalVars.UserCustomization.LeftLegColorString.ToString()); + ini.IniWriteValue(section2, "RightLegColorID", GlobalVars.UserCustomization.RightLegColorID.ToString()); + ini.IniWriteValue(section2, "RightLegColorString", GlobalVars.UserCustomization.RightLegColorString.ToString()); string section3 = "Other"; - ini.IniWriteValue(section3, "CharacterID", GlobalVars.CharacterID.ToString()); - ini.IniWriteValue(section3, "ExtraSelectionIsHat", GlobalVars.Custom_Extra_SelectionIsHat.ToString()); + ini.IniWriteValue(section3, "CharacterID", GlobalVars.UserCustomization.CharacterID.ToString()); + ini.IniWriteValue(section3, "ExtraSelectionIsHat", GlobalVars.UserCustomization.ExtraSelectionIsHat.ToString()); + ini.IniWriteValue(section3, "ShowHatsOnExtra", GlobalVars.UserCustomization.ShowHatsInExtra.ToString()); } else { @@ -347,87 +343,91 @@ public class LauncherFuncs head, tshirt, shirt, pants, icon, extra, headcolorid, headcolorstring, torsocolorid, torsocolorstring, larmid, larmstring, rarmid, rarmstring, llegid, - llegstring, rlegid, rlegstring, characterid, extraishat; + llegstring, rlegid, rlegstring, characterid, extraishat, showhatsonextra; IniFile ini = new IniFile(cfgpath); string section = "Items"; - - hat1 = ini.IniReadValue(section, "Hat1", GlobalVars.Custom_Hat1ID_Offline.ToString()); - hat2 = ini.IniReadValue(section, "Hat2", GlobalVars.Custom_Hat2ID_Offline.ToString()); - hat3 = ini.IniReadValue(section, "Hat3", GlobalVars.Custom_Hat3ID_Offline.ToString()); - face = ini.IniReadValue(section, "Face", GlobalVars.Custom_Face_Offline.ToString()); - head = ini.IniReadValue(section, "Head", GlobalVars.Custom_Head_Offline.ToString()); - tshirt = ini.IniReadValue(section, "TShirt", GlobalVars.Custom_T_Shirt_Offline.ToString()); - shirt = ini.IniReadValue(section, "Shirt", GlobalVars.Custom_Shirt_Offline.ToString()); - pants = ini.IniReadValue(section, "Pants", GlobalVars.Custom_Pants_Offline.ToString()); - icon = ini.IniReadValue(section, "Icon", GlobalVars.Custom_Icon_Offline.ToString()); - extra = ini.IniReadValue(section, "Extra", GlobalVars.Custom_Extra.ToString()); + + hat1 = ini.IniReadValue(section, "Hat1", GlobalVars.UserCustomization.Hat1.ToString()); + hat2 = ini.IniReadValue(section, "Hat2", GlobalVars.UserCustomization.Hat2.ToString()); + hat3 = ini.IniReadValue(section, "Hat3", GlobalVars.UserCustomization.Hat3.ToString()); + face = ini.IniReadValue(section, "Face", GlobalVars.UserCustomization.Face.ToString()); + head = ini.IniReadValue(section, "Head", GlobalVars.UserCustomization.Head.ToString()); + tshirt = ini.IniReadValue(section, "TShirt", GlobalVars.UserCustomization.TShirt.ToString()); + shirt = ini.IniReadValue(section, "Shirt", GlobalVars.UserCustomization.Shirt.ToString()); + pants = ini.IniReadValue(section, "Pants", GlobalVars.UserCustomization.Pants.ToString()); + icon = ini.IniReadValue(section, "Icon", GlobalVars.UserCustomization.Icon.ToString()); + extra = ini.IniReadValue(section, "Extra", GlobalVars.UserCustomization.Extra.ToString()); string section2 = "Colors"; - headcolorid = ini.IniReadValue(section2, "HeadColorID", GlobalVars.HeadColorID.ToString()); - headcolorstring = ini.IniReadValue(section2, "HeadColorString", GlobalVars.ColorMenu_HeadColor.ToString()); - torsocolorid = ini.IniReadValue(section2, "TorsoColorID", GlobalVars.TorsoColorID.ToString()); - torsocolorstring = ini.IniReadValue(section2, "TorsoColorString", GlobalVars.ColorMenu_TorsoColor.ToString()); - larmid = ini.IniReadValue(section2, "LeftArmColorID", GlobalVars.LeftArmColorID.ToString()); - larmstring = ini.IniReadValue(section2, "LeftArmColorString", GlobalVars.ColorMenu_LeftArmColor.ToString()); - rarmid = ini.IniReadValue(section2, "RightArmColorID", GlobalVars.RightArmColorID.ToString()); - rarmstring = ini.IniReadValue(section2, "RightArmColorString", GlobalVars.ColorMenu_RightArmColor.ToString()); - llegid = ini.IniReadValue(section2, "LeftLegColorID", GlobalVars.LeftLegColorID.ToString()); - llegstring = ini.IniReadValue(section2, "LeftLegColorString", GlobalVars.ColorMenu_LeftLegColor.ToString()); - rlegid = ini.IniReadValue(section2, "RightLegColorID", GlobalVars.RightLegColorID.ToString()); - rlegstring = ini.IniReadValue(section2, "RightLegColorString", GlobalVars.ColorMenu_RightLegColor.ToString()); + headcolorid = ini.IniReadValue(section2, "HeadColorID", GlobalVars.UserCustomization.HeadColorID.ToString()); + headcolorstring = ini.IniReadValue(section2, "HeadColorString", GlobalVars.UserCustomization.HeadColorString.ToString()); + torsocolorid = ini.IniReadValue(section2, "TorsoColorID", GlobalVars.UserCustomization.TorsoColorID.ToString()); + torsocolorstring = ini.IniReadValue(section2, "TorsoColorString", GlobalVars.UserCustomization.TorsoColorString.ToString()); + larmid = ini.IniReadValue(section2, "LeftArmColorID", GlobalVars.UserCustomization.LeftArmColorID.ToString()); + larmstring = ini.IniReadValue(section2, "LeftArmColorString", GlobalVars.UserCustomization.LeftArmColorString.ToString()); + rarmid = ini.IniReadValue(section2, "RightArmColorID", GlobalVars.UserCustomization.RightArmColorID.ToString()); + rarmstring = ini.IniReadValue(section2, "RightArmColorString", GlobalVars.UserCustomization.RightArmColorString.ToString()); + llegid = ini.IniReadValue(section2, "LeftLegColorID", GlobalVars.UserCustomization.LeftLegColorID.ToString()); + llegstring = ini.IniReadValue(section2, "LeftLegColorString", GlobalVars.UserCustomization.LeftLegColorString.ToString()); + rlegid = ini.IniReadValue(section2, "RightLegColorID", GlobalVars.UserCustomization.RightLegColorID.ToString()); + rlegstring = ini.IniReadValue(section2, "RightLegColorString", GlobalVars.UserCustomization.RightLegColorString.ToString()); string section3 = "Other"; - characterid = ini.IniReadValue(section3, "CharacterID", GlobalVars.CharacterID.ToString()); - extraishat = ini.IniReadValue(section3, "ExtraSelectionIsHat", GlobalVars.Custom_Extra_SelectionIsHat.ToString()); + characterid = ini.IniReadValue(section3, "CharacterID", GlobalVars.UserCustomization.CharacterID.ToString()); + extraishat = ini.IniReadValue(section3, "ExtraSelectionIsHat", GlobalVars.UserCustomization.ExtraSelectionIsHat.ToString()); + showhatsonextra = ini.IniReadValue(section3, "ShowHatsOnExtra", GlobalVars.UserCustomization.ShowHatsInExtra.ToString()); try { - GlobalVars.Custom_Hat1ID_Offline = hat1; - GlobalVars.Custom_Hat2ID_Offline = hat2; - GlobalVars.Custom_Hat3ID_Offline = hat3; + GlobalVars.UserCustomization.Hat1 = hat1; + GlobalVars.UserCustomization.Hat2 = hat2; + GlobalVars.UserCustomization.Hat3 = hat3; int iline4 = Convert.ToInt32(headcolorid); - GlobalVars.HeadColorID = iline4; + GlobalVars.UserCustomization.HeadColorID = iline4; int iline5 = Convert.ToInt32(torsocolorid); - GlobalVars.TorsoColorID = iline5; + GlobalVars.UserCustomization.TorsoColorID = iline5; int iline6 = Convert.ToInt32(larmid); - GlobalVars.LeftArmColorID = iline6; + GlobalVars.UserCustomization.LeftArmColorID = iline6; int iline7 = Convert.ToInt32(rarmid); - GlobalVars.RightArmColorID = iline7; + GlobalVars.UserCustomization.RightArmColorID = iline7; int iline8 = Convert.ToInt32(llegid); - GlobalVars.LeftLegColorID = iline8; + GlobalVars.UserCustomization.LeftLegColorID = iline8; int iline9 = Convert.ToInt32(rlegid); - GlobalVars.RightLegColorID = iline9; + GlobalVars.UserCustomization.RightLegColorID = iline9; - GlobalVars.ColorMenu_HeadColor = headcolorstring; - GlobalVars.ColorMenu_TorsoColor = torsocolorstring; - GlobalVars.ColorMenu_LeftArmColor = larmstring; - GlobalVars.ColorMenu_RightArmColor = rarmstring; - GlobalVars.ColorMenu_LeftLegColor = llegstring; - GlobalVars.ColorMenu_RightLegColor = rlegstring; + GlobalVars.UserCustomization.HeadColorString = headcolorstring; + GlobalVars.UserCustomization.TorsoColorString = torsocolorstring; + GlobalVars.UserCustomization.LeftArmColorString = larmstring; + GlobalVars.UserCustomization.RightArmColorString = rarmstring; + GlobalVars.UserCustomization.LeftLegColorString = llegstring; + GlobalVars.UserCustomization.RightLegColorString = rlegstring; - GlobalVars.Custom_Face_Offline = face; - GlobalVars.Custom_Head_Offline = head; - GlobalVars.Custom_T_Shirt_Offline = tshirt; - GlobalVars.Custom_Shirt_Offline = shirt; - GlobalVars.Custom_Pants_Offline = pants; - GlobalVars.Custom_Icon_Offline = icon; + GlobalVars.UserCustomization.Face = face; + GlobalVars.UserCustomization.Head = head; + GlobalVars.UserCustomization.TShirt = tshirt; + GlobalVars.UserCustomization.Shirt = shirt; + GlobalVars.UserCustomization.Pants = pants; + GlobalVars.UserCustomization.Icon = icon; - GlobalVars.CharacterID = characterid; + GlobalVars.UserCustomization.CharacterID = characterid; - GlobalVars.Custom_Extra = extra; + GlobalVars.UserCustomization.Extra = extra; bool bline24 = Convert.ToBoolean(extraishat); - GlobalVars.Custom_Extra_SelectionIsHat = bline24; + GlobalVars.UserCustomization.ExtraSelectionIsHat = bline24; + + bool bline9 = Convert.ToBoolean(showhatsonextra); + GlobalVars.UserCustomization.ShowHatsInExtra = bline9; } catch (Exception) { @@ -622,7 +622,6 @@ public class LauncherFuncs GlobalVars.SelectedClient = GlobalVars.DefaultClient; GlobalVars.RobloxPort = 53640; GlobalVars.PlayerLimit = 12; - GlobalVars.Custom_Extra_ShowHats = false; GlobalVars.UPnP = false; //GlobalVars.UDP = true; GlobalVars.DisabledHelp = false; @@ -638,73 +637,74 @@ public class LauncherFuncs public static void ResetCustomizationValues() { - GlobalVars.Custom_Hat1ID_Offline = "NoHat.rbxm"; - GlobalVars.Custom_Hat2ID_Offline = "NoHat.rbxm"; - GlobalVars.Custom_Hat3ID_Offline = "NoHat.rbxm"; - GlobalVars.Custom_Face_Offline = "DefaultFace.rbxm"; - GlobalVars.Custom_Head_Offline = "DefaultHead.rbxm"; - GlobalVars.Custom_T_Shirt_Offline = "NoTShirt.rbxm"; - GlobalVars.Custom_Shirt_Offline = "NoShirt.rbxm"; - GlobalVars.Custom_Pants_Offline = "NoPants.rbxm"; - GlobalVars.Custom_Icon_Offline = "NBC"; - GlobalVars.Custom_Extra = "NoExtra.rbxm"; - GlobalVars.HeadColorID = 24; - GlobalVars.TorsoColorID = 23; - GlobalVars.LeftArmColorID = 24; - GlobalVars.RightArmColorID = 24; - GlobalVars.LeftLegColorID = 119; - GlobalVars.RightLegColorID = 119; - GlobalVars.CharacterID = ""; - GlobalVars.ColorMenu_HeadColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_TorsoColor = "Color [A=255, R=13, G=105, B=172]"; - GlobalVars.ColorMenu_LeftArmColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_RightArmColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_LeftLegColor = "Color [A=255, R=164, G=189, B=71]"; - GlobalVars.ColorMenu_RightLegColor = "Color [A=255, R=164, G=189, B=71]"; - GlobalVars.Custom_Extra_SelectionIsHat = false; - ReloadLoadtextValue(); + GlobalVars.UserCustomization.Hat1 = "NoHat.rbxm"; + GlobalVars.UserCustomization.Hat2 = "NoHat.rbxm"; + GlobalVars.UserCustomization.Hat3 = "NoHat.rbxm"; + GlobalVars.UserCustomization.Face = "DefaultFace.rbxm"; + GlobalVars.UserCustomization.Head = "DefaultHead.rbxm"; + GlobalVars.UserCustomization.TShirt = "NoTShirt.rbxm"; + GlobalVars.UserCustomization.Shirt = "NoShirt.rbxm"; + GlobalVars.UserCustomization.Pants = "NoPants.rbxm"; + GlobalVars.UserCustomization.Icon = "NBC"; + GlobalVars.UserCustomization.Extra = "NoExtra.rbxm"; + GlobalVars.UserCustomization.HeadColorID = 24; + GlobalVars.UserCustomization.TorsoColorID = 23; + GlobalVars.UserCustomization.LeftArmColorID = 24; + GlobalVars.UserCustomization.RightArmColorID = 24; + GlobalVars.UserCustomization.LeftLegColorID = 119; + GlobalVars.UserCustomization.RightLegColorID = 119; + GlobalVars.UserCustomization.CharacterID = ""; + GlobalVars.UserCustomization.HeadColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.TorsoColorString = "Color [A=255, R=13, G=105, B=172]"; + GlobalVars.UserCustomization.LeftArmColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.RightArmColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.LeftLegColorString = "Color [A=255, R=164, G=189, B=71]"; + GlobalVars.UserCustomization.RightLegColorString = "Color [A=255, R=164, G=189, B=71]"; + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + GlobalVars.UserCustomization.ShowHatsInExtra = false; + ReloadLoadtextValue(); } public static void ReloadLoadtextValue() { - string hat1 = (!GlobalVars.Custom_Hat1ID_Offline.EndsWith("-Solo.rbxm")) ? GlobalVars.Custom_Hat1ID_Offline : "NoHat.rbxm"; - string hat2 = (!GlobalVars.Custom_Hat2ID_Offline.EndsWith("-Solo.rbxm")) ? GlobalVars.Custom_Hat2ID_Offline : "NoHat.rbxm"; - string hat3 = (!GlobalVars.Custom_Hat3ID_Offline.EndsWith("-Solo.rbxm")) ? GlobalVars.Custom_Hat3ID_Offline : "NoHat.rbxm"; - string extra = (!GlobalVars.Custom_Extra.EndsWith("-Solo.rbxm")) ? GlobalVars.Custom_Extra : "NoExtra.rbxm"; + string hat1 = (!GlobalVars.UserCustomization.Hat1.EndsWith("-Solo.rbxm")) ? GlobalVars.UserCustomization.Hat1 : "NoHat.rbxm"; + string hat2 = (!GlobalVars.UserCustomization.Hat2.EndsWith("-Solo.rbxm")) ? GlobalVars.UserCustomization.Hat2 : "NoHat.rbxm"; + string hat3 = (!GlobalVars.UserCustomization.Hat3.EndsWith("-Solo.rbxm")) ? GlobalVars.UserCustomization.Hat3 : "NoHat.rbxm"; + string extra = (!GlobalVars.UserCustomization.Extra.EndsWith("-Solo.rbxm")) ? GlobalVars.UserCustomization.Extra : "NoExtra.rbxm"; GlobalVars.loadtext = "'" + hat1 + "','" + hat2 + "','" + hat3 + "'," + - GlobalVars.HeadColorID + "," + - GlobalVars.TorsoColorID + "," + - GlobalVars.LeftArmColorID + "," + - GlobalVars.RightArmColorID + "," + - GlobalVars.LeftLegColorID + "," + - GlobalVars.RightLegColorID + ",'" + - GlobalVars.Custom_T_Shirt_Offline + "','" + - GlobalVars.Custom_Shirt_Offline + "','" + - GlobalVars.Custom_Pants_Offline + "','" + - GlobalVars.Custom_Face_Offline + "','" + - GlobalVars.Custom_Head_Offline + "','" + - GlobalVars.Custom_Icon_Offline + "','" + + GlobalVars.UserCustomization.HeadColorID + "," + + GlobalVars.UserCustomization.TorsoColorID + "," + + GlobalVars.UserCustomization.LeftArmColorID + "," + + GlobalVars.UserCustomization.RightArmColorID + "," + + GlobalVars.UserCustomization.LeftLegColorID + "," + + GlobalVars.UserCustomization.RightLegColorID + ",'" + + GlobalVars.UserCustomization.TShirt + "','" + + GlobalVars.UserCustomization.Shirt + "','" + + GlobalVars.UserCustomization.Pants + "','" + + GlobalVars.UserCustomization.Face + "','" + + GlobalVars.UserCustomization.Head + "','" + + GlobalVars.UserCustomization.Icon + "','" + extra + "'"; - GlobalVars.sololoadtext = "'" + GlobalVars.Custom_Hat1ID_Offline + "','" + - GlobalVars.Custom_Hat2ID_Offline + "','" + - GlobalVars.Custom_Hat3ID_Offline + "'," + - GlobalVars.HeadColorID + "," + - GlobalVars.TorsoColorID + "," + - GlobalVars.LeftArmColorID + "," + - GlobalVars.RightArmColorID + "," + - GlobalVars.LeftLegColorID + "," + - GlobalVars.RightLegColorID + ",'" + - GlobalVars.Custom_T_Shirt_Offline + "','" + - GlobalVars.Custom_Shirt_Offline + "','" + - GlobalVars.Custom_Pants_Offline + "','" + - GlobalVars.Custom_Face_Offline + "','" + - GlobalVars.Custom_Head_Offline + "','" + - GlobalVars.Custom_Icon_Offline + "','" + - GlobalVars.Custom_Extra + "'"; + GlobalVars.sololoadtext = "'" + GlobalVars.UserCustomization.Hat1 + "','" + + GlobalVars.UserCustomization.Hat2 + "','" + + GlobalVars.UserCustomization.Hat3 + "'," + + GlobalVars.UserCustomization.HeadColorID + "," + + GlobalVars.UserCustomization.TorsoColorID + "," + + GlobalVars.UserCustomization.LeftArmColorID + "," + + GlobalVars.UserCustomization.RightArmColorID + "," + + GlobalVars.UserCustomization.LeftLegColorID + "," + + GlobalVars.UserCustomization.RightLegColorID + ",'" + + GlobalVars.UserCustomization.TShirt + "','" + + GlobalVars.UserCustomization.Shirt + "','" + + GlobalVars.UserCustomization.Pants + "','" + + GlobalVars.UserCustomization.Face + "','" + + GlobalVars.UserCustomization.Head + "','" + + GlobalVars.UserCustomization.Icon + "','" + + GlobalVars.UserCustomization.Extra + "'"; } public static void GeneratePlayerID() diff --git a/NovetusLauncher/NovetusFuncs/NovetusSpecialClasses.cs b/NovetusLauncher/NovetusFuncs/NovetusSpecialClasses.cs index aef02de..7e74a5c 100644 --- a/NovetusLauncher/NovetusFuncs/NovetusSpecialClasses.cs +++ b/NovetusLauncher/NovetusFuncs/NovetusSpecialClasses.cs @@ -51,7 +51,6 @@ public class ClientInfo * Finish classes for: * * config - * customization * info * reshade * @@ -60,16 +59,84 @@ public class ClientInfo */ public class Config { + public Config() + { + + } + + } public class CustomizationConfig { + public CustomizationConfig() + { + Hat1 = "NoHat.rbxm"; + Hat2 = "NoHat.rbxm"; + Hat3 = "NoHat.rbxm"; + Face = "DefaultFace.rbxm"; + Head = "DefaultHead.rbxm"; + TShirt = "NoTShirt.rbxm"; + Shirt = "NoShirt.rbxm"; + Pants = "NoPants.rbxm"; + Icon = "NBC"; + Extra = "NoExtra.rbxm"; + HeadColorID = 24; + TorsoColorID = 23; + LeftArmColorID = 24; + RightArmColorID = 24; + LeftLegColorID = 119; + RightLegColorID = 119; + HeadColorString = "Color [A=255, R=245, G=205, B=47]"; + TorsoColorString = "Color [A=255, R=13, G=105, B=172]"; + LeftArmColorString = "Color [A=255, R=245, G=205, B=47]"; + RightArmColorString = "Color [A=255, R=245, G=205, B=47]"; + LeftLegColorString = "Color [A=255, R=164, G=189, B=71]"; + RightLegColorString = "Color [A=255, R=164, G=189, B=71]"; + ExtraSelectionIsHat = false; + ShowHatsInExtra = false; + CharacterID = ""; + } + + public string Hat1 { get; set; } + public string Hat2 { get; set; } + public string Hat3 { get; set; } + public string Face { get; set; } + public string Head { get; set; } + public string TShirt { get; set; } + public string Shirt { get; set; } + public string Pants { get; set; } + public string Icon { get; set; } + public string Extra { get; set; } + public int HeadColorID { get; set; } + public int TorsoColorID { get; set; } + public int LeftArmColorID { get; set; } + public int RightArmColorID { get; set; } + public int LeftLegColorID { get; set; } + public int RightLegColorID { get; set; } + public string HeadColorString { get; set; } + public string TorsoColorString { get; set; } + public string LeftArmColorString { get; set; } + public string RightArmColorString { get; set; } + public string LeftLegColorString { get; set; } + public string RightLegColorString { get; set; } + public bool ExtraSelectionIsHat { get; set; } + public bool ShowHatsInExtra { get; set; } + public string CharacterID { get; set; } } public class ProgramInfo { + public ProgramInfo() + { + + } } public class ReShadeConfig { + public ReShadeConfig() + { + + } } diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs index a51a140..f215d07 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs @@ -124,65 +124,65 @@ namespace NovetusLauncher { //body label2.Text = SelectedPart; - button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); - button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); - button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); - button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); - button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); - button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + button1.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString); + button2.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString); + button3.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString); + button4.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString); + button5.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString); + button6.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString); //icon - label5.Text = GlobalVars.Custom_Icon_Offline; + label5.Text = GlobalVars.UserCustomization.Icon; //charid - textBox1.Text = GlobalVars.CharacterID; + textBox1.Text = GlobalVars.UserCustomization.CharacterID; - checkBox1.Checked = GlobalVars.Custom_Extra_ShowHats; + checkBox1.Checked = GlobalVars.UserCustomization.ShowHatsInExtra; //clothing - if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://")) + if (GlobalVars.UserCustomization.TShirt.Contains("http://")) { - switch (GlobalVars.Custom_T_Shirt_Offline) + switch (GlobalVars.UserCustomization.TShirt) { case string finobe when finobe.Contains("http://finobe.com/asset/?id="): - textBox12.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); + textBox12.Text = GlobalVars.UserCustomization.TShirt.Replace("http://finobe.com/asset/?id=", ""); comboBox3.SelectedItem = "Finobe"; break; case string roblox when roblox.Contains("http://www.roblox.com/asset/?id="): default: - textBox12.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + textBox12.Text = GlobalVars.UserCustomization.TShirt.Replace("http://www.roblox.com/asset/?id=", ""); comboBox3.SelectedItem = "Roblox"; break; } } - if (GlobalVars.Custom_Shirt_Offline.Contains("http://")) + if (GlobalVars.UserCustomization.Shirt.Contains("http://")) { - switch (GlobalVars.Custom_Shirt_Offline) + switch (GlobalVars.UserCustomization.Shirt) { case string finobe when finobe.Contains("http://finobe.com/asset/?id="): - textBox11.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); + textBox11.Text = GlobalVars.UserCustomization.Shirt.Replace("http://finobe.com/asset/?id=", ""); comboBox2.SelectedItem = "Finobe"; break; case string roblox when roblox.Contains("http://www.roblox.com/asset/?id="): default: - textBox11.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + textBox11.Text = GlobalVars.UserCustomization.Shirt.Replace("http://www.roblox.com/asset/?id=", ""); comboBox2.SelectedItem = "Roblox"; break; } } - if (GlobalVars.Custom_Pants_Offline.Contains("http://")) + if (GlobalVars.UserCustomization.Pants.Contains("http://")) { - switch (GlobalVars.Custom_Pants_Offline) + switch (GlobalVars.UserCustomization.Pants) { case string finobe when finobe.Contains("http://finobe.com/asset/?id="): - textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://finobe.com/asset/?id=", ""); + textBox13.Text = GlobalVars.UserCustomization.Pants.Replace("http://finobe.com/asset/?id=", ""); comboBox1.SelectedItem = "Finobe"; break; case string roblox when roblox.Contains("http://www.roblox.com/asset/?id="): default: - textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + textBox13.Text = GlobalVars.UserCustomization.Pants.Replace("http://www.roblox.com/asset/?id=", ""); comboBox1.SelectedItem = "Roblox"; break; } @@ -258,43 +258,43 @@ namespace NovetusLauncher listBox2.Items.Add(file.Name); listBox3.Items.Add(file.Name); } - listBox1.SelectedItem = GlobalVars.Custom_Hat1ID_Offline; - listBox2.SelectedItem = GlobalVars.Custom_Hat2ID_Offline; - listBox3.SelectedItem = GlobalVars.Custom_Hat3ID_Offline; + listBox1.SelectedItem = GlobalVars.UserCustomization.Hat1; + listBox2.SelectedItem = GlobalVars.UserCustomization.Hat2; + listBox3.SelectedItem = GlobalVars.UserCustomization.Hat3; listBox1.Enabled = true; listBox2.Enabled = true; listBox3.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } break; @@ -323,18 +323,18 @@ namespace NovetusLauncher listBox4.Items.Add(file.Name); } - listBox4.SelectedItem = GlobalVars.Custom_Face_Offline; + listBox4.SelectedItem = GlobalVars.UserCustomization.Face; listBox4.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } break; @@ -364,18 +364,18 @@ namespace NovetusLauncher listBox5.Items.Add(file.Name); } - listBox5.SelectedItem = GlobalVars.Custom_T_Shirt_Offline; + listBox5.SelectedItem = GlobalVars.UserCustomization.TShirt; listBox5.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -411,18 +411,18 @@ namespace NovetusLauncher listBox6.Items.Add(file.Name); } - listBox6.SelectedItem = GlobalVars.Custom_Shirt_Offline; + listBox6.SelectedItem = GlobalVars.UserCustomization.Shirt; listBox6.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -458,18 +458,18 @@ namespace NovetusLauncher listBox7.Items.Add(file.Name); } - listBox7.SelectedItem = GlobalVars.Custom_Pants_Offline; + listBox7.SelectedItem = GlobalVars.UserCustomization.Pants; listBox7.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -504,18 +504,18 @@ namespace NovetusLauncher listBox8.Items.Add(file.Name); } - listBox8.SelectedItem = GlobalVars.Custom_Head_Offline; + listBox8.SelectedItem = GlobalVars.UserCustomization.Head; listBox8.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } break; @@ -546,7 +546,7 @@ namespace NovetusLauncher } } - if (GlobalVars.Custom_Extra_ShowHats == true) + if (GlobalVars.UserCustomization.ShowHatsInExtra == true) { if (Directory.Exists(GlobalVars.hatdir)) { @@ -569,34 +569,34 @@ namespace NovetusLauncher } } - listBox9.SelectedItem = GlobalVars.Custom_Extra; + listBox9.SelectedItem = GlobalVars.UserCustomization.Extra; listBox9.Enabled = true; try { - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch (Exception) { if (Directory.Exists(GlobalVars.hatdir)) { - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -627,17 +627,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } } } @@ -646,17 +646,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString(); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } } } @@ -665,17 +665,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString(); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } } @@ -687,44 +687,44 @@ namespace NovetusLauncher Random random = new Random(); int randomHat1 = random.Next(listBox1.Items.Count); listBox1.SelectedItem = listBox1.Items[randomHat1]; - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; int randomHat2 = random.Next(listBox2.Items.Count); listBox2.SelectedItem = listBox1.Items[randomHat2]; - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString(); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; int randomHat3 = random.Next(listBox3.Items.Count); listBox3.SelectedItem = listBox1.Items[randomHat3]; - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString(); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } } @@ -734,42 +734,42 @@ namespace NovetusLauncher if (Directory.Exists(GlobalVars.hatdir)) { listBox1.SelectedItem = "NoHat.rbxm"; - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; listBox2.SelectedItem = "NoHat.rbxm"; - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString(); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; listBox3.SelectedItem = "NoHat.rbxm"; - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString(); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } } @@ -780,17 +780,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.facedir)) { - GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } } @@ -802,17 +802,17 @@ namespace NovetusLauncher Random random = new Random(); int randomFace1 = random.Next(listBox4.Items.Count); listBox4.SelectedItem = listBox4.Items[randomFace1]; - GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } } @@ -822,17 +822,17 @@ namespace NovetusLauncher if (Directory.Exists(GlobalVars.facedir)) { listBox4.SelectedItem = "DefaultFace.rbxm"; - GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } } @@ -847,17 +847,17 @@ namespace NovetusLauncher textBox12.Text = ""; comboBox3.SelectedItem = "Roblox"; listBox5.SelectedItem = previtem; - GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -871,17 +871,17 @@ namespace NovetusLauncher Random random = new Random(); int randomTShirt1 = random.Next(listBox5.Items.Count); listBox5.SelectedItem = listBox5.Items[randomTShirt1]; - GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -893,17 +893,17 @@ namespace NovetusLauncher textBox12.Text = ""; comboBox3.SelectedItem = "Roblox"; listBox5.SelectedItem = "NoTShirt.rbxm"; - GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -918,17 +918,17 @@ namespace NovetusLauncher textBox11.Text = ""; comboBox2.SelectedItem = "Roblox"; listBox6.SelectedItem = previtem; - GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -942,17 +942,17 @@ namespace NovetusLauncher Random random = new Random(); int randomShirt1 = random.Next(listBox6.Items.Count); listBox6.SelectedItem = listBox6.Items[randomShirt1]; - GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -964,17 +964,17 @@ namespace NovetusLauncher textBox11.Text = ""; comboBox2.SelectedItem = "Roblox"; listBox6.SelectedItem = "NoShirt.rbxm"; - GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -989,17 +989,17 @@ namespace NovetusLauncher textBox13.Text = ""; comboBox1.SelectedItem = "Roblox"; listBox7.SelectedItem = previtem; - GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -1013,17 +1013,17 @@ namespace NovetusLauncher Random random = new Random(); int randomPants1 = random.Next(listBox7.Items.Count); listBox7.SelectedItem = listBox7.Items[randomPants1]; - GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -1035,17 +1035,17 @@ namespace NovetusLauncher textBox13.Text = ""; comboBox1.SelectedItem = "Roblox"; listBox7.SelectedItem = "NoPants.rbxm"; - GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -1056,17 +1056,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.headdir)) { - GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } } @@ -1078,17 +1078,17 @@ namespace NovetusLauncher Random random = new Random(); int randomHead1 = random.Next(listBox8.Items.Count); listBox8.SelectedItem = listBox8.Items[randomHead1]; - GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } } @@ -1098,17 +1098,17 @@ namespace NovetusLauncher if (Directory.Exists(GlobalVars.headdir)) { listBox8.SelectedItem = "DefaultHead.rbxm"; - GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } } @@ -1178,34 +1178,34 @@ namespace NovetusLauncher switch (part) { case "Head": - GlobalVars.HeadColorID = ColorID; - GlobalVars.ColorMenu_HeadColor = ButtonColor.ToString(); - button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); + GlobalVars.UserCustomization.HeadColorID = ColorID; + GlobalVars.UserCustomization.HeadColorString = ButtonColor.ToString(); + button1.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString); break; case "Torso": - GlobalVars.TorsoColorID = ColorID; - GlobalVars.ColorMenu_TorsoColor = ButtonColor.ToString(); - button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); + GlobalVars.UserCustomization.TorsoColorID = ColorID; + GlobalVars.UserCustomization.TorsoColorString = ButtonColor.ToString(); + button2.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString); break; case "Right Arm": - GlobalVars.RightArmColorID = ColorID; - GlobalVars.ColorMenu_RightArmColor = ButtonColor.ToString(); - button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); + GlobalVars.UserCustomization.RightArmColorID = ColorID; + GlobalVars.UserCustomization.RightArmColorString = ButtonColor.ToString(); + button3.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString); break; case "Left Arm": - GlobalVars.LeftArmColorID = ColorID; - GlobalVars.ColorMenu_LeftArmColor = ButtonColor.ToString(); - button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); + GlobalVars.UserCustomization.LeftArmColorID = ColorID; + GlobalVars.UserCustomization.LeftArmColorString = ButtonColor.ToString(); + button4.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString); break; case "Right Leg": - GlobalVars.RightLegColorID = ColorID; - GlobalVars.ColorMenu_RightLegColor = ButtonColor.ToString(); - button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); + GlobalVars.UserCustomization.RightLegColorID = ColorID; + GlobalVars.UserCustomization.RightLegColorString = ButtonColor.ToString(); + button5.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString); break; case "Left Leg": - GlobalVars.LeftLegColorID = ColorID; - GlobalVars.ColorMenu_LeftLegColor = ButtonColor.ToString(); - button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + GlobalVars.UserCustomization.LeftLegColorID = ColorID; + GlobalVars.UserCustomization.LeftLegColorString = ButtonColor.ToString(); + button6.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString); break; default: break; @@ -1418,25 +1418,25 @@ namespace NovetusLauncher void Button40Click(object sender, EventArgs e) { - GlobalVars.HeadColorID = 24; - GlobalVars.TorsoColorID = 23; - GlobalVars.LeftArmColorID = 24; - GlobalVars.RightArmColorID = 24; - GlobalVars.LeftLegColorID = 119; - GlobalVars.RightLegColorID = 119; - GlobalVars.CharacterID = ""; - GlobalVars.ColorMenu_HeadColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_TorsoColor = "Color [A=255, R=13, G=105, B=172]"; - GlobalVars.ColorMenu_LeftArmColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_RightArmColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_LeftLegColor = "Color [A=255, R=164, G=189, B=71]"; - GlobalVars.ColorMenu_RightLegColor = "Color [A=255, R=164, G=189, B=71]"; - button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); - button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); - button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); - button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); - button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); - button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + GlobalVars.UserCustomization.HeadColorID = 24; + GlobalVars.UserCustomization.TorsoColorID = 23; + GlobalVars.UserCustomization.LeftArmColorID = 24; + GlobalVars.UserCustomization.RightArmColorID = 24; + GlobalVars.UserCustomization.LeftLegColorID = 119; + GlobalVars.UserCustomization.RightLegColorID = 119; + GlobalVars.UserCustomization.CharacterID = ""; + GlobalVars.UserCustomization.HeadColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.TorsoColorString = "Color [A=255, R=13, G=105, B=172]"; + GlobalVars.UserCustomization.LeftArmColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.RightArmColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.LeftLegColorString = "Color [A=255, R=164, G=189, B=71]"; + GlobalVars.UserCustomization.RightLegColorString = "Color [A=255, R=164, G=189, B=71]"; + button1.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString); + button2.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString); + button3.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString); + button4.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString); + button5.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString); + button6.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString); } //3dview @@ -1466,31 +1466,31 @@ namespace NovetusLauncher //Icon void Button52Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "BC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "BC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void Button53Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "TBC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "TBC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void Button54Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "OBC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "OBC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void Button55Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "NBC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "NBC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void TextBox1TextChanged(object sender, EventArgs e) { - GlobalVars.CharacterID = textBox1.Text; + GlobalVars.UserCustomization.CharacterID = textBox1.Text; } //extra @@ -1501,34 +1501,34 @@ namespace NovetusLauncher { try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch(Exception) when (!Env.Debugging) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1544,34 +1544,34 @@ namespace NovetusLauncher listBox9.SelectedItem = listBox9.Items[randomItem1]; try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch(Exception) when (!Env.Debugging) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1585,34 +1585,34 @@ namespace NovetusLauncher listBox9.SelectedItem = "NoExtra.rbxm"; try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch(Exception) when (!Env.Debugging) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1624,7 +1624,7 @@ namespace NovetusLauncher switch (checkBox1.Checked) { case true: - GlobalVars.Custom_Extra_ShowHats = true; + GlobalVars.UserCustomization.ShowHatsInExtra = true; if (Directory.Exists(GlobalVars.hatdir)) { @@ -1647,7 +1647,7 @@ namespace NovetusLauncher } break; case false: - GlobalVars.Custom_Extra_ShowHats = false; + GlobalVars.UserCustomization.ShowHatsInExtra = false; listBox9.Items.Clear(); if (Directory.Exists(GlobalVars.extradir)) @@ -1668,34 +1668,34 @@ namespace NovetusLauncher listBox9.SelectedItem = "NoExtra.rbxm"; try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch (Exception) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1852,19 +1852,19 @@ namespace NovetusLauncher private void textBox11_TextChanged(object sender, EventArgs e) { listBox6.SelectedItem = "NoShirt.rbxm"; - GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox11.Text; + GlobalVars.UserCustomization.Shirt = Custom_Shirt_URL + textBox11.Text; } private void textBox12_TextChanged(object sender, EventArgs e) { listBox5.SelectedItem = "NoTShirt.rbxm"; - GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox12.Text; + GlobalVars.UserCustomization.TShirt = Custom_T_Shirt_URL + textBox12.Text; } private void textBox13_TextChanged(object sender, EventArgs e) { listBox7.SelectedItem = "NoPants.rbxm"; - GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text; + GlobalVars.UserCustomization.Pants = Custom_Pants_URL + textBox13.Text; } private void comboBox2_SelectedIndexChanged(object sender, EventArgs e) @@ -1881,7 +1881,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(textBox11.Text)) { - GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox11.Text; + GlobalVars.UserCustomization.Shirt = Custom_Shirt_URL + textBox11.Text; } } @@ -1899,7 +1899,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(textBox13.Text)) { - GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text; + GlobalVars.UserCustomization.Pants = Custom_Pants_URL + textBox13.Text; } } @@ -1917,7 +1917,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(textBox12.Text)) { - GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox12.Text; + GlobalVars.UserCustomization.TShirt = Custom_T_Shirt_URL + textBox12.Text; } } } diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs index f34691a..90d21ad 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs @@ -122,65 +122,65 @@ namespace NovetusLauncher { //body label2.Text = SelectedPart; - button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); - button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); - button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); - button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); - button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); - button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + button1.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString); + button2.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString); + button3.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString); + button4.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString); + button5.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString); + button6.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString); //icon - label5.Text = GlobalVars.Custom_Icon_Offline; + label5.Text = GlobalVars.UserCustomization.Icon; //charid - textBox1.Text = GlobalVars.CharacterID; + textBox1.Text = GlobalVars.UserCustomization.CharacterID; - checkBox1.Checked = GlobalVars.Custom_Extra_ShowHats; + checkBox1.Checked = GlobalVars.UserCustomization.ShowHatsInExtra; //clothing - if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://")) + if (GlobalVars.UserCustomization.TShirt.Contains("http://")) { - switch (GlobalVars.Custom_T_Shirt_Offline) + switch (GlobalVars.UserCustomization.TShirt) { case string finobe when finobe.Contains("http://finobe.com/asset/?id="): - textBox11.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); + textBox11.Text = GlobalVars.UserCustomization.TShirt.Replace("http://finobe.com/asset/?id=", ""); comboBox2.SelectedItem = "Finobe"; break; case string roblox when roblox.Contains("http://www.roblox.com/asset/?id="): default: - textBox11.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + textBox11.Text = GlobalVars.UserCustomization.TShirt.Replace("http://www.roblox.com/asset/?id=", ""); comboBox2.SelectedItem = "Roblox"; break; } } - if (GlobalVars.Custom_Shirt_Offline.Contains("http://")) + if (GlobalVars.UserCustomization.Shirt.Contains("http://")) { - switch (GlobalVars.Custom_Shirt_Offline) + switch (GlobalVars.UserCustomization.Shirt) { case string finobe when finobe.Contains("http://finobe.com/asset/?id="): - textBox12.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); + textBox12.Text = GlobalVars.UserCustomization.Shirt.Replace("http://finobe.com/asset/?id=", ""); comboBox1.SelectedItem = "Finobe"; break; case string roblox when roblox.Contains("http://www.roblox.com/asset/?id="): default: - textBox12.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + textBox12.Text = GlobalVars.UserCustomization.Shirt.Replace("http://www.roblox.com/asset/?id=", ""); comboBox1.SelectedItem = "Roblox"; break; } } - if (GlobalVars.Custom_Pants_Offline.Contains("http://")) + if (GlobalVars.UserCustomization.Pants.Contains("http://")) { - switch (GlobalVars.Custom_Pants_Offline) + switch (GlobalVars.UserCustomization.Pants) { case string finobe when finobe.Contains("http://finobe.com/asset/?id="): - textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://finobe.com/asset/?id=", ""); + textBox13.Text = GlobalVars.UserCustomization.Pants.Replace("http://finobe.com/asset/?id=", ""); comboBox3.SelectedItem = "Finobe"; break; case string roblox when roblox.Contains("http://www.roblox.com/asset/?id="): default: - textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + textBox13.Text = GlobalVars.UserCustomization.Pants.Replace("http://www.roblox.com/asset/?id=", ""); comboBox3.SelectedItem = "Roblox"; break; } @@ -253,43 +253,43 @@ namespace NovetusLauncher listBox2.Items.Add(file.Name); listBox3.Items.Add(file.Name); } - listBox1.SelectedItem = GlobalVars.Custom_Hat1ID_Offline; - listBox2.SelectedItem = GlobalVars.Custom_Hat2ID_Offline; - listBox3.SelectedItem = GlobalVars.Custom_Hat3ID_Offline; + listBox1.SelectedItem = GlobalVars.UserCustomization.Hat1; + listBox2.SelectedItem = GlobalVars.UserCustomization.Hat2; + listBox3.SelectedItem = GlobalVars.UserCustomization.Hat3; listBox1.Enabled = true; listBox2.Enabled = true; listBox3.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } break; @@ -317,18 +317,18 @@ namespace NovetusLauncher listBox4.Items.Add(file.Name); } - listBox4.SelectedItem = GlobalVars.Custom_Face_Offline; + listBox4.SelectedItem = GlobalVars.UserCustomization.Face; listBox4.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } break; @@ -358,18 +358,18 @@ namespace NovetusLauncher listBox5.Items.Add(file.Name); } - listBox5.SelectedItem = GlobalVars.Custom_T_Shirt_Offline; + listBox5.SelectedItem = GlobalVars.UserCustomization.TShirt; listBox5.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -405,18 +405,18 @@ namespace NovetusLauncher listBox6.Items.Add(file.Name); } - listBox6.SelectedItem = GlobalVars.Custom_Shirt_Offline; + listBox6.SelectedItem = GlobalVars.UserCustomization.Shirt; listBox6.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -452,18 +452,18 @@ namespace NovetusLauncher listBox7.Items.Add(file.Name); } - listBox7.SelectedItem = GlobalVars.Custom_Pants_Offline; + listBox7.SelectedItem = GlobalVars.UserCustomization.Pants; listBox7.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -497,18 +497,18 @@ namespace NovetusLauncher listBox8.Items.Add(file.Name); } - listBox8.SelectedItem = GlobalVars.Custom_Head_Offline; + listBox8.SelectedItem = GlobalVars.UserCustomization.Head; listBox8.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } break; @@ -538,7 +538,7 @@ namespace NovetusLauncher } } - if (GlobalVars.Custom_Extra_ShowHats == true) + if (GlobalVars.UserCustomization.ShowHatsInExtra == true) { if (Directory.Exists(GlobalVars.hatdir)) { @@ -561,34 +561,34 @@ namespace NovetusLauncher } } - listBox9.SelectedItem = GlobalVars.Custom_Extra; + listBox9.SelectedItem = GlobalVars.UserCustomization.Extra; listBox9.Enabled = true; try { - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch (Exception) { if (Directory.Exists(GlobalVars.hatdir)) { - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -619,17 +619,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } } } @@ -638,17 +638,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString(); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } } } @@ -657,17 +657,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString(); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } } @@ -679,44 +679,44 @@ namespace NovetusLauncher Random random = new Random(); int randomHat1 = random.Next(listBox1.Items.Count); listBox1.SelectedItem = listBox1.Items[randomHat1]; - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; int randomHat2 = random.Next(listBox2.Items.Count); listBox2.SelectedItem = listBox1.Items[randomHat2]; - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString(); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; int randomHat3 = random.Next(listBox3.Items.Count); listBox3.SelectedItem = listBox1.Items[randomHat3]; - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString(); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } } @@ -726,42 +726,42 @@ namespace NovetusLauncher if (Directory.Exists(GlobalVars.hatdir)) { listBox1.SelectedItem = "NoHat.rbxm"; - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat1 = listBox1.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; listBox2.SelectedItem = "NoHat.rbxm"; - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat2 = listBox2.SelectedItem.ToString(); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; listBox3.SelectedItem = "NoHat.rbxm"; - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Hat3 = listBox3.SelectedItem.ToString(); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt")) { - textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox2.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat1.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox2.Text = GlobalVars.Custom_Hat1ID_Offline; + textBox2.Text = GlobalVars.UserCustomization.Hat1; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt")) { - textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox3.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat2.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox3.Text = GlobalVars.Custom_Hat2ID_Offline; + textBox3.Text = GlobalVars.UserCustomization.Hat2; } - if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt")) { - textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox4.Text = File.ReadAllText(GlobalVars.hatdir + @"\\" + GlobalVars.UserCustomization.Hat3.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox4.Text = GlobalVars.Custom_Hat3ID_Offline; + textBox4.Text = GlobalVars.UserCustomization.Hat3; } } } @@ -772,17 +772,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.facedir)) { - GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } } @@ -794,17 +794,17 @@ namespace NovetusLauncher Random random = new Random(); int randomFace1 = random.Next(listBox4.Items.Count); listBox4.SelectedItem = listBox4.Items[randomFace1]; - GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } } @@ -814,17 +814,17 @@ namespace NovetusLauncher if (Directory.Exists(GlobalVars.facedir)) { listBox4.SelectedItem = "DefaultFace.rbxm"; - GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Face = listBox4.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; - if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt")) { - textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox6.Text = File.ReadAllText(GlobalVars.facedir + @"\\" + GlobalVars.UserCustomization.Face.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox6.Text = GlobalVars.Custom_Face_Offline; + textBox6.Text = GlobalVars.UserCustomization.Face; } } } @@ -839,17 +839,17 @@ namespace NovetusLauncher textBox11.Text = ""; comboBox2.SelectedItem = "Roblox"; listBox5.SelectedItem = previtem; - GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -863,17 +863,17 @@ namespace NovetusLauncher Random random = new Random(); int randomTShirt1 = random.Next(listBox5.Items.Count); listBox5.SelectedItem = listBox5.Items[randomTShirt1]; - GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -885,17 +885,17 @@ namespace NovetusLauncher textBox11.Text = ""; comboBox2.SelectedItem = "Roblox"; listBox5.SelectedItem = "NoTShirt.rbxm"; - GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.TShirt = listBox5.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; - if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox7.Text = File.ReadAllText(GlobalVars.tshirtdir + @"\\" + GlobalVars.UserCustomization.TShirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox7.Text = GlobalVars.Custom_T_Shirt_Offline; + textBox7.Text = GlobalVars.UserCustomization.TShirt; } } } @@ -910,17 +910,17 @@ namespace NovetusLauncher textBox12.Text = ""; comboBox1.SelectedItem = "Roblox"; listBox6.SelectedItem = previtem; - GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -934,17 +934,17 @@ namespace NovetusLauncher Random random = new Random(); int randomShirt1 = random.Next(listBox6.Items.Count); listBox6.SelectedItem = listBox6.Items[randomShirt1]; - GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -956,17 +956,17 @@ namespace NovetusLauncher textBox12.Text = ""; comboBox1.SelectedItem = "Roblox"; listBox6.SelectedItem = "NoShirt.rbxm"; - GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Shirt = listBox6.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; - if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt")) { - textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox8.Text = File.ReadAllText(GlobalVars.shirtdir + @"\\" + GlobalVars.UserCustomization.Shirt.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox8.Text = GlobalVars.Custom_Shirt_Offline; + textBox8.Text = GlobalVars.UserCustomization.Shirt; } } } @@ -981,17 +981,17 @@ namespace NovetusLauncher textBox13.Text = ""; comboBox3.SelectedItem = "Roblox"; listBox7.SelectedItem = previtem; - GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -1005,17 +1005,17 @@ namespace NovetusLauncher Random random = new Random(); int randomPants1 = random.Next(listBox7.Items.Count); listBox7.SelectedItem = listBox7.Items[randomPants1]; - GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -1027,17 +1027,17 @@ namespace NovetusLauncher textBox13.Text = ""; comboBox3.SelectedItem = "Roblox"; listBox7.SelectedItem = "NoPants.rbxm"; - GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Pants = listBox7.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; - if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt")) { - textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox9.Text = File.ReadAllText(GlobalVars.pantsdir + @"\\" + GlobalVars.UserCustomization.Pants.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox9.Text = GlobalVars.Custom_Pants_Offline; + textBox9.Text = GlobalVars.UserCustomization.Pants; } } } @@ -1048,17 +1048,17 @@ namespace NovetusLauncher { if (Directory.Exists(GlobalVars.headdir)) { - GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } } @@ -1070,17 +1070,17 @@ namespace NovetusLauncher Random random = new Random(); int randomHead1 = random.Next(listBox8.Items.Count); listBox8.SelectedItem = listBox8.Items[randomHead1]; - GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } } @@ -1090,17 +1090,17 @@ namespace NovetusLauncher if (Directory.Exists(GlobalVars.headdir)) { listBox8.SelectedItem = "DefaultHead.rbxm"; - GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Head = listBox8.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; - if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt")) + if (File.Exists(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt")) { - textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + "_desc.txt"); + textBox5.Text = File.ReadAllText(GlobalVars.headdir + @"\\" + GlobalVars.UserCustomization.Head.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox5.Text = GlobalVars.Custom_Head_Offline; + textBox5.Text = GlobalVars.UserCustomization.Head; } } } @@ -1170,34 +1170,34 @@ namespace NovetusLauncher switch (part) { case "Head": - GlobalVars.HeadColorID = ColorID; - GlobalVars.ColorMenu_HeadColor = ButtonColor.ToString(); - button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); + GlobalVars.UserCustomization.HeadColorID = ColorID; + GlobalVars.UserCustomization.HeadColorString = ButtonColor.ToString(); + button1.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString); break; case "Torso": - GlobalVars.TorsoColorID = ColorID; - GlobalVars.ColorMenu_TorsoColor = ButtonColor.ToString(); - button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); + GlobalVars.UserCustomization.TorsoColorID = ColorID; + GlobalVars.UserCustomization.TorsoColorString = ButtonColor.ToString(); + button2.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString); break; case "Right Arm": - GlobalVars.RightArmColorID = ColorID; - GlobalVars.ColorMenu_RightArmColor = ButtonColor.ToString(); - button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); + GlobalVars.UserCustomization.RightArmColorID = ColorID; + GlobalVars.UserCustomization.RightArmColorString = ButtonColor.ToString(); + button3.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString); break; case "Left Arm": - GlobalVars.LeftArmColorID = ColorID; - GlobalVars.ColorMenu_LeftArmColor = ButtonColor.ToString(); - button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); + GlobalVars.UserCustomization.LeftArmColorID = ColorID; + GlobalVars.UserCustomization.LeftArmColorString = ButtonColor.ToString(); + button4.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString); break; case "Right Leg": - GlobalVars.RightLegColorID = ColorID; - GlobalVars.ColorMenu_RightLegColor = ButtonColor.ToString(); - button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); + GlobalVars.UserCustomization.RightLegColorID = ColorID; + GlobalVars.UserCustomization.RightLegColorString = ButtonColor.ToString(); + button5.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString); break; case "Left Leg": - GlobalVars.LeftLegColorID = ColorID; - GlobalVars.ColorMenu_LeftLegColor = ButtonColor.ToString(); - button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + GlobalVars.UserCustomization.LeftLegColorID = ColorID; + GlobalVars.UserCustomization.LeftLegColorString = ButtonColor.ToString(); + button6.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString); break; default: break; @@ -1410,25 +1410,25 @@ namespace NovetusLauncher void Button40Click(object sender, EventArgs e) { - GlobalVars.HeadColorID = 24; - GlobalVars.TorsoColorID = 23; - GlobalVars.LeftArmColorID = 24; - GlobalVars.RightArmColorID = 24; - GlobalVars.LeftLegColorID = 119; - GlobalVars.RightLegColorID = 119; - GlobalVars.CharacterID = ""; - GlobalVars.ColorMenu_HeadColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_TorsoColor = "Color [A=255, R=13, G=105, B=172]"; - GlobalVars.ColorMenu_LeftArmColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_RightArmColor = "Color [A=255, R=245, G=205, B=47]"; - GlobalVars.ColorMenu_LeftLegColor = "Color [A=255, R=164, G=189, B=71]"; - GlobalVars.ColorMenu_RightLegColor = "Color [A=255, R=164, G=189, B=71]"; - button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); - button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); - button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); - button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); - button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); - button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + GlobalVars.UserCustomization.HeadColorID = 24; + GlobalVars.UserCustomization.TorsoColorID = 23; + GlobalVars.UserCustomization.LeftArmColorID = 24; + GlobalVars.UserCustomization.RightArmColorID = 24; + GlobalVars.UserCustomization.LeftLegColorID = 119; + GlobalVars.UserCustomization.RightLegColorID = 119; + GlobalVars.UserCustomization.CharacterID = ""; + GlobalVars.UserCustomization.HeadColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.TorsoColorString = "Color [A=255, R=13, G=105, B=172]"; + GlobalVars.UserCustomization.LeftArmColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.RightArmColorString = "Color [A=255, R=245, G=205, B=47]"; + GlobalVars.UserCustomization.LeftLegColorString = "Color [A=255, R=164, G=189, B=71]"; + GlobalVars.UserCustomization.RightLegColorString = "Color [A=255, R=164, G=189, B=71]"; + button1.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString); + button2.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString); + button3.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString); + button4.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString); + button5.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString); + button6.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString); } //3dview @@ -1458,31 +1458,31 @@ namespace NovetusLauncher //Icon void Button52Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "BC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "BC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void Button53Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "TBC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "TBC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void Button54Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "OBC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "OBC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void Button55Click(object sender, EventArgs e) { - GlobalVars.Custom_Icon_Offline = "NBC"; - label5.Text = GlobalVars.Custom_Icon_Offline; + GlobalVars.UserCustomization.Icon = "NBC"; + label5.Text = GlobalVars.UserCustomization.Icon; } void TextBox1TextChanged(object sender, EventArgs e) { - GlobalVars.CharacterID = textBox1.Text; + GlobalVars.UserCustomization.CharacterID = textBox1.Text; } //extra @@ -1493,34 +1493,34 @@ namespace NovetusLauncher { try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch(Exception) when (!Env.Debugging) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1536,34 +1536,34 @@ namespace NovetusLauncher listBox9.SelectedItem = listBox9.Items[randomItem1]; try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch(Exception) when (!Env.Debugging) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1577,34 +1577,34 @@ namespace NovetusLauncher listBox9.SelectedItem = "NoExtra.rbxm"; try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch(Exception) when (!Env.Debugging) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1616,7 +1616,7 @@ namespace NovetusLauncher switch (checkBox1.Checked) { case true: - GlobalVars.Custom_Extra_ShowHats = true; + GlobalVars.UserCustomization.ShowHatsInExtra = true; if (Directory.Exists(GlobalVars.hatdir)) { @@ -1639,7 +1639,7 @@ namespace NovetusLauncher } break; case false: - GlobalVars.Custom_Extra_ShowHats = false; + GlobalVars.UserCustomization.ShowHatsInExtra = false; listBox9.Items.Clear(); if (Directory.Exists(GlobalVars.extradir)) @@ -1660,34 +1660,34 @@ namespace NovetusLauncher listBox9.SelectedItem = "NoExtra.rbxm"; try { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = false; - if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = false; + if (File.Exists(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.extradir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } catch (Exception) { if (Directory.Exists(GlobalVars.hatdir)) { - GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + GlobalVars.UserCustomization.Extra = listBox9.SelectedItem.ToString(); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; - GlobalVars.Custom_Extra_SelectionIsHat = true; - if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt")) + GlobalVars.UserCustomization.ExtraSelectionIsHat = true; + if (File.Exists(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt")) { - textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + "_desc.txt"); + textBox10.Text = File.ReadAllText(GlobalVars.hatdir + "\\" + GlobalVars.UserCustomization.Extra.Replace(".rbxm", "") + "_desc.txt"); } else { - textBox10.Text = GlobalVars.Custom_Extra; + textBox10.Text = GlobalVars.UserCustomization.Extra; } } } @@ -1844,19 +1844,19 @@ namespace NovetusLauncher private void textBox11_TextChanged(object sender, EventArgs e) { listBox5.SelectedItem = "NoTShirt.rbxm"; - GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox11.Text; + GlobalVars.UserCustomization.TShirt = Custom_T_Shirt_URL + textBox11.Text; } private void textBox12_TextChanged(object sender, EventArgs e) { listBox6.SelectedItem = "NoShirt.rbxm"; - GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox12.Text; + GlobalVars.UserCustomization.Shirt = Custom_Shirt_URL + textBox12.Text; } private void textBox13_TextChanged(object sender, EventArgs e) { listBox7.SelectedItem = "NoPants.rbxm"; - GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text; + GlobalVars.UserCustomization.Pants = Custom_Pants_URL + textBox13.Text; } private void comboBox2_SelectedIndexChanged(object sender, EventArgs e) @@ -1873,7 +1873,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(textBox11.Text)) { - GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox11.Text; + GlobalVars.UserCustomization.TShirt = Custom_T_Shirt_URL + textBox11.Text; } } @@ -1891,7 +1891,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(textBox12.Text)) { - GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox12.Text; + GlobalVars.UserCustomization.Shirt = Custom_Shirt_URL + textBox12.Text; } } @@ -1909,7 +1909,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(textBox13.Text)) { - GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text; + GlobalVars.UserCustomization.Pants = Custom_Pants_URL + textBox13.Text; } } } diff --git a/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs b/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs index df4eba5..c3049f3 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs @@ -143,6 +143,7 @@ namespace NovetusLauncher this.label8 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.checkBox5 = new System.Windows.Forms.CheckBox(); + this.hat4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -348,41 +349,41 @@ namespace NovetusLauncher this.studioToolStripMenuItem, this.no3dToolStripMenuItem}); this.tagsToolStripMenuItem.Name = "tagsToolStripMenuItem"; - this.tagsToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.tagsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.tagsToolStripMenuItem.Text = "Add Tags"; // // clientToolStripMenuItem // this.clientToolStripMenuItem.Name = "clientToolStripMenuItem"; - this.clientToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.clientToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.clientToolStripMenuItem.Text = ""; this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click); // // serverToolStripMenuItem // this.serverToolStripMenuItem.Name = "serverToolStripMenuItem"; - this.serverToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.serverToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.serverToolStripMenuItem.Text = ""; this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click); // // soloToolStripMenuItem // this.soloToolStripMenuItem.Name = "soloToolStripMenuItem"; - this.soloToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.soloToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.soloToolStripMenuItem.Text = ""; this.soloToolStripMenuItem.Click += new System.EventHandler(this.soloToolStripMenuItem_Click); // // studioToolStripMenuItem // this.studioToolStripMenuItem.Name = "studioToolStripMenuItem"; - this.studioToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.studioToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.studioToolStripMenuItem.Text = ""; this.studioToolStripMenuItem.Click += new System.EventHandler(this.studioToolStripMenuItem_Click); // // no3dToolStripMenuItem // this.no3dToolStripMenuItem.Name = "no3dToolStripMenuItem"; - this.no3dToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.no3dToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.no3dToolStripMenuItem.Text = ""; this.no3dToolStripMenuItem.Click += new System.EventHandler(this.no3dToolStripMenuItem_Click); // @@ -396,7 +397,7 @@ namespace NovetusLauncher this.debuggingToolStripMenuItem, this.argsToolStripMenuItem}); this.variablesToolStripMenuItem.Name = "variablesToolStripMenuItem"; - this.variablesToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.variablesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.variablesToolStripMenuItem.Text = "Add Variables"; // // generalToolStripMenuItem @@ -409,7 +410,7 @@ namespace NovetusLauncher this.portToolStripMenuItem, this.portToolStripMenuItem1}); this.generalToolStripMenuItem.Name = "generalToolStripMenuItem"; - this.generalToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.generalToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.generalToolStripMenuItem.Text = "General"; // // mapfileToolStripMenuItem @@ -459,7 +460,7 @@ namespace NovetusLauncher this.serverToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.limitToolStripMenuItem}); this.serverToolStripMenuItem1.Name = "serverToolStripMenuItem1"; - this.serverToolStripMenuItem1.Size = new System.Drawing.Size(133, 22); + this.serverToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.serverToolStripMenuItem1.Text = "Server"; // // limitToolStripMenuItem @@ -478,7 +479,7 @@ namespace NovetusLauncher this.md5scriptdToolStripMenuItem, this.md5exedToolStripMenuItem}); this.securityToolStripMenuItem.Name = "securityToolStripMenuItem"; - this.securityToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.securityToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.securityToolStripMenuItem.Text = "Security"; // // md5launcherToolStripMenuItem @@ -526,7 +527,7 @@ namespace NovetusLauncher this.iconeToolStripMenuItem, this.iconToolStripMenuItem}); this.playerToolStripMenuItem.Name = "playerToolStripMenuItem"; - this.playerToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.playerToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.playerToolStripMenuItem.Text = "Player"; // // customizationToolStripMenuItem @@ -542,7 +543,7 @@ namespace NovetusLauncher this.extraToolStripMenuItem, this.charappToolStripMenuItem}); this.customizationToolStripMenuItem.Name = "customizationToolStripMenuItem"; - this.customizationToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.customizationToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.customizationToolStripMenuItem.Text = "Customization"; // // bodyColorsToolStripMenuItem @@ -555,7 +556,7 @@ namespace NovetusLauncher this.rarmcolorToolStripMenuItem, this.rlegcolorToolStripMenuItem}); this.bodyColorsToolStripMenuItem.Name = "bodyColorsToolStripMenuItem"; - this.bodyColorsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.bodyColorsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.bodyColorsToolStripMenuItem.Text = "Body Colors"; // // headcolorToolStripMenuItem @@ -613,69 +614,69 @@ namespace NovetusLauncher this.hat2wsToolStripMenuItem, this.hat3wsToolStripMenuItem}); this.hatsToolStripMenuItem.Name = "hatsToolStripMenuItem"; - this.hatsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.hatsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hatsToolStripMenuItem.Text = "Hats"; // // hat1ToolStripMenuItem // this.hat1ToolStripMenuItem.Name = "hat1ToolStripMenuItem"; - this.hat1ToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat1ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat1ToolStripMenuItem.Text = "%hat1%"; this.hat1ToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat2ToolStripMenuItem // this.hat2ToolStripMenuItem.Name = "hat2ToolStripMenuItem"; - this.hat2ToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat2ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat2ToolStripMenuItem.Text = "%hat2%"; this.hat2ToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat3ToolStripMenuItem // this.hat3ToolStripMenuItem.Name = "hat3ToolStripMenuItem"; - this.hat3ToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat3ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat3ToolStripMenuItem.Text = "%hat3%"; this.hat3ToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat1dToolStripMenuItem // this.hat1dToolStripMenuItem.Name = "hat1dToolStripMenuItem"; - this.hat1dToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat1dToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat1dToolStripMenuItem.Text = "%hat1d%"; this.hat1dToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat2dToolStripMenuItem // this.hat2dToolStripMenuItem.Name = "hat2dToolStripMenuItem"; - this.hat2dToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat2dToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat2dToolStripMenuItem.Text = "%hat2d%"; this.hat2dToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat3dToolStripMenuItem // this.hat3dToolStripMenuItem.Name = "hat3dToolStripMenuItem"; - this.hat3dToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat3dToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat3dToolStripMenuItem.Text = "%hat3d%"; this.hat3dToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat1wsToolStripMenuItem // this.hat1wsToolStripMenuItem.Name = "hat1wsToolStripMenuItem"; - this.hat1wsToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat1wsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat1wsToolStripMenuItem.Text = "%hat1ws%"; this.hat1wsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat2wsToolStripMenuItem // this.hat2wsToolStripMenuItem.Name = "hat2wsToolStripMenuItem"; - this.hat2wsToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat2wsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat2wsToolStripMenuItem.Text = "%hat2ws%"; this.hat2wsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat3wsToolStripMenuItem // this.hat3wsToolStripMenuItem.Name = "hat3wsToolStripMenuItem"; - this.hat3wsToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.hat3wsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat3wsToolStripMenuItem.Text = "%hat3ws%"; this.hat3wsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // @@ -686,7 +687,7 @@ namespace NovetusLauncher this.facedToolStripMenuItem, this.facewsToolStripMenuItem}); this.facesToolStripMenuItem.Name = "facesToolStripMenuItem"; - this.facesToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.facesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.facesToolStripMenuItem.Text = "Faces"; // // faceToolStripMenuItem @@ -717,7 +718,7 @@ namespace NovetusLauncher this.headdToolStripMenuItem, this.headwsToolStripMenuItem}); this.headsToolStripMenuItem.Name = "headsToolStripMenuItem"; - this.headsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.headsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.headsToolStripMenuItem.Text = "Heads"; // // headToolStripMenuItem @@ -748,7 +749,7 @@ namespace NovetusLauncher this.tshirtdToolStripMenuItem, this.tshirtwsToolStripMenuItem}); this.tShirtsToolStripMenuItem.Name = "tShirtsToolStripMenuItem"; - this.tShirtsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.tShirtsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.tShirtsToolStripMenuItem.Text = "T-Shirts"; // // tshirtToolStripMenuItem @@ -779,7 +780,7 @@ namespace NovetusLauncher this.shirtdToolStripMenuItem, this.shirtwsToolStripMenuItem}); this.shirtsToolStripMenuItem.Name = "shirtsToolStripMenuItem"; - this.shirtsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.shirtsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.shirtsToolStripMenuItem.Text = "Shirts"; // // shirtToolStripMenuItem @@ -810,7 +811,7 @@ namespace NovetusLauncher this.pantsdToolStripMenuItem, this.pantswsToolStripMenuItem}); this.pantsToolStripMenuItem.Name = "pantsToolStripMenuItem"; - this.pantsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.pantsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.pantsToolStripMenuItem.Text = "Pants"; // // pantsToolStripMenuItem1 @@ -840,86 +841,87 @@ namespace NovetusLauncher this.extraToolStripMenuItem1, this.extradToolStripMenuItem, this.extrawsToolStripMenuItem, + this.hat4ToolStripMenuItem, this.hat4dToolStripMenuItem, this.hat4wsToolStripMenuItem}); this.extraToolStripMenuItem.Name = "extraToolStripMenuItem"; - this.extraToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.extraToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.extraToolStripMenuItem.Text = "Extra"; // // extraToolStripMenuItem1 // this.extraToolStripMenuItem1.Name = "extraToolStripMenuItem1"; - this.extraToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); + this.extraToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.extraToolStripMenuItem1.Text = "%extra%"; this.extraToolStripMenuItem1.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // extradToolStripMenuItem // this.extradToolStripMenuItem.Name = "extradToolStripMenuItem"; - this.extradToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.extradToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.extradToolStripMenuItem.Text = "%extrad%"; this.extradToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // extrawsToolStripMenuItem // this.extrawsToolStripMenuItem.Name = "extrawsToolStripMenuItem"; - this.extrawsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.extrawsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.extrawsToolStripMenuItem.Text = "%extraws%"; this.extrawsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat4dToolStripMenuItem // this.hat4dToolStripMenuItem.Name = "hat4dToolStripMenuItem"; - this.hat4dToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.hat4dToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat4dToolStripMenuItem.Text = "%hat4d%"; this.hat4dToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat4wsToolStripMenuItem // this.hat4wsToolStripMenuItem.Name = "hat4wsToolStripMenuItem"; - this.hat4wsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.hat4wsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat4wsToolStripMenuItem.Text = "%hat4ws%"; this.hat4wsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // charappToolStripMenuItem // this.charappToolStripMenuItem.Name = "charappToolStripMenuItem"; - this.charappToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.charappToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.charappToolStripMenuItem.Text = "%charapp%"; this.charappToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // nameToolStripMenuItem // this.nameToolStripMenuItem.Name = "nameToolStripMenuItem"; - this.nameToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.nameToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.nameToolStripMenuItem.Text = "%name%"; this.nameToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // idToolStripMenuItem // this.idToolStripMenuItem.Name = "idToolStripMenuItem"; - this.idToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.idToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.idToolStripMenuItem.Text = "%id%"; this.idToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // tripcodeToolStripMenuItem // this.tripcodeToolStripMenuItem.Name = "tripcodeToolStripMenuItem"; - this.tripcodeToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.tripcodeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.tripcodeToolStripMenuItem.Text = "%tripcode%"; this.tripcodeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // iconeToolStripMenuItem // this.iconeToolStripMenuItem.Name = "iconeToolStripMenuItem"; - this.iconeToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.iconeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.iconeToolStripMenuItem.Text = "%icone%"; this.iconeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // iconToolStripMenuItem // this.iconToolStripMenuItem.Name = "iconToolStripMenuItem"; - this.iconToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.iconToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.iconToolStripMenuItem.Text = "%icon%"; this.iconToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // @@ -928,7 +930,7 @@ namespace NovetusLauncher this.debuggingToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.donothingToolStripMenuItem}); this.debuggingToolStripMenuItem.Name = "debuggingToolStripMenuItem"; - this.debuggingToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.debuggingToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.debuggingToolStripMenuItem.Text = "Debugging"; // // donothingToolStripMenuItem @@ -941,14 +943,14 @@ namespace NovetusLauncher // argsToolStripMenuItem // this.argsToolStripMenuItem.Name = "argsToolStripMenuItem"; - this.argsToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.argsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.argsToolStripMenuItem.Text = "%args%"; this.argsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // documentationToolStripMenuItem1 // this.documentationToolStripMenuItem1.Name = "documentationToolStripMenuItem1"; - this.documentationToolStripMenuItem1.Size = new System.Drawing.Size(157, 22); + this.documentationToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.documentationToolStripMenuItem1.Text = "Documentation"; this.documentationToolStripMenuItem1.Click += new System.EventHandler(this.documentationToolStripMenuItem_Click); // @@ -1026,6 +1028,13 @@ namespace NovetusLauncher this.checkBox5.UseVisualStyleBackColor = true; this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged); // + // hat4ToolStripMenuItem + // + this.hat4ToolStripMenuItem.Name = "hat4ToolStripMenuItem"; + this.hat4ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.hat4ToolStripMenuItem.Text = "%hat4%"; + this.hat4ToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // // ClientinfoEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1174,5 +1183,6 @@ namespace NovetusLauncher private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label9; private System.Windows.Forms.CheckBox checkBox5; + private System.Windows.Forms.ToolStripMenuItem hat4ToolStripMenuItem; } }