Leahnaya/OpenFK
1
0
Fork 0
mirror of https://github.com/GittyMac/OpenFK.git synced 2026-03-21 17:44:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Redesigned settings along with other tweaks

Browse Source
This commit is contained in:
GittyMac 2021-06-23 00:12:15 -04:00
parent 3aafbe387d
commit 26e0168045
4 changed files with 148 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
OpenFK/ConfigForm.Designer.cs generated
View File

@ -34,9 +34,12 @@
this.RPCToggle = new System.Windows.Forms.CheckBox();
this.ScaleCB = new System.Windows.Forms.ComboBox();
this.ExitButton = new System.Windows.Forms.Button();
this.header = new System.Windows.Forms.Label();
this.rdfToggle = new System.Windows.Forms.CheckBox();
this.USBToggle = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// QualityCB
@ -46,7 +49,7 @@
"0 - High",
"1 - Medium",
"2 - Low"});
this.QualityCB.Location = new System.Drawing.Point(12, 129);
this.QualityCB.Location = new System.Drawing.Point(171, 64);
this.QualityCB.Name = "QualityCB";
this.QualityCB.Size = new System.Drawing.Size(121, 21);
this.QualityCB.TabIndex = 0;
@ -55,18 +58,18 @@
// customFtoggle
//
this.customFtoggle.AutoSize = true;
this.customFtoggle.Location = new System.Drawing.Point(12, 58);
this.customFtoggle.Location = new System.Drawing.Point(34, 69);
this.customFtoggle.Name = "customFtoggle";
this.customFtoggle.Size = new System.Drawing.Size(66, 17);
this.customFtoggle.Size = new System.Drawing.Size(104, 17);
this.customFtoggle.TabIndex = 1;
this.customFtoggle.Text = "customF";
this.customFtoggle.Text = "Customf Support";
this.customFtoggle.UseVisualStyleBackColor = true;
this.customFtoggle.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// RPCToggle
//
this.RPCToggle.AutoSize = true;
this.RPCToggle.Location = new System.Drawing.Point(12, 81);
this.RPCToggle.Location = new System.Drawing.Point(34, 92);
this.RPCToggle.Name = "RPCToggle";
this.RPCToggle.Size = new System.Drawing.Size(96, 17);
this.RPCToggle.TabIndex = 2;
@ -78,11 +81,11 @@
//
this.ScaleCB.FormattingEnabled = true;
this.ScaleCB.Items.AddRange(new object[] {
"0 - Default (Zoom to Aspect Ratio)",
"1 - Crop 4:3",
"2 - Stretch 4:3",
"3 - Dot by Dot"});
this.ScaleCB.Location = new System.Drawing.Point(12, 156);
"0 - Default (Hor+)",
"1 - Crop (Vert-)",
"2 - Stretch",
"3 - Pixel-based"});
this.ScaleCB.Location = new System.Drawing.Point(171, 104);
this.ScaleCB.Name = "ScaleCB";
this.ScaleCB.Size = new System.Drawing.Size(121, 21);
this.ScaleCB.TabIndex = 3;
@ -90,7 +93,7 @@
//
// ExitButton
//
this.ExitButton.Location = new System.Drawing.Point(12, 183);
this.ExitButton.Location = new System.Drawing.Point(243, 150);
this.ExitButton.Name = "ExitButton";
this.ExitButton.Size = new System.Drawing.Size(75, 23);
this.ExitButton.TabIndex = 4;
@ -98,19 +101,10 @@
this.ExitButton.UseVisualStyleBackColor = true;
this.ExitButton.Click += new System.EventHandler(this.button1_Click);
//
// header
//
this.header.AutoSize = true;
this.header.Location = new System.Drawing.Point(12, 13);
this.header.Name = "header";
this.header.Size = new System.Drawing.Size(79, 13);
this.header.TabIndex = 6;
this.header.Text = "OpenFK Config";
//
// rdfToggle
//
this.rdfToggle.AutoSize = true;
this.rdfToggle.Location = new System.Drawing.Point(12, 35);
this.rdfToggle.Location = new System.Drawing.Point(34, 46);
this.rdfToggle.Name = "rdfToggle";
this.rdfToggle.Size = new System.Drawing.Size(89, 17);
this.rdfToggle.TabIndex = 7;
@ -121,7 +115,7 @@
// USBToggle
//
this.USBToggle.AutoSize = true;
this.USBToggle.Location = new System.Drawing.Point(12, 104);
this.USBToggle.Location = new System.Drawing.Point(34, 115);
this.USBToggle.Name = "USBToggle";
this.USBToggle.Size = new System.Drawing.Size(88, 17);
this.USBToggle.TabIndex = 8;
@ -129,14 +123,57 @@
this.USBToggle.UseVisualStyleBackColor = true;
this.USBToggle.CheckedChanged += new System.EventHandler(this.USBToggle_CheckedChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(166, 22);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(130, 16);
this.label1.TabIndex = 9;
this.label1.Text = "Graphics Settings";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(166, 48);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(39, 13);
this.label2.TabIndex = 10;
this.label2.Text = "Quality";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(166, 88);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(42, 13);
this.label3.TabIndex = 11;
this.label3.Text = "Scaling";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(34, 22);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(109, 16);
this.label4.TabIndex = 12;
this.label4.Text = "Game Settings";
//
// ConfigForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(173, 218);
this.ClientSize = new System.Drawing.Size(330, 185);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.USBToggle);
this.Controls.Add(this.rdfToggle);
this.Controls.Add(this.header);
this.Controls.Add(this.ExitButton);
this.Controls.Add(this.ScaleCB);
this.Controls.Add(this.RPCToggle);
@ -146,7 +183,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "ConfigForm";
this.Text = "Config";
this.Text = "OpenFK Config";
this.ResumeLayout(false);
this.PerformLayout();
@ -159,8 +196,11 @@
private System.Windows.Forms.CheckBox RPCToggle;
private System.Windows.Forms.ComboBox ScaleCB;
private System.Windows.Forms.Button ExitButton;
private System.Windows.Forms.Label header;
private System.Windows.Forms.CheckBox rdfToggle;
private System.Windows.Forms.CheckBox USBToggle;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
}
}

103
OpenFK/Form1.cs
View File

@ -73,6 +73,7 @@ namespace OpenFK
//Items
public XmlDocument bittyData;
public XmlDocument userData;
public DiscordRpcClient client;
private FileSystemWatcher watcher;
@ -108,7 +109,7 @@ namespace OpenFK
AS2Container.ScaleMode = Settings.Default.ScaleMode;
AS2Container.Movie = Directory.GetCurrentDirectory() + @"\Main.swf"; //Sets Main.swf as the Flash Movie to Play.
AS2Container.Play(); //Plays Main.swf
Debug.WriteLine("Main.swf is Loaded");
Debug.WriteLine("[AS2Container] Main.swf is Loaded");
AS2Container.FSCommand += new _IShockwaveFlashEvents_FSCommandEventHandler(flashPlayer_FSCommand); //This sets up the FSCommand handler, which CCommunicator likes to use a lot.
try
@ -117,13 +118,13 @@ namespace OpenFK
AS3Container.Quality2 = "High";
AS3Container.ScaleMode = Settings.Default.ScaleMode;
AS3Container.Movie = Directory.GetCurrentDirectory() + @"\MainAS3.swf"; //Sets MainAS3.swf as the Flash Movie to Play.
Debug.WriteLine("MainAS3.swf is Loaded");
Debug.WriteLine("[AS3Container] MainAS3.swf is Loaded");
AS3Container.FSCommand += new _IShockwaveFlashEvents_FSCommandEventHandler(flashPlayerAS3_FSCommand);
AS3Container.FlashCall += new _IShockwaveFlashEvents_FlashCallEventHandler(flashPlayerAS3_FlashCall);
}
catch
{
Debug.WriteLine("AS3 Failed to Load! Potentially an older version.");
Debug.WriteLine("[AS3Container] AS3 Failed to Load! Potentially an older version.");
}
//End of Flash initialization
@ -166,7 +167,7 @@ namespace OpenFK
private void flashPlayerAS3_FSCommand(object sender, _IShockwaveFlashEvents_FSCommandEvent e)
{
Debug.WriteLine("AS3 COMMAND! - " + e.command + " " + e.args);
Debug.WriteLine("[AS3] [SendMsg] " + e.args);
if(e.args.Contains("<save_jpeg ")) //Saving jpegs for UG game thumbnails or game over backgrounds.
{
XmlDocument request = new XmlDocument(); //e.args to xml
@ -234,7 +235,7 @@ namespace OpenFK
if (s != usbBittyID) //If it's still the same, it won't repeat the actions
{
usbBittyID = s;
Debug.WriteLine("BittyID - " + s);
Debug.WriteLine("[Bitty] USB bitty - " + s);
setBitty(s);
}
}
@ -250,7 +251,7 @@ namespace OpenFK
private void flashPlayerAS3_FlashCall(object sender, _IShockwaveFlashEvents_FlashCallEvent e)
{
Debug.WriteLine("NEW AS3 CALL!" + " - " + e.request);
Debug.WriteLine("[AS3] [FlashCall] " + e.request);
if(e.request.Contains("<as3_loaded "))
{
setVar(@"<?xml version=""1.0"" encoding=""UTF - 8""?><commands><as3_loaded id=""1"" path=""MainAS3.swf"" result=""0"" err="""" /></commands>");
@ -278,7 +279,7 @@ namespace OpenFK
void flashPlayer_FSCommand(object sender, _IShockwaveFlashEvents_FSCommandEvent e) //FSCommand Handler
{
Debug.WriteLine("NEW COMMAND!" + " - " + e.command + " " + e.args);
Debug.WriteLine("[AS2] [SendMsg] " + e.args);
//
// XML LOAD COMMANDS
@ -297,7 +298,7 @@ namespace OpenFK
//XML LOADING
filename = xn.Attributes["section"].Value;
foldername = xn.Attributes["name"].Value;
Debug.WriteLine("RDF Request: Section - {0} Name - {1}", filename, foldername);
Debug.WriteLine("[Load] File Requested - {1}/{0}", filename, foldername);
loadFile(filename, foldername);
//Rich Prescense
@ -387,7 +388,7 @@ namespace OpenFK
{
filename = xn.Attributes["section"].Value;
foldername = xn.Attributes["name"].Value;
Debug.WriteLine("RDF Request: Section - {0} Name - {1}", filename, foldername); //debug output
Debug.WriteLine("[Save] File Requested - {1}/{0}", filename, foldername); //debug output
XDocument args = XDocument.Parse(e.args);
@ -410,6 +411,7 @@ namespace OpenFK
File.WriteAllBytes(Directory.GetCurrentDirectory() + @"\data\" + foldername + @"\" + filename + ".rdf", iso_8859_1.GetBytes(RDFTool.encode(iso_8859_1.GetString(RDFData))));
}
else File.WriteAllText(Directory.GetCurrentDirectory() + @"\data\" + foldername + @"\" + filename + ".xml", output.ToString()); //saves
Debug.WriteLine("[Save] Successfully saved - " + foldername + "/" + filename); //Debug Output
}
}
@ -499,7 +501,7 @@ namespace OpenFK
var updateprocess = Process.Start(updatescript);
}
Application.Exit(); //Closes OpenFK
Debug.WriteLine("radicaclose called, goodbye!"); //Debug output
Debug.WriteLine("[OpenFK] Radicaclose was called"); //Debug output
}
//
@ -521,7 +523,6 @@ namespace OpenFK
string commandLimited = "";
foreach (XmlNode node in nodeList)
{
Debug.WriteLine(node.InnerXml);
commandLimited = node.InnerXml;
}
XmlDocument doc2 = new XmlDocument();
@ -553,7 +554,7 @@ namespace OpenFK
//HTTP POST (CRIB SAVING + POSTCARDS)
if (e.args.Contains("<netcommands"))
{
Debug.WriteLine("NETCOMMAND!");
Debug.WriteLine("[Network] Netcommand called.");
if (DebugOnline == true)
{
AS2Container.SetVariable("msg", HTTPPost(e.args, Host).ToString()); //Sends the result of the POST request. It's usually a command for the game to handle.
@ -567,7 +568,7 @@ namespace OpenFK
string localVerNum = "1.8";
string fslocalVersion = "";
string fslocalVerNum = "1.0";
Debug.WriteLine("UPDATE - Requested!");
Debug.WriteLine("[Network] [Update] Update Requested");
setVar(@"<progress percent=""0.25"" />");
try
{
@ -577,21 +578,21 @@ namespace OpenFK
}
catch
{
Debug.WriteLine("No update.xml found...");
Debug.WriteLine("[Network] [Update] Update.xml was not found");
}
setVar(@"<progress percent=""25.00"" />");
try
{
Debug.WriteLine("getting github xml");
Debug.WriteLine("[Network] [Update] Downloading Update.xml from GitHub");
netStore = XDocument.Parse(Get(@"https://raw.githubusercontent.com/GittyMac/OpenFK/master/update.xml"));
Debug.WriteLine("got the xml");
Debug.WriteLine("[Network] [Update] Update.xml was downloaded");
string netVersion = netStore.Root.Attribute("name").Value;
string netVersionNum = netStore.Root.Attribute("version").Value;
string netVersionSize = netStore.Root.Attribute("size").Value;
setVar(@"<progress percent=""50.00"" />");
if (localVersion != netVersion)
{
Debug.WriteLine("update needed!");
Debug.WriteLine("[Network] [Update] An update is needed");
netStore.Save(Directory.GetCurrentDirectory() + @"\update.xml");
setVar(@"<checkupdate result=""2"" reason=""New version of OpenFK found."" version=""2009_07_16_544"" size=""" + netVersionSize + @""" curversion=""" + localVerNum + @""" extversion=""" + netVersionNum + @""" extname=""" + netVersion + @""" />");
}
@ -605,14 +606,14 @@ namespace OpenFK
}
catch
{
Debug.WriteLine("No update.xml found...");
Debug.WriteLine("[Network] [Update] FSGUI Update.xml was not found");
}
setVar(@"<progress percent=""75.00"" />");
try
{
Debug.WriteLine("getting github xml");
Debug.WriteLine("[Network] [Update] Downloading FSGUI Update.xml from GitHub");
fsnetStore = XDocument.Parse(Get(@"https://raw.githubusercontent.com/GittyMac/FunkeySelectorGUI/master/update.xml"));
Debug.WriteLine("got the xml");
Debug.WriteLine("[Network] [Update] FSGUI Update.xml was downloaded");
string fsnetVersion = fsnetStore.Root.Attribute("name").Value;
string fsnetVersionNum = fsnetStore.Root.Attribute("version").Value;
string fsnetVersionSize = fsnetStore.Root.Attribute("size").Value;
@ -626,9 +627,9 @@ namespace OpenFK
}
catch
{
Debug.WriteLine("no fsgui to close...");
Debug.WriteLine("[Network] [Update] Cannot close FSGUI");
}
Debug.WriteLine("update needed!");
Debug.WriteLine("[Network] [Update] A FSGUI update is needed");
setVar(@"<checkupdate result=""2"" reason=""New version of FSGUI found."" version=""2009_07_16_544"" size=""" + fsnetVersionSize + @""" curversion=""" + fslocalVerNum + @""" extversion=""" + fsnetVersionNum + @""" extname=""" + fsnetVersion + @""" />");
}
else
@ -638,7 +639,7 @@ namespace OpenFK
}
catch
{
Debug.WriteLine("No update!");
Debug.WriteLine("[Network] [Update] No FSGUI update");
setVar(@"<checkupdate result=""1"" reason=""Could not find the FunkeySelectorGUI update!"" />");
}
}
@ -649,7 +650,7 @@ namespace OpenFK
}
catch
{
Debug.WriteLine("No update!");
Debug.WriteLine("[Network] [Update] No update");
setVar(@"<checkupdate result=""1"" reason=""Could not find the OpenFK update!"" />");
}
}
@ -705,6 +706,52 @@ namespace OpenFK
//END OF HTTP NETCOMMANDS
//
//
// XML LOAD COMMANDS
//
if (e.args.Contains("<createuser ")) //load
{
//XML PARSING
string username;
string password;
string savepassword;
string hinta;
string hintq;
XmlDocument request = new XmlDocument(); //e.args to xml
request.LoadXml(e.args);
XmlNodeList xnList = request.SelectNodes("/commands/createuser"); //filters xml to the load info
foreach (XmlNode xn in xnList) //fetches the information to load
{
//XML LOADING
username = xn.Attributes["name"].Value;
password = xn.Attributes["password"].Value;
savepassword = xn.Attributes["savepassword"].Value;
hintq = xn.Attributes["hintq"].Value;
hinta = xn.Attributes["hinta"].Value;
Debug.WriteLine("[Load] File Requested - system/users");
loadFile("users", "system");
string userString = userData.OuterXml;
string data2send = userString.Replace("</users>", "") + @"<user gname=""" + username + @""" hinta=""" + hinta + @""" hintq=""" + hintq + @""" savepassword=""" + savepassword + @""" password=""" + password + @""" name=""" + username + @""" /></users>";
if (!Directory.Exists(Directory.GetCurrentDirectory() + @"\data\" + "system"))
{
Directory.CreateDirectory(Directory.GetCurrentDirectory() + @"\data\" + "system");
}
if (Settings.Default.RDF == true)
{
Encoding iso_8859_1 = Encoding.GetEncoding("iso-8859-1");
byte[] RDFData = iso_8859_1.GetBytes(data2send.ToString());
File.WriteAllBytes(Directory.GetCurrentDirectory() + @"\data\" + "system" + @"\" + "users" + ".rdf", iso_8859_1.GetBytes(RDFTool.encode(iso_8859_1.GetString(RDFData))));
}
else File.WriteAllText(Directory.GetCurrentDirectory() + @"\data\" + "system" + @"\" + "users" + ".xml", data2send.ToString()); //saves
Debug.WriteLine("[UserAdd] Successfully added user - " + username); //Debug Output
}
}
//
// END OF XML LOAD COMMANDS
//
//
//FSGUI
//
@ -779,6 +826,12 @@ namespace OpenFK
bittyData.LoadXml(filedata);
}
if (file == "users")
{
userData = new XmlDocument();
userData.LoadXml(filedata);
}
if (file == "config")
{
XmlDocument configData = new XmlDocument();
@ -814,7 +867,7 @@ namespace OpenFK
index = @"<commands><load section=""" + file + @""" name=""" + folder + @""" result=""1"" reason=""Error loading file!"" /></commands>"; //I would just let dotNET handle this, but UGLevels needs an error to continue.
}
setVar(index.ToString()); //Sends XML data to the game
Debug.WriteLine("RDF - Sent " + file); //Debug Output
Debug.WriteLine("[Load] Successfully loaded - " + folder + "/" + file); //Debug Output
}
//

2
OpenFK/Resources/FetchOCX.bat
View File

@ -2,6 +2,8 @@
echo Welcome to OpenFK OCX fetcher!
echo Written by GittyMac
echo ------------------------------
for /f "delims=" %%a in ('powershell $PSVersionTable.PSVersion.Major') do set "var=%%a"
if %var% lss 3 @echo Your Powershell version is too old to fetch the OCX. Update Powershell to version 3 or higher. && pause && exit
echo Downloading data...
mkdir tempdl
cd tempdl

2
update.xml
View File

@ -1 +1 @@
<update version="1.8" name="OpenFK 1.8" size="343000" url32="https://github.com/GittyMac/OpenFK/releases/download/v1.8/OpenFK.1.8.x86.zip" url64="https://github.com/GittyMac/OpenFK/releases/download/v1.8/OpenFK.1.8.x64.zip" />
<update version="1.9" name="OpenFK 1.9" size="343000" url32="https://github.com/GittyMac/OpenFK/releases/download/v1.9/OpenFK.1.9.x86.zip" url64="https://github.com/GittyMac/OpenFK/releases/download/v1.9/OpenFK.1.9.x64.zip" />