fix for proection is on casting

dust765 · Feb 26, 2024 · a0ad0eb · a0ad0eb
1 parent 33d1aff
commit a0ad0eb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/ClassicUO.Client/Dust765/External/OnCastingGump.cs b/src/ClassicUO.Client/Dust765/External/OnCastingGump.cs
@@ -7,6 +7,7 @@
 using ClassicUO.Renderer;
 using ClassicUO.Dust765.Managers;
 using System;
+using ClassicUO.Game.Data;
 
 namespace ClassicUO.Dust765.External
 {
@@ -53,17 +54,31 @@ public void Start(uint _spell_id, uint _re = 0)
         {
             _startTime = Time.Ticks;
             uint circle;
+            System.TimeSpan spellTime;
 
             if (!ProfileManager.CurrentProfile.OnCastingGump_hidden)
             {
                 IsVisible = true;
             }
 
             try
-            { 
+            {
                 SpellAction spell = (SpellAction)_spell_id;
                 circle = (uint)SpellManager.GetCircle(spell);
-                _endTime = _startTime + 400 + circle * 250 + _re; // (0.5+ 0.25 * circle) * 1000
+                uint protection_delay = 0;
+                if (World.Player.IsBuffIconExists(BuffIconType.Protection))
+                {
+                    protection_delay = 1;
+                    if (circle != 9)
+                    {
+                        protection_delay = protection_delay + 2;
+                    } else
+                    {
+                        protection_delay = protection_delay + 5;
+                        circle = circle + 2;
+                    }
+                }
+                _endTime = _startTime + 400 + (circle + protection_delay) * 250 + _re; // (0.5+ 0.25 * circle) * 1000
                 GameActions.iscasting = true;
             }
             catch

diff --git a/src/ClassicUO.Client/Dust765/Shared/SpellManager.cs b/src/ClassicUO.Client/Dust765/Shared/SpellManager.cs
@@ -36,7 +36,8 @@ public enum SpellCircle
         Fifth,
         Sixth,
         Seventh,
-        Eighth
+        Eighth,
+        Nine
     }
 
     public enum SpellAction : ushort
@@ -247,7 +248,6 @@ public static SpellCircle GetCircle(SpellAction spell)
                 case SpellAction.Strength:
                 case SpellAction.CurseWeapon:
                 case SpellAction.PainSpike:
-                case SpellAction.AttuneWeapon:
                 case SpellAction.CleansebyFire:
                 case SpellAction.Thunderstorm:
                     return SpellCircle.Second;
@@ -265,8 +265,6 @@ public static SpellCircle GetCircle(SpellAction spell)
                 case SpellAction.SummonFey:
                 case SpellAction.SummonFiend:
                 case SpellAction.ReaperForm:
-                case SpellAction.Wildfire:
-                case SpellAction.EssenceofWind:
                 case SpellAction.DryadAllure:
                 case SpellAction.EtherealVoyage:
                 case SpellAction.WordofDeath:
@@ -281,7 +279,6 @@ public static SpellCircle GetCircle(SpellAction spell)
                 case SpellAction.ManaDrain:
                 case SpellAction.Recall:
                 case SpellAction.RemoveCurse:
-                case SpellAction.GiftofLife:
                 case SpellAction.ArcaneCircle:
                 case SpellAction.HorrificBeast:
                 case SpellAction.Exorcism:
@@ -337,8 +334,13 @@ public static SpellCircle GetCircle(SpellAction spell)
                 case SpellAction.EarthElemental:
                 case SpellAction.FireElemental:
                 case SpellAction.WaterElemental:
-                case SpellAction.GiftofRenewal:
                     return SpellCircle.Eighth;
+                case SpellAction.GiftofRenewal:
+                case SpellAction.AttuneWeapon:
+                case SpellAction.GiftofLife:
+                case SpellAction.Wildfire:
+                case SpellAction.EssenceofWind:
+                    return SpellCircle.Nine;
             }
             throw new InvalidOperationException();
         }