Merge branch 'feature' into develop

Author: swiftmg0d

CYPVP/.vs/CYPVP/FileContentIndex/25dd74a5-1241-4945-8f63-a065daac8a5e.vsidx

@@ -60,11 +60,12 @@
     <Compile Include="GameWindow.Designer.cs">
       <DependentUpon>GameWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="Help.cs">
+    <Compile Include="Help.cs" />
+    <Compile Include="HelpWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Help.Designer.cs">
-      <DependentUpon>Help.cs</DependentUpon>
+    <Compile Include="HelpWindow.Designer.cs">
+      <DependentUpon>HelpWindow.cs</DependentUpon>
     </Compile>
     <Compile Include="MainMenu.cs" />
     <Compile Include="Program.cs" />
@@ -75,8 +76,8 @@
     <EmbeddedResource Include="GameWindow.resx">
       <DependentUpon>GameWindow.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Help.resx">
-      <DependentUpon>Help.cs</DependentUpon>
+    <EmbeddedResource Include="HelpWindow.resx">
+      <DependentUpon>HelpWindow.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

CYPVP/.vs/CYPVP/FileContentIndex/33eadd8b-bc98-4b9b-9f18-29b93d16aa82.vsidx

@@ -55,14 +55,15 @@ private void pb_muteSound_Click(object sender, EventArgs e)
 
         private void btn_help_Click(object sender, EventArgs e)
         {
-            Help help = new Help();
+            HelpWindow help = new HelpWindow();
             help.StartPosition=FormStartPosition.Manual;
             help.Location = this.Location;
             this.Hide();
             Menu.Stop();
             if(help.ShowDialog() == DialogResult.Cancel) {
-                this.Show();
-                Menu.Play();
+                this.Show(); 
+                //Menu.Play();
+
             }
         }
 
@@ -76,7 +77,7 @@ private void btn_start_Click(object sender, EventArgs e)
             if (gameWindow.ShowDialog() == DialogResult.Cancel)
             {
                 this.Show();
-                Menu.Play();
+                //Menu.Play();
             }
         }
     }

CYPVP/.vs/CYPVP/FileContentIndex/53b67511-f783-4307-8729-215663627ac5.vsidx

@@ -71,7 +71,7 @@ private void GameWindow_KeyUp(object sender, KeyEventArgs e)
                 Game.CanMoveUp = false;
                 if (Game.Check())
                 {
-                    Character.Image = Properties.Resources.up_standing;
+                    Character.Image= Properties.Resources.up_standing;
                 }
 
             }
@@ -126,8 +126,10 @@ private void Movements_Tick(object sender, EventArgs e)
             }
         }
 
-       
+        private void GameWindow_Load(object sender, EventArgs e)
+        {
 
+        }
     }
 }
 

CYPVP/.vs/CYPVP/FileContentIndex/7b929954-88ea-4eb5-afb6-599a35dd43da.vsidx

@@ -127,7 +127,7 @@
   <data name="Character.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAAIGNIUk0AAHomAACAhAAA+gAAAIDoAAB1
-        MAAA6mAAADqYAAAXcJy6UTwAAAAJcEhZcwAADsAAAA7AAWrWiQkAAAAHdElNRQfnBg4MEyIVn/obAAAA
+        MAAA6mAAADqYAAAXcJy6UTwAAAAJcEhZcwAADr8AAA6/ATgFUyQAAAAHdElNRQfnBg4MEyIVn/obAAAA
         L3RFWHRDb21tZW50AEdJRiByZXNpemVkIG9uIGh0dHBzOi8vZXpnaWYuY29tL3Jlc2l6ZaI7uLIAAAAS
         dEVYdFNvZnR3YXJlAGV6Z2lmLmNvbaDDs1gAAAtQSURBVHhe7ZppbFzVFcffzJvVs+/rG3u8Trw7jmN7
         7Hh3NjvOYmdPHEhIutAmYWlrSChpWKJmaSs1rSqkKKC2AkFYFUQLUiXafmirFio+VJVaKqCFBqgKhQpQ

CYPVP/.vs/CYPVP/FileContentIndex/dc29599d-d075-42eb-8f40-f73ec1632901.vsidx

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -10,25 +8,30 @@
 
 namespace CYPVP
 {
-    public partial class Help : Form
+    public class Help
+
     {
-        public Help()
-        {
-            InitializeComponent();
-            pictureBox1.BackColor = Color.Transparent;
-            pictureBox2.BackColor=Color.Transparent;
-            
-        }
 
-        private void button1_Click(object sender, EventArgs e)
+        public bool CanMoveUp { get; set; }
+        public bool CanMoveDown { get; set; }
+        public bool CanMoveRight { get; set; }
+        public bool CanMoveLeft { get; set; }
+        public int Height { get; set; }
+        public int Width { get; set; }
+        public Help(int height, int width)
         {
-            this.Close();
-            this.DialogResult = DialogResult.Cancel;
+            CanMoveDown = false;
+            CanMoveLeft = false;
+            CanMoveRight = false;
+            CanMoveUp = false;
+            Height = height;
+            Width = width;
         }
-
-        private void pictureBox1_Click(object sender, EventArgs e)
+       
+        public bool Check()
         {
-
+            return CanMoveDown == false && CanMoveUp == false && CanMoveLeft == false && CanMoveRight == false;
         }
+
     }
 }