Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Customizations now are saved by user name, allowing multiple customizations to be saved under 1 Novetus install. You can now manually save customizations.

This commit is contained in:
Bitl 2019-11-25 17:38:28 -07:00
parent 51770b7068
commit 6d4143fa7e
11 changed files with 70 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NovetusLauncher/NovetusCMD/Program.cs
View File

@ -140,7 +140,7 @@ namespace NovetusCMD
static void WriteConfigValues() static void WriteConfigValues()
{ {
LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
ConsolePrint("Config Saved.", 3); ConsolePrint("Config Saved.", 3);
} }
@ -155,7 +155,7 @@ namespace NovetusCMD
static void ReadConfigValues() static void ReadConfigValues()
{ {
LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
ConsolePrint("Config loaded.", 3); ConsolePrint("Config loaded.", 3);
ReadClientValues(GlobalVars.SelectedClient); ReadClientValues(GlobalVars.SelectedClient);
} }
@ -255,9 +255,9 @@ namespace NovetusCMD
{ {
ConsolePrint("NovetusCMD is now loading all server configurations from the INI file.", 5); ConsolePrint("NovetusCMD is now loading all server configurations from the INI file.", 5);
if (!File.Exists(GlobalVars.ConfigDir + "\\config.ini")) if (!File.Exists(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName))
{ {
ConsolePrint("WARNING 2 - config.ini not found. Creating one with default values.", 5); ConsolePrint("WARNING 2 - " + GlobalVars.ConfigName + " not found. Creating one with default values.", 5);
WriteConfigValues(); WriteConfigValues();
} }

7
NovetusLauncher/NovetusFuncs/GlobalVars.cs
View File

@ -131,8 +131,11 @@ public static class GlobalVars
public static readonly string ScriptGenName = "CSMPBoot"; public static readonly string ScriptGenName = "CSMPBoot";
public static SimpleHTTPServer WebServer = null; public static SimpleHTTPServer WebServer = null;
public static bool IsWebServerOn = false; public static bool IsWebServerOn = false;
//vars for loader //config name
public static bool ReadyToLaunch = false; public static readonly string ConfigName = "config.ini";
public static readonly string ConfigNameCustomization = "character_" + PlayerName + ".ini";
//vars for loader
public static bool ReadyToLaunch = false;
//server settings. //server settings.
public static bool UPnP = false; public static bool UPnP = false;
public static string Map = ""; public static string Map = "";

8
NovetusLauncher/NovetusFuncs/LauncherFuncs.cs
View File

@ -97,7 +97,7 @@ public class LauncherFuncs
if (Decryptline2.Equals("0")) if (Decryptline2.Equals("0"))
{ {
GeneratePlayerID(); GeneratePlayerID();
WriteConfigValues(GlobalVars.ConfigDir + "\\config.ini"); WriteConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
} }
else else
{ {
@ -129,7 +129,7 @@ public class LauncherFuncs
if (string.IsNullOrWhiteSpace(Decryptline12)) if (string.IsNullOrWhiteSpace(Decryptline12))
{ {
GenerateTripcode(); GenerateTripcode();
WriteConfigValues(GlobalVars.ConfigDir + "\\config.ini"); WriteConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
} }
else else
{ {
@ -137,7 +137,7 @@ public class LauncherFuncs
GlobalVars.PlayerTripcode = sdecrypt12; GlobalVars.PlayerTripcode = sdecrypt12;
} }
ReadCustomizationValues(cfgpath.Replace(".ini", "_customization.ini")); ReadCustomizationValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization);
} }
public static void WriteConfigValues(string cfgpath) public static void WriteConfigValues(string cfgpath)
@ -157,7 +157,7 @@ public class LauncherFuncs
ini.IniWriteValue(section, "UPnP", GlobalVars.UPnP.ToString()); ini.IniWriteValue(section, "UPnP", GlobalVars.UPnP.ToString());
ini.IniWriteValue(section, "ItemMakerDisableHelpMessage", GlobalVars.DisabledHelp.ToString()); ini.IniWriteValue(section, "ItemMakerDisableHelpMessage", GlobalVars.DisabledHelp.ToString());
ini.IniWriteValue(section, "PlayerTripcode", SecurityFuncs.Base64Encode(GlobalVars.PlayerTripcode.ToString())); ini.IniWriteValue(section, "PlayerTripcode", SecurityFuncs.Base64Encode(GlobalVars.PlayerTripcode.ToString()));
WriteCustomizationValues(cfgpath.Replace(".ini", "_customization.ini")); WriteCustomizationValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization);
} }
public static void ResetConfigValues() public static void ResetConfigValues()

2
NovetusLauncher/NovetusFuncs/ScriptGenerator.cs
View File

@ -119,7 +119,7 @@ public class ScriptGenerator
private static void ReadConfigValues() private static void ReadConfigValues()
{ {
LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
} }
public static void GenerateScriptForClient(ScriptType type, string client) public static void GenerateScriptForClient(ScriptType type, string client)

61
NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs generated
View File

@ -49,8 +49,6 @@ namespace NovetusLauncher
this.button64 = new System.Windows.Forms.Button(); this.button64 = new System.Windows.Forms.Button();
this.button68 = new System.Windows.Forms.Button(); this.button68 = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.button70 = new System.Windows.Forms.Button();
this.button69 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button();
@ -58,7 +56,9 @@ namespace NovetusLauncher
this.button5 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button(); this.button6 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.button70 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button();
this.button69 = new System.Windows.Forms.Button();
this.button8 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button();
this.button9 = new System.Windows.Forms.Button(); this.button9 = new System.Windows.Forms.Button();
this.button10 = new System.Windows.Forms.Button(); this.button10 = new System.Windows.Forms.Button();
@ -153,6 +153,7 @@ namespace NovetusLauncher
this.button54 = new System.Windows.Forms.Button(); this.button54 = new System.Windows.Forms.Button();
this.button53 = new System.Windows.Forms.Button(); this.button53 = new System.Windows.Forms.Button();
this.button52 = new System.Windows.Forms.Button(); this.button52 = new System.Windows.Forms.Button();
this.button71 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
@ -330,28 +331,6 @@ namespace NovetusLauncher
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "Body Parts"; this.groupBox2.Text = "Body Parts";
// //
// button70
//
this.button70.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(174)))), ((int)(((byte)(122)))), ((int)(((byte)(89)))));
this.button70.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.button70.Location = new System.Drawing.Point(244, 97);
this.button70.Name = "button70";
this.button70.Size = new System.Drawing.Size(20, 20);
this.button70.TabIndex = 33;
this.button70.UseVisualStyleBackColor = false;
this.button70.Click += new System.EventHandler(this.button70_Click);
//
// button69
//
this.button69.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(112)))), ((int)(((byte)(160)))));
this.button69.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.button69.Location = new System.Drawing.Point(58, 97);
this.button69.Name = "button69";
this.button69.Size = new System.Drawing.Size(20, 20);
this.button69.TabIndex = 32;
this.button69.UseVisualStyleBackColor = false;
this.button69.Click += new System.EventHandler(this.button69_Click);
//
// button2 // button2
// //
this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(105)))), ((int)(((byte)(172))))); this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(105)))), ((int)(((byte)(172)))));
@ -461,6 +440,17 @@ namespace NovetusLauncher
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "Part Colors"; this.groupBox1.Text = "Part Colors";
// //
// button70
//
this.button70.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(174)))), ((int)(((byte)(122)))), ((int)(((byte)(89)))));
this.button70.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.button70.Location = new System.Drawing.Point(244, 97);
this.button70.Name = "button70";
this.button70.Size = new System.Drawing.Size(20, 20);
this.button70.TabIndex = 33;
this.button70.UseVisualStyleBackColor = false;
this.button70.Click += new System.EventHandler(this.button70_Click);
//
// button7 // button7
// //
this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(243)))), ((int)(((byte)(243))))); this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(243)))), ((int)(((byte)(243)))));
@ -472,6 +462,17 @@ namespace NovetusLauncher
this.button7.UseVisualStyleBackColor = false; this.button7.UseVisualStyleBackColor = false;
this.button7.Click += new System.EventHandler(this.Button7Click); this.button7.Click += new System.EventHandler(this.Button7Click);
// //
// button69
//
this.button69.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(112)))), ((int)(((byte)(160)))));
this.button69.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.button69.Location = new System.Drawing.Point(58, 97);
this.button69.Name = "button69";
this.button69.Size = new System.Drawing.Size(20, 20);
this.button69.TabIndex = 32;
this.button69.UseVisualStyleBackColor = false;
this.button69.Click += new System.EventHandler(this.button69_Click);
//
// button8 // button8
// //
this.button8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(229)))), ((int)(((byte)(224))))); this.button8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(229)))), ((int)(((byte)(224)))));
@ -1302,6 +1303,7 @@ namespace NovetusLauncher
// //
// tabPage7 // tabPage7
// //
this.tabPage7.Controls.Add(this.button71);
this.tabPage7.Controls.Add(this.label8); this.tabPage7.Controls.Add(this.label8);
this.tabPage7.Controls.Add(this.pictureBox10); this.tabPage7.Controls.Add(this.pictureBox10);
this.tabPage7.Controls.Add(this.button60); this.tabPage7.Controls.Add(this.button60);
@ -1466,6 +1468,16 @@ namespace NovetusLauncher
this.button52.UseVisualStyleBackColor = true; this.button52.UseVisualStyleBackColor = true;
this.button52.Click += new System.EventHandler(this.Button52Click); this.button52.Click += new System.EventHandler(this.Button52Click);
// //
// button71
//
this.button71.Location = new System.Drawing.Point(365, 37);
this.button71.Name = "button71";
this.button71.Size = new System.Drawing.Size(99, 31);
this.button71.TabIndex = 13;
this.button71.Text = "Save Outfit";
this.button71.UseVisualStyleBackColor = true;
this.button71.Click += new System.EventHandler(this.button71_Click);
//
// CharacterCustomization // CharacterCustomization
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1627,5 +1639,6 @@ namespace NovetusLauncher
private System.Windows.Forms.Button button68; private System.Windows.Forms.Button button68;
private System.Windows.Forms.Button button70; private System.Windows.Forms.Button button70;
private System.Windows.Forms.Button button69; private System.Windows.Forms.Button button69;
private System.Windows.Forms.Button button71;
} }
} }

6
NovetusLauncher/NovetusLauncher/CharacterCustomization.cs
View File

@ -1345,6 +1345,12 @@ namespace NovetusLauncher
ApplyPreset(9, 194, 9, 9, 119, 119); ApplyPreset(9, 194, 9, 9, 119, 119);
} }
private void button71_Click(object sender, EventArgs e)
{
LauncherFuncs.WriteCustomizationValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization);
MessageBox.Show("Outfit Saved!");
}
/* /*
private void button61_Click(object sender, EventArgs e) private void button61_Click(object sender, EventArgs e)
{ {

2
NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs
View File

@ -75,7 +75,7 @@ namespace NovetusLauncher
void ClientinfoCreatorLoad(object sender, EventArgs e) void ClientinfoCreatorLoad(object sender, EventArgs e)
{ {
string cfgpath = GlobalVars.ConfigDir + "\\config.ini"; string cfgpath = GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName;
if (!File.Exists(cfgpath)) if (!File.Exists(cfgpath))
{ {
LauncherFuncs.WriteConfigValues(cfgpath); LauncherFuncs.WriteConfigValues(cfgpath);

4
NovetusLauncher/NovetusLauncher/ItemMaker.cs
View File

@ -108,7 +108,7 @@ namespace NovetusLauncher
void ItemMakerLoad(object sender, EventArgs e) void ItemMakerLoad(object sender, EventArgs e)
{ {
string cfgpath = GlobalVars.ConfigDir + "\\config.ini"; string cfgpath = GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName;
if (!File.Exists(cfgpath)) if (!File.Exists(cfgpath))
{ {
LauncherFuncs.WriteConfigValues(cfgpath); LauncherFuncs.WriteConfigValues(cfgpath);
@ -133,7 +133,7 @@ namespace NovetusLauncher
void ItemMakerClose(object sender, CancelEventArgs e) void ItemMakerClose(object sender, CancelEventArgs e)
{ {
LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
} }
void CheckBox1CheckedChanged(object sender, EventArgs e) void CheckBox1CheckedChanged(object sender, EventArgs e)

2
NovetusLauncher/NovetusLauncher/LoaderForm.cs
View File

@ -170,7 +170,7 @@ namespace NovetusLauncher
void ReadConfigValues() void ReadConfigValues()
{ {
LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
} }
void ReadClientValues(string ClientName) void ReadClientValues(string ClientName)

14
NovetusLauncher/NovetusLauncher/MainForm.cs
View File

@ -322,14 +322,14 @@ namespace NovetusLauncher
{ {
ConsolePrint("ERROR 4 - changelog.txt not found.", 2); ConsolePrint("ERROR 4 - changelog.txt not found.", 2);
} }
if (!File.Exists(GlobalVars.ConfigDir + "\\config.ini")) if (!File.Exists(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName))
{ {
ConsolePrint("WARNING 1 - config.ini not found. Creating one with default values.", 5); ConsolePrint("WARNING 1 - " + GlobalVars.ConfigName + " not found. Creating one with default values.", 5);
WriteConfigValues(); WriteConfigValues();
} }
if (!File.Exists(GlobalVars.ConfigDir + "\\config_customization.ini")) if (!File.Exists(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization))
{ {
ConsolePrint("WARNING 2 - config_customization.ini not found. Creating one with default values.", 5); ConsolePrint("WARNING 2 - " + GlobalVars.ConfigNameCustomization + " not found. Creating one with default values.", 5);
WriteCustomizationValues(); WriteCustomizationValues();
} }
if (!File.Exists(GlobalVars.ConfigDir + "\\servers.txt")) if (!File.Exists(GlobalVars.ConfigDir + "\\servers.txt"))
@ -381,7 +381,7 @@ namespace NovetusLauncher
void ReadConfigValues() void ReadConfigValues()
{ {
LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
if (GlobalVars.CloseOnLaunch == true) if (GlobalVars.CloseOnLaunch == true)
{ {
@ -411,13 +411,13 @@ namespace NovetusLauncher
void WriteConfigValues() void WriteConfigValues()
{ {
LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
ConsolePrint("Config Saved.", 3); ConsolePrint("Config Saved.", 3);
} }
void WriteCustomizationValues() void WriteCustomizationValues()
{ {
LauncherFuncs.WriteCustomizationValues(GlobalVars.ConfigDir + "\\config_customization.ini"); LauncherFuncs.WriteCustomizationValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization);
ConsolePrint("Config Saved.", 3); ConsolePrint("Config Saved.", 3);
} }

4
NovetusLauncher/NovetusLauncher/QuickConfigure.cs
View File

@ -33,7 +33,7 @@ namespace NovetusLauncher
void QuickConfigureLoad(object sender, EventArgs e) void QuickConfigureLoad(object sender, EventArgs e)
{ {
string cfgpath = GlobalVars.ConfigDir + "\\config.ini"; string cfgpath = GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName;
if (!File.Exists(cfgpath)) if (!File.Exists(cfgpath))
{ {
LauncherFuncs.WriteConfigValues(cfgpath); LauncherFuncs.WriteConfigValues(cfgpath);
@ -107,7 +107,7 @@ namespace NovetusLauncher
void QuickConfigureClose(object sender, CancelEventArgs e) void QuickConfigureClose(object sender, CancelEventArgs e)
{ {
LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\config.ini"); LauncherFuncs.WriteConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
GlobalVars.ReadyToLaunch = true; GlobalVars.ReadyToLaunch = true;
} }
} }