Merge branch 'main' of https://github.com/HansenDJ/CSE210-06_Final-Pr…

…oject
HansenDJ · Apr 4, 2022 · 0ba6d99 · 0ba6d99
2 parents 455b2c6 + 0d57f24
commit 0ba6d99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Game/Director.cs b/Game/Director.cs
@@ -72,6 +72,7 @@ public void StartGame()
 
     private static DateTime CheckIfDied(Timer timer, DateTime startTime, BackgroundService bg, SpawnDestory sp, Coin coin)
     {
+
         if (!PlayerStats.PlayerDeadCheck())
         {
 

diff --git a/Game/Services/difficultyHandler.cs b/Game/Services/difficultyHandler.cs
@@ -8,7 +8,7 @@ public static class DifficultyHandler
     public static int previousLevel = 1;
     public static bool levelChange;
 
-    public static int maxEnemies = 35;
+    public static int maxEnemies = 50;
     //public static bool newAudio = true;
 
 

diff --git a/Game/SpawnDestroy.cs b/Game/SpawnDestroy.cs
@@ -405,7 +405,7 @@ public void SpawnWeapon(int weaponType, int custom = 1,int customX = 0,int custo
                 // Load the weapon laser image when weapon purchased
                 _weaponSwitcher.SetCharTexture(ImageService.laser11Texture);
                 playerWeaponList.Add(_weaponSwitcher);
-                _weaponSwitcher.strength = 7;
+                _weaponSwitcher.strength = 10;
                 maxReloadTime = 400;
 
                 break;
@@ -414,7 +414,7 @@ public void SpawnWeapon(int weaponType, int custom = 1,int customX = 0,int custo
                 // Load the weapon laser image when weapon purchased
                 _weaponSwitcher.SetCharTexture(ImageService.laser10Texture);
                 playerWeaponList.Add(_weaponSwitcher);
-                _weaponSwitcher.strength = 12;
+                _weaponSwitcher.strength = 15;
                 maxReloadTime = 400;
                 break;
             case 3:
@@ -474,9 +474,10 @@ public void SpawnWeapon(int weaponType, int custom = 1,int customX = 0,int custo
                 maxReloadTime = 70;
                 break;
             case 10:
-                AudioService.PlayAudio(AudioService.playershot9);
+
                 // Load the weapon laser image when weapon purchased
                 _weaponSwitcher.SetCharTexture(ImageService.coinCounterTexture);
+                AudioService.PlayAudio(AudioService.playershot9);
                 playerWeaponList.Add(_weaponSwitcher);
                 _weaponSwitcher.strength = 100;
                 maxReloadTime = 100;
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ public void StartGame() @@
         private static DateTime CheckIfDied(Timer timer, DateTime startTime, BackgroundService bg, SpawnDestory sp, Coin coin)
         {
             if (!PlayerStats.PlayerDeadCheck())
             {
@@ Expand Down @@