Merge branch 'feature' into develop

Author: swiftmg0d

CYPVP/.vs/CYPVP/FileContentIndex/0b9138e6-b7f9-45c2-beb2-d505378289de.vsidx

@@ -48,6 +48,12 @@
   <ItemGroup>
     <Compile Include="AudioManager.cs" />
     <Compile Include="Character.cs" />
+    <Compile Include="EndGame.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="EndGame.Designer.cs">
+      <DependentUpon>EndGame.cs</DependentUpon>
+    </Compile>
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -72,6 +78,10 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Slime.cs" />
+    <Compile Include="Star.cs" />
+    <EmbeddedResource Include="EndGame.resx">
+      <DependentUpon>EndGame.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
@@ -227,5 +237,23 @@
   <ItemGroup>
     <None Include="Resources\5_statusbar.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Btn01.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\star_preview_rev_1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\coin_collect.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\oscillating-space-waves-31400.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Epic Fail Sound Effect.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Yayyy Sound Effect.wav" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

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

@@ -28,7 +28,7 @@ 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)
+                    if (NewPosition >= 80)
                     {
 
 

CYPVP/.vs/CYPVP/FileContentIndex/44234552-0736-4444-bd4f-fe79b13b6706.vsidx

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Media;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace CYPVP
+{
+    public partial class EndGame : Form
+    {
+        public int Points { get; set; }
+        public SoundPlayer soundPlayer { get; set; }
+        public EndGame(int points)
+        {
+            InitializeComponent();
+            Points = points;
+            lb_Points.Text = Points.ToString();
+            if (GetGrade() == 10)
+            {
+                lb_Grade.Text = "10";
+            }else if(GetGrade() == 4)
+            {
+                lb_Grade.Text = "5";
+            }
+            else
+            {
+                lb_Grade.Text = $"{GetGrade() + 1}";
+            }
+            if (GetGrade() > 5)
+            {
+                label3.Text = "Yeyy you passed Visual Programming";
+                soundPlayer = new SoundPlayer(Properties.Resources.Yayyy_Sound_Effect);
+                soundPlayer.Play();
+            }
+            else
+            {
+                soundPlayer = new SoundPlayer(Properties.Resources.Epic_Fail_Sound_Effect);
+                soundPlayer.Play();
+            }
+        }
+
+        public int GetGrade()
+        {
+            if ((int)(Points / 10) < 5) return 4;
+            if ((int)(Points / 10) >= 10) return 10;
+            return (int)(Points / 10);
+        }
+
+        private void EndGame_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            this.Close();
+            Application.OpenForms["CYPVP"].Show();
+            CYPVP.Menu.Play();
+        }
+    }
+}