diff --git a/.vs/Elite Power Management Simulator/v16/.suo b/.vs/Elite Power Management Simulator/v16/.suo index ee852c8..0c991d3 100644 Binary files a/.vs/Elite Power Management Simulator/v16/.suo and b/.vs/Elite Power Management Simulator/v16/.suo differ diff --git a/Elite Power Management Simulator/Elite Power Management Simulator.csproj b/Elite Power Management Simulator/Elite Power Management Simulator.csproj index 7d0075c..2cf7d17 100644 --- a/Elite Power Management Simulator/Elite Power Management Simulator.csproj +++ b/Elite Power Management Simulator/Elite Power Management Simulator.csproj @@ -12,6 +12,21 @@ 512 true true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -32,6 +47,18 @@ prompt 4 + + false + + + D19BDBC21544C44B269FADA562582A08614989EA + + + Elite Power Management Simulator_TemporaryKey.pfx + + + skyfall_logo_roulette_white001_64only.ico + @@ -67,6 +94,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs @@ -80,5 +108,23 @@ + + + + + + + + + False + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + \ No newline at end of file diff --git a/Elite Power Management Simulator/Form1.Designer.cs b/Elite Power Management Simulator/Form1.Designer.cs index d3abe32..80cef80 100644 --- a/Elite Power Management Simulator/Form1.Designer.cs +++ b/Elite Power Management Simulator/Form1.Designer.cs @@ -182,7 +182,7 @@ this.lbl_version.Name = "lbl_version"; this.lbl_version.Size = new System.Drawing.Size(46, 13); this.lbl_version.TabIndex = 11; - this.lbl_version.Text = "v1.0.2.3"; + this.lbl_version.Text = "v1.0.3.0"; // // gbox_pipmgmt // diff --git a/Elite Power Management Simulator/Form1.cs b/Elite Power Management Simulator/Form1.cs index b4a1f4d..1c63cca 100644 --- a/Elite Power Management Simulator/Form1.cs +++ b/Elite Power Management Simulator/Form1.cs @@ -43,11 +43,60 @@ namespace Elite_Power_Management_Simulator { pwr_reset(); } + /*public static void fastProg(this ProgressBar bar, int value) + { + if (value < bar.Maximum) + { + bar.Value = value + 1; + } + bar.Value = value; + }*/ public void update() { + /* + // Old style, slow due to progress bar animations prog_eng.Value = global.eng; prog_sys.Value = global.sys; prog_wep.Value = global.wep; + */ + + /* + fastProg(prog_eng, global.eng); + fastProg(prog_sys, global.sys); + fastProg(prog_wep, global.wep); + */ + + // // Fast processing of Windows progress bars // // + //SYS + if (global.sys < prog_sys.Maximum) { + prog_sys.Value = global.sys + 1; + prog_sys.Value = global.sys; + } else { + prog_sys.Maximum = 10; + prog_sys.Value = prog_sys.Maximum; + prog_sys.Value = global.sys; + prog_sys.Maximum = 8; + } + //ENG + if (global.eng < prog_eng.Maximum) { + prog_eng.Value = global.eng + 1; + prog_eng.Value = global.eng; + } else { + prog_eng.Maximum = 10; + prog_eng.Value = prog_eng.Maximum; + prog_eng.Value = global.eng; + prog_eng.Maximum = 8; + } + //WEP + if (global.wep < prog_wep.Maximum) { + prog_wep.Value = global.wep + 1; + prog_wep.Value = global.wep; + } else { + prog_wep.Maximum = 10; + prog_wep.Value = prog_wep.Maximum; + prog_wep.Value = global.wep; + prog_wep.Maximum = 8; + } //Update Labels to show pip count string eng = Convert.ToString(Convert.ToDecimal(global.eng) / 2); diff --git a/Elite Power Management Simulator/Properties/AssemblyInfo.cs b/Elite Power Management Simulator/Properties/AssemblyInfo.cs index c22612f..9063ecd 100644 --- a/Elite Power Management Simulator/Properties/AssemblyInfo.cs +++ b/Elite Power Management Simulator/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ -using System.Reflection; +using System.Resources; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -32,5 +33,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2.3")] -[assembly: AssemblyFileVersion("1.0.2.3")] +[assembly: AssemblyVersion("1.0.3.0")] +[assembly: AssemblyFileVersion("1.0.3.0")] +[assembly: NeutralResourcesLanguage("en")] diff --git a/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache b/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache index b82eb2f..2bb87b2 100644 Binary files a/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache and b/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache differ diff --git a/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csprojAssemblyReference.cache b/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csprojAssemblyReference.cache index 36a7c0b..4181560 100644 Binary files a/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csprojAssemblyReference.cache and b/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csprojAssemblyReference.cache differ diff --git a/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe b/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe index a02fd32..3fc304c 100644 Binary files a/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe and b/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe differ diff --git a/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb b/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb index d0a6e92..b767f1d 100644 Binary files a/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb and b/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb differ diff --git a/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferences.cache index 916af83..57e89ec 100644 Binary files a/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 19b8d49..a5b73ab 100644 Binary files a/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/Elite Power Management Simulator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache b/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache index 9db4491..0f53dca 100644 Binary files a/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache and b/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache differ diff --git a/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csprojAssemblyReference.cache b/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csprojAssemblyReference.cache index 4c4ceaf..beb0652 100644 Binary files a/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csprojAssemblyReference.cache and b/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csprojAssemblyReference.cache differ diff --git a/Elite Power Management Simulator/obj/Release/elite_power_sim.exe b/Elite Power Management Simulator/obj/Release/elite_power_sim.exe index c338248..01a4e9b 100644 Binary files a/Elite Power Management Simulator/obj/Release/elite_power_sim.exe and b/Elite Power Management Simulator/obj/Release/elite_power_sim.exe differ diff --git a/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb b/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb index 0dc176d..c1c9208 100644 Binary files a/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb and b/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb differ diff --git a/Elite Power Management Simulator/skyfall_logo_roulette_white001_64only.ico b/Elite Power Management Simulator/skyfall_logo_roulette_white001_64only.ico new file mode 100644 index 0000000..989c715 Binary files /dev/null and b/Elite Power Management Simulator/skyfall_logo_roulette_white001_64only.ico differ