Fixed waves bug, fixed raygun broken overheat and fixed rpg damage

nicorm2000 · Mar 5, 2024 · f13ef7b · f13ef7b
1 parent aa799db
commit f13ef7b
Show file tree

Hide file tree

Showing 9 changed files with 1,902 additions and 556 deletions.
diff --git a/Assets/Scenes/Level.unity b/Assets/Scenes/Level.unity
@@ -11067,6 +11067,10 @@ PrefabInstance:
       propertyPath: weaponOverheatUI
       value: 
       objectReference: {fileID: 1017782199}
+    - target: {fileID: 3823591937530358882, guid: a9df24e86a219ac458086842d36682f6, type: 3}
+      propertyPath: overheatIncreaseAmount
+      value: 15
+      objectReference: {fileID: 0}
     - target: {fileID: 3970204813613353202, guid: a9df24e86a219ac458086842d36682f6, type: 3}
       propertyPath: screenShake
       value: 

diff --git a/Assets/Scriptable Objects/Player/PlayerData.cs b/Assets/Scriptable Objects/Player/PlayerData.cs
@@ -90,7 +90,7 @@ public void ResetPlayerStacks()
         weaponData[2].damage = 15;
         weaponData[3].damage = 15;
         weaponData[4].damage = 50;
-        weaponData[5].damage = 100;
+        weaponData[5].damage = 150;
         weaponData[6].damage = 50;
     }
 

diff --git a/Assets/Scriptable Objects/Weapons/RPG.asset b/Assets/Scriptable Objects/Weapons/RPG.asset
@@ -22,7 +22,7 @@ MonoBehaviour:
   weaponID: 5
   bulletSpeed: 10
   lifespan: 3
-  damage: 100
+  damage: 150
   bulletPrefab: {fileID: 7942789937546522980, guid: a6f12fb2264106246bd48190cbe3ed3f, type: 3}
   attackSpeed: 1
   multipleShoots: 0

diff --git a/Assets/Scriptable Objects/Weapons/Uzi.asset b/Assets/Scriptable Objects/Weapons/Uzi.asset
@@ -22,7 +22,7 @@ MonoBehaviour:
   weaponID: 0
   bulletSpeed: 20
   lifespan: 3
-  damage: 15
+  damage: 200
   bulletPrefab: {fileID: 7942789937546522980, guid: f0dd38f37e49c7849ad18429ca7bb8d9, type: 3}
   attackSpeed: 12.5
   multipleShoots: 0
@@ -74,3 +74,4 @@ MonoBehaviour:
   empty: EmptyUzi
   loaded: ShootUzi
   cooldown: CooldownUzi
+  explosion: 
diff --git a/Assets/Scripts/Waves/WaveManager.cs b/Assets/Scripts/Waves/WaveManager.cs
@@ -66,6 +66,7 @@ public class WaveManager : MonoBehaviour
     private bool _canSpawn = true;
     private bool _nextWave = false;
     private bool _finishedWaves = false;
+    private bool _popUpActive = false;
 
     private void OnValidate()
     {
@@ -101,6 +102,7 @@ private void Start()
     {
         ResetWaves();
         ResetEnemiesValues();
+        currentWaveIndex = 3;
         waveUI.ShowWaveText(waves[currentWaveIndex].waveIndex);
     }
 
@@ -125,7 +127,14 @@ private void Update()
         {
             if (waves[currentWaveIndex].waveIndex == _maxWaves - Constants.ONE && !iAmInShop)
             {
-                ActivateShop();
+                if (!_popUpActive)
+                {
+                    if (!AudioManager.muteSFX)
+                    {
+                        audioManager.PlaySound(waveBegins);
+                    }
+                    ActivateShop();
+                }
                 return;
             }
 
@@ -163,11 +172,6 @@ private void WaveUpdater()
     {
         if (currentWaveIndex + Constants.ONE != waves.Length && !playerData._isDead)
         {
-            if (!AudioManager.muteSFX)
-            {
-                audioManager.PlaySound(waveBegins);
-            }
-
             SpawnNextWave();
         }
         else
@@ -196,8 +200,16 @@ private void SpawnNextWave()
     {
         abilities.DestroySlowers();
         currentWaveIndex++;
-        shop.ActivatePopUp();
+        if (waves[currentWaveIndex].waveIndex != _maxWaves - Constants.ONE - Constants.ROUNDS_BETWEEN_SHOPS && !_popUpActive)
+        {
+            if (!AudioManager.muteSFX)
+            {
+                audioManager.PlaySound(waveBegins);
+            }
+            shop.ActivatePopUp();
+        }
         StartCoroutine(waveUI.ShowWaveUI(waves[currentWaveIndex].waveIndex));
+        _popUpActive = false;
         _canSpawn = true;
     }
 
@@ -235,10 +247,12 @@ private IEnumerator SpawnWaveCoroutine()
     /// </summary>
     private void ActivateShop()
     {
+        shop.ActivatePopUp();
         basket.SetActive(true);
         door.SetActive(true);
         baoBasketIndicator.SetActive(true);
 
+        _popUpActive = true;
         StartCoroutine(WaitForBasketToFall());
     }
 

diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
@@ -24,7 +24,7 @@ MonoBehaviour:
     ParentPath: Virtual Acoustics\Default Work Unit
     guid: 4223a3686c4109478e7ed29528df1d47
     GuidInternal: 
-    m_lastTime: -8585009928231844858
+    m_lastTime: -8585034087828136112
     List: []
   AuxBusWwu:
   - PhysicalPath: Master-Mixer Hierarchy\Default Work Unit.wwu
@@ -38,7 +38,7 @@ MonoBehaviour:
     ParentPath: Master-Mixer Hierarchy\Default Work Unit
     guid: 575a9845c542444394dfd29888a832bf
     GuidInternal: 
-    m_lastTime: -8585009928237854745
+    m_lastTime: -8585034087829703651
     List:
     - name: Master Audio Bus
       guid: d8a41415a61d2a41a17e75ca0c2149f3
@@ -66,7 +66,7 @@ MonoBehaviour:
     ParentPath: SoundBanks\Default Work Unit
     guid: 30beb28910178f449ebdc0bc6c1a585e
     GuidInternal: 
-    m_lastTime: -8585009928231864794
+    m_lastTime: -8585011844418850727
     List:
     - name: main
       guid: 65504061b930a547a54895fa61c9e604
@@ -94,7 +94,7 @@ MonoBehaviour:
     ParentPath: Events\Default Work Unit
     guid: 3af410611e2c92469af731b5137fe77a
     GuidInternal: 
-    m_lastTime: -8584921011380583309
+    m_lastTime: -8584921816734801244
     List:
     - name: BaoMumbling
       guid: 60681b47a562a94592542c31c0dcc178
@@ -1230,7 +1230,7 @@ MonoBehaviour:
     ParentPath: Game Parameters\Default Work Unit
     guid: e9be0c57c704234199bd1346d9c03688
     GuidInternal: 
-    m_lastTime: -8585009928240697791
+    m_lastTime: -8585034087829167692
     List: []
   StateWwu:
   - PhysicalPath: States\Default Work Unit.wwu
@@ -1244,7 +1244,7 @@ MonoBehaviour:
     ParentPath: States\Default Work Unit
     guid: 3591ab73d9acd6499536a6e724806059
     GuidInternal: 
-    m_lastTime: -8585009928231854829
+    m_lastTime: -8585034087828676102
     List: []
   SwitchWwu:
   - PhysicalPath: Switches\Default Work Unit.wwu
@@ -1258,7 +1258,7 @@ MonoBehaviour:
     ParentPath: Switches\Default Work Unit
     guid: 5740de960ece4f4f8122a79587657419
     GuidInternal: 
-    m_lastTime: -8585009928231854829
+    m_lastTime: -8585012469004588718
     List:
     - name: Weapons
       guid: 9fa804b76132a4498c0dbd29ca1d48cf
@@ -1388,10 +1388,10 @@ MonoBehaviour:
     ParentPath: Triggers\Default Work Unit
     guid: 7c1c60d25133b4489627899fa0359356
     GuidInternal: 
-    m_lastTime: -8585009928231854829
+    m_lastTime: -8585034087828296152
     List: []
   ExpandedFileSystemItemIds: 
-  ExpandedWaapiItemIds: 
+  ExpandedWaapiItemIds: 0500000006000000
   AutoSyncSelection: 0
   autoPopulateEnabled: 1
   currentDataSource: 0

diff --git a/Project S_WwiseProject/Project S_WwiseProject.Nico.validationcache b/Project S_WwiseProject/Project S_WwiseProject.Nico.validationcache
@@ -36,7 +36,7 @@
 	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Queries\Factory Queries.wwu" DateLow="1698196500" DateHigh="0"/>
 	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Queries\Default Work Unit.wwu" DateLow="1698198102" DateHigh="0"/>
 	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Project S_WwiseProject.wproj" DateLow="1698198174" DateHigh="0"/>
-	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Project S_WwiseProject.Nico.wsettings" DateLow="1709430580" DateHigh="0"/>
+	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Project S_WwiseProject.Nico.wsettings" DateLow="1709493352" DateHigh="0"/>
 	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Presets\Factory Spatial Audio.wwu" DateLow="1698196500" DateHigh="0"/>
 	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Presets\Default Work Unit.wwu" DateLow="1698198102" DateHigh="0"/>
 	<ValidationCacheItem File="C:\Users\Nico\Desktop\Project S\Project S_WwiseProject\Modulators\Default Work Unit.wwu" DateLow="1698198102" DateHigh="0"/>