diff --git a/1/1.csproj b/1/1.csproj index 2495cb2..7b9e15c 100644 --- a/1/1.csproj +++ b/1/1.csproj @@ -9,9 +9,10 @@ Properties _1 1 - v4.7.2 + v4.8 512 true + true diff --git a/2/2.csproj b/2/2.csproj index e7c7ad5..a5da901 100644 --- a/2/2.csproj +++ b/2/2.csproj @@ -9,9 +9,10 @@ Properties _2 2 - v4.7.2 + v4.8 512 true + true diff --git a/3/3.csproj b/3/3.csproj index fdc2689..f96267e 100644 --- a/3/3.csproj +++ b/3/3.csproj @@ -9,9 +9,10 @@ Properties _3 3 - v4.7.2 + v4.8 512 true + true diff --git a/3g/3g.csproj b/3g/3g.csproj index 411d503..35073aa 100644 --- a/3g/3g.csproj +++ b/3g/3g.csproj @@ -9,9 +9,10 @@ Properties LaptopSimulator2015.Levels 3g - v4.7.2 + v4.8 512 true + true diff --git a/4/4.csproj b/4/4.csproj index a5dd012..1eed25b 100644 --- a/4/4.csproj +++ b/4/4.csproj @@ -9,9 +9,10 @@ Properties _4 4 - v4.7.2 + v4.8 512 true + true diff --git a/Base/Base.csproj b/Base/Base.csproj index d7c643c..5e5a783 100644 --- a/Base/Base.csproj +++ b/Base/Base.csproj @@ -9,9 +9,10 @@ Properties Base Base - v4.7.2 + v4.8 512 true + true diff --git a/CaptchaGlitch_Double/CaptchaGlitch_Double.csproj b/CaptchaGlitch_Double/CaptchaGlitch_Double.csproj index 8681e47..ef1ddeb 100644 --- a/CaptchaGlitch_Double/CaptchaGlitch_Double.csproj +++ b/CaptchaGlitch_Double/CaptchaGlitch_Double.csproj @@ -9,9 +9,10 @@ Properties CaptchaGlitch_Double CaptchaGlitch_Double - v4.7.2 + v4.8 512 true + true diff --git a/CaptchaGlitch_Rand/CaptchaGlitch_Rand.csproj b/CaptchaGlitch_Rand/CaptchaGlitch_Rand.csproj index b916503..a3f6754 100644 --- a/CaptchaGlitch_Rand/CaptchaGlitch_Rand.csproj +++ b/CaptchaGlitch_Rand/CaptchaGlitch_Rand.csproj @@ -9,9 +9,10 @@ Properties CaptchaGlitch_Rand CaptchaGlitch_Rand - v4.7.2 + v4.8 512 true + true diff --git a/LaptopSimulator2015/App.config b/LaptopSimulator2015/App.config index 0e4059c..f943934 100644 --- a/LaptopSimulator2015/App.config +++ b/LaptopSimulator2015/App.config @@ -1,30 +1,11 @@ - + - - -
- - - + - - - - 0 - - - False - - - True - - - 1 - - - (Default) - - - - \ No newline at end of file + + + + + + diff --git a/LaptopSimulator2015/FakeDesktop.cs b/LaptopSimulator2015/FakeDesktop.cs index 4515772..c31f7e3 100644 --- a/LaptopSimulator2015/FakeDesktop.cs +++ b/LaptopSimulator2015/FakeDesktop.cs @@ -368,6 +368,7 @@ namespace LaptopSimulator2015 case 0: CaptchaPanel_Click(sender, e); levelWindowContents.SelectedIndex = 1; + captchaBox.Select(); break; case 1: if (captchaBox.Text == (string)captchaBox.Tag) diff --git a/LaptopSimulator2015/LaptopSimulator2015.csproj b/LaptopSimulator2015/LaptopSimulator2015.csproj index 0a52123..9b64aaa 100644 --- a/LaptopSimulator2015/LaptopSimulator2015.csproj +++ b/LaptopSimulator2015/LaptopSimulator2015.csproj @@ -8,10 +8,11 @@ Exe LaptopSimulator2015 LaptopSimulator2015 - v4.7.2 + v4.8 512 true true + AnyCPU @@ -79,6 +80,12 @@ True strings.resx + + Form + + + Tutorial.cs + @@ -102,6 +109,9 @@ ResXFileCodeGenerator strings.Designer.cs + + Tutorial.cs + diff --git a/LaptopSimulator2015/Program.cs b/LaptopSimulator2015/Program.cs index 1a1825b..a8ac783 100644 --- a/LaptopSimulator2015/Program.cs +++ b/LaptopSimulator2015/Program.cs @@ -34,6 +34,8 @@ namespace LaptopSimulator2015 Console.ForegroundColor = ConsoleColor.Green; Console.Clear(); Console.WriteLine(strings.consoleStarting); + while (Settings.level == -1) + Application.Run(new Tutorial()); Application.Run(new FakeDesktop()); Console.WriteLine(strings.consoleQuit); Thread.Sleep(1000); diff --git a/LaptopSimulator2015/Settings.cs b/LaptopSimulator2015/Settings.cs index c369e4a..a7e06bd 100644 --- a/LaptopSimulator2015/Settings.cs +++ b/LaptopSimulator2015/Settings.cs @@ -24,7 +24,7 @@ namespace LaptopSimulator2015 { xmldoc_temp.Add(new XElement("wam", 10)); xmldoc_temp.Add(new XElement("lsd", false)); xmldoc_temp.Add(new XElement("subs", true)); - xmldoc_temp.Add(new XElement("level", 0)); + xmldoc_temp.Add(new XElement("level", -1)); xmldoc_temp.Add(new XElement("lang", CultureInfo.CurrentCulture)); xmldoc_temp.Save(_xmlfile); } diff --git a/LaptopSimulator2015/Tutorial.Designer.cs b/LaptopSimulator2015/Tutorial.Designer.cs new file mode 100644 index 0000000..6b24b9e --- /dev/null +++ b/LaptopSimulator2015/Tutorial.Designer.cs @@ -0,0 +1,61 @@ +namespace LaptopSimulator2015 +{ + partial class Tutorial + { + /// + /// 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.skipButton = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // skipButton + // + this.skipButton.Location = new System.Drawing.Point(761, 0); + this.skipButton.Name = "skipButton"; + this.skipButton.Size = new System.Drawing.Size(39, 23); + this.skipButton.TabIndex = 0; + this.skipButton.Text = "SKIP"; + this.skipButton.UseVisualStyleBackColor = true; + this.skipButton.Visible = false; + this.skipButton.Click += new System.EventHandler(this.skipButton_Click); + // + // Tutorial + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.skipButton); + this.Name = "Tutorial"; + this.Text = "Tutorial"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button skipButton; + } +} \ No newline at end of file diff --git a/LaptopSimulator2015/Tutorial.cs b/LaptopSimulator2015/Tutorial.cs new file mode 100644 index 0000000..947de03 --- /dev/null +++ b/LaptopSimulator2015/Tutorial.cs @@ -0,0 +1,29 @@ +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 LaptopSimulator2015 +{ + public partial class Tutorial : Form + { + public Tutorial() + { + InitializeComponent(); +#if DEBUG + skipButton.Visible = true; +#endif + } + + private void skipButton_Click(object sender, EventArgs e) + { + Settings.level = 0; + Close(); + } + } +} diff --git a/LaptopSimulator2015/Tutorial.resx b/LaptopSimulator2015/Tutorial.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/LaptopSimulator2015/Tutorial.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/LevelTest/App.config b/LevelTest/App.config index 56efbc7..f943934 100644 --- a/LevelTest/App.config +++ b/LevelTest/App.config @@ -1,6 +1,11 @@ - + - + - \ No newline at end of file + + + + + + diff --git a/LevelTest/LevelTest.csproj b/LevelTest/LevelTest.csproj index d6e5b8f..887eeec 100644 --- a/LevelTest/LevelTest.csproj +++ b/LevelTest/LevelTest.csproj @@ -8,10 +8,11 @@ WinExe LevelTest LevelTest - v4.7.2 + v4.8 512 true true + AnyCPU @@ -74,6 +75,7 @@ True Resources.resx + True SettingsSingleFileGenerator diff --git a/LevelTest/Properties/Resources.Designer.cs b/LevelTest/Properties/Resources.Designer.cs index b330f8f..c9a7e3c 100644 --- a/LevelTest/Properties/Resources.Designer.cs +++ b/LevelTest/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace LevelTest.Properties -{ - - +namespace LevelTest.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,44 +19,39 @@ namespace LevelTest.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { + internal static global::System.Resources.ResourceManager ResourceManager { get { - if ((resourceMan == null)) - { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LevelTest.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } diff --git a/LevelTest/Properties/Settings.Designer.cs b/LevelTest/Properties/Settings.Designer.cs index f3c781b..f1ff74a 100644 --- a/LevelTest/Properties/Settings.Designer.cs +++ b/LevelTest/Properties/Settings.Designer.cs @@ -8,19 +8,16 @@ // //------------------------------------------------------------------------------ -namespace LevelTest.Properties -{ - - +namespace LevelTest.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { + + public static Settings Default { get { return defaultInstance; } diff --git a/tmp3/LevelTest.exe b/tmp3/LevelTest.exe new file mode 100644 index 0000000..e13543c Binary files /dev/null and b/tmp3/LevelTest.exe differ diff --git a/zz_CaptchaGlitch_Empty/zz_CaptchaGlitch_Empty.csproj b/zz_CaptchaGlitch_Empty/zz_CaptchaGlitch_Empty.csproj index 6d90ed0..131cc4d 100644 --- a/zz_CaptchaGlitch_Empty/zz_CaptchaGlitch_Empty.csproj +++ b/zz_CaptchaGlitch_Empty/zz_CaptchaGlitch_Empty.csproj @@ -9,9 +9,10 @@ Properties zz_CaptchaGlitch_Empty zz_CaptchaGlitch_Empty - v4.7.2 + v4.8 512 true + true diff --git a/zzz_ShuffleChars/zzz_ShuffleChars.csproj b/zzz_ShuffleChars/zzz_ShuffleChars.csproj index 35b7ea4..d3522f8 100644 --- a/zzz_ShuffleChars/zzz_ShuffleChars.csproj +++ b/zzz_ShuffleChars/zzz_ShuffleChars.csproj @@ -9,9 +9,10 @@ Properties zzz_ShuffleChars zzz_ShuffleChars - v4.7.2 + v4.8 512 true + true