fix: correct naming, mesage colors

Author: pandinocoder

Intersect (Core)/CustomColors.cs

@@ -194,7 +194,7 @@ public sealed partial class CombatNamespace
 
         public Color LevelUp = Color.Cyan;
 
-        public Color LevelDown = Color.Red;
+        public Color LevelLost = Color.Red;
 
         public Color MagicDamage = new Color(255, 255, 0, 255);
 

Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_GiveExperience.cs

@@ -1,4 +1,4 @@
-using Intersect.Editor.Localization;
+using Intersect.Editor.Localization;
 using Intersect.Enums;
 using Intersect.Framework.Core.GameObjects.Variables;
 using Intersect.GameObjects.Events.Commands;
@@ -48,7 +48,7 @@ private void InitLocalization()
         rdoGlobalVariable.Text = Strings.EventGiveExperience.ServerVariable;
         rdoGuildVariable.Text = Strings.EventGiveExperience.GuildVariable;
 
-        chkEnableLevelDown.Text = Strings.EventGiveExperience.EnableLevelDown;
+        chkEnableLevelDown.Text = Strings.EventGiveExperience.EnableLosingLevels;
 
         btnSave.Text = Strings.General.Okay;
         btnCancel.Text = Strings.General.Cancel;

Intersect.Editor/Localization/Strings.cs

@@ -2952,7 +2952,7 @@ public partial struct EventGiveExperience
         public static LocalizedString AmountType = @"Amount Type";
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public static LocalizedString EnableLevelDown = @"Enable losing levels?";
+        public static LocalizedString EnableLosingLevels = @"Enable losing levels?";
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public static LocalizedString GuildVariable = @"Guild Variable";

Intersect.Server.Core/Entities/Player.cs

@@ -1279,15 +1279,15 @@ public void SetLevel(int level, bool resetExperience = false)
     public void AddLevels(int levels = 1, bool resetExperience = true)
     {
         ClassBase? classDescriptor = null;
-        var messageList = new List<string>();
-        int targetLevel = Math.Clamp(Level + levels, 1, Options.Instance.Player.MaxLevel);
-
+        List<(string, Color)> messageList = [];
+        
+        var targetLevel = Math.Clamp(Level + levels, 1, Options.Instance.Player.MaxLevel);
         if (levels > 0)
         {
             while (Level < targetLevel)
             {
                 SetLevel(Level + 1, resetExperience);
-                messageList.Add(Strings.Player.LevelUp.ToString(Level));
+                messageList.Add((Strings.Player.LevelUp.ToString(Level), CustomColors.Combat.LevelUp));
 
                 if ((classDescriptor?.Id == ClassId || ClassBase.TryGet(ClassId, out classDescriptor)) && classDescriptor?.Spells != default)
                 {
@@ -1300,7 +1300,9 @@ public void AddLevels(int levels = 1, bool resetExperience = true)
 
                         var spellInstance = new Spell(spell.Id);
                         _ = TryTeachSpell(spellInstance, false);
-                        messageList.Add(Strings.Player.LearnedSpell.ToString(spellInstance.SpellName));
+                        messageList.Add(
+                            (Strings.Player.LearnedSpell.ToString(spellInstance.SpellName), CustomColors.Alerts.Info)
+                        );
                     }
                 }
 
@@ -1313,7 +1315,7 @@ public void AddLevels(int levels = 1, bool resetExperience = true)
             while (targetLevel < Level)
             {
                 SetLevel(Level - 1);
-                messageList.Add(Strings.Player.LevelLost.ToString(Level));
+                messageList.Add((Strings.Player.LevelLost.ToString(Level), CustomColors.Combat.LevelLost));
 
                 if ((classDescriptor?.Id == ClassId || ClassBase.TryGet(ClassId, out classDescriptor)) && classDescriptor?.Spells != default)
                 {
@@ -1325,44 +1327,39 @@ public void AddLevels(int levels = 1, bool resetExperience = true)
                         }
 
                         ForgetSpell(FindSpell(spell.Id), true);
-                        messageList.Add(Strings.Player.ForgotSpell.ToString(SpellBase.GetName(spell.Id)));
+                        messageList.Add(
+                            (Strings.Player.ForgotSpell.ToString(SpellBase.GetName(spell.Id)), CustomColors.Alerts.Info)
+                        );
                     }
                 }
 
                 StartCommonEventsWithTrigger(CommonEventTrigger.LevelDown);
-                PacketSender.SendActionMsg(this, Strings.Combat.LevelDown, CustomColors.Combat.LevelDown);
-                levels++;
+                PacketSender.SendActionMsg(this, Strings.Combat.LevelDown, CustomColors.Combat.LevelLost);
             }
         }
 
-        foreach (var message in messageList)
+        RecalculateStatsAndPoints();
+        UnequipInvalidItems();
+        PacketSender.SendExperience(this);
+        PacketSender.SendPointsTo(this);
+        PacketSender.SendPlayerSpells(this);
+        PacketSender.SendEntityDataToProximity(this);
+
+        if (StatPoints > 0)
         {
-            PacketSender.SendChatMsg(
-                this,
-                message,
-                ChatMessageType.Experience,
-                levels > 0 ? CustomColors.Combat.LevelUp : CustomColors.Combat.LevelDown,
-                Name
-            );
+            messageList.Add((Strings.Player.StatPoints.ToString(StatPoints), CustomColors.Combat.StatPoints));
         }
 
-        if (StatPoints > 0)
+        foreach (var (message, color) in messageList)
         {
             PacketSender.SendChatMsg(
                 this,
-                Strings.Player.StatPoints.ToString(StatPoints),
+                message,
                 ChatMessageType.Experience,
-                CustomColors.Combat.StatPoints,
+                color,
                 Name
             );
         }
-
-        RecalculateStatsAndPoints();
-        UnequipInvalidItems();
-        PacketSender.SendExperience(this);
-        PacketSender.SendPointsTo(this);
-        PacketSender.SendPlayerSpells(this);
-        PacketSender.SendEntityDataToProximity(this);
     }
 
     public void GiveExperience(long amount)
@@ -5459,17 +5456,24 @@ public void SwapSpells(int spell1, int spell2)
         PacketSender.SendPlayerSpellUpdate(this, spell2);
     }
 
-    public void ForgetSpell(int spellSlot, bool removeBoundSpell = false)
+    public bool ForgetSpell(int spellSlot, bool removeBoundSpell = false)
     {
+        if (spellSlot < 0 || Spells.Count <= spellSlot)
+        {
+            return false;
+        }
+        
         if (!SpellBase.Get(Spells[spellSlot].SpellId).Bound || removeBoundSpell)
         {
             Spells[spellSlot].Set(Spell.None);
             PacketSender.SendPlayerSpellUpdate(this, spellSlot);
             UnequipInvalidItems();
+            return true;
         }
         else
         {
             PacketSender.SendChatMsg(this, Strings.Combat.TryForgetBoundSpell, ChatMessageType.Spells);
+            return false;
         }
     }