i don't fuckin' write

This commit is contained in:
Bitl 2021-09-01 16:09:01 -07:00
parent e44c8c982b
commit 8768501f85
32 changed files with 925 additions and 1084 deletions

View File

@ -21,7 +21,7 @@ class CharacterCustomizationShared
public List<PartColor> PartColorListConv;
public Provider[] contentProviders;
public Form Parent;
public Settings.UIOptions.Style FormStyle;
public Settings.Style FormStyle;
public Button HeadButton, TorsoButton, LeftArmButton, RightArmButton, LeftLegButton, RightLegButton;
public ComboBox FaceTypeBox, TShirtsTypeBox, ShirtsTypeBox, PantsTypeBox;
public TextBox FaceIDBox, TShirtsIDBox, ShirtsIDBox, PantsIDBox, CharacterIDBox, Hat1Desc, Hat2Desc, Hat3Desc, HeadDesc, TShirtDesc, ShirtDesc, PantsDesc, FaceDesc, ExtraItemDesc;
@ -151,12 +151,7 @@ class CharacterCustomizationShared
//body
SelectedPartLabel.Text = SelectedPart;
HeadButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString);
TorsoButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString);
RightArmButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString);
LeftArmButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString);
RightLegButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString);
LeftLegButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString);
ReloadColors();
//icon
IconLabel.Text = GlobalVars.UserCustomization.Icon;
@ -178,7 +173,7 @@ class CharacterCustomizationShared
switch (CharacterTabControl.SelectedTab)
{
case TabPage pg1 when pg1 == CharacterTabControl.TabPages["tabPage1"]:
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -193,7 +188,7 @@ class CharacterCustomizationShared
ExtraItemList.Items.Clear();
break;
case TabPage pg7 when pg7 == CharacterTabControl.TabPages["tabPage7"]:
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -213,7 +208,7 @@ class CharacterCustomizationShared
break;
case TabPage pg2 when pg2 == CharacterTabControl.TabPages["tabPage2"]:
//hats
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 239);
}
@ -257,7 +252,7 @@ class CharacterCustomizationShared
break;
case TabPage pg3 when pg3 == CharacterTabControl.TabPages["tabPage3"]:
//faces
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -285,7 +280,7 @@ class CharacterCustomizationShared
break;
case TabPage pg4 when pg4 == CharacterTabControl.TabPages["tabPage4"]:
//faces
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -312,7 +307,7 @@ class CharacterCustomizationShared
break;
case TabPage pg5 when pg5 == CharacterTabControl.TabPages["tabPage5"]:
//faces
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -339,7 +334,7 @@ class CharacterCustomizationShared
break;
case TabPage pg6 when pg6 == CharacterTabControl.TabPages["tabPage6"]:
//faces
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -366,7 +361,7 @@ class CharacterCustomizationShared
break;
case TabPage pg8 when pg8 == CharacterTabControl.TabPages["tabPage8"]:
//faces
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -392,7 +387,7 @@ class CharacterCustomizationShared
break;
case TabPage pg9 when pg9 == CharacterTabControl.TabPages["tabPage9"]:
//faces
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -430,7 +425,7 @@ class CharacterCustomizationShared
}
break;
default:
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
OrganizationPanel.Location = new Point(110, 359);
}
@ -449,6 +444,16 @@ class CharacterCustomizationShared
#endregion
#region Part/Color Funcs
public void ReloadColors()
{
HeadButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString);
TorsoButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.TorsoColorString);
RightArmButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightArmColorString);
LeftArmButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftArmColorString);
RightLegButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.RightLegColorString);
LeftLegButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.LeftLegColorString);
}
public void ColorButton()
{
int selectedIndex = 0;
@ -602,6 +607,29 @@ class CharacterCustomizationShared
}
}
}
public void SaveOutfit()
{
GlobalFuncs.Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true);
MessageBox.Show("Outfit Saved!", "Novetus - Outfit Saved", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
public void LoadOutfit()
{
using (var ofd = new OpenFileDialog())
{
ofd.Filter = "Novetus config_customization files (*.ini)|*.ini";
ofd.FilterIndex = 1;
ofd.FileName = "config_customization.ini";
ofd.Title = "Load config_customization.ini";
if (ofd.ShowDialog() == DialogResult.OK)
{
GlobalFuncs.Customization(ofd.FileName, false);
ReloadColors();
MessageBox.Show("Outfit Loaded!", "Novetus - Outfit Loaded", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}
#endregion
}
#endregion

View File

@ -116,7 +116,7 @@ using System.Windows.Forms;
client.StartInfo.FileName = rbxexe;
client.StartInfo.Arguments = args;
client.Start();
client.PriorityClass = ProcessPriorityClass.RealTime;
client.PriorityClass = GlobalVars.UserConfiguration.Priority;
}
catch (Exception ex)
{

View File

@ -146,6 +146,7 @@ partial class CharacterCustomizationCompact
this.button54 = new System.Windows.Forms.Button();
this.button53 = new System.Windows.Forms.Button();
this.button52 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
@ -1145,6 +1146,7 @@ partial class CharacterCustomizationCompact
//
// tabPage7
//
this.tabPage7.Controls.Add(this.button7);
this.tabPage7.Controls.Add(this.button71);
this.tabPage7.Controls.Add(this.label8);
this.tabPage7.Controls.Add(this.pictureBox10);
@ -1321,6 +1323,16 @@ partial class CharacterCustomizationCompact
this.button52.UseVisualStyleBackColor = true;
this.button52.Click += new System.EventHandler(this.Button52Click);
//
// button7
//
this.button7.Location = new System.Drawing.Point(365, 70);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(99, 31);
this.button7.TabIndex = 14;
this.button7.Text = "Load Outfit";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
// CharacterCustomizationCompact
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1381,7 +1393,7 @@ partial class CharacterCustomizationCompact
//*vomits*
characterCustomizationForm = new CharacterCustomizationShared();
characterCustomizationForm.Parent = this;
characterCustomizationForm.FormStyle = Settings.UIOptions.Style.Compact;
characterCustomizationForm.FormStyle = Settings.Style.Compact;
characterCustomizationForm.ColorView = listView1;
characterCustomizationForm.FaceTypeBox = FaceTypeBox;
characterCustomizationForm.TShirtsTypeBox = TShirtsTypeBox;
@ -1542,4 +1554,5 @@ partial class CharacterCustomizationCompact
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.Label label30;
private System.Windows.Forms.Button button7;
}

View File

@ -833,8 +833,12 @@ public partial class CharacterCustomizationCompact : Form
private void button71_Click(object sender, EventArgs e)
{
GlobalFuncs.Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true);
MessageBox.Show("Outfit Saved!", "Novetus - Outfit Saved", MessageBoxButtons.OK, MessageBoxIcon.Information);
characterCustomizationForm.SaveOutfit();
}
private void button7_Click(object sender, EventArgs e)
{
characterCustomizationForm.LoadOutfit();
}
void TextBox1TextChanged(object sender, EventArgs e)

View File

@ -56,6 +56,7 @@ partial class CharacterCustomizationExtended
this.tabControl1 = new TabControlWithoutHeader();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label30 = new System.Windows.Forms.Label();
this.listView1 = new System.Windows.Forms.ListView();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.button61 = new System.Windows.Forms.Button();
@ -163,7 +164,8 @@ partial class CharacterCustomizationExtended
this.button82 = new System.Windows.Forms.Button();
this.button42 = new System.Windows.Forms.Button();
this.button81 = new System.Windows.Forms.Button();
this.label30 = new System.Windows.Forms.Label();
this.button7 = new System.Windows.Forms.Button();
this.label17 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.tabControl1.SuspendLayout();
@ -208,7 +210,6 @@ partial class CharacterCustomizationExtended
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Controls.Add(this.label9);
this.panel1.Controls.Add(this.button71);
this.panel1.Controls.Add(this.button80);
this.panel1.Controls.Add(this.button79);
this.panel1.Controls.Add(this.button78);
@ -227,18 +228,18 @@ partial class CharacterCustomizationExtended
// label9
//
this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.label9.Location = new System.Drawing.Point(3, 238);
this.label9.Location = new System.Drawing.Point(3, 242);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(75, 2);
this.label9.TabIndex = 14;
//
// button71
//
this.button71.Location = new System.Drawing.Point(3, 268);
this.button71.Location = new System.Drawing.Point(350, 258);
this.button71.Name = "button71";
this.button71.Size = new System.Drawing.Size(75, 22);
this.button71.Size = new System.Drawing.Size(73, 22);
this.button71.TabIndex = 13;
this.button71.Text = "SAVE";
this.button71.Text = "Save Outfit";
this.button71.UseVisualStyleBackColor = true;
this.button71.Click += new System.EventHandler(this.button71_Click);
//
@ -284,11 +285,11 @@ partial class CharacterCustomizationExtended
//
// button43
//
this.button43.Location = new System.Drawing.Point(3, 243);
this.button43.Location = new System.Drawing.Point(3, 252);
this.button43.Name = "button43";
this.button43.Size = new System.Drawing.Size(75, 22);
this.button43.Size = new System.Drawing.Size(75, 35);
this.button43.TabIndex = 1;
this.button43.Text = "3D VIEW";
this.button43.Text = "3D PREVIEW";
this.button43.UseVisualStyleBackColor = true;
this.button43.Click += new System.EventHandler(this.Button43Click);
//
@ -399,6 +400,18 @@ partial class CharacterCustomizationExtended
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Body Colors";
//
// label30
//
this.label30.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label30.ForeColor = System.Drawing.Color.Red;
this.label30.Location = new System.Drawing.Point(6, 156);
this.label30.Name = "label30";
this.label30.Size = new System.Drawing.Size(329, 36);
this.label30.TabIndex = 5;
this.label30.Text = "Some colors may be incompatible with earlier clients. Incompatible colors will sh" +
"ow up as grey in-game. ";
this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// listView1
//
this.listView1.HideSelection = false;
@ -1315,8 +1328,11 @@ partial class CharacterCustomizationExtended
//
// tabPage7
//
this.tabPage7.Controls.Add(this.label17);
this.tabPage7.Controls.Add(this.button7);
this.tabPage7.Controls.Add(this.label8);
this.tabPage7.Controls.Add(this.pictureBox10);
this.tabPage7.Controls.Add(this.button71);
this.tabPage7.Controls.Add(this.button60);
this.tabPage7.Controls.Add(this.textBox1);
this.tabPage7.Controls.Add(this.label7);
@ -1367,7 +1383,7 @@ partial class CharacterCustomizationExtended
//
this.textBox1.Location = new System.Drawing.Point(40, 260);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(462, 20);
this.textBox1.Size = new System.Drawing.Size(258, 20);
this.textBox1.TabIndex = 9;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.textBox1.TextChanged += new System.EventHandler(this.TextBox1TextChanged);
@ -1382,7 +1398,7 @@ partial class CharacterCustomizationExtended
//
// label6
//
this.label6.Location = new System.Drawing.Point(140, 238);
this.label6.Location = new System.Drawing.Point(41, 238);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(257, 19);
this.label6.TabIndex = 7;
@ -1533,18 +1549,24 @@ partial class CharacterCustomizationExtended
this.button81.UseVisualStyleBackColor = true;
this.button81.Click += new System.EventHandler(this.button81_Click);
//
// label30
// button7
//
this.label30.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label30.ForeColor = System.Drawing.Color.Red;
this.label30.Location = new System.Drawing.Point(6, 156);
this.label30.Name = "label30";
this.label30.Size = new System.Drawing.Size(329, 36);
this.label30.TabIndex = 5;
this.label30.Text = "Some colors may be incompatible with earlier clients. Incompatible colors will sh" +
"ow up as grey in-game. ";
this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.label30.Visible = true;
this.button7.Location = new System.Drawing.Point(429, 258);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(73, 22);
this.button7.TabIndex = 15;
this.button7.Text = "Load Outfit";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(390, 238);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(73, 13);
this.label17.TabIndex = 16;
this.label17.Text = "Outfit Settings";
//
// CharacterCustomizationExtended
//
@ -1611,7 +1633,7 @@ partial class CharacterCustomizationExtended
//*vomits*
characterCustomizationForm = new CharacterCustomizationShared();
characterCustomizationForm.Parent = this;
characterCustomizationForm.FormStyle = Settings.UIOptions.Style.Extended;
characterCustomizationForm.FormStyle = Settings.Style.Extended;
characterCustomizationForm.ColorView = listView1;
characterCustomizationForm.FaceTypeBox = FaceTypeBox;
characterCustomizationForm.TShirtsTypeBox = TShirtsTypeBox;
@ -1791,4 +1813,6 @@ partial class CharacterCustomizationExtended
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.Label label30;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Button button7;
}

View File

@ -898,8 +898,12 @@ public partial class CharacterCustomizationExtended : Form
private void button71_Click(object sender, EventArgs e)
{
GlobalFuncs.Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true);
MessageBox.Show("Outfit Saved!", "Novetus - Outfit Saved", MessageBoxButtons.OK, MessageBoxIcon.Information);
characterCustomizationForm.SaveOutfit();
}
private void button7_Click(object sender, EventArgs e)
{
characterCustomizationForm.LoadOutfit();
}
void TextBox1TextChanged(object sender, EventArgs e)

View File

@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACe
OAAAAk1TRnQBSQFMAgEBAwEAAbwBAAG8AQABQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
OAAAAk1TRnQBSQFMAgEBAwEAAcQBAAHEAQABQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
BAABAQIAAUADAAEBAQABCAYAAUAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

View File

@ -1,5 +1,7 @@
#region File Formats
using System.Diagnostics;
public class FileFormat
{
#region Client Information
@ -16,7 +18,7 @@ public class FileFormat
ScriptMD5 = "";
Fix2007 = false;
AlreadyHasSecurity = false;
ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp;
ClientLoadOptions = Settings.ClientLoadOptions.Client_2008AndUp;
CommandLineArgs = "";
}
@ -29,7 +31,7 @@ public class FileFormat
public string ScriptMD5 { get; set; }
public bool Fix2007 { get; set; }
public bool AlreadyHasSecurity { get; set; }
public Settings.GraphicsOptions.ClientLoadOptions ClientLoadOptions { get; set; }
public Settings.ClientLoadOptions ClientLoadOptions { get; set; }
public string CommandLineArgs { get; set; }
}
#endregion
@ -52,10 +54,10 @@ public class FileFormat
DiscordPresence = true;
MapPath = "";
MapPathSnip = "";
GraphicsMode = Settings.GraphicsOptions.Mode.Automatic;
GraphicsMode = Settings.Mode.Automatic;
ReShade = false;
QualityLevel = Settings.GraphicsOptions.Level.Automatic;
LauncherStyle = Settings.UIOptions.Style.Extended;
QualityLevel = Settings.Level.Automatic;
LauncherStyle = Settings.Style.Extended;
ReShadeFPSDisplay = false;
ReShadePerformanceMode = false;
AssetLocalizerSaveBackups = true;
@ -64,6 +66,7 @@ public class FileFormat
ShowServerNotifications = true;
ServerBrowserServerName = "Novetus";
ServerBrowserServerAddress = "localhost";
Priority = ProcessPriorityClass.RealTime;
}
public string SelectedClient { get; set; }
@ -79,10 +82,10 @@ public class FileFormat
public bool DiscordPresence { get; set; }
public string MapPath { get; set; }
public string MapPathSnip { get; set; }
public Settings.GraphicsOptions.Mode GraphicsMode { get; set; }
public Settings.Mode GraphicsMode { get; set; }
public bool ReShade { get; set; }
public Settings.GraphicsOptions.Level QualityLevel { get; set; }
public Settings.UIOptions.Style LauncherStyle { get; set; }
public Settings.Level QualityLevel { get; set; }
public Settings.Style LauncherStyle { get; set; }
public bool ReShadeFPSDisplay { get; set; }
public bool ReShadePerformanceMode { get; set; }
public bool AssetLocalizerSaveBackups { get; set; }
@ -91,6 +94,7 @@ public class FileFormat
public bool ShowServerNotifications { get; set; }
public string ServerBrowserServerName { get; set; }
public string ServerBrowserServerAddress { get; set; }
public ProcessPriorityClass Priority { get; set; }
}
#endregion

View File

@ -1,6 +1,7 @@
#region Usings
using System.Linq;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using System.Xml;
using System.Xml.Linq;
#endregion
@ -11,29 +12,14 @@ public enum XMLTypes
Token,
Bool,
Float,
String
String,
Vector2Int16
}
#endregion
#region Roblox XML Parser
public static class RobloxXML
{
public static string GetStringForXMLType(XMLTypes type)
{
switch (type)
{
case XMLTypes.Bool:
return "bool";
case XMLTypes.Float:
return "float";
case XMLTypes.Token:
return "token";
case XMLTypes.String:
default:
return "string";
}
}
public static void EditRenderSettings(XDocument doc, string setting, string value, XMLTypes type)
{
var v = from nodes in doc.Descendants("Item")
@ -42,13 +28,36 @@ public static class RobloxXML
foreach (var item in v)
{
var v2 = from nodes in item.Descendants(GetStringForXMLType(type))
var v2 = from nodes in item.Descendants((type != XMLTypes.Vector2Int16 ? type.ToString().ToLower() : "Vector2int16"))
where nodes.Attribute("name").Value == setting
select nodes;
foreach (var item2 in v2)
{
item2.Value = value;
if (type != XMLTypes.Vector2Int16)
{
item2.Value = value;
}
else
{
string[] vals = value.Split('x');
var v3 = from nodes in item2.Descendants("X")
select nodes;
foreach (var item3 in v3)
{
item3.Value = vals[0];
}
var v4 = from nodes in item2.Descendants("Y")
select nodes;
foreach (var item4 in v4)
{
item4.Value = vals[1];
}
}
}
}
}
@ -64,7 +73,7 @@ public static class RobloxXML
foreach (var item in v)
{
var v2 = from nodes in item.Descendants(GetStringForXMLType(type))
var v2 = from nodes in item.Descendants(type.ToString().ToLower())
where nodes.Attribute("name").Value == setting
select nodes;
@ -85,13 +94,39 @@ public static class RobloxXML
foreach (var item in v)
{
var v2 = from nodes in item.Descendants(GetStringForXMLType(type))
var v2 = from nodes in item.Descendants((type != XMLTypes.Vector2Int16 ? type.ToString().ToLower() : "Vector2int16"))
where nodes.Attribute("name").Value == setting
select nodes;
foreach (var item2 in v2)
{
return item2.Value;
if (type != XMLTypes.Vector2Int16)
{
return item2.Value;
}
else
{
string ValX = "";
string ValY = "";
var v3 = from nodes in item2.Descendants("X")
select nodes;
foreach (var item3 in v3)
{
ValX = item3.Value;
}
var v4 = from nodes in item2.Descendants("Y")
select nodes;
foreach (var item4 in v4)
{
ValY = item4.Value;
}
return ValX + "x" + ValY;
}
}
}

View File

@ -1,248 +1,90 @@
#region Settings
#region Usings
using System;
using System.Diagnostics;
using System.IO;
#endregion
#region Settings
public class Settings
{
#region Graphics Options
public class GraphicsOptions
public enum Mode
{
public enum Mode
Automatic = 0,
OpenGLStable = 1,
OpenGLExperimental = 2,
DirectX = 3
}
public enum Level
{
Automatic = 0,
VeryLow = 1,
Low = 2,
Medium = 3,
High = 4,
Ultra = 5,
Custom = 6
}
public enum Style
{
None = 0,
Extended = 1,
Compact = 2
}
public enum ClientLoadOptions
{
Client_2007_NoGraphicsOptions = 0,
Client_2007 = 1,
Client_2008AndUp = 2,
Client_2008AndUp_LegacyOpenGL = 3,
Client_2008AndUp_QualityLevel21 = 4,
Client_2008AndUp_NoGraphicsOptions = 5,
Client_2008AndUp_ForceAutomatic = 6,
Client_2008AndUp_ForceAutomaticQL21 = 7,
Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL = 8
}
public static ClientLoadOptions GetClientLoadOptionsForBool(bool level)
{
switch (level)
{
Automatic = 0,
OpenGLStable = 1,
OpenGLExperimental = 2,
DirectX = 3
}
public enum Level
{
Automatic = 0,
VeryLow = 1,
Low = 2,
Medium = 3,
High = 4,
Ultra = 5,
Custom = 6
}
public enum ClientLoadOptions
{
Client_2007_NoGraphicsOptions = 0,
Client_2007 = 1,
Client_2008AndUp = 2,
Client_2008AndUp_LegacyOpenGL = 3,
Client_2008AndUp_QualityLevel21 = 4,
Client_2008AndUp_NoGraphicsOptions = 5,
Client_2008AndUp_ForceAutomatic = 6,
Client_2008AndUp_ForceAutomaticQL21 = 7,
Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL = 8
}
public static Mode GetModeForInt(int level)
{
switch (level)
{
case 1:
return Mode.OpenGLStable;
case 2:
return Mode.OpenGLExperimental;
case 3:
return Mode.DirectX;
default:
return Mode.Automatic;
}
}
public static int GetIntForMode(Mode level)
{
switch (level)
{
case Mode.OpenGLStable:
return 1;
case Mode.OpenGLExperimental:
return 2;
case Mode.DirectX:
return 3;
default:
return 0;
}
}
public static Level GetLevelForInt(int level)
{
switch (level)
{
case 0:
return Level.Automatic;
case 1:
return Level.VeryLow;
case 2:
return Level.Low;
case 3:
return Level.Medium;
case 4:
return Level.High;
case 6:
return Level.Custom;
case 5:
default:
return Level.Ultra;
}
}
public static int GetIntForLevel(Level level)
{
switch (level)
{
case Level.Automatic:
return 0;
case Level.VeryLow:
return 1;
case Level.Low:
return 2;
case Level.Medium:
return 3;
case Level.High:
return 4;
case Level.Custom:
return 6;
case Level.Ultra:
default:
return 5;
}
}
public static ClientLoadOptions GetClientLoadOptionsForInt(int level)
{
switch (level)
{
case 1:
return ClientLoadOptions.Client_2007;
case 2:
return ClientLoadOptions.Client_2008AndUp;
case 3:
return ClientLoadOptions.Client_2008AndUp_LegacyOpenGL;
case 4:
return ClientLoadOptions.Client_2008AndUp_QualityLevel21;
case 5:
return ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions;
case 6:
return ClientLoadOptions.Client_2008AndUp_ForceAutomatic;
case 7:
return ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21;
case 8:
return ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL;
default:
return ClientLoadOptions.Client_2007_NoGraphicsOptions;
}
}
public static ClientLoadOptions GetClientLoadOptionsForBool(bool level)
{
switch (level)
{
case false:
return ClientLoadOptions.Client_2008AndUp;
default:
return ClientLoadOptions.Client_2007_NoGraphicsOptions;
}
}
public static int GetIntForClientLoadOptions(ClientLoadOptions level)
{
switch (level)
{
case ClientLoadOptions.Client_2007:
return 1;
case ClientLoadOptions.Client_2008AndUp:
return 2;
case ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
return 3;
case ClientLoadOptions.Client_2008AndUp_QualityLevel21:
return 4;
case ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions:
return 5;
case ClientLoadOptions.Client_2008AndUp_ForceAutomatic:
return 6;
case ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21:
return 7;
case ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
return 8;
default:
return 0;
}
}
public static string GetPathForClientLoadOptions(ClientLoadOptions level)
{
string localAppdataRobloxPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Roblox";
string appdataRobloxPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Roblox";
if (!Directory.Exists(localAppdataRobloxPath))
{
Directory.CreateDirectory(localAppdataRobloxPath);
}
if (!Directory.Exists(appdataRobloxPath))
{
Directory.CreateDirectory(appdataRobloxPath);
}
switch (level)
{
case ClientLoadOptions.Client_2008AndUp_QualityLevel21:
case ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions:
case ClientLoadOptions.Client_2008AndUp_ForceAutomatic:
case ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21:
case ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
case ClientLoadOptions.Client_2008AndUp:
return localAppdataRobloxPath;
default:
return appdataRobloxPath;
}
case false:
return ClientLoadOptions.Client_2008AndUp;
default:
return ClientLoadOptions.Client_2007_NoGraphicsOptions;
}
}
#endregion
#region UI Options
public static class UIOptions
public static string GetPathForClientLoadOptions(ClientLoadOptions level)
{
public enum Style
string localAppdataRobloxPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Roblox";
string appdataRobloxPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Roblox";
if (!Directory.Exists(localAppdataRobloxPath))
{
None = 0,
Extended = 1,
Compact = 2
Directory.CreateDirectory(localAppdataRobloxPath);
}
public static Style GetStyleForInt(int level)
if (!Directory.Exists(appdataRobloxPath))
{
switch (level)
{
case 1:
return Style.Extended;
case 2:
return Style.Compact;
default:
return Style.None;
}
Directory.CreateDirectory(appdataRobloxPath);
}
public static int GetIntForStyle(Style level)
switch (level)
{
switch (level)
{
case Style.Extended:
return 1;
case Style.Compact:
return 2;
default:
return 0;
}
case ClientLoadOptions.Client_2008AndUp_QualityLevel21:
case ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions:
case ClientLoadOptions.Client_2008AndUp_ForceAutomatic:
case ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21:
case ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
case ClientLoadOptions.Client_2008AndUp:
return localAppdataRobloxPath;
default:
return appdataRobloxPath;
}
}
#endregion
}
#endregion
#endregion

View File

@ -128,16 +128,17 @@ public class GlobalFuncs
ini.IniWriteValue(section, "DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString());
ini.IniWriteValue(section, "MapPath", GlobalVars.UserConfiguration.MapPath.ToString());
ini.IniWriteValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString());
ini.IniWriteValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
ini.IniWriteValue(section, "GraphicsMode", ((int)GlobalVars.UserConfiguration.GraphicsMode).ToString());
ini.IniWriteValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
ini.IniWriteValue(section, "QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
ini.IniWriteValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString());
ini.IniWriteValue(section, "QualityLevel", ((int)GlobalVars.UserConfiguration.QualityLevel).ToString());
ini.IniWriteValue(section, "Style", ((int)GlobalVars.UserConfiguration.LauncherStyle).ToString());
ini.IniWriteValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
ini.IniWriteValue(section, "AlternateServerIP", GlobalVars.UserConfiguration.AlternateServerIP.ToString());
ini.IniWriteValue(section, "DisableReshadeDelete", GlobalVars.UserConfiguration.DisableReshadeDelete.ToString());
ini.IniWriteValue(section, "ShowServerNotifications", GlobalVars.UserConfiguration.ShowServerNotifications.ToString());
ini.IniWriteValue(section, "ServerBrowserServerName", GlobalVars.UserConfiguration.ServerBrowserServerName.ToString());
ini.IniWriteValue(section, "ServerBrowserServerAddress", GlobalVars.UserConfiguration.ServerBrowserServerAddress.ToString());
ini.IniWriteValue(section, "ClientLaunchPriority", ((int)GlobalVars.UserConfiguration.Priority).ToString());
}
else
{
@ -148,7 +149,7 @@ public class GlobalFuncs
map, port, limit, upnp,
disablehelpmessage, tripcode, discord, mappath, mapsnip,
graphics, reshade, qualitylevel, style, savebackups, altIP,
disReshadeDel, showNotifs, SB_Name, SB_Address;
disReshadeDel, showNotifs, SB_Name, SB_Address, priority;
INIFile ini = new INIFile(cfgpath);
@ -167,16 +168,17 @@ public class GlobalFuncs
discord = ini.IniReadValue(section, "DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString());
mappath = ini.IniReadValue(section, "MapPath", GlobalVars.UserConfiguration.MapPath.ToString());
mapsnip = ini.IniReadValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString());
graphics = ini.IniReadValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
graphics = ini.IniReadValue(section, "GraphicsMode", ((int)GlobalVars.UserConfiguration.GraphicsMode).ToString());
reshade = ini.IniReadValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
qualitylevel = ini.IniReadValue(section, "QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
style = ini.IniReadValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString());
qualitylevel = ini.IniReadValue(section, "QualityLevel", ((int)GlobalVars.UserConfiguration.QualityLevel).ToString());
style = ini.IniReadValue(section, "Style", ((int)GlobalVars.UserConfiguration.LauncherStyle).ToString());
savebackups = ini.IniReadValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
altIP = ini.IniReadValue(section, "AlternateServerIP", GlobalVars.UserConfiguration.AlternateServerIP.ToString());
disReshadeDel = ini.IniReadValue(section, "DisableReshadeDelete", GlobalVars.UserConfiguration.DisableReshadeDelete.ToString());
showNotifs = ini.IniReadValue(section, "ShowServerNotifications", GlobalVars.UserConfiguration.ShowServerNotifications.ToString());
SB_Name = ini.IniReadValue(section, "ServerBrowserServerName", GlobalVars.UserConfiguration.ServerBrowserServerName.ToString());
SB_Address = ini.IniReadValue(section, "ServerBrowserServerAddress", GlobalVars.UserConfiguration.ServerBrowserServerAddress.ToString());
priority = ini.IniReadValue(section, "ClientLaunchPriority", ((int)GlobalVars.UserConfiguration.Priority).ToString());
GlobalVars.UserConfiguration.CloseOnLaunch = Convert.ToBoolean(closeonlaunch);
@ -223,16 +225,17 @@ public class GlobalFuncs
Config(cfgpath, true);
}
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.GetModeForInt(Convert.ToInt32(graphics));
GlobalVars.UserConfiguration.GraphicsMode = (Settings.Mode)Convert.ToInt32(graphics);
GlobalVars.UserConfiguration.ReShade = Convert.ToBoolean(reshade);
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.GetLevelForInt(Convert.ToInt32(qualitylevel));
GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.GetStyleForInt(Convert.ToInt32(style));
GlobalVars.UserConfiguration.QualityLevel = (Settings.Level)Convert.ToInt32(qualitylevel);
GlobalVars.UserConfiguration.LauncherStyle = (Settings.Style)Convert.ToInt32(style);
GlobalVars.UserConfiguration.AssetLocalizerSaveBackups = Convert.ToBoolean(savebackups);
GlobalVars.UserConfiguration.AlternateServerIP = altIP;
GlobalVars.UserConfiguration.DisableReshadeDelete = Convert.ToBoolean(disReshadeDel);
GlobalVars.UserConfiguration.ShowServerNotifications = Convert.ToBoolean(showNotifs);
GlobalVars.UserConfiguration.ServerBrowserServerName = SB_Name;
GlobalVars.UserConfiguration.ServerBrowserServerAddress = SB_Address;
GlobalVars.UserConfiguration.Priority = (ProcessPriorityClass)Convert.ToInt32(priority);
}
catch (Exception)
{
@ -716,11 +719,11 @@ public class GlobalFuncs
info.AlreadyHasSecurity = Convert.ToBoolean(alreadyhassecurity);
if (clientloadoptions.Equals("True") || clientloadoptions.Equals("False"))
{
info.ClientLoadOptions = Settings.GraphicsOptions.GetClientLoadOptionsForBool(Convert.ToBoolean(clientloadoptions));
info.ClientLoadOptions = Settings.GetClientLoadOptionsForBool(Convert.ToBoolean(clientloadoptions));
}
else
{
info.ClientLoadOptions = Settings.GraphicsOptions.GetClientLoadOptionsForInt(Convert.ToInt32(clientloadoptions));
info.ClientLoadOptions = (Settings.ClientLoadOptions)Convert.ToInt32(clientloadoptions);
}
info.CommandLineArgs = commandlineargs;
@ -740,14 +743,14 @@ public class GlobalFuncs
#if LAUNCHER
if (IsInCompact)
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Compact;
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact;
}
else
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Extended;
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
}
#else
GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Extended;
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
#endif
GeneratePlayerID();
GenerateTripcode();
@ -961,43 +964,43 @@ public class GlobalFuncs
{
FileFormat.ClientInfo info = GetClientInfoValues(ClientName);
if (GlobalVars.UserConfiguration.QualityLevel != Settings.GraphicsOptions.Level.Custom)
if (GlobalVars.UserConfiguration.QualityLevel != Settings.Level.Custom)
{
int GraphicsMode = 0;
if (info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomatic)
if (info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomatic)
{
GraphicsMode = 1;
}
else
{
if (info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2007_NoGraphicsOptions ||
info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions)
if (info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2007_NoGraphicsOptions ||
info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions)
{
switch (GlobalVars.UserConfiguration.GraphicsMode)
{
case Settings.GraphicsOptions.Mode.OpenGLStable:
case Settings.Mode.OpenGLStable:
switch (info.ClientLoadOptions)
{
case Settings.GraphicsOptions.ClientLoadOptions.Client_2007:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
case Settings.ClientLoadOptions.Client_2007:
case Settings.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case Settings.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
GraphicsMode = 2;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
case Settings.ClientLoadOptions.Client_2008AndUp:
case Settings.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
GraphicsMode = 4;
break;
default:
break;
}
break;
case Settings.GraphicsOptions.Mode.OpenGLExperimental:
case Settings.Mode.OpenGLExperimental:
GraphicsMode = 4;
break;
case Settings.GraphicsOptions.Mode.DirectX:
case Settings.Mode.DirectX:
GraphicsMode = 3;
break;
default:
@ -1011,8 +1014,8 @@ public class GlobalFuncs
int MeshDetail = 100;
int ShadingQuality = 100;
int GFXQualityLevel = 19;
if (info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21)
if (info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_QualityLevel21)
{
GFXQualityLevel = 21;
}
@ -1025,7 +1028,7 @@ public class GlobalFuncs
switch (GlobalVars.UserConfiguration.QualityLevel)
{
case Settings.GraphicsOptions.Level.Automatic:
case Settings.Level.Automatic:
//set everything to automatic. Some ultra settings will still be enabled.
AA = 0;
Bevels = 0;
@ -1033,7 +1036,7 @@ public class GlobalFuncs
GFXQualityLevel = 0;
MaterialQuality = 0;
break;
case Settings.GraphicsOptions.Level.VeryLow:
case Settings.Level.VeryLow:
AA = 2;
MeshDetail = 50;
ShadingQuality = 50;
@ -1044,7 +1047,7 @@ public class GlobalFuncs
Shadows_2008 = 2;
Shadows_2007 = false;
break;
case Settings.GraphicsOptions.Level.Low:
case Settings.Level.Low:
AA = 2;
MeshDetail = 50;
ShadingQuality = 50;
@ -1055,74 +1058,74 @@ public class GlobalFuncs
Shadows_2008 = 2;
Shadows_2007 = false;
break;
case Settings.GraphicsOptions.Level.Medium:
case Settings.Level.Medium:
MeshDetail = 75;
ShadingQuality = 75;
GFXQualityLevel = 10;
MaterialQuality = 2;
AASamples = 4;
Bevels = 2;
if (info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomatic ||
info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21 ||
info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL)
if (info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomatic ||
info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_QualityLevel21 ||
info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL)
{
Shadows_2008 = 3;
}
Shadows_2007 = false;
break;
case Settings.GraphicsOptions.Level.High:
case Settings.Level.High:
MeshDetail = 75;
ShadingQuality = 75;
GFXQualityLevel = 15;
AASamples = 4;
break;
case Settings.GraphicsOptions.Level.Ultra:
case Settings.Level.Ultra:
default:
break;
}
ApplyClientSettings(info, ClientName, GraphicsMode, MeshDetail, ShadingQuality, MaterialQuality, AA, AASamples, Bevels,
Shadows_2008, Shadows_2007, "", GFXQualityLevel);
Shadows_2008, Shadows_2007, "", GFXQualityLevel, "800x600", "1024x768", 0);
}
else
{
//save graphics mode.
int GraphicsMode = 0;
if (info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomatic)
if (info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomatic)
{
GraphicsMode = 1;
}
else
{
if (info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2007_NoGraphicsOptions ||
info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions)
if (info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2007_NoGraphicsOptions ||
info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions)
{
switch (GlobalVars.UserConfiguration.GraphicsMode)
{
case Settings.GraphicsOptions.Mode.OpenGLStable:
case Settings.Mode.OpenGLStable:
switch (info.ClientLoadOptions)
{
case Settings.GraphicsOptions.ClientLoadOptions.Client_2007:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
case Settings.ClientLoadOptions.Client_2007:
case Settings.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case Settings.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
GraphicsMode = 2;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
case Settings.ClientLoadOptions.Client_2008AndUp:
case Settings.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
GraphicsMode = 4;
break;
default:
break;
}
break;
case Settings.GraphicsOptions.Mode.OpenGLExperimental:
case Settings.Mode.OpenGLExperimental:
GraphicsMode = 4;
break;
case Settings.GraphicsOptions.Mode.DirectX:
case Settings.Mode.DirectX:
GraphicsMode = 3;
break;
default:
@ -1132,7 +1135,7 @@ public class GlobalFuncs
}
}
ApplyClientSettings(info, ClientName, GraphicsMode, 0, 0, 0, 0, 0, 0, 0, false, "", 0, true);
ApplyClientSettings(info, ClientName, GraphicsMode, 0, 0, 0, 0, 0, 0, 0, false, "", 0, "800x600", "1024x768", 0, true);
//just copy the file.
string terms = "_" + ClientName;
@ -1144,7 +1147,7 @@ public class GlobalFuncs
{
if (dir.Contains(terms) && !dir.Contains("_default"))
{
FixedFileCopy(dir, Settings.GraphicsOptions.GetPathForClientLoadOptions(info.ClientLoadOptions) + @"\" + Path.GetFileName(dir).Replace(terms, "")
FixedFileCopy(dir, Settings.GetPathForClientLoadOptions(info.ClientLoadOptions) + @"\" + Path.GetFileName(dir).Replace(terms, "")
.Replace(dir.Substring(dir.LastIndexOf('-') + 1), "")
.Replace("-", ".xml"), true);
}
@ -1160,42 +1163,43 @@ public class GlobalFuncs
//oh god....
//we're using this one for custom graphics quality. Better than the latter.
public static void ApplyClientSettings_custom(FileFormat.ClientInfo info, string ClientName, int MeshDetail, int ShadingQuality, int MaterialQuality,
int AA, int AASamples, int Bevels, int Shadows_2008, bool Shadows_2007, string Style_2007, int GFXQualityLevel)
int AA, int AASamples, int Bevels, int Shadows_2008, bool Shadows_2007, string Style_2007, int GFXQualityLevel, string WindowResolution, string FullscreenResolution,
int ModernResolution)
{
int GraphicsMode = 0;
if (info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomatic)
if (info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions == Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomatic)
{
GraphicsMode = 1;
}
else
{
if (info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2007_NoGraphicsOptions ||
info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions)
if (info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2007_NoGraphicsOptions ||
info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions)
{
switch (GlobalVars.UserConfiguration.GraphicsMode)
{
case Settings.GraphicsOptions.Mode.OpenGLStable:
case Settings.Mode.OpenGLStable:
switch (info.ClientLoadOptions)
{
case Settings.GraphicsOptions.ClientLoadOptions.Client_2007:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
case Settings.ClientLoadOptions.Client_2007:
case Settings.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
case Settings.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
GraphicsMode = 2;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp:
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
case Settings.ClientLoadOptions.Client_2008AndUp:
case Settings.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
GraphicsMode = 4;
break;
default:
break;
}
break;
case Settings.GraphicsOptions.Mode.OpenGLExperimental:
case Settings.Mode.OpenGLExperimental:
GraphicsMode = 4;
break;
case Settings.GraphicsOptions.Mode.DirectX:
case Settings.Mode.DirectX:
GraphicsMode = 3;
break;
default:
@ -1206,15 +1210,19 @@ public class GlobalFuncs
}
ApplyClientSettings(info, ClientName, GraphicsMode, MeshDetail, ShadingQuality, MaterialQuality,
AA, AASamples, Bevels, Shadows_2008, Shadows_2007, Style_2007, GFXQualityLevel);
AA, AASamples, Bevels, Shadows_2008, Shadows_2007, Style_2007, GFXQualityLevel, WindowResolution, FullscreenResolution, ModernResolution);
}
//it's worse.
public static void ApplyClientSettings(FileFormat.ClientInfo info, string ClientName, int GraphicsMode, int MeshDetail, int ShadingQuality, int MaterialQuality,
int AA, int AASamples, int Bevels, int Shadows_2008, bool Shadows_2007, string Style_2007, int GFXQualityLevel, bool onlyGraphicsMode = false)
int AA, int AASamples, int Bevels, int Shadows_2008, bool Shadows_2007, string Style_2007, int GFXQualityLevel, string WindowResolution, string FullscreenResolution,
int ModernResolution, bool onlyGraphicsMode = false)
{
try
{
string winRes = WindowResolution;
string fullRes = FullscreenResolution;
string terms = "_" + ClientName;
string[] dirs = Directory.GetFiles(GlobalPaths.ConfigDirClients);
@ -1269,6 +1277,11 @@ public class GlobalFuncs
RobloxXML.EditRenderSettings(doc, "shadows", Shadows_2007.ToString().ToLower(), XMLTypes.Bool);
RobloxXML.EditRenderSettings(doc, "_skinFile", !string.IsNullOrWhiteSpace(Style_2007) ? @"Styles\" + Style_2007 : "", XMLTypes.String);
RobloxXML.EditRenderSettings(doc, "QualityLevel", GFXQualityLevel.ToString(), XMLTypes.Token);
RobloxXML.EditRenderSettings(doc, "FullscreenSizePreference", fullRes.ToString(), XMLTypes.Vector2Int16);
RobloxXML.EditRenderSettings(doc, "FullscreenSize", fullRes.ToString(), XMLTypes.Vector2Int16);
RobloxXML.EditRenderSettings(doc, "WindowSizePreference", winRes.ToString(), XMLTypes.Vector2Int16);
RobloxXML.EditRenderSettings(doc, "WindowSize", winRes.ToString(), XMLTypes.Vector2Int16);
RobloxXML.EditRenderSettings(doc, "Resolution", ModernResolution.ToString(), XMLTypes.Token);
}
}
catch (Exception)
@ -1278,7 +1291,7 @@ public class GlobalFuncs
finally
{
doc.Save(dir);
FixedFileCopy(dir, Settings.GraphicsOptions.GetPathForClientLoadOptions(info.ClientLoadOptions) + @"\" + Path.GetFileName(dir).Replace(terms, "")
FixedFileCopy(dir, Settings.GetPathForClientLoadOptions(info.ClientLoadOptions) + @"\" + Path.GetFileName(dir).Replace(terms, "")
.Replace(dir.Substring(dir.LastIndexOf('-') + 1), "")
.Replace("-", ".xml"), true);
}
@ -1522,7 +1535,7 @@ public class GlobalFuncs
client.Exited += e;
}
client.Start();
client.PriorityClass = ProcessPriorityClass.RealTime;
client.PriorityClass = GlobalVars.UserConfiguration.Priority;
SecurityFuncs.RenameWindow(client, type, clientname, mapname);
if (e != null)
{

View File

@ -52,6 +52,12 @@
this.Style2007 = new System.Windows.Forms.TextBox();
this.Style2007FolderFinder = new System.Windows.Forms.Button();
this.Styles2007Info = new System.Windows.Forms.Button();
this.label12 = new System.Windows.Forms.Label();
this.GraphicsWindowResolution = new System.Windows.Forms.TextBox();
this.GraphicsFullscreenResolution = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.GraphicsModernResolution = new System.Windows.Forms.ComboBox();
this.label14 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.GraphicsLevel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.GraphicsMeshQuality)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.GraphicsShadingQuality)).BeginInit();
@ -246,7 +252,7 @@
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.ForeColor = System.Drawing.Color.Red;
this.label9.Location = new System.Drawing.Point(93, 281);
this.label9.Location = new System.Drawing.Point(95, 359);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(234, 13);
this.label9.TabIndex = 17;
@ -311,12 +317,93 @@
this.Styles2007Info.UseVisualStyleBackColor = true;
this.Styles2007Info.Click += new System.EventHandler(this.Styles2007Info_Click);
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(12, 282);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(159, 13);
this.label12.TabIndex = 25;
this.label12.Text = "Window Resolution (2007-2009)";
//
// GraphicsWindowResolution
//
this.GraphicsWindowResolution.Location = new System.Drawing.Point(172, 279);
this.GraphicsWindowResolution.Name = "GraphicsWindowResolution";
this.GraphicsWindowResolution.Size = new System.Drawing.Size(246, 20);
this.GraphicsWindowResolution.TabIndex = 26;
this.GraphicsWindowResolution.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.GraphicsWindowResolution.TextChanged += new System.EventHandler(this.GraphicsWindowResolution_TextChanged);
//
// GraphicsFullscreenResolution
//
this.GraphicsFullscreenResolution.Location = new System.Drawing.Point(172, 305);
this.GraphicsFullscreenResolution.Name = "GraphicsFullscreenResolution";
this.GraphicsFullscreenResolution.Size = new System.Drawing.Size(246, 20);
this.GraphicsFullscreenResolution.TabIndex = 28;
this.GraphicsFullscreenResolution.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.GraphicsFullscreenResolution.TextChanged += new System.EventHandler(this.GraphicsFullscreenResolution_TextChanged);
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(12, 305);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(108, 26);
this.label13.TabIndex = 27;
this.label13.Text = "Fullscreen Resolution\r\n(2007-2009)";
//
// GraphicsModernResolution
//
this.GraphicsModernResolution.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.GraphicsModernResolution.FormattingEnabled = true;
this.GraphicsModernResolution.Items.AddRange(new object[] {
"0: Automatic",
"1: 720x526",
"2: 800x600",
"3: 1024x600 (wide)",
"4: 1024x768",
"5: 1280x720 (wide)",
"6: 1280x768 (wide)",
"7: 1152x864",
"8: 1280x800 (wide)",
"9: 1360x768 (wide)",
"10: 1280x960",
"11: 1280x1024",
"12: 1440x900 (wide)",
"13: 1600x900 (wide)",
"14: 1600x1024 (wide)",
"15: 1600x1200",
"16: 1680x1050 (wide)",
"17: 1920x1080 (wide)",
"18: 1920x1200 (wide)"});
this.GraphicsModernResolution.Location = new System.Drawing.Point(172, 331);
this.GraphicsModernResolution.Name = "GraphicsModernResolution";
this.GraphicsModernResolution.Size = new System.Drawing.Size(246, 21);
this.GraphicsModernResolution.TabIndex = 29;
this.GraphicsModernResolution.SelectedIndexChanged += new System.EventHandler(this.GraphicsModernResolution_SelectedIndexChanged);
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(12, 339);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(96, 13);
this.label14.TabIndex = 30;
this.label14.Text = "Resolution (2010+)";
//
// CustomGraphicsOptions
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.ClientSize = new System.Drawing.Size(430, 303);
this.ClientSize = new System.Drawing.Size(430, 381);
this.Controls.Add(this.label14);
this.Controls.Add(this.GraphicsModernResolution);
this.Controls.Add(this.GraphicsFullscreenResolution);
this.Controls.Add(this.label13);
this.Controls.Add(this.GraphicsWindowResolution);
this.Controls.Add(this.label12);
this.Controls.Add(this.Styles2007Info);
this.Controls.Add(this.Style2007FolderFinder);
this.Controls.Add(this.Style2007);
@ -379,5 +466,11 @@
private System.Windows.Forms.TextBox Style2007;
private System.Windows.Forms.Button Style2007FolderFinder;
private System.Windows.Forms.Button Styles2007Info;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.TextBox GraphicsWindowResolution;
private System.Windows.Forms.TextBox GraphicsFullscreenResolution;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.ComboBox GraphicsModernResolution;
private System.Windows.Forms.Label label14;
}
}

View File

@ -2,6 +2,7 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using System.Xml.Linq;
#endregion
@ -22,7 +23,10 @@ namespace NovetusLauncher
private int Shadows_2008 = 0;
private bool Shadows_2007 = false;
private string Style_2007 = "";
private static string ClientName = "";
private string WindowResolution = "";
private string FullscreenResolution = "";
private bool initial = true;
private int ModernResolution = 0;
private FileFormat.ClientInfo info;
#endregion
@ -36,10 +40,10 @@ namespace NovetusLauncher
#region Form Events
private void CustomGraphicsOptions_Load(object sender, EventArgs e)
{
ClientName = GlobalVars.UserConfiguration.SelectedClient;
info = GlobalFuncs.GetClientInfoValues(ClientName);
GlobalFuncs.ReadClientValues(GlobalVars.UserConfiguration.SelectedClient, null);
info = GlobalFuncs.GetClientInfoValues(GlobalVars.UserConfiguration.SelectedClient);
string terms = "_" + ClientName;
string terms = "_" + GlobalVars.UserConfiguration.SelectedClient;
bool hasFoundDir = false;
string[] dirs = Directory.GetFiles(GlobalPaths.ConfigDirClients);
@ -214,6 +218,68 @@ namespace NovetusLauncher
GraphicsLevel.Enabled = false;
}
try
{
FullscreenResolution = RobloxXML.GetRenderSettings(doc, "FullscreenSize", XMLTypes.Vector2Int16);
if (!string.IsNullOrWhiteSpace(FullscreenResolution))
{
GraphicsFullscreenResolution.Text = FullscreenResolution;
}
else
{
FullscreenResolution = RobloxXML.GetRenderSettings(doc, "FullscreenSizePreference", XMLTypes.Vector2Int16);
if (!string.IsNullOrWhiteSpace(FullscreenResolution))
{
GraphicsFullscreenResolution.Text = FullscreenResolution;
}
else
{
GraphicsFullscreenResolution.Enabled = false;
}
}
}
catch (Exception)
{
GraphicsFullscreenResolution.Enabled = false;
}
try
{
WindowResolution = RobloxXML.GetRenderSettings(doc, "WindowSize", XMLTypes.Vector2Int16);
if (!string.IsNullOrWhiteSpace(WindowResolution))
{
GraphicsWindowResolution.Text = WindowResolution;
}
else
{
WindowResolution = RobloxXML.GetRenderSettings(doc, "WindowSizePreference", XMLTypes.Vector2Int16);
if (!string.IsNullOrWhiteSpace(WindowResolution))
{
GraphicsWindowResolution.Text = WindowResolution;
}
else
{
GraphicsWindowResolution.Enabled = false;
}
}
}
catch (Exception)
{
GraphicsWindowResolution.Enabled = false;
}
try
{
ModernResolution = Convert.ToInt32(RobloxXML.GetRenderSettings(doc, "Resolution", XMLTypes.Token));
GraphicsModernResolution.SelectedIndex = ModernResolution;
}
catch (Exception)
{
GraphicsModernResolution.Enabled = false;
}
doc = null;
GC.Collect();
GC.WaitForPendingFinalizers();
@ -226,12 +292,14 @@ namespace NovetusLauncher
MessageBox.Show("This client does not support setting adjustment through the Novetus Launcher.\nTry opening this client in ROBLOX Studio and adjust it through the settings in Tools -> Settings.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
Close();
}
initial = false;
}
private void GraphicsLevel_ValueChanged(object sender, EventArgs e)
{
if (GraphicsLevel.Value > 19 && (info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21))
if (GraphicsLevel.Value > 19 && (info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2008AndUp_QualityLevel21))
{
GraphicsLevel.Value = 19;
}
@ -241,8 +309,8 @@ namespace NovetusLauncher
private void GraphicsLevel_Click(object sender, EventArgs e)
{
if (GraphicsLevel.Value > 19 && (info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21))
if (GraphicsLevel.Value > 19 && (info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 ||
info.ClientLoadOptions != Settings.ClientLoadOptions.Client_2008AndUp_QualityLevel21))
{
MessageBox.Show("This client does not support quality levels above 19.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
@ -319,14 +387,41 @@ namespace NovetusLauncher
Style_2007 = Style2007.Text;
}
private void GraphicsWindowResolution_TextChanged(object sender, EventArgs e)
{
if (!initial && !CheckIfResolutionString(GraphicsWindowResolution.Text))
{
MessageBox.Show("Please input a valid resolution. i.e 800x600 or 1024x768. Novetus will reset back to the default resolution.", "Novetus - Error when inputting resolution.", MessageBoxButtons.OK, MessageBoxIcon.Error);
GraphicsWindowResolution.Text = "800x600";
}
WindowResolution = GraphicsWindowResolution.Text;
}
private void GraphicsFullscreenResolution_TextChanged(object sender, EventArgs e)
{
if (!initial && !CheckIfResolutionString(GraphicsFullscreenResolution.Text))
{
MessageBox.Show("Please input a valid resolution. i.e 800x600 or 1024x768. Novetus will reset back to the default resolution.", "Novetus - Error when inputting resolution.", MessageBoxButtons.OK, MessageBoxIcon.Error);
GraphicsFullscreenResolution.Text = "1024x768";
}
FullscreenResolution = GraphicsFullscreenResolution.Text;
}
private void GraphicsModernResolution_SelectedIndexChanged(object sender, EventArgs e)
{
ModernResolution = GraphicsModernResolution.SelectedIndex;
}
private void Style2007FolderFinder_Click(object sender, EventArgs e)
{
Process.Start("explorer.exe", GlobalPaths.ClientDir.Replace(@"\\", @"\") + @"\" + ClientName + @"\Styles");
Process.Start("explorer.exe", GlobalPaths.ClientDir.Replace(@"\\", @"\") + @"\" + GlobalVars.UserConfiguration.SelectedClient + @"\Styles");
}
private void Styles2007Info_Click(object sender, EventArgs e)
{
MessageBox.Show("Make sure you place the styles you want in the Styles folder in " + GlobalPaths.ClientDir.Replace(@"\\", @"\") + @"\" + ClientName + @"\Styles." + Environment.NewLine + "If the files are not placed in this directory, they will not be loaded properly.\nThis client will accept .msstyles and .cjstyles files.", "Novetus - Styles Help", MessageBoxButtons.OK, MessageBoxIcon.Information);
MessageBox.Show("Make sure you place the styles you want in the Styles folder in " + GlobalPaths.ClientDir.Replace(@"\\", @"\") + @"\" + GlobalVars.UserConfiguration.SelectedClient + @"\Styles." + Environment.NewLine + "If the files are not placed in this directory, they will not be loaded properly.\nThis client will accept .msstyles and .cjstyles files.", "Novetus - Styles Help", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void GraphicsShadows2007_SelectedIndexChanged(object sender, EventArgs e)
@ -344,9 +439,47 @@ namespace NovetusLauncher
private void CustomGraphicsOptions_Close(object sender, FormClosingEventArgs e)
{
GlobalFuncs.ReadClientValues(ClientName, null);
GlobalFuncs.ApplyClientSettings_custom(info, ClientName, MeshDetail, ShadingQuality, MaterialQuality,
AA, AASamples, Bevels, Shadows_2008, Shadows_2007, Style_2007, QualityLevel);
GlobalFuncs.ReadClientValues(GlobalVars.UserConfiguration.SelectedClient, null);
GlobalFuncs.ApplyClientSettings_custom(info, GlobalVars.UserConfiguration.SelectedClient, MeshDetail, ShadingQuality, MaterialQuality,
AA, AASamples, Bevels, Shadows_2008, Shadows_2007, Style_2007, QualityLevel,
WindowResolution, FullscreenResolution, ModernResolution);
}
#endregion
#region Functions
private bool CheckIfResolutionString(string resString)
{
try
{
string[] resStringTest = resString.Split('x');
if (resStringTest.Length > 0)
{
if (int.TryParse(resStringTest[0], out _))
{
if (int.TryParse(resStringTest[1], out _))
{
return true;
}
else
{
return false;
}
}
else
{
return false;
}
}
else
{
return false;
}
}
catch (Exception)
{
return false;
}
}
#endregion
}

View File

@ -116,13 +116,13 @@ namespace NovetusLauncher
this.label7 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.button9 = new System.Windows.Forms.Button();
this.checkBox3 = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.button5 = new System.Windows.Forms.Button();
this.richTextBox3 = new System.Windows.Forms.RichTextBox();
this.SettingsButton = new System.Windows.Forms.Button();
this.UAButton = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.button9 = new System.Windows.Forms.Button();
this.richTextBox3 = new System.Windows.Forms.RichTextBox();
this.button5 = new System.Windows.Forms.Button();
this.SettingsButton = new System.Windows.Forms.Button();
this.button25 = new System.Windows.Forms.Button();
this.button21 = new System.Windows.Forms.Button();
this.textBox5 = new System.Windows.Forms.TextBox();
@ -924,13 +924,13 @@ namespace NovetusLauncher
this.tabPage5.Controls.Add(this.label7);
this.tabPage5.Controls.Add(this.label10);
this.tabPage5.Controls.Add(this.label8);
this.tabPage5.Controls.Add(this.button9);
this.tabPage5.Controls.Add(this.checkBox3);
this.tabPage5.Controls.Add(this.checkBox1);
this.tabPage5.Controls.Add(this.button5);
this.tabPage5.Controls.Add(this.richTextBox3);
this.tabPage5.Controls.Add(this.SettingsButton);
this.tabPage5.Controls.Add(this.UAButton);
this.tabPage5.Controls.Add(this.checkBox1);
this.tabPage5.Controls.Add(this.button9);
this.tabPage5.Controls.Add(this.richTextBox3);
this.tabPage5.Controls.Add(this.button5);
this.tabPage5.Controls.Add(this.SettingsButton);
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(405, 258);
@ -941,11 +941,11 @@ namespace NovetusLauncher
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(173, 32);
this.label5.Location = new System.Drawing.Point(297, 18);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(30, 13);
this.label5.Size = new System.Drawing.Size(78, 13);
this.label5.TabIndex = 62;
this.label5.Text = "Style";
this.label5.Text = "Launcher Style";
//
// comboBox3
//
@ -954,9 +954,9 @@ namespace NovetusLauncher
this.comboBox3.Items.AddRange(new object[] {
"Extended",
"Compact"});
this.comboBox3.Location = new System.Drawing.Point(212, 29);
this.comboBox3.Location = new System.Drawing.Point(287, 34);
this.comboBox3.Name = "comboBox3";
this.comboBox3.Size = new System.Drawing.Size(89, 21);
this.comboBox3.Size = new System.Drawing.Size(99, 21);
this.comboBox3.TabIndex = 61;
this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
//
@ -965,7 +965,7 @@ namespace NovetusLauncher
this.checkBox2.AutoSize = true;
this.checkBox2.Checked = true;
this.checkBox2.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox2.Location = new System.Drawing.Point(176, 8);
this.checkBox2.Location = new System.Drawing.Point(25, 3);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(135, 17);
this.checkBox2.TabIndex = 59;
@ -986,9 +986,9 @@ namespace NovetusLauncher
// button26
//
this.button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button26.Location = new System.Drawing.Point(88, 28);
this.button26.Location = new System.Drawing.Point(96, 21);
this.button26.Name = "button26";
this.button26.Size = new System.Drawing.Size(77, 23);
this.button26.Size = new System.Drawing.Size(48, 34);
this.button26.TabIndex = 57;
this.button26.Text = "Clear Cache";
this.button26.UseVisualStyleBackColor = true;
@ -1020,20 +1020,9 @@ namespace NovetusLauncher
this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label8.Click += new System.EventHandler(this.label8_Click);
//
// button9
//
this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button9.Location = new System.Drawing.Point(62, 4);
this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(45, 23);
this.button9.TabIndex = 37;
this.button9.Text = "Reset";
this.button9.UseVisualStyleBackColor = true;
this.button9.Click += new System.EventHandler(this.Button9Click);
//
// checkBox3
//
this.checkBox3.Location = new System.Drawing.Point(317, 7);
this.checkBox3.Location = new System.Drawing.Point(166, 2);
this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(77, 19);
this.checkBox3.TabIndex = 22;
@ -1041,34 +1030,44 @@ namespace NovetusLauncher
this.checkBox3.UseVisualStyleBackColor = true;
this.checkBox3.CheckedChanged += new System.EventHandler(this.CheckBox3CheckedChanged);
//
// UAButton
//
this.UAButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.UAButton.Location = new System.Drawing.Point(147, 21);
this.UAButton.Name = "UAButton";
this.UAButton.Size = new System.Drawing.Size(63, 34);
this.UAButton.TabIndex = 37;
this.UAButton.Text = "Install UserAgent";
this.UAButton.UseVisualStyleBackColor = true;
this.UAButton.Click += new System.EventHandler(this.Button21Click);
//
// checkBox1
//
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox1.Location = new System.Drawing.Point(307, 27);
this.checkBox1.Location = new System.Drawing.Point(249, 3);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(87, 30);
this.checkBox1.Size = new System.Drawing.Size(127, 19);
this.checkBox1.TabIndex = 5;
this.checkBox1.Text = "Minimize on\r\nLaunch";
this.checkBox1.Text = "Minimize on Launch";
this.checkBox1.UseCompatibleTextRendering = true;
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1CheckedChanged);
//
// button5
// button9
//
this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button5.Location = new System.Drawing.Point(14, 4);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(42, 23);
this.button5.TabIndex = 10;
this.button5.Text = "Save";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.Button5Click);
this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button9.Location = new System.Drawing.Point(6, 21);
this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(45, 34);
this.button9.TabIndex = 37;
this.button9.Text = "Reset Config";
this.button9.UseVisualStyleBackColor = true;
this.button9.Click += new System.EventHandler(this.Button9Click);
//
// richTextBox3
//
this.richTextBox3.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.richTextBox3.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.richTextBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.richTextBox3.Location = new System.Drawing.Point(6, 70);
this.richTextBox3.Name = "richTextBox3";
@ -1077,28 +1076,28 @@ namespace NovetusLauncher
this.richTextBox3.TabIndex = 60;
this.richTextBox3.Text = "credits text";
//
// button5
//
this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button5.Location = new System.Drawing.Point(52, 21);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(42, 34);
this.button5.TabIndex = 10;
this.button5.Text = "Save Config";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.Button5Click);
//
// SettingsButton
//
this.SettingsButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.SettingsButton.Location = new System.Drawing.Point(110, 4);
this.SettingsButton.Location = new System.Drawing.Point(213, 21);
this.SettingsButton.Name = "SettingsButton";
this.SettingsButton.Size = new System.Drawing.Size(55, 23);
this.SettingsButton.Size = new System.Drawing.Size(55, 34);
this.SettingsButton.TabIndex = 10;
this.SettingsButton.Text = "Settings";
this.SettingsButton.UseVisualStyleBackColor = true;
this.SettingsButton.Click += new System.EventHandler(this.SettingsButtonClick);
//
// UAButton
//
this.UAButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.UAButton.Location = new System.Drawing.Point(14, 28);
this.UAButton.Name = "UAButton";
this.UAButton.Size = new System.Drawing.Size(69, 23);
this.UAButton.TabIndex = 37;
this.UAButton.Text = "UserAgent";
this.UAButton.UseVisualStyleBackColor = true;
this.UAButton.Click += new System.EventHandler(this.Button21Click);
//
// button25
//
this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -1484,7 +1483,7 @@ namespace NovetusLauncher
//*vomits*
launcherForm = new LauncherFormShared();
launcherForm.Parent = this;
launcherForm.FormStyle = Settings.UIOptions.Style.Compact;
launcherForm.FormStyle = Settings.Style.Compact;
launcherForm.ConsoleBox = richTextBox1;
launcherForm.Tabs = tabControl1;
launcherForm.MapDescBox = textBox4;

View File

@ -252,14 +252,7 @@ namespace NovetusLauncher
void SettingsButtonClick(object sender, EventArgs e)
{
LauncherFormCompactSettings im = new LauncherFormCompactSettings();
im.FormClosing += SettingsExited;
im.Show();
}
void SettingsExited(object sender, FormClosingEventArgs e)
{
GlobalFuncs.ReadClientValues(richTextBox1);
launcherForm.LoadSettings();
}
private void button34_Click(object sender, EventArgs e)

View File

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

View File

@ -139,21 +139,13 @@ namespace NovetusLauncher
this.button36 = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
this.comboBox3 = new System.Windows.Forms.ComboBox();
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.label31 = new System.Windows.Forms.Label();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.checkBox2 = new System.Windows.Forms.CheckBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
this.checkBox7 = new System.Windows.Forms.CheckBox();
this.label22 = new System.Windows.Forms.Label();
this.checkBox5 = new System.Windows.Forms.CheckBox();
this.checkBox3 = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.button9 = new System.Windows.Forms.Button();
this.button26 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.richTextBox3 = new System.Windows.Forms.RichTextBox();
this.label10 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
@ -1194,7 +1186,6 @@ namespace NovetusLauncher
//
this.tabPage5.Controls.Add(this.panel5);
this.tabPage5.Controls.Add(this.richTextBox3);
this.tabPage5.Controls.Add(this.label10);
this.tabPage5.Controls.Add(this.label18);
this.tabPage5.Controls.Add(this.label8);
this.tabPage5.Controls.Add(this.label7);
@ -1210,38 +1201,31 @@ namespace NovetusLauncher
this.panel5.Controls.Add(this.button36);
this.panel5.Controls.Add(this.label5);
this.panel5.Controls.Add(this.comboBox3);
this.panel5.Controls.Add(this.comboBox2);
this.panel5.Controls.Add(this.label31);
this.panel5.Controls.Add(this.comboBox1);
this.panel5.Controls.Add(this.checkBox2);
this.panel5.Controls.Add(this.checkBox6);
this.panel5.Controls.Add(this.checkBox7);
this.panel5.Controls.Add(this.label22);
this.panel5.Controls.Add(this.checkBox5);
this.panel5.Controls.Add(this.checkBox3);
this.panel5.Controls.Add(this.checkBox1);
this.panel5.Controls.Add(this.button9);
this.panel5.Controls.Add(this.button26);
this.panel5.Controls.Add(this.button5);
this.panel5.Location = new System.Drawing.Point(3, 4);
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(200, 259);
this.panel5.Size = new System.Drawing.Size(625, 61);
this.panel5.TabIndex = 68;
//
// button36
//
this.button36.Location = new System.Drawing.Point(3, 161);
this.button36.Location = new System.Drawing.Point(401, 27);
this.button36.Name = "button36";
this.button36.Size = new System.Drawing.Size(190, 23);
this.button36.Size = new System.Drawing.Size(60, 26);
this.button36.TabIndex = 77;
this.button36.Text = "Change custom graphics options";
this.button36.Text = "Settings";
this.button36.UseVisualStyleBackColor = true;
this.button36.Click += new System.EventHandler(this.button36_Click);
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(3, 85);
this.label5.Location = new System.Drawing.Point(373, 4);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(78, 13);
this.label5.TabIndex = 76;
@ -1254,60 +1238,18 @@ namespace NovetusLauncher
this.comboBox3.Items.AddRange(new object[] {
"Extended",
"Compact"});
this.comboBox3.Location = new System.Drawing.Point(90, 82);
this.comboBox3.Location = new System.Drawing.Point(457, 2);
this.comboBox3.Name = "comboBox3";
this.comboBox3.Size = new System.Drawing.Size(103, 21);
this.comboBox3.TabIndex = 75;
this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
//
// comboBox2
//
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Items.AddRange(new object[] {
"Automatic",
"Very Low",
"Low",
"Medium",
"High",
"Ultra",
"Custom"});
this.comboBox2.Location = new System.Drawing.Point(90, 134);
this.comboBox2.Name = "comboBox2";
this.comboBox2.Size = new System.Drawing.Size(103, 21);
this.comboBox2.TabIndex = 73;
this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
//
// label31
//
this.label31.AutoSize = true;
this.label31.Location = new System.Drawing.Point(3, 111);
this.label31.Name = "label31";
this.label31.Size = new System.Drawing.Size(79, 13);
this.label31.TabIndex = 69;
this.label31.Text = "Graphics Mode";
//
// comboBox1
//
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Items.AddRange(new object[] {
"Automatic",
"GL Stable",
"GL Experimental",
"DirectX"});
this.comboBox1.Location = new System.Drawing.Point(90, 108);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(103, 21);
this.comboBox1.TabIndex = 68;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// checkBox2
//
this.checkBox2.AutoSize = true;
this.checkBox2.Checked = true;
this.checkBox2.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox2.Location = new System.Drawing.Point(3, 3);
this.checkBox2.Location = new System.Drawing.Point(11, 3);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(135, 17);
this.checkBox2.TabIndex = 59;
@ -1316,52 +1258,9 @@ namespace NovetusLauncher
this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
this.checkBox2.Click += new System.EventHandler(this.CheckBox2Click);
//
// checkBox6
//
this.checkBox6.Location = new System.Drawing.Point(3, 224);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(131, 16);
this.checkBox6.TabIndex = 63;
this.checkBox6.Text = "ReShade FPS Display";
this.checkBox6.UseVisualStyleBackColor = true;
this.checkBox6.CheckedChanged += new System.EventHandler(this.checkBox6_CheckedChanged);
//
// checkBox7
//
this.checkBox7.AutoSize = true;
this.checkBox7.Location = new System.Drawing.Point(3, 207);
this.checkBox7.Name = "checkBox7";
this.checkBox7.Size = new System.Drawing.Size(164, 17);
this.checkBox7.TabIndex = 64;
this.checkBox7.Text = "ReShade Performance Mode";
this.checkBox7.UseVisualStyleBackColor = true;
this.checkBox7.CheckedChanged += new System.EventHandler(this.checkBox7_CheckedChanged);
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(3, 137);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(84, 13);
this.label22.TabIndex = 67;
this.label22.Text = "Graphics Quality";
//
// checkBox5
//
this.checkBox5.AutoSize = true;
this.checkBox5.Checked = true;
this.checkBox5.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox5.Location = new System.Drawing.Point(3, 190);
this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(107, 17);
this.checkBox5.TabIndex = 62;
this.checkBox5.Text = "Toggle ReShade";
this.checkBox5.UseVisualStyleBackColor = true;
this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged);
//
// checkBox3
//
this.checkBox3.Location = new System.Drawing.Point(3, 19);
this.checkBox3.Location = new System.Drawing.Point(152, 2);
this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(77, 19);
this.checkBox3.TabIndex = 22;
@ -1373,7 +1272,7 @@ namespace NovetusLauncher
//
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox1.Location = new System.Drawing.Point(3, 37);
this.checkBox1.Location = new System.Drawing.Point(235, 3);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(124, 17);
this.checkBox1.TabIndex = 5;
@ -1384,21 +1283,21 @@ namespace NovetusLauncher
//
// button9
//
this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button9.Location = new System.Drawing.Point(154, 55);
this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button9.Location = new System.Drawing.Point(198, 27);
this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(39, 21);
this.button9.Size = new System.Drawing.Size(83, 26);
this.button9.TabIndex = 37;
this.button9.Text = "Reset";
this.button9.Text = "Reset Config";
this.button9.UseVisualStyleBackColor = true;
this.button9.Click += new System.EventHandler(this.Button9Click);
//
// button26
//
this.button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button26.Location = new System.Drawing.Point(3, 55);
this.button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button26.Location = new System.Drawing.Point(287, 27);
this.button26.Name = "button26";
this.button26.Size = new System.Drawing.Size(104, 21);
this.button26.Size = new System.Drawing.Size(108, 26);
this.button26.TabIndex = 57;
this.button26.Text = "Clear Asset Cache";
this.button26.UseVisualStyleBackColor = true;
@ -1406,37 +1305,28 @@ namespace NovetusLauncher
//
// button5
//
this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button5.Location = new System.Drawing.Point(113, 55);
this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button5.Location = new System.Drawing.Point(109, 27);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(35, 21);
this.button5.Size = new System.Drawing.Size(83, 26);
this.button5.TabIndex = 10;
this.button5.Text = "Save";
this.button5.Text = "Save Config";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.Button5Click);
//
// richTextBox3
//
this.richTextBox3.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.richTextBox3.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.richTextBox3.Location = new System.Drawing.Point(209, 4);
this.richTextBox3.Location = new System.Drawing.Point(11, 67);
this.richTextBox3.Name = "richTextBox3";
this.richTextBox3.ReadOnly = true;
this.richTextBox3.Size = new System.Drawing.Size(413, 219);
this.richTextBox3.Size = new System.Drawing.Size(601, 175);
this.richTextBox3.TabIndex = 60;
this.richTextBox3.Text = "credits text";
//
// label10
//
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.label10.Location = new System.Drawing.Point(209, 85);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(413, 2);
this.label10.TabIndex = 53;
//
// label18
//
this.label18.Location = new System.Drawing.Point(336, 237);
this.label18.Location = new System.Drawing.Point(232, 247);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(155, 16);
this.label18.TabIndex = 58;
@ -1445,7 +1335,7 @@ namespace NovetusLauncher
//
// label8
//
this.label8.Location = new System.Drawing.Point(209, 237);
this.label8.Location = new System.Drawing.Point(8, 247);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(122, 16);
this.label8.TabIndex = 48;
@ -1455,7 +1345,7 @@ namespace NovetusLauncher
//
// label7
//
this.label7.Location = new System.Drawing.Point(491, 237);
this.label7.Location = new System.Drawing.Point(484, 247);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(128, 16);
this.label7.TabIndex = 54;
@ -1583,7 +1473,7 @@ namespace NovetusLauncher
//*vomits*
launcherForm = new LauncherFormShared();
launcherForm.Parent = this;
launcherForm.FormStyle = Settings.UIOptions.Style.Extended;
launcherForm.FormStyle = Settings.Style.Extended;
launcherForm.ConsoleBox = richTextBox1;
launcherForm.Tabs = tabControl1;
launcherForm.MapDescBox = textBox4;
@ -1604,13 +1494,8 @@ namespace NovetusLauncher
launcherForm.ReadmeBox = richTextBox3;
launcherForm.ProductVersionLabel = label8;
launcherForm.NovetusVersionLabel = label11;
launcherForm.GraphicsModeBox = comboBox1;
launcherForm.GraphicsLevelBox = comboBox2;
launcherForm.CloseOnLaunchCheckbox = checkBox1;
launcherForm.DiscordPresenceCheckbox = checkBox2;
launcherForm.ReShadeCheckbox = checkBox5;
launcherForm.ReShadeFPSDisplayCheckBox = checkBox6;
launcherForm.ReShadePerformanceModeCheckBox = checkBox7;
launcherForm.uPnPCheckBox = checkBox4;
launcherForm.ShowServerNotifsCheckBox = checkBox9;
launcherForm.PlayerIDTextBox = textBox5;
@ -1637,7 +1522,6 @@ namespace NovetusLauncher
private System.Windows.Forms.TreeView treeView1;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.Button button22;
@ -1728,21 +1612,13 @@ namespace NovetusLauncher
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.RichTextBox richTextBox3;
private System.Windows.Forms.Button button35;
private System.Windows.Forms.CheckBox checkBox5;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.CheckBox checkBox7;
private System.Windows.Forms.CheckBox checkBox6;
private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Label label31;
private System.Windows.Forms.ComboBox comboBox2;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.ComboBox comboBox3;
private System.Windows.Forms.TextBox SearchBar;
private System.Windows.Forms.Button SearchButton;
private System.Windows.Forms.Button button36;
private System.Windows.Forms.Button button37;
private System.Windows.Forms.CheckBox checkBox9;
//private System.Windows.Forms.CheckBox checkBox8;
@ -1755,5 +1631,6 @@ namespace NovetusLauncher
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ImageList imageList1;
private System.Windows.Forms.Button button23;
private System.Windows.Forms.Button button36;
}
}

View File

@ -300,100 +300,9 @@ namespace NovetusLauncher
tabControl1.SelectedTab = tabPage5;
}
private void checkBox5_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShade = checkBox5.Checked;
}
private void checkBox6_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShadeFPSDisplay = checkBox6.Checked;
}
private void checkBox7_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShadePerformanceMode = checkBox7.Checked;
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBox1.SelectedIndex)
{
case 1:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.OpenGLStable;
break;
case 2:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.OpenGLExperimental;
break;
case 3:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.DirectX;
break;
default:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.Automatic;
break;
}
GlobalFuncs.ReadClientValues(richTextBox1);
}
private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBox2.SelectedIndex)
{
case 1:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.VeryLow;
break;
case 2:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Low;
break;
case 3:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Medium;
break;
case 4:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.High;
break;
case 5:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Ultra;
break;
case 6:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Custom;
break;
default:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Automatic;
break;
}
GlobalFuncs.ReadClientValues(richTextBox1);
if (comboBox2.SelectedIndex != 6)
{
//https://stackoverflow.com/questions/9029351/close-all-open-forms-except-the-main-menu-in-c-sharp
FormCollection fc = Application.OpenForms;
foreach (Form frm in fc)
{
//iterate through
if (frm.Name == "CustomGraphicsOptions")
{
frm.Close();
break;
}
}
}
}
private void button36_Click(object sender, EventArgs e)
{
if (GlobalVars.UserConfiguration.QualityLevel == Settings.GraphicsOptions.Level.Custom)
{
CustomGraphicsOptions opt = new CustomGraphicsOptions();
opt.Show();
}
else
{
MessageBox.Show("You do not have the 'Custom' option selected. Please select it before continuing.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
launcherForm.LoadSettings();
}
private void button34_Click(object sender, EventArgs e)
@ -446,7 +355,7 @@ namespace NovetusLauncher
{
launcherForm.AddNewMap();
}
#endregion
#endregion
}
#endregion
}

View File

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

View File

@ -26,7 +26,7 @@ namespace NovetusLauncher
//CONTROLS
public Form Parent = null;
public Settings.UIOptions.Style FormStyle = Settings.UIOptions.Style.None;
public Settings.Style FormStyle = Settings.Style.None;
public RichTextBox ConsoleBox, ChangelogBox, ReadmeBox = null;
public TabControl Tabs = null;
public TextBox MapDescBox, ServerInfo, SearchBar, PlayerIDTextBox, PlayerNameTextBox, ClientDescriptionBox, IPBox,
@ -35,9 +35,8 @@ namespace NovetusLauncher
public ListBox ServerBox, PortBox, ClientBox = null;
public Label SplashLabel, ProductVersionLabel, NovetusVersionLabel, PlayerTripcodeLabel, IPLabel, PortLabel,
SelectedClientLabel, SelectedMapLabel, ClientWarningLabel = null;
public ComboBox StyleSelectorBox, GraphicsModeBox, GraphicsLevelBox = null;
public CheckBox CloseOnLaunchCheckbox, DiscordPresenceCheckbox, ReShadeCheckbox, ReShadeFPSDisplayCheckBox,
ReShadePerformanceModeCheckBox, uPnPCheckBox, ShowServerNotifsCheckBox, LocalPlayCheckBox = null;
public ComboBox StyleSelectorBox = null;
public CheckBox CloseOnLaunchCheckbox, DiscordPresenceCheckbox, uPnPCheckBox, ShowServerNotifsCheckBox, LocalPlayCheckBox = null;
public Button RegeneratePlayerIDButton = null;
public NumericUpDown PlayerLimitBox, HostPortBox, JoinPortBox = null;
public string TabPageHost, TabPageMaps, TabPageClients, TabPageSaved = "";
@ -355,7 +354,7 @@ namespace NovetusLauncher
{
if (gameType == ScriptType.Studio)
{
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
DialogResult result = MessageBox.Show("If you want to test out your place, you will have to save your place in Novetus's map folder, then launch your place in Play Solo.", "Novetus - Launch ROBLOX Studio", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
if (result == DialogResult.Cancel)
@ -638,17 +637,17 @@ namespace NovetusLauncher
switch (StyleSelectorBox.SelectedIndex)
{
case 1:
if (FormStyle == Settings.UIOptions.Style.Extended)
if (FormStyle == Settings.Style.Extended)
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Compact;
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact;
CloseEvent();
Application.Restart();
}
break;
default:
if (FormStyle == Settings.UIOptions.Style.Compact)
if (FormStyle == Settings.Style.Compact)
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Extended;
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
CloseEvent();
Application.Restart();
}
@ -674,78 +673,17 @@ namespace NovetusLauncher
IPLabel.Text = GlobalVars.IP;
PortLabel.Text = GlobalVars.JoinPort.ToString();
DiscordPresenceCheckbox.Checked = GlobalVars.UserConfiguration.DiscordPresence;
if (FormStyle == Settings.UIOptions.Style.Extended)
{
if (ReShadeCheckbox != null)
ReShadeCheckbox.Checked = GlobalVars.UserConfiguration.ReShade;
if (ReShadeFPSDisplayCheckBox != null)
ReShadeFPSDisplayCheckBox.Checked = GlobalVars.UserConfiguration.ReShadeFPSDisplay;
if (ReShadePerformanceModeCheckBox != null)
ReShadePerformanceModeCheckBox.Checked = GlobalVars.UserConfiguration.ReShadePerformanceMode;
}
uPnPCheckBox.Checked = GlobalVars.UserConfiguration.UPnP;
ShowServerNotifsCheckBox.Checked = GlobalVars.UserConfiguration.ShowServerNotifications;
ServerBrowserNameBox.Text = GlobalVars.UserConfiguration.ServerBrowserServerName;
ServerBrowserAddressBox.Text = GlobalVars.UserConfiguration.ServerBrowserServerAddress;
if (FormStyle == Settings.UIOptions.Style.Extended)
{
if (GraphicsModeBox != null)
{
switch (GlobalVars.UserConfiguration.GraphicsMode)
{
case Settings.GraphicsOptions.Mode.OpenGLStable:
GraphicsModeBox.SelectedIndex = 1;
break;
case Settings.GraphicsOptions.Mode.OpenGLExperimental:
GraphicsModeBox.SelectedIndex = 2;
break;
case Settings.GraphicsOptions.Mode.DirectX:
GraphicsModeBox.SelectedIndex = 3;
break;
default:
GraphicsModeBox.SelectedIndex = 0;
break;
}
}
if (GraphicsLevelBox != null)
{
switch (GlobalVars.UserConfiguration.QualityLevel)
{
case Settings.GraphicsOptions.Level.VeryLow:
GraphicsLevelBox.SelectedIndex = 1;
break;
case Settings.GraphicsOptions.Level.Low:
GraphicsLevelBox.SelectedIndex = 2;
break;
case Settings.GraphicsOptions.Level.Medium:
GraphicsLevelBox.SelectedIndex = 3;
break;
case Settings.GraphicsOptions.Level.High:
GraphicsLevelBox.SelectedIndex = 4;
break;
case Settings.GraphicsOptions.Level.Ultra:
GraphicsLevelBox.SelectedIndex = 5;
break;
case Settings.GraphicsOptions.Level.Custom:
GraphicsLevelBox.SelectedIndex = 6;
break;
default:
GraphicsLevelBox.SelectedIndex = 0;
break;
}
}
}
switch (GlobalVars.UserConfiguration.LauncherStyle)
{
case Settings.UIOptions.Style.Compact:
case Settings.Style.Compact:
StyleSelectorBox.SelectedIndex = 1;
break;
case Settings.UIOptions.Style.Extended:
case Settings.Style.Extended:
default:
StyleSelectorBox.SelectedIndex = 0;
break;
@ -1204,6 +1142,19 @@ namespace NovetusLauncher
}
}
}
public void LoadSettings()
{
LauncherFormSettings im = new LauncherFormSettings();
im.FormClosing += SettingsExited;
im.Show();
}
void SettingsExited(object sender, FormClosingEventArgs e)
{
GlobalFuncs.ReadClientValues(ConsoleBox);
}
#endregion
#region Helper Functions

View File

@ -1,6 +1,6 @@
namespace NovetusLauncher
{
partial class LauncherFormCompactSettings
partial class LauncherFormSettings
{
/// <summary>
/// Required designer variable.
@ -28,7 +28,7 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompactSettings));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormSettings));
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.label31 = new System.Windows.Forms.Label();
this.comboBox1 = new System.Windows.Forms.ComboBox();
@ -38,6 +38,14 @@
this.checkBox5 = new System.Windows.Forms.CheckBox();
this.button1 = new System.Windows.Forms.Button();
this.label9 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.comboBox3 = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// comboBox2
@ -52,7 +60,7 @@
"High",
"Ultra",
"Custom"});
this.comboBox2.Location = new System.Drawing.Point(123, 38);
this.comboBox2.Location = new System.Drawing.Point(90, 44);
this.comboBox2.Name = "comboBox2";
this.comboBox2.Size = new System.Drawing.Size(109, 21);
this.comboBox2.TabIndex = 81;
@ -61,7 +69,7 @@
// label31
//
this.label31.AutoSize = true;
this.label31.Location = new System.Drawing.Point(38, 14);
this.label31.Location = new System.Drawing.Point(5, 20);
this.label31.Name = "label31";
this.label31.Size = new System.Drawing.Size(79, 13);
this.label31.TabIndex = 80;
@ -76,7 +84,7 @@
"GL Stable",
"GL Experimental",
"DirectX"});
this.comboBox1.Location = new System.Drawing.Point(123, 11);
this.comboBox1.Location = new System.Drawing.Point(90, 17);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(109, 21);
this.comboBox1.TabIndex = 79;
@ -84,7 +92,7 @@
//
// checkBox6
//
this.checkBox6.Location = new System.Drawing.Point(68, 128);
this.checkBox6.Location = new System.Drawing.Point(6, 48);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(131, 17);
this.checkBox6.TabIndex = 76;
@ -95,7 +103,7 @@
// checkBox7
//
this.checkBox7.AutoSize = true;
this.checkBox7.Location = new System.Drawing.Point(68, 111);
this.checkBox7.Location = new System.Drawing.Point(6, 31);
this.checkBox7.Name = "checkBox7";
this.checkBox7.Size = new System.Drawing.Size(164, 17);
this.checkBox7.TabIndex = 77;
@ -106,7 +114,7 @@
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(38, 40);
this.label22.Location = new System.Drawing.Point(5, 46);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(84, 13);
this.label22.TabIndex = 78;
@ -117,7 +125,7 @@
this.checkBox5.AutoSize = true;
this.checkBox5.Checked = true;
this.checkBox5.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox5.Location = new System.Drawing.Point(68, 94);
this.checkBox5.Location = new System.Drawing.Point(6, 14);
this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(107, 17);
this.checkBox5.TabIndex = 75;
@ -127,9 +135,9 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(12, 65);
this.button1.Location = new System.Drawing.Point(8, 71);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(246, 23);
this.button1.Size = new System.Drawing.Size(191, 23);
this.button1.TabIndex = 83;
this.button1.Text = "Change custom graphics options";
this.button1.UseVisualStyleBackColor = true;
@ -140,33 +148,97 @@
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.ForeColor = System.Drawing.Color.Red;
this.label9.Location = new System.Drawing.Point(20, 147);
this.label9.Location = new System.Drawing.Point(91, 114);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(234, 13);
this.label9.TabIndex = 84;
this.label9.Text = "Close this window to save your settings.";
//
// LauncherFormCompactSettings
// groupBox1
//
this.groupBox1.Controls.Add(this.checkBox7);
this.groupBox1.Controls.Add(this.checkBox5);
this.groupBox1.Controls.Add(this.checkBox6);
this.groupBox1.Location = new System.Drawing.Point(223, 1);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(172, 70);
this.groupBox1.TabIndex = 85;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "ReShade Options";
//
// groupBox2
//
this.groupBox2.Controls.Add(this.label31);
this.groupBox2.Controls.Add(this.label22);
this.groupBox2.Controls.Add(this.comboBox1);
this.groupBox2.Controls.Add(this.button1);
this.groupBox2.Controls.Add(this.comboBox2);
this.groupBox2.Location = new System.Drawing.Point(12, 1);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(205, 110);
this.groupBox2.TabIndex = 86;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Graphics Options";
//
// groupBox3
//
this.groupBox3.Controls.Add(this.label1);
this.groupBox3.Controls.Add(this.comboBox3);
this.groupBox3.Location = new System.Drawing.Point(223, 72);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(172, 39);
this.groupBox3.TabIndex = 87;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Other";
//
// comboBox3
//
this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox3.FormattingEnabled = true;
this.comboBox3.Items.AddRange(new object[] {
"Low",
"Below normal",
"Normal",
"Above normal",
"High",
"Realtime"});
this.comboBox3.Location = new System.Drawing.Point(50, 12);
this.comboBox3.Name = "comboBox3";
this.comboBox3.Size = new System.Drawing.Size(120, 21);
this.comboBox3.TabIndex = 0;
this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 16);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(38, 13);
this.label1.TabIndex = 1;
this.label1.Text = "Priority";
//
// LauncherFormSettings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.ClientSize = new System.Drawing.Size(270, 169);
this.ClientSize = new System.Drawing.Size(407, 134);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.label9);
this.Controls.Add(this.button1);
this.Controls.Add(this.comboBox2);
this.Controls.Add(this.label31);
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.checkBox6);
this.Controls.Add(this.checkBox7);
this.Controls.Add(this.label22);
this.Controls.Add(this.checkBox5);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "LauncherFormCompactSettings";
this.Name = "LauncherFormSettings";
this.Text = "Novetus Settings";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.NovetusSettings_Close);
this.Load += new System.EventHandler(this.NovetusSettings_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -187,5 +259,10 @@
private System.Windows.Forms.CheckBox checkBox5;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.ComboBox comboBox3;
private System.Windows.Forms.Label label1;
}
}

View File

@ -1,110 +1,27 @@
#region Usings
using System;
using System.Diagnostics;
using System.Windows.Forms;
#endregion
namespace NovetusLauncher
{
#region LauncherFormCompactSettings
public partial class LauncherFormCompactSettings : Form
#region LauncherFormSettings
public partial class LauncherFormSettings : Form
{
#region Constructor
public LauncherFormCompactSettings()
public LauncherFormSettings()
{
InitializeComponent();
}
#endregion
#region Form Events
private void checkBox5_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShade = checkBox5.Checked;
}
private void checkBox6_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShadeFPSDisplay = checkBox6.Checked;
}
private void checkBox7_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShadePerformanceMode = checkBox7.Checked;
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBox1.SelectedIndex)
{
case 1:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.OpenGLStable;
break;
case 2:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.OpenGLExperimental;
break;
case 3:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.DirectX;
break;
default:
GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.Automatic;
break;
}
}
private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBox2.SelectedIndex)
{
case 1:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.VeryLow;
break;
case 2:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Low;
break;
case 3:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Medium;
break;
case 4:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.High;
break;
case 5:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Ultra;
break;
case 6:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Custom;
break;
default:
GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Automatic;
break;
}
if (comboBox2.SelectedIndex != 6)
{
//https://stackoverflow.com/questions/9029351/close-all-open-forms-except-the-main-menu-in-c-sharp
FormCollection fc = Application.OpenForms;
foreach (Form frm in fc)
{
//iterate through
if (frm.Name == "CustomGraphicsOptions")
{
frm.Close();
break;
}
}
}
}
private void NovetusSettings_Load(object sender, EventArgs e)
{
if (GlobalVars.UserConfiguration.LauncherStyle == Settings.UIOptions.Style.Compact)
{
ReadConfigValues();
}
else
{
Close();
}
GlobalFuncs.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, true);
ReadConfigValues();
CenterToScreen();
}
private void NovetusSettings_Close(object sender, FormClosingEventArgs e)
@ -124,9 +41,76 @@ namespace NovetusLauncher
}
}
private void checkBox5_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShade = checkBox5.Checked;
}
private void checkBox6_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShadeFPSDisplay = checkBox6.Checked;
}
private void checkBox7_CheckedChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.ReShadePerformanceMode = checkBox7.Checked;
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.GraphicsMode = (Settings.Mode)comboBox1.SelectedIndex;
}
private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
{
GlobalVars.UserConfiguration.QualityLevel = (Settings.Level)comboBox2.SelectedIndex;
if (comboBox2.SelectedIndex != 6)
{
//https://stackoverflow.com/questions/9029351/close-all-open-forms-except-the-main-menu-in-c-sharp
FormCollection fc = Application.OpenForms;
foreach (Form frm in fc)
{
//iterate through
if (frm.Name == "CustomGraphicsOptions")
{
frm.Close();
break;
}
}
}
}
private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBox3.SelectedIndex)
{
case 1:
GlobalVars.UserConfiguration.Priority = ProcessPriorityClass.BelowNormal;
break;
case 2:
GlobalVars.UserConfiguration.Priority = ProcessPriorityClass.Normal;
break;
case 3:
GlobalVars.UserConfiguration.Priority = ProcessPriorityClass.AboveNormal;
break;
case 4:
GlobalVars.UserConfiguration.Priority = ProcessPriorityClass.High;
break;
case 5:
GlobalVars.UserConfiguration.Priority = ProcessPriorityClass.RealTime;
break;
default:
GlobalVars.UserConfiguration.Priority = ProcessPriorityClass.Idle;
break;
}
}
private void button1_Click(object sender, EventArgs e)
{
if (GlobalVars.UserConfiguration.QualityLevel == Settings.GraphicsOptions.Level.Custom)
if (GlobalVars.UserConfiguration.QualityLevel == Settings.Level.Custom)
{
GlobalFuncs.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, true);
CustomGraphicsOptions opt = new CustomGraphicsOptions();
@ -146,45 +130,29 @@ namespace NovetusLauncher
checkBox5.Checked = GlobalVars.UserConfiguration.ReShade;
checkBox6.Checked = GlobalVars.UserConfiguration.ReShadeFPSDisplay;
checkBox7.Checked = GlobalVars.UserConfiguration.ReShadePerformanceMode;
comboBox1.SelectedIndex = (int)GlobalVars.UserConfiguration.GraphicsMode;
comboBox2.SelectedIndex = (int)GlobalVars.UserConfiguration.QualityLevel;
switch (GlobalVars.UserConfiguration.GraphicsMode)
switch (GlobalVars.UserConfiguration.Priority)
{
case Settings.GraphicsOptions.Mode.OpenGLStable:
comboBox1.SelectedIndex = 1;
case ProcessPriorityClass.BelowNormal:
comboBox3.SelectedIndex = 1;
break;
case Settings.GraphicsOptions.Mode.OpenGLExperimental:
comboBox1.SelectedIndex = 2;
case ProcessPriorityClass.Normal:
comboBox3.SelectedIndex = 2;
break;
case Settings.GraphicsOptions.Mode.DirectX:
comboBox1.SelectedIndex = 3;
case ProcessPriorityClass.AboveNormal:
comboBox3.SelectedIndex = 3;
break;
case ProcessPriorityClass.High:
comboBox3.SelectedIndex = 4;
break;
case ProcessPriorityClass.RealTime:
comboBox3.SelectedIndex = 5;
break;
case ProcessPriorityClass.Idle:
default:
comboBox1.SelectedIndex = 0;
break;
}
switch (GlobalVars.UserConfiguration.QualityLevel)
{
case Settings.GraphicsOptions.Level.VeryLow:
comboBox2.SelectedIndex = 1;
break;
case Settings.GraphicsOptions.Level.Low:
comboBox2.SelectedIndex = 2;
break;
case Settings.GraphicsOptions.Level.Medium:
comboBox2.SelectedIndex = 3;
break;
case Settings.GraphicsOptions.Level.High:
comboBox2.SelectedIndex = 4;
break;
case Settings.GraphicsOptions.Level.Ultra:
comboBox2.SelectedIndex = 5;
break;
case Settings.GraphicsOptions.Level.Custom:
comboBox2.SelectedIndex = 6;
break;
default:
comboBox2.SelectedIndex = 0;
comboBox3.SelectedIndex = 0;
break;
}
}

View File

@ -369,8 +369,8 @@
"Hat",
"Head",
"Face",
"Shirt",
"T-Shirt",
"Shirt",
"Pants",
"Lua Script"});
this.AssetLocalization_AssetTypeBox.Location = new System.Drawing.Point(75, 13);

View File

@ -498,44 +498,6 @@ public partial class AssetSDK : Form
return openFileDialog1;
}
public static RobloxFileType SelectROBLOXFileType(int index)
{
RobloxFileType type;
switch (index)
{
case 1:
type = RobloxFileType.RBXM;
break;
case 2:
type = RobloxFileType.Hat;
break;
case 3:
type = RobloxFileType.Head;
break;
case 4:
type = RobloxFileType.Face;
break;
case 5:
type = RobloxFileType.Shirt;
break;
case 6:
type = RobloxFileType.TShirt;
break;
case 7:
type = RobloxFileType.Pants;
break;
//case 8:
//type = RobloxFileType.Script;
//break;
default:
type = RobloxFileType.RBXL;
break;
}
return type;
}
public static string GetProgressString(RobloxFileType type, int percent)
{
string progressString = "";
@ -1093,7 +1055,7 @@ public partial class AssetSDK : Form
private void AssetLocalization_AssetTypeBox_SelectedIndexChanged(object sender, EventArgs e)
{
currentType = SelectROBLOXFileType(AssetLocalization_AssetTypeBox.SelectedIndex);
currentType = (RobloxFileType)AssetLocalization_AssetTypeBox.SelectedIndex;
}
private void AssetLocalization_ItemNameBox_TextChanged(object sender, EventArgs e)

View File

@ -178,11 +178,11 @@ public partial class ClientinfoEditor : Form
if (cmdargsorclientoptions.Equals("True") || cmdargsorclientoptions.Equals("False"))
{
label9.Text = "v2 (v1.2.3)";
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.GetClientLoadOptionsForBool(Convert.ToBoolean(cmdargsorclientoptions));
SelectedClientInfo.ClientLoadOptions = Settings.GetClientLoadOptionsForBool(Convert.ToBoolean(cmdargsorclientoptions));
}
else
{
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.GetClientLoadOptionsForInt(Convert.ToInt32(cmdargsorclientoptions));
SelectedClientInfo.ClientLoadOptions = (Settings.ClientLoadOptions)Convert.ToInt32(cmdargsorclientoptions);
}
SelectedClientInfo.CommandLineArgs = commandargsver2;
}
@ -190,7 +190,7 @@ public partial class ClientinfoEditor : Form
catch (Exception)
{
//Again, fake it.
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp;
SelectedClientInfo.ClientLoadOptions = Settings.ClientLoadOptions.Client_2008AndUp;
SelectedClientInfo.CommandLineArgs = cmdargsorclientoptions;
}
@ -204,36 +204,7 @@ public partial class ClientinfoEditor : Form
checkBox6.Checked = SelectedClientInfo.Fix2007;
checkBox7.Checked = SelectedClientInfo.AlreadyHasSecurity;
switch (SelectedClientInfo.ClientLoadOptions)
{
case Settings.GraphicsOptions.ClientLoadOptions.Client_2007:
comboBox1.SelectedIndex = 1;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp:
comboBox1.SelectedIndex = 2;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
comboBox1.SelectedIndex = 3;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
comboBox1.SelectedIndex = 4;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions:
comboBox1.SelectedIndex = 5;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomatic:
comboBox1.SelectedIndex = 6;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21:
comboBox1.SelectedIndex = 7;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
comboBox1.SelectedIndex = 8;
break;
default:
comboBox1.SelectedIndex = 0;
break;
}
comboBox1.SelectedIndex = (int)SelectedClientInfo.ClientLoadOptions;
textBox1.Text = SelectedClientInfo.Description;
textBox4.Text = SelectedClientInfo.CommandLineArgs;
textBox5.Text = SelectedClientInfo.Warning;
@ -256,7 +227,7 @@ public partial class ClientinfoEditor : Form
SecurityFuncs.Base64Encode(Locked.ToString()),
SecurityFuncs.Base64Encode(SelectedClientInfo.Fix2007.ToString()),
SecurityFuncs.Base64Encode(SelectedClientInfo.AlreadyHasSecurity.ToString()),
SecurityFuncs.Base64Encode(Settings.GraphicsOptions.GetIntForClientLoadOptions(SelectedClientInfo.ClientLoadOptions).ToString()),
SecurityFuncs.Base64Encode(((int)SelectedClientInfo.ClientLoadOptions).ToString()),
SecurityFuncs.Base64Encode(SelectedClientInfo.CommandLineArgs.ToString())
};
File.WriteAllText(SelectedClientInfoPath + "\\clientinfo.nov", SecurityFuncs.Base64Encode(string.Join("|", lines)));
@ -294,7 +265,7 @@ public partial class ClientinfoEditor : Form
Locked.ToString(),
SelectedClientInfo.Fix2007.ToString(),
SelectedClientInfo.AlreadyHasSecurity.ToString(),
Settings.GraphicsOptions.GetIntForClientLoadOptions(SelectedClientInfo.ClientLoadOptions).ToString(),
((int)SelectedClientInfo.ClientLoadOptions).ToString(),
SelectedClientInfo.CommandLineArgs.ToString()
};
File.WriteAllLines(sfd.FileName, lines);
@ -328,7 +299,7 @@ public partial class ClientinfoEditor : Form
ini.IniWriteValue(section, "Locked", Locked.ToString());
ini.IniWriteValue(section, "Fix2007", SelectedClientInfo.Fix2007.ToString());
ini.IniWriteValue(section, "AlreadyHasSecurity", SelectedClientInfo.AlreadyHasSecurity.ToString());
ini.IniWriteValue(section, "ClientLoadOptions", Settings.GraphicsOptions.GetIntForClientLoadOptions(SelectedClientInfo.ClientLoadOptions).ToString());
ini.IniWriteValue(section, "ClientLoadOptions", ((int)SelectedClientInfo.ClientLoadOptions).ToString());
ini.IniWriteValue(section, "CommandLineArgs", SelectedClientInfo.CommandLineArgs.ToString());
}
}
@ -389,37 +360,7 @@ public partial class ClientinfoEditor : Form
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBox1.SelectedIndex)
{
case 1:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2007;
break;
case 2:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp;
break;
case 3:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL;
break;
case 4:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21;
break;
case 5:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions;
break;
case 6:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomatic;
break;
case 7:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21;
break;
case 8:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL;
break;
default:
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2007_NoGraphicsOptions;
break;
}
SelectedClientInfo.ClientLoadOptions = (Settings.ClientLoadOptions)comboBox1.SelectedIndex;
BeginInvoke(new Action(() => { comboBox1.Select(0, 0); }));
}
#endregion
@ -486,7 +427,7 @@ public partial class ClientinfoEditor : Form
SelectedClientInfo.LegacyMode = false;
SelectedClientInfo.Fix2007 = false;
SelectedClientInfo.AlreadyHasSecurity = false;
SelectedClientInfo.ClientLoadOptions = Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp;
SelectedClientInfo.ClientLoadOptions = Settings.ClientLoadOptions.Client_2008AndUp;
SelectedClientInfo.Description = "";
SelectedClientInfo.ClientMD5 = "";
SelectedClientInfo.ScriptMD5 = "";
@ -499,36 +440,7 @@ public partial class ClientinfoEditor : Form
checkBox4.Checked = Locked;
checkBox6.Checked = SelectedClientInfo.Fix2007;
checkBox7.Checked = SelectedClientInfo.AlreadyHasSecurity;
switch (SelectedClientInfo.ClientLoadOptions)
{
case Settings.GraphicsOptions.ClientLoadOptions.Client_2007:
comboBox1.SelectedIndex = 1;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp:
comboBox1.SelectedIndex = 2;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_LegacyOpenGL:
comboBox1.SelectedIndex = 3;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21:
comboBox1.SelectedIndex = 4;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_NoGraphicsOptions:
comboBox1.SelectedIndex = 5;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomatic:
comboBox1.SelectedIndex = 6;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21:
comboBox1.SelectedIndex = 7;
break;
case Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_HasCharacterOnlyShadowsLegacyOpenGL:
comboBox1.SelectedIndex = 8;
break;
default:
comboBox1.SelectedIndex = 0;
break;
}
comboBox1.SelectedIndex = (int)SelectedClientInfo.ClientLoadOptions;
textBox1.Text = SelectedClientInfo.Description;
textBox4.Text = SelectedClientInfo.CommandLineArgs;
textBox5.Text = SelectedClientInfo.Warning;

View File

@ -248,11 +248,11 @@ public partial class ItemCreationSDK : Form
switch (GlobalVars.UserConfiguration.LauncherStyle)
{
case Settings.UIOptions.Style.Extended:
case Settings.Style.Extended:
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
ccustom.Show();
break;
case Settings.UIOptions.Style.Compact:
case Settings.Style.Compact:
CharacterCustomizationCompact ccustom2 = new CharacterCustomizationCompact();
ccustom2.Show();
break;
@ -393,7 +393,7 @@ public partial class ItemCreationSDK : Form
{
item.SetAttributeValue("class", meshclass);
var v2 = from nodes in item.Descendants(RobloxXML.GetStringForXMLType(XMLTypes.Float))
var v2 = from nodes in item.Descendants(XMLTypes.Float.ToString().ToLower())
where nodes.Attribute("name").Value == "Bevel"
select nodes;
@ -402,7 +402,7 @@ public partial class ItemCreationSDK : Form
item2.Value = bevel.ToString();
}
var v3 = from nodes in item.Descendants(RobloxXML.GetStringForXMLType(XMLTypes.Float))
var v3 = from nodes in item.Descendants(XMLTypes.Float.ToString().ToLower())
where nodes.Attribute("name").Value == "Bevel Roundness"
select nodes;
@ -411,7 +411,7 @@ public partial class ItemCreationSDK : Form
item3.Value = bevelRoundness.ToString();
}
var v4 = from nodes in item.Descendants(RobloxXML.GetStringForXMLType(XMLTypes.Float))
var v4 = from nodes in item.Descendants(XMLTypes.Float.ToString().ToLower())
where nodes.Attribute("name").Value == "Bulge"
select nodes;
@ -420,7 +420,7 @@ public partial class ItemCreationSDK : Form
item4.Value = bulge.ToString();
}
var vX = from nodes in item.Descendants(RobloxXML.GetStringForXMLType(XMLTypes.Token))
var vX = from nodes in item.Descendants(XMLTypes.Token.ToString().ToLower())
where nodes.Attribute("name").Value == "LODX"
select nodes;
@ -429,7 +429,7 @@ public partial class ItemCreationSDK : Form
itemX.Value = LODX.ToString();
}
var vY = from nodes in item.Descendants(RobloxXML.GetStringForXMLType(XMLTypes.Token))
var vY = from nodes in item.Descendants(XMLTypes.Token.ToString().ToLower())
where nodes.Attribute("name").Value == "LODY"
select nodes;
@ -438,7 +438,7 @@ public partial class ItemCreationSDK : Form
itemY.Value = LODY.ToString();
}
var v5 = from nodes in item.Descendants(RobloxXML.GetStringForXMLType(XMLTypes.Token))
var v5 = from nodes in item.Descendants(XMLTypes.Token.ToString().ToLower())
where nodes.Attribute("name").Value == "MeshType"
select nodes;

View File

@ -170,11 +170,11 @@
<Compile Include="Forms\LauncherForm\Compact\LauncherFormCompact.Designer.cs">
<DependentUpon>LauncherFormCompact.cs</DependentUpon>
</Compile>
<Compile Include="Forms\LauncherForm\Compact\LauncherFormCompactSettings.cs">
<Compile Include="Forms\LauncherFormSettings.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\LauncherForm\Compact\LauncherFormCompactSettings.Designer.cs">
<DependentUpon>LauncherFormCompactSettings.cs</DependentUpon>
<Compile Include="Forms\LauncherFormSettings.Designer.cs">
<DependentUpon>LauncherFormSettings.cs</DependentUpon>
</Compile>
<Compile Include="Forms\SDK\AssetSDK.cs">
<SubType>Form</SubType>
@ -259,8 +259,8 @@
<EmbeddedResource Include="Forms\LauncherForm\Compact\LauncherFormCompact.resx">
<DependentUpon>LauncherFormCompact.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\LauncherForm\Compact\LauncherFormCompactSettings.resx">
<DependentUpon>LauncherFormCompactSettings.cs</DependentUpon>
<EmbeddedResource Include="Forms\LauncherFormSettings.resx">
<DependentUpon>LauncherFormSettings.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\LauncherForm\Extended\LauncherFormExtended.resx">
<DependentUpon>LauncherFormExtended.cs</DependentUpon>

View File

@ -41,10 +41,10 @@ namespace NovetusLauncher
{
switch (GlobalVars.UserConfiguration.LauncherStyle)
{
case Settings.UIOptions.Style.Compact:
case Settings.Style.Compact:
Application.Run(new LauncherFormCompact());
break;
case Settings.UIOptions.Style.Extended:
case Settings.Style.Extended:
default:
Application.Run(new LauncherFormExtended());
break;

View File

@ -71,11 +71,11 @@ namespace NovetusURI
{
switch(GlobalVars.UserConfiguration.LauncherStyle)
{
case Settings.UIOptions.Style.Compact:
case Settings.Style.Compact:
CharacterCustomizationCompact ccustom2 = new CharacterCustomizationCompact();
ccustom2.Show();
break;
case Settings.UIOptions.Style.Extended:
case Settings.Style.Extended:
default:
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
ccustom.Show();

View File

@ -78,8 +78,8 @@
<token name="Bevels">0</token>
<token name="FrameRateManager">0</token>
<Vector2int16 name="FullscreenSizePreference">
<X>0</X>
<Y>0</Y>
<X>1024</X>
<Y>768</Y>
</Vector2int16>
<bool name="IsAggregationShown">false</bool>
<bool name="IsSynchronizedWithPhysics">false</bool>
@ -88,8 +88,8 @@
<string name="Name">Rendering</string>
<token name="Shadow">0</token>
<Vector2int16 name="WindowSizePreference">
<X>0</X>
<Y>0</Y>
<X>800</X>
<Y>600</Y>
</Vector2int16>
<bool name="archivable">true</bool>
<token name="graphicsMode">1</token>

View File

@ -78,8 +78,8 @@
<token name="Bevels">0</token>
<token name="FrameRateManager">0</token>
<Vector2int16 name="FullscreenSizePreference">
<X>0</X>
<Y>0</Y>
<X>1024</X>
<Y>768</Y>
</Vector2int16>
<bool name="IsAggregationShown">false</bool>
<bool name="IsSynchronizedWithPhysics">false</bool>
@ -88,8 +88,8 @@
<string name="Name">Rendering</string>
<token name="Shadow">0</token>
<Vector2int16 name="WindowSizePreference">
<X>0</X>
<Y>0</Y>
<X>800</X>
<Y>600</Y>
</Vector2int16>
<bool name="archivable">true</bool>
<token name="graphicsMode">1</token>