Merge pull request #10 from samdherron/ShrinkPlayerSize&FireballRando…

…mGrav Changed the playerShape.Height when jumping during a few of the jump …
samdherron · Jul 16, 2019 · d745696 · d745696
2 parents 07ae1e3 + 991f51f
commit d745696
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 8 deletions.
diff --git a/Dropper/Player.cs b/Dropper/Player.cs
@@ -173,6 +173,7 @@ public override void Draw(GameTime gameTime)
         {
             spriteBatch.Begin();
 
+
             //Determine whether to display Coloured Sprite or Normal Sprite
             if (powerUpActive)
             {
@@ -201,6 +202,7 @@ public override void Draw(GameTime gameTime)
                         new Vector2(0), spriteDirection, 0f);
             }
 
+            //spriteBatch.FillRectangle(player, Color.Blue);
             spriteBatch.End();
 
 
@@ -233,6 +235,7 @@ public override void Update(GameTime gameTime)
 
             float deltaTime = (float)gameTime.ElapsedGameTime.TotalMilliseconds;
 
+            player.Height = picSize * scale;
 
             if (powerupTimer >= 0 && powerUpActive)
             {
@@ -283,6 +286,11 @@ public override void Update(GameTime gameTime)
                 else if (velocity.Y != 0)
                 {
                     midJump = true;
+
+                    if (currentFrame > 14 && currentFrame < 19)
+                    {
+                        player.Height = (picSize * scale) - 32;
+                    }
                 }
 
 
@@ -357,25 +365,26 @@ public override void Update(GameTime gameTime)
                 }
 
                 //Animation Logic Region
-                #region New Animation Frame Logic (Adventurer Sheet)
+                #region Animation Frame Logic (Adventurer Sheet)
 
+
 
+                //Switch to running frame
                 if ((velocity.X != 0 && currentFrame < 4))
                 {
                     currentFrame = 4;
                 }
 
 
-
-
-
+                //Cycle Back to Starting running frame
                 if (velocity.X != 0 && currentFrame >= 8 && !midJump && !isSliding)
                 {
                     currentFrame = 4;
                 }
 
                 if (velocity.X == 0 && !midJump && !isSliding)
                 {
+                    //Standing still frames
                     if (currentFrame >= 3)
                     {
                         currentFrame = 0;
@@ -386,14 +395,15 @@ public override void Update(GameTime gameTime)
 
                 if (midJump)
                 {
+
                     if (currentFrame < 13)
                     {
                         currentFrame = 13;
                     }
 
-
                 }
 
+                /*
                 if (isSliding)
                 {
                     if (currentFrame < 9 || currentFrame > 12)
@@ -407,6 +417,7 @@ public override void Update(GameTime gameTime)
                     Console.WriteLine("Slide actiated");
 
                 }
+                */
 
                 if (currentFrame < 20 && currentFrame != 9)
                 {

diff --git a/Dropper/Projectile.cs b/Dropper/Projectile.cs
@@ -3,6 +3,7 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 using System;
+using System.Collections.Generic;
 
 namespace Fireball_Dodger
 {
@@ -18,7 +19,7 @@ class Projectile : DrawableGameComponent
         Random rndColor = new Random();
         Random rndSpawnX = new Random();
         const float gravity = 0.06f;
-        public static float speed = 9.7f;
+        public static float speed = 7.7f;
         Vector2 gravityVect = new Vector2(0, gravity);
         Random rndY = new Random();
         SpriteFont font;
@@ -102,6 +103,7 @@ public override void Update(GameTime gameTime)
             velocity.X = 0;
             velocity.Y = 0;
 
+
             float deltaTime = (float)gameTime.ElapsedGameTime.TotalMilliseconds;
 
             /*
@@ -149,6 +151,18 @@ public override void Update(GameTime gameTime)
                     Console.WriteLine("new random Y projectile value: " + projectileShape.Y);
                     projectilesFired++;
 
+                    //Gets either div2 or div3 for the projectile size
+                    if (projectileSizeRandomizer(rndColor) == "div2")
+                    {
+                        projectileShape.Width = (512 / 2);
+                        projectileShape.Height = (197 / 2);
+                    }
+                    else
+                    {
+                        projectileShape.Width = (512 / 3);
+                        projectileShape.Height = (197 / 3);
+                    }
+
                     //See EnergyRandomRoll method
                     if (energyProjectile)
                     {
@@ -164,12 +178,14 @@ public override void Update(GameTime gameTime)
 
                 multiSpawn = multiSpawner(projectileShape, rndSpawnX);
 
+                /*
                 if (multiSpawn && multiCounter > 30)
                 {
                     Console.WriteLine("projectile Spawned");
                     Projectile p1 = new Projectile(Game);
                     multiCounter = 0;
-                }
+                } 
+                */
 
                 if (velocity.X == 0)
                 {
@@ -195,7 +211,25 @@ public override void Update(GameTime gameTime)
                 }
 
                 projectileShape.X = projectileShape.X + (int)velocity.X;
-                projectileShape.Y = projectileShape.Y + (int)velocity.Y;
+
+                if (projectileShape.Intersects(Player.player) && Player.powerUpActive)
+                {
+                    if (rndColor.Next(0, 1) == 0)
+                    {
+                        velocity.Y += (gravityVect.Y * deltaTime * 15);
+                    }
+                    else
+                    {
+                        velocity.Y -= (gravityVect.Y * deltaTime * 15);
+                    }
+                    projectileShape.Y = projectileShape.Y + (int)velocity.Y;
+                }
+                else
+                {
+
+                    projectileShape.Y = projectileShape.Y + (int)velocity.Y;
+                }
+
                 bulletWaitFireCounter++;
 
                 projectileShape.X -= rndSpawnX.Next(0, 15);
@@ -272,6 +306,20 @@ private bool EnergyRandomRoll(Random energyRoll)
             return result;
         }
 
+        private string projectileSizeRandomizer(Random rnd)
+        {
+            string result;
+
+            if (rnd.Next(0, 2) == 0)
+            {
+                result = "div2";
+            } else
+            {
+                result = "div3";
+            }
+
+            return result;
+        }
 
 
     }