Merge remote-tracking branch 'origin/main'

HansenDJ · Apr 4, 2022 · d03dd31 · d03dd31
2 parents 4afff41 + 5c96fba
commit d03dd31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Game/Director.cs b/Game/Director.cs
@@ -55,7 +55,7 @@ public void StartGame()
             TimeService(startTime, sp);
             // if (action)
             LevelChangeCheck(bg);
-            Powerup.ReduceEffectTime();
+            Powerup.ReduceEffectTime(player);
 
             TimerCheckLagandDraw(timer, player, sp, bg, coin);
         }

diff --git a/Game/Player.cs b/Game/Player.cs
@@ -15,8 +15,8 @@ public class Player : Character
     public static int moveIncrementL;
     public static int moveIncrementR;
     private readonly int playerXRange = VideoService.scrnWidth - VideoService.scrnWidth / 5;
-    public int offsetH = 14;
     public int offsetW = 18;
+    public int offsetH = 14;
 
 
     // SETS player constants

diff --git a/Game/Powerup.cs b/Game/Powerup.cs
@@ -23,7 +23,7 @@ public static void SetEffectTime(double time)
         effectTime = time;
     }
 
-    public static void ReduceEffectTime()
+    public static void ReduceEffectTime(Player player)
     {
         effectTime = endTime - Director.secondsPassed;
         if (effectTime <= 0)
@@ -34,8 +34,10 @@ public static void ReduceEffectTime()
             isExplosiveShot = false;
             isShielded = false;
             isCoins = false;
-            // Player.offsetW = 30;
-            // Player.offsetH = 10;
+            player.offsetW = 18;
+            player.offsetH = 14;
+            player.SetOffsetColliderWidth(player.offsetW);
+            player.SetOffsetColliderHeight(player.offsetH);
         }
     }
     public static void IsHealthHit2Effect()