Merge pull request #852 from pacampbell/fix_emblem_errors

refactor: Cleanup some emblem settings

Author: pacampbell

Arrowgene.Ddon.GameServer/Characters/JobEmblemManager.cs

@@ -114,19 +114,19 @@ public float GetInheritanceChance(Item item, List<CDataItemAmount> payments)
             return (float)chance / 100.0f;
         }
 
-        public ushort MaxEmblemPoints(ushort emblemLevel)
+        public ushort MaxEmblemPointsForLevel(JobEmblem jobEmblem)
         {
-            return (ushort) Server.GameSettings.EmblemSettings.LevelingData.Where(x => x.Level <= emblemLevel).Sum(x => x.EP);
+            return (ushort)Server.GameSettings.EmblemSettings.LevelingData.Where(x => x.Level <= jobEmblem.EmblemLevel).Sum(x => x.EP);
         }
 
-        public ushort MaxEmblemPoints(JobEmblem jobEmblem)
+        public ushort GetAvailableEmblemPoints(JobEmblem jobEmblem)
         {
-            return MaxEmblemPoints(jobEmblem.EmblemLevel);
+            return (ushort)(MaxEmblemPointsForLevel(jobEmblem) - jobEmblem.EmblemPointsUsed);
         }
 
-        public ushort GetAvailableEmblemPoints(JobEmblem jobEmblem)
+        public ushort GetMaxTotalEmblemPoints()
         {
-            return (ushort)(MaxEmblemPoints(jobEmblem) - jobEmblem.EmblemPointsUsed);
+            return (ushort) Server.GameSettings.EmblemSettings.LevelingData.Where(x => x.Level <= Server.GameSettings.EmblemSettings.MaxEmblemLevel).Sum(x => x.EP);
         }
 
         public uint LevelUpPPCost(byte emblemLevel)

Arrowgene.Ddon.GameServer/Handler/JobEmblemGetEmblemListHandler.cs

@@ -37,7 +37,7 @@ public override S2CJobEmblemGetEmblemListRes Handle(GameClient client, C2SJobEmb
                     {
                         JobId = jobId,
                         Amount = Server.JobEmblemManager.GetAvailableEmblemPoints(emblemData),
-                        MaxAmount = Server.JobEmblemManager.MaxEmblemPoints(emblemData),
+                        MaxAmount = Server.JobEmblemManager.MaxEmblemPointsForLevel(emblemData),
                     });
                 }
             }
@@ -110,7 +110,7 @@ public override S2CJobEmblemGetEmblemListRes Handle(GameClient client, C2SJobEmb
                 Amount = Server.GameSettings.EmblemSettings.EmblemInheritanceEquipLossGGCost
             });
 
-            result.EmblemSettings.MaxEmblemPoints = Server.GameSettings.EmblemSettings.MaxEmblemPoints;
+            result.EmblemSettings.MaxEmblemPoints = Server.JobEmblemManager.GetMaxTotalEmblemPoints();
             result.EmblemSettings.MaxEmblemLevel = Server.GameSettings.EmblemSettings.MaxEmblemLevel;
             result.EmblemSettings.MaxInhertienceChanceIncrease = Server.GameSettings.EmblemSettings.MaxInheritanceChanceIncrease;
 

Arrowgene.Ddon.GameServer/Handler/JobEmblemResetParamLevelHandler.cs

@@ -77,7 +77,7 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemResetParamLeve
                 {
                     JobId = JobId.Fighter,
                     Amount = Server.JobEmblemManager.GetAvailableEmblemPoints(emblemData),
-                    MaxAmount = Server.JobEmblemManager.MaxEmblemPoints(emblemData)
+                    MaxAmount = Server.JobEmblemManager.MaxEmblemPointsForLevel(emblemData)
                 }
             }, packets);
 

Arrowgene.Ddon.GameServer/Handler/JobEmblemUpdateLevelHandler.cs

@@ -36,7 +36,7 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemUpdateLevelReq
                 {
                     JobId = request.JobId,
                     Amount = Server.JobEmblemManager.GetAvailableEmblemPoints(emblemData),
-                    MaxAmount = Server.JobEmblemManager.MaxEmblemPoints(emblemData)
+                    MaxAmount = Server.JobEmblemManager.MaxEmblemPointsForLevel(emblemData)
                 },
             }, packets);
 

Arrowgene.Ddon.GameServer/Handler/JobEmblemUpdateParamLevel.cs

@@ -65,7 +65,7 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemUpdateParamLev
                 {
                     JobId = JobId.Fighter,
                     Amount = Server.JobEmblemManager.GetAvailableEmblemPoints(emblemData),
-                    MaxAmount = Server.JobEmblemManager.MaxEmblemPoints(emblemData)
+                    MaxAmount = Server.JobEmblemManager.MaxEmblemPointsForLevel(emblemData)
                 }
             }, packets);
 

Arrowgene.Ddon.Server/Settings/EmblemSettings.cs

@@ -36,23 +36,6 @@ public byte MaxEmblemLevel
         }
         private const byte _MaxEmblemLevel = 120;
 
-        /// <summary>
-        /// Defines the maximum number of emblem points that can be distributed at one time.
-        /// </summary>
-        [DefaultValue(_MaxEmblemPoints)]
-        public ushort MaxEmblemPoints
-        {
-            set
-            {
-                SetSetting("MaxEmblemPoints", value);
-            }
-            get
-            {
-                return TryGetSetting("MaxEmblemPoints", _MaxEmblemPoints);
-            }
-        }
-        private const ushort _MaxEmblemPoints = 350;
-
 
         /// <summary>
         /// Defines the maximum amount you can increase your odds when attaching crests to the job emblem.