fix/enhancement: remove bounded spells through events (#1900)

* fix/enhancement: remove bounded spells through events * review: fix typo "Bounded" to "Bound"
AscensionGameDev · Sep 11, 2023 · bdabcf4 · bdabcf4
1 parent 670ff53
commit bdabcf4
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/Intersect (Core)/GameObjects/Events/Commands/EventCommands.cs b/Intersect (Core)/GameObjects/Events/Commands/EventCommands.cs
@@ -355,6 +355,8 @@ public ChangeSpellsCommand(Dictionary<Guid, List<EventCommand>> commandLists)
 
         public bool Add { get; set; } //If !Add then Remove
 
+        public bool RemoveBoundSpell { get; set; }
+
         //Branch[0] is the event commands to execute when taught/removed successfully, Branch[1] is for when it's not.
         public Guid[] BranchIds { get; set; } = new Guid[2];
 

diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ChangeSpells.Designer.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ChangeSpells.Designer.cs
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ChangeSpells.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ChangeSpells.cs
@@ -29,6 +29,7 @@ public EventCommandChangeSpells(ChangeSpellsCommand refCommand, EventPage refPag
             cmbSpell.Items.AddRange(SpellBase.Names);
             cmbAction.SelectedIndex = refCommand.Add ? 0 : 1;
             cmbSpell.SelectedIndex = SpellBase.ListIndex(mMyCommand.SpellId);
+            chkRemoveBound.Checked = mMyCommand.RemoveBoundSpell;
         }
 
         private void InitLocalization()
@@ -42,6 +43,7 @@ private void InitLocalization()
 
             lblAction.Text = Strings.EventChangeSpells.action;
             lblSpell.Text = Strings.EventChangeSpells.spell;
+            chkRemoveBound.Text = Strings.EventChangeSpells.RemoveBound;
             btnSave.Text = Strings.EventChangeSpells.okay;
             btnCancel.Text = Strings.EventChangeSpells.cancel;
         }
@@ -50,9 +52,23 @@ private void btnSave_Click(object sender, EventArgs e)
         {
             mMyCommand.Add = !Convert.ToBoolean(cmbAction.SelectedIndex);
             mMyCommand.SpellId = SpellBase.IdFromList(cmbSpell.SelectedIndex);
+            mMyCommand.RemoveBoundSpell = chkRemoveBound.Checked;
             mEventEditor.FinishCommandEdit();
         }
 
+        private void cmbAction_IndexChanged(object sender, EventArgs e)
+        {
+            if (cmbAction.SelectedIndex == 0)
+            {
+                chkRemoveBound.Checked = false;
+                chkRemoveBound.Enabled = false;
+            }
+            else
+            {
+                chkRemoveBound.Enabled = true;
+            }
+        }
+
         private void btnCancel_Click(object sender, EventArgs e)
         {
             mEventEditor.CancelCommandEdit();

diff --git a/Intersect.Editor/Localization/Strings.cs b/Intersect.Editor/Localization/Strings.cs
@@ -1781,6 +1781,8 @@ public partial struct EventChangeSpells
 
             public static LocalizedString okay = @"Ok";
 
+            public static LocalizedString RemoveBound = @"Remove Bound Spell ?";
+
             public static LocalizedString spell = @"Spell: ";
 
             public static LocalizedString title = @"Change Player Spells";

diff --git a/Intersect.Server/Entities/Events/CommandProcessing.cs b/Intersect.Server/Entities/Events/CommandProcessing.cs
@@ -444,7 +444,7 @@ Stack<CommandInstance> callStack
             {
                 if (player.FindSpell(command.SpellId) > -1 && command.SpellId != Guid.Empty)
                 {
-                    player.ForgetSpell(player.FindSpell(command.SpellId));
+                    player.ForgetSpell(player.FindSpell(command.SpellId), command.RemoveBoundSpell);
                     success = true;
                 }
             }

diff --git a/Intersect.Server/Entities/Player.cs b/Intersect.Server/Entities/Player.cs
@@ -4844,9 +4844,9 @@ public void SwapSpells(int spell1, int spell2)
             PacketSender.SendPlayerSpellUpdate(this, spell2);
         }
 
-        public void ForgetSpell(int spellSlot)
+        public void ForgetSpell(int spellSlot, bool removeBoundSpell = false)
         {
-            if (!SpellBase.Get(Spells[spellSlot].SpellId).Bound)
+            if (!SpellBase.Get(Spells[spellSlot].SpellId).Bound || removeBoundSpell)
             {
                 Spells[spellSlot].Set(Spell.None);
                 PacketSender.SendPlayerSpellUpdate(this, spellSlot);