Merge branch 'betaMain' into 'main'

merge beta main into main

See merge request haavarfj/project-sprint!82

Assets/Prefabs/DungeonGen/menufloor.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: menufloor
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _NORMALMAP
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: 127813e9f5bc43f488b3fdaa5578cf4f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 13, y: 13}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 2, y: 10}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 57816ddfe701e81459f8cae027a016ad, type: 3}
+        m_Scale: {x: 2, y: 10}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.0237
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/Prefabs/DungeonGen/menufloor.mat.meta

+fileFormatVersion: 2
+guid: 8fe7e940d2bed6d4e98fd38c1cae7f07
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Monsters/Muddy.prefab

@@ -120,9 +120,9 @@ MonoBehaviour:
   hitboxShape: 0
   attackHitboxRadius: 2
   attackBoxSize: {x: 0.2, y: 0.2}
-  meleeDamage: 10
+  meleeDamage: 30
   hasRushAttack: 1
-  rushSpeedBonus: 1.2
+  rushSpeedBonus: 1.5
   stunnedByDamage: 1
   hitStunTime: 0.3
   hasWeaponPivot: 0

Assets/Prefabs/Projectiles/DemonGoo.prefab

@@ -102,24 +102,24 @@ TrailRenderer:
       m_RotationOrder: 4
     colorGradient:
       serializedVersion: 2
-      key0: {r: 0.20677266, g: 0.7264151, b: 0.1946244, a: 1}
-      key1: {r: 0.57086176, g: 1, b: 0.5226415, a: 1}
+      key0: {r: 0.86274517, g: 0, b: 0.27058825, a: 1}
+      key1: {r: 0.8117648, g: 0.53333336, b: 1, a: 1}
       key2: {r: 0.78559345, g: 0.9433962, b: 0.31505868, a: 1}
-      key3: {r: 0.4660377, g: 1, b: 0.54310447, a: 0}
+      key3: {r: 0.78559345, g: 0.9433962, b: 0.31505868, a: 0}
       key4: {r: 0, g: 0, b: 0, a: 0}
       key5: {r: 0, g: 0, b: 0, a: 0}
       key6: {r: 0, g: 0, b: 0, a: 0}
       key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 10023
-      ctime1: 31418
+      ctime0: 0
+      ctime1: 51464
       ctime2: 39514
-      ctime3: 48573
+      ctime3: 39514
       ctime4: 0
       ctime5: 0
       ctime6: 0
       ctime7: 0
-      atime0: 23130
-      atime1: 57054
+      atime0: 0
+      atime1: 65535
       atime2: 65535
       atime3: 0
       atime4: 0
@@ -127,8 +127,8 @@ TrailRenderer:
       atime6: 0
       atime7: 0
       m_Mode: 0
-      m_NumColorKeys: 4
-      m_NumAlphaKeys: 3
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
     numCornerVertices: 0
     numCapVertices: 0
     alignment: 0

Assets/Scenes/EnemyAi.unity

@@ -142,6 +142,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: GolemBoss
       objectReference: {fileID: 0}
+    - target: {fileID: 3061790757463449505, guid: 68691832d39297e41ba73685f8d6076c, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3061790757463449518, guid: 68691832d39297e41ba73685f8d6076c, type: 3}
       propertyPath: m_RootOrder
       value: 9
@@ -560,6 +564,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43c5c1f37aff7b4c8b801964c10dcaf, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  RespawnTimer: 3
   player: {fileID: 1855907569}
 --- !u!4 &1149577419
 Transform:
@@ -605,10 +610,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d601b2b5c2c518845920874dd962a135, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  difficulty: 0
   isTest: 1
   DungeonGen: {fileID: 0}
   PlayerManager: {fileID: 0}
   masterVolume: 1
+  fxVolume: 1
+  musicVolume: 1
+  footstepVolume: 1
 --- !u!4 &1165663897
 Transform:
   m_ObjectHideFlags: 0
@@ -48655,6 +48664,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 28ee171456ec78e42bbc35660d51adcd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  boss: {fileID: 0}
 --- !u!23 &8734477332002887386
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/Scenes/MVP.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -790,6 +790,8 @@ MonoBehaviour:
   - {fileID: 8300000, guid: 428d897e82920354b9323f76ccafd8a4, type: 3}
   - {fileID: 8300000, guid: fba79c9b9f396604eb011d764e1f009c, type: 3}
   - {fileID: 8300000, guid: 3b2da081707f82a4c84a64dac1a590c2, type: 3}
+  - {fileID: 8300000, guid: f147823cc33457740847f4a33272d37b, type: 3}
+  - {fileID: 8300000, guid: bfc8d298e70e5594ca3b82a2419f9b02, type: 3}
   HighPriestClips:
   - {fileID: 8300000, guid: 3b2da081707f82a4c84a64dac1a590c2, type: 3}
   ChaseClips:
@@ -908,8 +910,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isTest: 0
-  DungeonGen: {fileID: 0}
-  PlayerManager: {fileID: 0}
   difficulty: 1
 --- !u!1 &981693709
 GameObject:

Assets/Scriptable Objects/Inventory/Generators/Scipts/Weapon Generators/LeapingCutGen.cs

@@ -17,6 +17,7 @@ public class LeapingCutGen : ThrowingUltGen
         int rand = Random.Range(0, 10);
         int cooldown;
         float leapspeed;
+        int damage = 5;
         if (rand < ((int)rarity))
         {
             name = "Jump'n'slice";
@@ -48,6 +49,7 @@ public class LeapingCutGen : ThrowingUltGen
             icon,
             circleVFX,
             color,
+            damage,
             0.3f,
             cooldown,
             leapspeed

Assets/Scriptable Objects/Inventory/Generators/Scipts/Weapon Generators/WhirlingBladesGen.cs

@@ -7,6 +7,8 @@ public class WhirlingBladesGen : ThrowingUltGen
 {
     [SerializeField] private Sprite icon;
     [SerializeField] private GameObject circleVFX;
+
+   
     public override ThrowingUltimate Generate(ItemRarity rarity, out string prefix)
     {
         WhirlingBlades blades = CreateInstance(nameof(WhirlingBlades)) as WhirlingBlades;
@@ -16,6 +18,7 @@ public class WhirlingBladesGen : ThrowingUltGen
         int activeTime;
         int radius = Random.Range(5, 12);
         Color color;
+        int damage;
         if (rand < ((int)rarity))
         {
             name = "Spinning Blades";
@@ -23,6 +26,7 @@ public class WhirlingBladesGen : ThrowingUltGen
             cooldown = Random.Range(30, 40);
             activeTime = Random.Range(3, 6);
             color = Color.blue;
+            damage = Random.Range(5, 11);
         }
         else if (rand < ((int)rarity)+2)
         {
@@ -31,6 +35,7 @@ public class WhirlingBladesGen : ThrowingUltGen
             cooldown = Random.Range(20, 30);
             activeTime = Random.Range(2, 4);
             color = Color.red;
+            damage = Random.Range(5, 11);
         }
         else
         {
@@ -38,9 +43,10 @@ public class WhirlingBladesGen : ThrowingUltGen
             prefix = "";
             cooldown = Random.Range(25, 35);
             activeTime = Random.Range(2, 5);
+            damage = Random.Range(5, 11);
             color = Color.cyan;
         }
-        blades.SetInstance(name, icon, cooldown, circleVFX, color, activeTime, radius);
+        blades.SetInstance(name, icon, cooldown, circleVFX, color, damage, activeTime, radius);
         return blades;
     }
 

Assets/Scriptable Objects/Inventory/Objects/Abilities/weapon/throwing/Vampire Blades.asset

@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   name: Vampire Blades
   sprite: {fileID: -4303733957676302675, guid: 2ece47a4be90da4479e789050600b7b1, type: 3}
-  cooldown: 4
+  cooldown: 5
   duration: 0
   description: 
   projectilePrefab: {fileID: 2521325373936790857, guid: 777476cc630ea674683fbfa980ff63e1, type: 3}

Assets/Scriptable Objects/Inventory/Objects/Abilities/weapon/throwing/Vampire Knives.asset

@@ -14,15 +14,15 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   name: Vampire Knives
   sprite: {fileID: -4303733957676302675, guid: 2ece47a4be90da4479e789050600b7b1, type: 3}
-  cooldown: 2
+  cooldown: 4
   duration: 0
   description: 
   projectilePrefab: {fileID: 2521325373936790857, guid: 777476cc630ea674683fbfa980ff63e1, type: 3}
-  damageFactor: 0.8
-  projectileSizeFactor: 0.6
+  damageFactor: 1.5
+  projectileSizeFactor: 0.8
   spin: 0
   projectileSpeedBonus: 1
-  numberOfProjectiles: 5
-  spread: 5
+  numberOfProjectiles: 10
+  spread: 2.5
   lifeSteal: 1
   onHitDebuffs: []

Assets/Scriptable Objects/Inventory/Objects/Items/Weapons/Starting Sword.prefab → Assets/Scriptable Objects/Inventory/Objects/Items/Weapons/Rusty Blade.prefab

@@ -175,7 +175,7 @@ GameObject:
   - component: {fileID: 2865182372117990927}
   - component: {fileID: 8152451937638955535}
   m_Layer: 7
-  m_Name: Starting Sword
+  m_Name: Rusty Blade
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -211,7 +211,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   sprite: {fileID: 21300000, guid: 87e950d7d53ebdd45812d973e5326b95, type: 3}
   type: 1
-  description: 
+  description: Better than nothing...
   equipmentType: 1
   ability: {fileID: 0}
   enemyMask:
@@ -220,7 +220,7 @@ MonoBehaviour:
   attackDamage: 4
   critChance: 0.2
   critDamage: 2
-  attackCooldown: 0.4
+  attackCooldown: 0.2
   _size: 1
   special: {fileID: 0}
   _special: {fileID: 0}

Assets/Scriptable Objects/Inventory/Objects/Items/Weapons/Throwing/Battle Axe.prefab

@@ -217,7 +217,9 @@ MonoBehaviour:
   enemyMask:
     serializedVersion: 2
     m_Bits: 256
-  attackDamage: 4
+  attackDamage: 5
+  critChance: 0.2
+  critDamage: 2
   attackCooldown: 0.6
   _size: 1
   special: {fileID: 11400000, guid: 033793eb9f28fb84b96dea3ad357b8cc, type: 2}

Assets/Scriptable Objects/Inventory/Objects/Items/Weapons/Throwing/Throwing Knife.prefab

@@ -218,12 +218,14 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 256
   attackDamage: 2
-  attackCooldown: 0.15
+  critChance: 0.2
+  critDamage: 2
+  attackCooldown: 0.1
   _size: 1
   special: {fileID: 11400000, guid: e1fb18143da31d9458be2de916372d31, type: 2}
   _special: {fileID: 11400000, guid: e1fb18143da31d9458be2de916372d31, type: 2}
   _ultimate: {fileID: 0}
-  chargeTime: 0.15
+  chargeTime: 0.2
   projPrefab: {fileID: 2521325373936790857, guid: 36b01286ae5709e4ebbea631bd18e1b0, type: 3}
   doesReturn: 0
   dmgTargetsOnlyOnce: 0

Assets/Scriptable Objects/Inventory/Scripts/Ability Scripts/abilities/throwing/special/LeapingCut.cs

@@ -11,15 +11,14 @@ public class LeapingCut : ThrowingUltimate
     [SerializeField] private float _activeTime;
     [SerializeField, Range(1, 10)] private float leapSpeed;
     [SerializeField] private GameObject circleVFX;
-
+    [SerializeField] private int damage;
 
     Dictionary<Transform, KeyValuePair<Vector3, Factors>> casters;
 
     private void OnValidate()
     {
         duration = _activeTime;
-        description = "Leap to your mouse position, and summon whirling blades around you when you land, which deals your weapons damage 4 times " +
-            "during 1 second.";
+        this.description = "Leap to your mouse position, and summon whirling blades around you when you land, which deals " + damage + " damage 4 times per second.";
     }
     public override void CastAbility(Transform caster, Factors factors, Vector3 direction, Vector3 position, out float repeatRate, out bool stop)
     {
@@ -58,16 +57,16 @@ public class LeapingCut : ThrowingUltimate
             circleVFX,
             factors.projectile.transform.GetComponentInChildren<SpriteRenderer>().sprite,
             factors.projectileSize,
-            10,
+            8,
             1,
-            (int)factors.damage,
+            damage,
             0.25f,
             factors.targets);
 
         casters.Remove(caster);
     }
 
-    public void SetInstance(string name, Sprite icon, GameObject circleVFX, Color color, float activeTime, int cooldown, float leapSpeed = 5)
+    public void SetInstance(string name, Sprite icon, GameObject circleVFX, Color color, int damage, float activeTime, int cooldown, float leapSpeed = 5)
     {
         this.sprite = icon;
         this.circleVFX = circleVFX;
@@ -77,7 +76,8 @@ public class LeapingCut : ThrowingUltimate
         this.leapSpeed = leapSpeed;
         this.cooldown = cooldown;
         this.name = name;
-        this.description = "Leap to your mouse position, and when you land, deal your weapons damage 4 times during 1 second.";
+        this.damage = damage;
+        this.description = "Leap to your mouse position, and summon whirling blades around you when you land, which deals " + damage + " damage 4 times per second.";
     }
 
 

Assets/Scriptable Objects/Inventory/Scripts/Ability Scripts/abilities/throwing/ultimate/WhirlingBlades.cs

@@ -7,17 +7,19 @@ public class WhirlingBlades : ThrowingUltimate
 {
 
     [SerializeField] private GameObject circleVFX; // The circle effect that will be spawned
-    [SerializeField, Range(1,8)] private float _activeTime; 
+    [SerializeField, Range(1, 8)] private float _activeTime;
     [SerializeField] private float radius;
     private readonly float damageRate = 0.5f;
 
+    [SerializeField] private int damage = 1;
+
     private void OnValidate()
     {
         name = "Whirling Blades";
         duration = _activeTime;
         //damageRate = 0.5f;
 
-        description = "Whirl your blades around you in a circle with radius " + radius + ". Enemies inside take damage equal to your weapon's damage" +
+        description = "Whirl your blades around you in a circle with radius " + radius + ". Enemies inside take " + damage+" damage "+
             "twice per second. Lasts for " + duration + " seconds";
     }
   
@@ -26,8 +28,6 @@ public class WhirlingBlades : ThrowingUltimate
     {
         GameObject bladesGO = new GameObject("Whirling Blades");
         bladesGO.transform.position = caster.position - new Vector3(0, 0.2f,0);
-        int damage = (int)(factors.damage);
-        if (damage <= 0) damage = 1;
 
         CirclingBlades circl = bladesGO.AddComponent<CirclingBlades>();
         circl.Set(
@@ -54,10 +54,12 @@ public class WhirlingBlades : ThrowingUltimate
         int cooldown,
         GameObject circleVFX,
         Color color,
+        int damage,
         float activeTime,
         float radius
         )
     {
+        this.damage = damage;
         this.sprite = icon;
         this.name = name;
         this.cooldown = cooldown;
@@ -66,8 +68,8 @@ public class WhirlingBlades : ThrowingUltimate
         this._activeTime = activeTime;
         this.duration = this._activeTime;
         this.radius = radius;
-        description = "Whirl your blades around you in a circle with radius " + this.radius + ". Enemies inside take damage equal to your weapon's damage" +
-            "twice per second. Lasts for " + this.duration + " seconds";
+        description = "Whirl your blades around you in a circle with radius " + radius + ". Enemies inside take " + damage + " damage " +
+           "twice per second. Lasts for " + duration + " seconds";
     }
 }
 

Assets/Scripts/Audio/MenuMusic.cs

+using UnityEngine;
+
+public class MenuMusic : AdjustableAudio
+{
+    
+    [SerializeField] AudioClip[] musicClips;
+    [SerializeField] private float minVolume = 0.03f;
+
+
+    private void Awake()
+    {
+        if (audioSrc == null) audioSrc = GetComponent<AudioSource>();
+
+        Settings.volumeChangedEvent += AdjustVolume;
+        audioSrc.volume = Settings.masterVolume * Settings.musicVolume;
+        CheckToPlayMusic();
+    }
+
+    private void FixedUpdate()
+    {
+        CheckToPlayMusic();
+    }
+
+    private void CheckToPlayMusic()
+    {
+        if (!audioSrc.isPlaying && (Settings.masterVolume != 0 || Settings.musicVolume != 0 || Settings.masterVolume * Settings.musicVolume > minVolume))
+        {
+            audioSrc.clip = musicClips[Random.Range(0, musicClips.Length)];
+            audioSrc.Play();
+        }
+    }
+
+    private void OnDestroy()
+    {
+        Settings.volumeChangedEvent -= AdjustVolume;
+    }
+
+    protected override void AdjustVolume()
+    {
+        audioSrc.volume = Settings.masterVolume * Settings.musicVolume;
+        if (audioSrc.volume < minVolume)
+            audioSrc.Stop(); // It is so low that we can probably just stop it entirerly
+    }
+
+    
+
+}

Assets/Scripts/Audio/MenuMusic.cs.meta

+fileFormatVersion: 2
+guid: b1e32ab0099a74d4082e2992b09bfc0a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: