Merge branch 'master' into JuliusesNyeSuperBranch

.gitignore

@@ -70,4 +70,5 @@ crashlytics-build.properties
 
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
-/[Aa]ssets/[Ss]treamingAssets/aa/*
\ No newline at end of file
+/[Aa]ssets/[Ss]treamingAssets/aa/*
+MrBigsock/Packages/packages-lock.json

MrBigsock/Assets/Code/Core/AttackStats.cs

@@ -96,13 +96,13 @@ namespace BigSock {
 			res.IsCalculated = true;
 
 			// Calculate damage variety.
-			var mod = (1-DamageVariance) + RND.NextDouble() * DamageVariance * 2;
-			Damage *= (float) mod;
+			var mod = (1- res.DamageVariance) + RND.NextDouble() * res.DamageVariance * 2;
+			res.Damage *= (float) mod;
 
 			// Check for crits.
-			if(RND.NextDouble() <= CritChance) {
-				Damage *= CritDamageModifier;
-				IsCrit = true;
+			if(RND.NextDouble() <= res.CritChance) {
+				res.Damage *= res.CritDamageModifier;
+				res.IsCrit = true;
 			}
 
 			return res;