Merge branch 'feature' into develop

Author: swiftmg0d

CYPVP/.vs/CYPVP/FileContentIndex/20f4cdc1-010d-47f9-b38f-3e513de9614a.vsidx

@@ -47,6 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AudioManager.cs" />
+    <Compile Include="Character.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -70,6 +71,7 @@
     <Compile Include="MainMenu.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Slime.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
@@ -80,7 +82,7 @@
       <DependentUpon>HelpWindow.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -201,5 +203,29 @@
   <ItemGroup>
     <None Include="assets\player_movements\up\up_standing.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\slime.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\slime_left.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\slime_right.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\1_statusbar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\2_statusbar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\3_statusbar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\4_statusbar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\5_statusbar.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

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

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace CYPVP
+{
+    public class Character
+    {
+        public PictureBox CharacterSkin { get; set; }
+        public bool CanMoveUp { get; set; }
+        public bool CanMoveDown { get; set; }
+        public bool CanMoveRight { get; set; }
+        public bool CanMoveLeft { get; set; }
+        public Character(PictureBox Character)
+        {
+            CharacterSkin = Character;
+            CharacterSkin.BackColor = Color.Transparent;
+        }
+        public void Move(String Position,int Speed,int Height,int Width,int x,int y)
+        {
+            
+           
+            
+                if (Position == "UP")
+                {
+                    int NewPosition = CharacterSkin.Location.Y - Speed;
+                    if (NewPosition >= 40)
+                    {
+                    
+                   
+                        CharacterSkin.Location = new Point(CharacterSkin.Location.X, NewPosition);
+
+ 
+                }
+
+                }
+                else if (Position == "DOWN")
+                {
+                    int NewPosition = CharacterSkin.Location.Y + Speed;
+                    if (NewPosition < Height - 100)
+                    {
+                    
+                        CharacterSkin.Location = new Point(CharacterSkin.Location.X, NewPosition);
+
+                    
+                }
+
+                }
+                else if (Position == "RIGHT")
+                {
+                    int NewPosition = CharacterSkin.Location.X + Speed;
+                    if (NewPosition < Width - 70)
+                    {
+                    
+                        CharacterSkin.Location = new Point(NewPosition, CharacterSkin.Location.Y);
+                    
+                    
+                    }
+
+                }
+                else if (Position == "LEFT")
+                {
+                    int NewPosition = CharacterSkin.Location.X - Speed;
+                    if (NewPosition >= 10)
+                    {
+                    
+                        CharacterSkin.Location = new Point(NewPosition, CharacterSkin.Location.Y);
+                    
+                  
+
+                    }
+                }
+            
+
+            
+        }
+        public bool Check()
+        {
+            return CanMoveDown == false && CanMoveUp == false && CanMoveLeft == false && CanMoveRight == false;
+        }
+    }
+}

CYPVP/.vs/CYPVP/FileContentIndex/53748a5c-7157-4a39-90d2-63bdf1d13a80.vsidx

@@ -9,63 +9,44 @@ namespace CYPVP
 {
     public class Game
     {
-        public bool CanMoveUp { get; set; }
-        public bool CanMoveDown { get; set; }
-        public bool CanMoveRight { get; set; }
-        public bool CanMoveLeft { get; set; }
-        public int NewPosition { get; set; }
-        public int Height { get; set; }
-        public int Width { get; set; }
-        public Game(int height,int width) { 
-            CanMoveDown = false;
-            CanMoveLeft = false;
-            CanMoveRight=false;
-            CanMoveUp = false;
-            Height=height;
-            Width=width;
+        public Character MainCharacter { get; set; }
+
+        public  Slime MainSlime { get; set; }
+        public int Score { get; set; }
+        public int Time { get; set; }
+
+
+
+        public Game(int height,int width,PictureBox mainCharacter,PictureBox mainSlime) {
+            MainCharacter = new Character(mainCharacter);
+            MainSlime=new Slime(mainSlime);
+            Time = 90;
+            Score = 0;
         }
-        public void MoveCharachter(PictureBox Charachter,string Position,int Speed)
+
+        internal void MoveCharacter(int Height,int Width)
         {
-            if (Position == "UP")
+            if (MainCharacter.CanMoveUp)
             {
-                NewPosition = Charachter.Location.Y - Speed;
-                if (NewPosition >= 40)
-                {
-                    Charachter.Location = new Point(Charachter.Location.X, NewPosition);
-                }
-
+                MainCharacter.Move("UP", 15, Height, Width,MainSlime.SlimeSkin.Location.X, MainSlime.SlimeSkin.Location.Y);
             }
-            else if(Position == "DOWN")
+            else if (MainCharacter.CanMoveDown)
             {
-                NewPosition = Charachter.Location.Y + Speed;
-                if (NewPosition < Height-100)
-                {
-                    Charachter.Location = new Point(Charachter.Location.X, NewPosition);
-                }
-               
+                MainCharacter.Move("DOWN", 15, Height, Width, MainSlime.SlimeSkin.Location.X, MainSlime.SlimeSkin.Location.Y);
             }
-            else if(Position == "RIGHT")
+            else if (MainCharacter.CanMoveLeft)
             {
-                NewPosition = Charachter.Location.X + Speed;
-                if(NewPosition < Width-70)
-                {
-                    Charachter.Location = new Point(NewPosition, Charachter.Location.Y);
-                }
-
+                MainCharacter.Move("LEFT", 15, Height, Width, MainSlime.SlimeSkin.Location.X, MainSlime.SlimeSkin.Location.Y);
             }
-            else if(Position == "LEFT")
+            else if (MainCharacter.CanMoveRight)
             {
-                NewPosition = Charachter.Location.X - Speed;
-                if (NewPosition >= 10)
-                {
-                    Charachter.Location = new Point(NewPosition, Charachter.Location.Y);
-
-                }
+                MainCharacter.Move("RIGHT", 15, Height, Width, MainSlime.SlimeSkin.Location.X, MainSlime.SlimeSkin.Location.Y);
             }
         }
-        public bool Check()
+
+        internal void MoveSlime()
         {
-            return CanMoveDown == false && CanMoveUp == false && CanMoveLeft == false && CanMoveRight == false;
+            MainSlime.Move((int)MainCharacter.CharacterSkin.Location.X, (int)MainCharacter.CharacterSkin.Location.Y);
         }
     }
 }