diff --git a/OpenFK.sln b/OpenFK.sln
index 6254def..bdd1d0d 100644
--- a/OpenFK.sln
+++ b/OpenFK.sln
@@ -8,13 +8,25 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Debug|x64.ActiveCfg = Debug|x64
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Debug|x64.Build.0 = Debug|x64
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Debug|x86.ActiveCfg = Debug|x86
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Debug|x86.Build.0 = Debug|x86
{8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Release|x64.ActiveCfg = Release|x64
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Release|x64.Build.0 = Release|x64
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Release|x86.ActiveCfg = Release|x86
+ {8AB83EF7-E6F0-421D-A233-E84BD13F0B78}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/OpenFK/ConfigForm.Designer.cs b/OpenFK/ConfigForm.Designer.cs
new file mode 100644
index 0000000..e2eb2e8
--- /dev/null
+++ b/OpenFK/ConfigForm.Designer.cs
@@ -0,0 +1,136 @@
+namespace OpenFK
+{
+ partial class ConfigForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.QualityCB = new System.Windows.Forms.ComboBox();
+ this.customFtoggle = new System.Windows.Forms.CheckBox();
+ 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.SuspendLayout();
+ //
+ // QualityCB
+ //
+ this.QualityCB.FormattingEnabled = true;
+ this.QualityCB.Items.AddRange(new object[] {
+ "0 - High",
+ "1 - Medium",
+ "2 - Low"});
+ this.QualityCB.Location = new System.Drawing.Point(12, 84);
+ this.QualityCB.Name = "QualityCB";
+ this.QualityCB.Size = new System.Drawing.Size(121, 21);
+ this.QualityCB.TabIndex = 0;
+ this.QualityCB.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+ //
+ // customFtoggle
+ //
+ this.customFtoggle.AutoSize = true;
+ this.customFtoggle.Location = new System.Drawing.Point(12, 38);
+ this.customFtoggle.Name = "customFtoggle";
+ this.customFtoggle.Size = new System.Drawing.Size(66, 17);
+ this.customFtoggle.TabIndex = 1;
+ this.customFtoggle.Text = "customF";
+ 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, 61);
+ this.RPCToggle.Name = "RPCToggle";
+ this.RPCToggle.Size = new System.Drawing.Size(96, 17);
+ this.RPCToggle.TabIndex = 2;
+ this.RPCToggle.Text = "Rich Presence";
+ this.RPCToggle.UseVisualStyleBackColor = true;
+ this.RPCToggle.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
+ //
+ // ScaleCB
+ //
+ 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, 111);
+ this.ScaleCB.Name = "ScaleCB";
+ this.ScaleCB.Size = new System.Drawing.Size(121, 21);
+ this.ScaleCB.TabIndex = 3;
+ this.ScaleCB.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
+ //
+ // ExitButton
+ //
+ this.ExitButton.Location = new System.Drawing.Point(12, 138);
+ this.ExitButton.Name = "ExitButton";
+ this.ExitButton.Size = new System.Drawing.Size(75, 23);
+ this.ExitButton.TabIndex = 4;
+ this.ExitButton.Text = "Close";
+ 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";
+ //
+ // ConfigForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(173, 175);
+ this.Controls.Add(this.header);
+ this.Controls.Add(this.ExitButton);
+ this.Controls.Add(this.ScaleCB);
+ this.Controls.Add(this.RPCToggle);
+ this.Controls.Add(this.customFtoggle);
+ this.Controls.Add(this.QualityCB);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ this.MaximizeBox = false;
+ this.Name = "ConfigForm";
+ this.Text = "Config";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ComboBox QualityCB;
+ private System.Windows.Forms.CheckBox customFtoggle;
+ private System.Windows.Forms.CheckBox RPCToggle;
+ private System.Windows.Forms.ComboBox ScaleCB;
+ private System.Windows.Forms.Button ExitButton;
+ private System.Windows.Forms.Label header;
+ }
+}
\ No newline at end of file
diff --git a/OpenFK/ConfigForm.cs b/OpenFK/ConfigForm.cs
new file mode 100644
index 0000000..239fc91
--- /dev/null
+++ b/OpenFK/ConfigForm.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace OpenFK
+{
+ public partial class ConfigForm : Form
+ {
+ public ConfigForm()
+ {
+ InitializeComponent();
+ customFtoggle.Checked = Properties.Settings.Default.customF;
+ RPCToggle.Checked = Properties.Settings.Default.RPC;
+ QualityCB.SelectedIndex = Properties.Settings.Default.Quality;
+ ScaleCB.SelectedIndex = Properties.Settings.Default.ScaleMode;
+ }
+
+ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.Quality = QualityCB.SelectedIndex;
+ Properties.Settings.Default.Save();
+ }
+
+ private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.ScaleMode = ScaleCB.SelectedIndex;
+ Properties.Settings.Default.Save();
+ }
+
+ private void checkBox1_CheckedChanged(object sender, EventArgs e)
+ {
+ if (customFtoggle.Checked)
+ {
+ Properties.Settings.Default.customF = true;
+ }
+ else
+ Properties.Settings.Default.customF = false;
+ Properties.Settings.Default.Save();
+ }
+
+ private void checkBox2_CheckedChanged(object sender, EventArgs e)
+ {
+ if (RPCToggle.Checked)
+ {
+ Properties.Settings.Default.RPC = true;
+ }
+ else
+ Properties.Settings.Default.RPC = false;
+ Properties.Settings.Default.Save();
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ Application.Exit();
+ }
+ }
+}
diff --git a/OpenFK/ConfigForm.resx b/OpenFK/ConfigForm.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/OpenFK/ConfigForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/OpenFK/FodyWeavers.xml b/OpenFK/FodyWeavers.xml
new file mode 100644
index 0000000..bae04fe
--- /dev/null
+++ b/OpenFK/FodyWeavers.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/OpenFK/FodyWeavers.xsd b/OpenFK/FodyWeavers.xsd
new file mode 100644
index 0000000..44a5374
--- /dev/null
+++ b/OpenFK/FodyWeavers.xsd
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+ A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
+
+
+
+
+ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
+
+
+
+
+ A list of unmanaged 32 bit assembly names to include, delimited with line breaks.
+
+
+
+
+ A list of unmanaged 64 bit assembly names to include, delimited with line breaks.
+
+
+
+
+ The order of preloaded assemblies, delimited with line breaks.
+
+
+
+
+
+ This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.
+
+
+
+
+ Controls if .pdbs for reference assemblies are also embedded.
+
+
+
+
+ Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.
+
+
+
+
+ As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.
+
+
+
+
+ Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.
+
+
+
+
+ Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.
+
+
+
+
+ A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
+
+
+
+
+ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.
+
+
+
+
+ A list of unmanaged 32 bit assembly names to include, delimited with |.
+
+
+
+
+ A list of unmanaged 64 bit assembly names to include, delimited with |.
+
+
+
+
+ The order of preloaded assemblies, delimited with |.
+
+
+
+
+
+
+
+ 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.
+
+
+
+
+ A comma-separated list of error codes that can be safely ignored in assembly verification.
+
+
+
+
+ 'false' to turn off automatic generation of the XML Schema file.
+
+
+
+
+
\ No newline at end of file
diff --git a/OpenFK/Form1.Designer.cs b/OpenFK/Form1.Designer.cs
index f62d539..311bed4 100644
--- a/OpenFK/Form1.Designer.cs
+++ b/OpenFK/Form1.Designer.cs
@@ -49,7 +49,6 @@
this.ClientSize = new System.Drawing.Size(800, 600);
this.Controls.Add(this.AS2Container);
this.Name = "Form1";
- this.StartPosition = System.Windows.Forms.FormStartPosition.WindowsDefaultBounds;
this.Text = "OpenFK";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form_FormClosing);
this.Load += new System.EventHandler(this.Form1_Load);
diff --git a/OpenFK/Form1.cs b/OpenFK/Form1.cs
index f970a7f..f4841d2 100644
--- a/OpenFK/Form1.cs
+++ b/OpenFK/Form1.cs
@@ -48,6 +48,18 @@ namespace OpenFK
private void Form1_Load(object sender, EventArgs e)
{
+ //MegaByte (Not functional)
+
+ //Process MBRun = new Process();
+ //ProcessStartInfo MBData = new ProcessStartInfo();
+ //MBData.FileName = Directory.GetParent(Directory.GetCurrentDirectory()) + @"\MegaByte\" + "MegaByte.exe";
+ //MBData.Arguments = "-MBRun -MBDebug";
+ //MBData.RedirectStandardOutput = true;
+ //MBData.RedirectStandardInput = true;
+ //MBData.UseShellExecute = false;
+ //MBRun.StartInfo = MBData;
+ //MBRun.Start();
+
//Checks if the main SWF exists
if(!File.Exists(Directory.GetCurrentDirectory() + @"\Main.swf"))
{
@@ -66,6 +78,8 @@ namespace OpenFK
//End of RP Initialize
//Flash initialization
+ AS2Container.Quality = Settings.Default.Quality;
+ 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");
@@ -315,6 +329,19 @@ namespace OpenFK
//
//END OF HTTP NETCOMMANDS
//
+
+ //
+ //FSGUI
+ //
+
+ if (e.args.Contains("
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAbwEAAAIB
- AAAAAQAAAAAAAAAAAAAAAFoBAABnVWZVAA4AAK9SAAADPgAACAACAAAAAAAIAAQAAAAgAAAACAAEAAAA
+ ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAYwEAAAIB
+ AAAAAQAAAAAAAAAAAAAAAE4BAABnVWZVAA4AAK9SAAADPgAACAACAAAAAAAIAAQAAAAgAAAACAAEAAAA
IAAAAAgADgAAAFcAaQBuAGQAbwB3AAAACAAGAAAALQAxAAAACAAGAAAALQAxAAAACAAKAAAASABpAGcA
aAAAAAgAAgAAAAAACAAGAAAALQAxAAAACAAAAAAACAACAAAAAAAIABAAAABTAGgAbwB3AEEAbABsAAAA
CAAEAAAAMAAAAAgABAAAADAAAAAIAAIAAAAAAAgAAAAAAAgAAgAAAAAADQAAAAAAAAAAAAAAAAAAAAAA
CAAEAAAAMQAAAAgABAAAADAAAAAIAAAAAAAIAAQAAAAwAAAACAAIAAAAYQBsAGwAAAAIAAwAAABmAGEA
- bABzAGUAAAAIAAwAAABmAGEAbABzAGUAAAAIAAQAAAAwAAAACAAMAAAAcwBjAGEAbABlAAAACAAGAAAA
- LQAxAAAACw==
+ bABzAGUAAAAIAAwAAABmAGEAbABzAGUAAAAIAAQAAAAwAAAACAAMAAAAcwBjAGEAbABlAAAACw==
\ No newline at end of file
diff --git a/OpenFK/OpenFK.csproj b/OpenFK/OpenFK.csproj
index eac18d0..0dd5f9e 100644
--- a/OpenFK/OpenFK.csproj
+++ b/OpenFK/OpenFK.csproj
@@ -1,5 +1,6 @@
+
Debug
@@ -12,6 +13,8 @@
512
true
+
+
x86
@@ -26,8 +29,8 @@
8.0
- x86
- pdbonly
+ x64
+ none
true
bin\Release\
TRACE
@@ -36,7 +39,54 @@
true
8.0
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ 8.0
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ none
+ x86
+ 8.0
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 8.0
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ none
+ x64
+ 8.0
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ ..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll
+
..\packages\DiscordRichPresence.1.0.150\lib\net35\DiscordRPC.dll
@@ -56,6 +106,12 @@
+
+ Form
+
+
+ ConfigForm.cs
+
Form
@@ -64,6 +120,9 @@
+
+ ConfigForm.cs
+
Form1.cs
@@ -97,6 +156,7 @@
0
aximp
True
+ False
{D27CDB6B-AE6D-11CF-96B8-444553540000}
@@ -105,8 +165,19 @@
0
tlbimp
True
- True
+ False
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
\ No newline at end of file
diff --git a/OpenFK/Program.cs b/OpenFK/Program.cs
index 7cc7dac..d2c0fb5 100644
--- a/OpenFK/Program.cs
+++ b/OpenFK/Program.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Windows.Forms;
@@ -11,11 +12,18 @@ namespace OpenFK
/// The main entry point for the application.
///
[STAThread]
- static void Main()
+ static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new Form1());
+ if (args.Contains("/config"))
+ {
+ Application.Run(new ConfigForm());
+ }
+ else if (File.Exists(Directory.GetCurrentDirectory() + @"\Flash.ocx"))
+ {
+ Application.Run(new Form1());
+ }else MessageBox.Show("Flash.ocx is not found!", "OpenFK", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
diff --git a/OpenFK/Properties/AssemblyInfo.cs b/OpenFK/Properties/AssemblyInfo.cs
index f4a09cc..1eb80d7 100644
--- a/OpenFK/Properties/AssemblyInfo.cs
+++ b/OpenFK/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("OpenFK")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Lako")]
[assembly: AssemblyProduct("OpenFK")]
[assembly: AssemblyCopyright("Copyright © Lako 2020")]
[assembly: AssemblyTrademark("")]
diff --git a/OpenFK/Properties/Settings.Designer.cs b/OpenFK/Properties/Settings.Designer.cs
index dbe8f51..6c4974c 100644
--- a/OpenFK/Properties/Settings.Designer.cs
+++ b/OpenFK/Properties/Settings.Designer.cs
@@ -46,5 +46,29 @@ namespace OpenFK.Properties {
this["RPC"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ public int Quality {
+ get {
+ return ((int)(this["Quality"]));
+ }
+ set {
+ this["Quality"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ public int ScaleMode {
+ get {
+ return ((int)(this["ScaleMode"]));
+ }
+ set {
+ this["ScaleMode"] = value;
+ }
+ }
}
}
diff --git a/OpenFK/Properties/Settings.settings b/OpenFK/Properties/Settings.settings
index 93d91b9..333ebca 100644
--- a/OpenFK/Properties/Settings.settings
+++ b/OpenFK/Properties/Settings.settings
@@ -8,5 +8,11 @@
False
+
+ 0
+
+
+ 0
+
\ No newline at end of file
diff --git a/OpenFK/app.config b/OpenFK/app.config
index 3102300..a4f7978 100644
--- a/OpenFK/app.config
+++ b/OpenFK/app.config
@@ -7,14 +7,18 @@
-
False
-
False
+
+ 0
+
+
+ 0
+
diff --git a/OpenFK/packages.config b/OpenFK/packages.config
index 9cb90ff..6991d4f 100644
--- a/OpenFK/packages.config
+++ b/OpenFK/packages.config
@@ -1,5 +1,7 @@
+
+
\ No newline at end of file