Merge remote-tracking branch 'refs/remotes/Histacom2-Devs/master'

Histacom2.Engine/Template/WinXP.Designer.cs

@@ -30,8 +30,8 @@ private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinXP));
             this.program = new System.Windows.Forms.Panel();
-            this.flowLayoutPanel1 = new System.Windows.Forms.Panel();
             this.bottomleftcorner = new System.Windows.Forms.Panel();
+            this.flowLayoutPanel1 = new System.Windows.Forms.Panel();
             this.toprightcorner = new System.Windows.Forms.Panel();
             this.bottomrightcorner = new System.Windows.Forms.Panel();
             this.topleftcorner = new System.Windows.Forms.Panel();
@@ -70,14 +70,6 @@ private void InitializeComponent()
             this.program.Size = new System.Drawing.Size(300, 300);
             this.program.TabIndex = 10;
             // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 30);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(292, 266);
-            this.flowLayoutPanel1.TabIndex = 11;
-            // 
             // bottomleftcorner
             // 
             this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -88,6 +80,14 @@ private void InitializeComponent()
             this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomleftcorner.TabIndex = 10;
             // 
+            // flowLayoutPanel1
+            // 
+            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 30);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(292, 266);
+            this.flowLayoutPanel1.TabIndex = 11;
+            // 
             // toprightcorner
             // 
             this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -255,13 +255,13 @@ private void InitializeComponent()
         internal System.Windows.Forms.Panel topleftcorner;
         internal System.Windows.Forms.Panel bottom;
         internal System.Windows.Forms.Panel top;
-        internal System.Windows.Forms.PictureBox maximizebutton;
-        internal System.Windows.Forms.PictureBox minimizebutton;
         internal System.Windows.Forms.Label programname;
-        internal System.Windows.Forms.PictureBox closebutton;
         internal System.Windows.Forms.Panel right;
         internal System.Windows.Forms.Panel left;
         public System.Windows.Forms.PictureBox programIcon;
         public System.Windows.Forms.Panel flowLayoutPanel1;
+        public System.Windows.Forms.PictureBox maximizebutton;
+        public System.Windows.Forms.PictureBox minimizebutton;
+        public System.Windows.Forms.PictureBox closebutton;
     }
 }

Histacom2/Histacom2.csproj

@@ -684,6 +684,7 @@
   <ItemGroup>
     <Content Include="Icon128x.ico" />
     <Content Include="Resources\12padams_EULA.txt" />
+    <None Include="Resources\WinClassic\WinXPIE6Icon.png" />
     <None Include="Resources\WinClassic\WinXPError.png" />
     <None Include="Resources\WinClassic\WinXPPrintersSmall.png" />
     <None Include="Resources\WinClassic\WinXPControlPanelSmall.png" />

Histacom2/OS/WinXPBad/Story/Hack4.cs

@@ -17,6 +17,7 @@ public class Hack4 : object
 
         public static async void StartObjective()
         {
+            try {
                 await Task.Delay(5000);
                 WinXP app = wm.InitXP(Console, "Command Prompt", null, true, true);
                 Console.WriteLine("telnet> 104.27.135.159 Connecting...");
@@ -64,11 +65,17 @@ public static async void StartObjective()
                 await Task.Delay(5000); Console.WriteLine("telnet> Transfer complete.");
                 await Task.Delay(4000); Console.WriteLine("TheHiddenHacker> now open up the time distorter and make a choice, ill wait");
             }
+            catch (Exception e)
+            {
+                return;
+            }
+        }
 
         public static async void VirusDestruction(WinClassicIE6Bad ie)
         {
-            await Task.Delay(10000); ((WinClassic)ie.ParentForm).maximizebutton.Image = ((WinClassic)ie.ParentForm).closebutton.Image;
-            await Task.Delay(1000); ((WinClassic)ie.ParentForm).minimizebutton.Image = ((WinClassic)ie.ParentForm).closebutton.Image;
+            Console.ParentForm.Close();
+            await Task.Delay(10000); ((WinXP)ie.ParentForm).maximizebutton.Image = ((WinXP)ie.ParentForm).closebutton.Image;
+            await Task.Delay(1000); ((WinXP)ie.ParentForm).minimizebutton.Image = ((WinXP)ie.ParentForm).closebutton.Image;
             await Task.Delay(1000); ie.toolStripMenuItem8.Image = Properties.Resources.WinXPError;
             await Task.Delay(1000); ie.toolStripMenuItem7.Image = Properties.Resources.WinXPError;
             await Task.Delay(1000); ie.toolStripMenuItem5.Image = Properties.Resources.WinXPError;
@@ -82,6 +89,13 @@ public static async void VirusDestruction(WinClassicIE6Bad ie)
             await Task.Delay(1000); ie.toolStripMenuItem8.Image = null; ie.toolStripMenuItem8.BackColor = Color.Red; ie.toolStripMenuItem7.BackColor = Color.Lime; ie.panel2.BackColor = Color.Black;
             await Task.Delay(1000); ie.toolStripMenuItem7.Image = null; ie.toolStripMenuItem7.BackColor = Color.Red; ie.toolStripMenuItem5.BackColor = Color.Lime; ie.toolStripMenuItem8.Visible = false; ie.toolStripMenuItem6.Visible = false;
             await Task.Delay(1000); ie.toolStripMenuItem5.Image = null; ie.toolStripMenuItem5.BackColor = Color.Red; ie.toolStripMenuItem4.BackColor = Color.Lime; ie.toolStripMenuItem7.Visible = false; ie.comboBox1.BackColor = Color.Black;
+            await Task.Delay(1000); ie.toolStripMenuItem4.Image = null; ie.toolStripMenuItem4.BackColor = Color.Red; ie.toolStripMenuItem3.BackColor = Color.Lime; ie.toolStripMenuItem5.Visible = false; ie.comboBox1.ForeColor = Color.Black;
+            await Task.Delay(1000); ie.toolStripMenuItem3.Image = null; ie.toolStripMenuItem3.BackColor = Color.Red; ie.toolStripMenuItem2.BackColor = Color.Lime; ie.toolStripMenuItem4.Visible = false; ie.panel2.Hide();
+            await Task.Delay(1000); ie.toolStripMenuItem2.Image = null; ie.toolStripMenuItem2.BackColor = Color.Red; ie.backToolStripMenuItem.BackColor = Color.Lime; ie.toolStripMenuItem3.Visible = false; ie.menuStrip1.Hide(); ie.panel1.BackColor = Color.White;
+            await Task.Delay(1000); ie.backToolStripMenuItem.Image = null; ie.backToolStripMenuItem.BackColor = Color.Red; ie.toolStripMenuItem2.Visible = false; ie.panel1.BackColor = Color.Black;
+            await Task.Delay(1000); ie.backToolStripMenuItem.Visible = false; ie.panel1.Hide(); ie.label1.BackColor = Color.Black;
+            await Task.Delay(1000); ie.label1.BackColor = Color.White;
+            await Task.Delay(1000); ie.Hide();
         }
     }
 }

Histacom2/OS/WinXPBad/VirusLabel.Designer.cs

@@ -54,13 +54,13 @@ private void InitializeComponent()
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.Fuchsia;
+            this.BackColor = System.Drawing.Color.White;
             this.ClientSize = new System.Drawing.Size(247, 19);
             this.Controls.Add(this.label1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "VirusLabel";
             this.Text = "VirusLabel";
-            this.TransparencyKey = System.Drawing.Color.Fuchsia;
+            this.TransparencyKey = System.Drawing.Color.White;
             this.ResumeLayout(false);
 
         }

Histacom2/OS/WinXPBad/WinClassicIE6Bad.Designer.cs

@@ -320,6 +320,7 @@ private void InitializeComponent()
             // 
             // labelTimer
             // 
+            this.labelTimer.Enabled = true;
             this.labelTimer.Interval = 1000;
             this.labelTimer.Tick += new System.EventHandler(this.labelTimer_Tick);
             // 
@@ -336,6 +337,7 @@ private void InitializeComponent()
             this.Controls.Add(this.panel1);
             this.Name = "WinClassicIE6Bad";
             this.Size = new System.Drawing.Size(992, 656);
+            this.Load += new System.EventHandler(this.WinClassicIE6Bad_Load);
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.menuStrip1.ResumeLayout(false);
@@ -351,9 +353,6 @@ private void InitializeComponent()
         }
 
         #endregion
-
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.MenuStrip menuStrip1;
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
@@ -380,5 +379,7 @@ private void InitializeComponent()
         public Engine.UI.ClassicLabel classicLabel1;
         public System.Windows.Forms.Panel panel2;
         public System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6;
+        public System.Windows.Forms.Panel panel1;
+        public System.Windows.Forms.MenuStrip menuStrip1;
     }
 }

Histacom2/OS/WinXPBad/WinClassicIE6Bad.cs

@@ -16,6 +16,7 @@ public partial class WinClassicIE6Bad : UserControl
     {
         private bool light = true;
         private Random r = new Random();
+        private Random r2 = new Random();
 
         private int maxX;
         private int maxY;
@@ -23,11 +24,6 @@ public partial class WinClassicIE6Bad : UserControl
         public WinClassicIE6Bad()
         {
             InitializeComponent();
-
-            maxX = TitleScreen.frmBadXP.Width;
-            maxY = TitleScreen.frmBadXP.Height;
-            Hack4.VirusDestruction(this);
-            ((WinClassic)ParentForm).closeDisabled = true;
         }
 
         private void originalTimer_Tick(object sender, EventArgs e)
@@ -47,8 +43,18 @@ private void originalTimer_Tick(object sender, EventArgs e)
         private void labelTimer_Tick(object sender, EventArgs e)
         {
             VirusLabel v = new VirusLabel();
+            v.Location = new Point(r.Next(0, maxX), r2.Next(0, maxY));
             v.Show();
-            v.Location = new Point(r.Next(0, maxX), r.Next(0, maxY));
+            v.TopMost = true;
+            v.BringToFront();
+        }
+
+        private void WinClassicIE6Bad_Load(object sender, EventArgs e)
+        {
+            maxX = Screen.PrimaryScreen.Bounds.Width;
+            maxY = Screen.PrimaryScreen.Bounds.Height;
+            Hack4.VirusDestruction(this);
+            ((WinXP)ParentForm).closeDisabled = true;
         }
     }
 }

Histacom2/OS/WinXPBad/WinXPBad.Designer.cs

@@ -406,6 +406,7 @@ private void InitializeComponent()
             this.classicStartMenuItem1.Size = new System.Drawing.Size(181, 40);
             this.classicStartMenuItem1.SubTitle = "Internet Explorer";
             this.classicStartMenuItem1.Text = "Internet";
+            this.classicStartMenuItem1.Click += new System.EventHandler(this.classicStartMenuItem1_Click);
             // 
             // classicStartMenuItem2
             // 

Histacom2/OS/WinXPBad/WinXPBad.cs

@@ -283,6 +283,13 @@ private void deleteToolStripMenuItem_Click(object sender, EventArgs e)
                 }
             }
         }
+
+        private void classicStartMenuItem1_Click(object sender, EventArgs e)
+        {
+            wm.InitXP(new WinClassicIE6Bad(), "Internet Explorer 6", Properties.Resources.WinXPIE6Icon, true, true);
+            startmenu.Hide();
+            startbutton.Enabled = false;
+        }
     }
 }
 

Histacom2/Properties/Resources.resx

@@ -2101,4 +2101,7 @@
   <data name="WinXPError" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WinClassic\WinXPError.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="WinXPIE6Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\WinXPIE6Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Histacom2/Properties/Resources1.Designer.cs

@@ -2223,6 +2223,16 @@ public static System.Drawing.Bitmap WinXPIE6 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap WinXPIE6Icon {
+            get {
+                object obj = ResourceManager.GetObject("WinXPIE6Icon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>