Move classcount to constant

Fizo55 · Fizo55 · commit 85c6a6ee5302 · 2021-08-22T02:37:41.000+02:00
diff --git a/src/NosCore.Algorithm/CloseDefenceService/CloseDefenceService.cs b/src/NosCore.Algorithm/CloseDefenceService/CloseDefenceService.cs
@@ -1,11 +1,10 @@
 ﻿using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.CloseDefenceService
 {
     public class CloseDefenceService : ICloseDefenceService
     {
-        private readonly long[,] _closeDefence = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _closeDefence = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public CloseDefenceService()
         {
diff --git a/src/NosCore.Algorithm/Constants.cs b/src/NosCore.Algorithm/Constants.cs
@@ -1,10 +1,14 @@
-﻿namespace NosCore.Algorithm
+﻿using NosCore.Shared.Enumerations;
+using System;
+
+namespace NosCore.Algorithm
 {
     internal class Constants
     {
         internal const byte MaxLevel = 99;
         internal const byte MaxFairyLevel = 80;
         internal const byte MaxJobLevel = 80;
         internal const byte MaxHeroLevel = 60;
+        internal static readonly int ClassCount = Enum.GetNames(typeof(CharacterClassType)).Length;
     }
 }
diff --git a/src/NosCore.Algorithm/DamageService/DamageService.cs b/src/NosCore.Algorithm/DamageService/DamageService.cs
@@ -5,19 +5,18 @@
 // -----------------------------------
 
 using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.DamageService
 {
     public class DamageService : IDamageService
     {
-        private readonly long[,] _minDamage = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _minDamage = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public DamageService()
         {
             _minDamage[(byte)CharacterClassType.Adventurer, 0] = 10;
-            _minDamage[(byte)CharacterClassType.Swordsman, 0] = 10;
             _minDamage[(byte)CharacterClassType.Archer, 0] = 60;
+            _minDamage[(byte)CharacterClassType.Swordsman, 0] = 10;
             _minDamage[(byte)CharacterClassType.Mage, 0] = 10;
             _minDamage[(byte)CharacterClassType.MartialArtist, 0] = 10;
 
diff --git a/src/NosCore.Algorithm/DistanceDefenceService/DistanceDefenceService.cs b/src/NosCore.Algorithm/DistanceDefenceService/DistanceDefenceService.cs
@@ -1,11 +1,10 @@
 ﻿using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.DistanceDefenceService
 {
     public class DistanceDefenceService : IDistanceDefenceService
     {
-        private readonly long[,] _distanceDefence = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _distanceDefence = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public DistanceDefenceService()
         {
diff --git a/src/NosCore.Algorithm/DistanceDodgeService/DistanceDodgeService.cs b/src/NosCore.Algorithm/DistanceDodgeService/DistanceDodgeService.cs
@@ -1,11 +1,10 @@
 ﻿using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.DistanceDodgeService
 {
     public class DistanceDodgeService : IDistanceDodgeService
     {
-        private readonly long[,] _distanceDodge = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _distanceDodge = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public DistanceDodgeService()
         {
diff --git a/src/NosCore.Algorithm/DodgeService/HitDodgeService.cs b/src/NosCore.Algorithm/DodgeService/HitDodgeService.cs
@@ -1,11 +1,10 @@
 ﻿using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.HitDodgeService
 {
     public class HitDodgeService : IHitDodgeService
     {
-        private readonly long[,] _hitDodge = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _hitDodge = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public HitDodgeService()
         {
diff --git a/src/NosCore.Algorithm/HitRateService/HitRateService.cs b/src/NosCore.Algorithm/HitRateService/HitRateService.cs
@@ -5,13 +5,12 @@
 // -----------------------------------
 
 using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.HitRateService
 {
     public class HitRateService : IHitRateService
     {
-        private readonly long[,] _hitRate = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _hitRate = new long[Constants.ClassCount, Constants.MaxLevel];
         public HitRateService()
         {
             var archerHitRate = 31;
diff --git a/src/NosCore.Algorithm/HpService/HpService.cs b/src/NosCore.Algorithm/HpService/HpService.cs
@@ -11,7 +11,7 @@ namespace NosCore.Algorithm.HpService
 {
     public class HpService : IHpService
     {
-        private readonly long[,] _hpData = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _hpData = new long[Constants.ClassCount, Constants.MaxLevel];
         public readonly int[][] ClassConstants = new int[][] { new int[] { 0, 0, 0 }, new int[] { 8, 2, 0 }, new int[] { 3, 6, 1 }, new int[] { 0, 2, 8 }, new int[] { 5, 3, 2 } };
 
         public HpService()
diff --git a/src/NosCore.Algorithm/JobExperienceService/JobExperienceService.cs b/src/NosCore.Algorithm/JobExperienceService/JobExperienceService.cs
@@ -5,13 +5,12 @@
 // -----------------------------------
 
 using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.JobExperienceService
 {
     public class JobExperienceService : IJobExperienceService
     {
-        private readonly long[,] _jobXpData = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxJobLevel];
+        private readonly long[,] _jobXpData = new long[Constants.ClassCount, Constants.MaxJobLevel];
 
         public JobExperienceService()
         {
diff --git a/src/NosCore.Algorithm/MagicDefenceService/MagicDefenceService.cs b/src/NosCore.Algorithm/MagicDefenceService/MagicDefenceService.cs
@@ -1,11 +1,10 @@
 ﻿using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.MagicDefenceService
 {
     public class MagicDefenceService : IMagicDefenceService
     {
-        private readonly long[,] _magicDefence = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _magicDefence = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public MagicDefenceService()
         {
diff --git a/src/NosCore.Algorithm/MpService/MpService.cs b/src/NosCore.Algorithm/MpService/MpService.cs
@@ -5,13 +5,12 @@
 // -----------------------------------
 
 using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.MpService
 {
     public class MpService : IMpService
     {
-        private readonly long[,] _mpData = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _mpData = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public MpService()
         {
diff --git a/src/NosCore.Algorithm/SecondaryDamageService/SecondaryDamageService.cs b/src/NosCore.Algorithm/SecondaryDamageService/SecondaryDamageService.cs
@@ -11,7 +11,7 @@ namespace NosCore.Algorithm.SecondaryDamageService
 {
     public class SecondaryDamageService : ISecondaryDamageService
     {
-        private readonly long[,] _secondaryMinDamage = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _secondaryMinDamage = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public SecondaryDamageService()
         {
diff --git a/src/NosCore.Algorithm/SecondaryHitRateService/SecondaryHitRateService.cs b/src/NosCore.Algorithm/SecondaryHitRateService/SecondaryHitRateService.cs
@@ -1,11 +1,10 @@
 ﻿using NosCore.Shared.Enumerations;
-using System;
 
 namespace NosCore.Algorithm.SecondaryHitRateService
 {
     public class SecondaryHitRateService : ISecondaryHitRateService
     {
-        private readonly long[,] _secondaryHitRate = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];
+        private readonly long[,] _secondaryHitRate = new long[Constants.ClassCount, Constants.MaxLevel];
 
         public SecondaryHitRateService()
         {

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`using NosCore.Shared.Enumerations;`
`2`		`-using System;`
`3`	`2`
`4`	`3`	`namespace NosCore.Algorithm.CloseDefenceService`
`5`	`4`	`{`
`6`	`5`	`public class CloseDefenceService : ICloseDefenceService`
`7`	`6`	`{`
`8`		`- private readonly long[,] _closeDefence = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];`
	`7`	`+ private readonly long[,] _closeDefence = new long[Constants.ClassCount, Constants.MaxLevel];`
`9`	`8`
`10`	`9`	`public CloseDefenceService()`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
`1`		`-namespace NosCore.Algorithm`
	`1`	`+using NosCore.Shared.Enumerations;`
	`2`	`+using System;`
	`3`	`+`
	`4`	`+namespace NosCore.Algorithm`
`2`	`5`	`{`
`3`	`6`	`internal class Constants`
`4`	`7`	`{`
`5`	`8`	`internal const byte MaxLevel = 99;`
`6`	`9`	`internal const byte MaxFairyLevel = 80;`
`7`	`10`	`internal const byte MaxJobLevel = 80;`
`8`	`11`	`internal const byte MaxHeroLevel = 60;`
	`12`	`+ internal static readonly int ClassCount = Enum.GetNames(typeof(CharacterClassType)).Length;`
`9`	`13`	`}`
`10`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,18 @@`
`5`	`5`	`// -----------------------------------`
`6`	`6`
`7`	`7`	`using NosCore.Shared.Enumerations;`
`8`		`-using System;`
`9`	`8`
`10`	`9`	`namespace NosCore.Algorithm.DamageService`
`11`	`10`	`{`
`12`	`11`	`public class DamageService : IDamageService`
`13`	`12`	`{`
`14`		`- private readonly long[,] _minDamage = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];`
	`13`	`+ private readonly long[,] _minDamage = new long[Constants.ClassCount, Constants.MaxLevel];`
`15`	`14`
`16`	`15`	`public DamageService()`
`17`	`16`	`{`
`18`	`17`	`_minDamage[(byte)CharacterClassType.Adventurer, 0] = 10;`
`19`		`- _minDamage[(byte)CharacterClassType.Swordsman, 0] = 10;`
`20`	`18`	`_minDamage[(byte)CharacterClassType.Archer, 0] = 60;`
	`19`	`+ _minDamage[(byte)CharacterClassType.Swordsman, 0] = 10;`
`21`	`20`	`_minDamage[(byte)CharacterClassType.Mage, 0] = 10;`
`22`	`21`	`_minDamage[(byte)CharacterClassType.MartialArtist, 0] = 10;`
`23`	`22`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,12 @@`
`5`	`5`	`// -----------------------------------`
`6`	`6`
`7`	`7`	`using NosCore.Shared.Enumerations;`
`8`		`-using System;`
`9`	`8`
`10`	`9`	`namespace NosCore.Algorithm.HitRateService`
`11`	`10`	`{`
`12`	`11`	`public class HitRateService : IHitRateService`
`13`	`12`	`{`
`14`		`- private readonly long[,] _hitRate = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];`
	`13`	`+ private readonly long[,] _hitRate = new long[Constants.ClassCount, Constants.MaxLevel];`
`15`	`14`	`public HitRateService()`
`16`	`15`	`{`
`17`	`16`	`var archerHitRate = 31;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace NosCore.Algorithm.HpService`
`11`	`11`	`{`
`12`	`12`	`public class HpService : IHpService`
`13`	`13`	`{`
`14`		`- private readonly long[,] _hpData = new long[Enum.GetNames(typeof(CharacterClassType)).Length, Constants.MaxLevel];`
	`14`	`+ private readonly long[,] _hpData = new long[Constants.ClassCount, Constants.MaxLevel];`
`15`	`15`	`public readonly int[][] ClassConstants = new int[][] { new int[] { 0, 0, 0 }, new int[] { 8, 2, 0 }, new int[] { 3, 6, 1 }, new int[] { 0, 2, 8 }, new int[] { 5, 3, 2 } };`
`16`	`16`
`17`	`17`	`public HpService()`