From c9d3fd68805f5b8de329198e6817a7e2ec190a64 Mon Sep 17 00:00:00 2001
From: Ny Bruker <robinhs@stud.ntnu.no>
Date: Thu, 20 Oct 2022 09:53:08 +0200
Subject: [PATCH] Replaced the Inventory skill with Concentration.

---
 MrBigsock/Assets/Code/Core/Skills/Skills.cs | 17 ++++++++---------
 MrBigsock/Assets/Code/PlayerController.cs   |  9 +++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/MrBigsock/Assets/Code/Core/Skills/Skills.cs b/MrBigsock/Assets/Code/Core/Skills/Skills.cs
index 6ef9fc52..297ac20c 100644
--- a/MrBigsock/Assets/Code/Core/Skills/Skills.cs
+++ b/MrBigsock/Assets/Code/Core/Skills/Skills.cs
@@ -18,7 +18,7 @@ namespace BigSock {
 		public int Damage { get; set; }
 		public int Speed { get; set; }
 		public int Luck { get; set; }
-		public int Inventory { get; set; }
+		public int Concentration { get; set; }
 	}
 
 
@@ -32,7 +32,7 @@ namespace BigSock {
 		Damage,
 		Speed,
 		Luck,
-		Inventory,
+		Concentration,
 	}
 
 	/*
@@ -49,8 +49,8 @@ namespace BigSock {
 			a.MP += b.MP;
 			a.Damage += b.Damage;
 			a.Speed += b.Speed;
-			//a.Luck += b.Luck;
-			//a.Inventory += b.Inventory;
+			a.Luck += b.Luck;
+			a.Concentration += b.Concentration;
 			return a;
 		}
 
@@ -74,20 +74,19 @@ namespace BigSock {
 				case Skill.Damage:
 					stats.Damage             += amount * increase.Damage;
 					stats.Knockback          += amount * increase.Knockback;
-					stats.Range              += amount * increase.Range;
 					break;
 				case Skill.Speed:
 					stats.MoveSpeed          += amount * increase.MoveSpeed;
 					stats.AttackSpeed        += amount * increase.AttackSpeed;
-					stats.ProjectileSpeed    += amount * increase.ProjectileSpeed;
 					break;
 				case Skill.Luck:
 					stats.CritChance         += amount * increase.CritChance;
 					stats.CritDamageModifier += amount * increase.CritDamageModifier;
 					break;
-				case Skill.Inventory:
-					// Special code, must adjust inventory based on what level it increased to.
-					// Might be problematic with increase & shrink.
+				case Skill.Concentration:
+					stats.Range              += amount * increase.Range;
+					stats.ProjectileSpeed    += amount * increase.ProjectileSpeed;
+					//- Add accuracy skill
 					break;
 				default:
 					throw new NotImplementedException();
diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs
index 15c7d2c6..d85f1bc8 100644
--- a/MrBigsock/Assets/Code/PlayerController.cs
+++ b/MrBigsock/Assets/Code/PlayerController.cs
@@ -272,15 +272,16 @@ namespace BigSock {
 			// Damage
 			Damage = 0.1f,
 			Knockback = 0.1f,
-			Range = 0.1f,
 			// Speed
 			MoveSpeed = 0.1f,
 			AttackSpeed = 0.1f,
-			ProjectileSpeed = 0.1f,
-			// Luck?
+			// Luck
 			CritChance = 0.05f,
 			CritDamageModifier = 0.1f,
-			// Inventory?
+			// Concentration
+			Range = 0.1f,
+			ProjectileSpeed = 0.1f,
+			//-- Accuracy
 		};
 
 
-- 
GitLab