fix map, showhightlight with you use all spells

dust765 · Jan 26, 2024 · 276d390 · 276d390
1 parent bd55606
commit 276d390
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 18 deletions.
diff --git a/src/ClassicUO.Client/Dust765/Dust765/CombatCollection.cs b/src/ClassicUO.Client/Dust765/Dust765/CombatCollection.cs
@@ -1353,7 +1353,6 @@ public static void SpellCastFromCliloc(string text)
             {
                 if (!GameActions.iscasting)
                     World.Player.OnCasting.Start((uint)GameActions.LastSpellIndexCursor);
-                World.Player.Hue = 0x0023;
             }
             // ## BEGIN - END ## // ONCASTINGGUMP
         }

diff --git a/src/ClassicUO.Client/Game/GameActions.cs b/src/ClassicUO.Client/Game/GameActions.cs
@@ -32,6 +32,7 @@
 
 using System;
 using ClassicUO.Configuration;
+using ClassicUO.Dust765.Dust765;
 using ClassicUO.Game.Data;
 using ClassicUO.Game.GameObjects;
 using ClassicUO.Game.Managers;
@@ -720,6 +721,7 @@ public static void CastSpellFromBook(int index, uint bookSerial)
                 // ## BEGIN - END ## // VISUAL HELPERS
                 LastSpellIndexCursor = index;
                 GameCursor._spellTime = 0;
+
                 // ## BEGIN - END ## // VISUAL HELPERS
                 // ## BEGIN - END ## // ONCASTINGGUMP
                 if (ProfileManager.CurrentProfile.OnCastingGump)
@@ -741,6 +743,8 @@ public static void CastSpell(int index)
                 // ## BEGIN - END ## // VISUAL HELPERS
                 LastSpellIndexCursor = index;
                 GameCursor._spellTime = 0;
+                CombatCollection.StartSpelltime();
+
                 // ## BEGIN - END ## // VISUAL HELPERS
                 // ## BEGIN - END ## // ONCASTINGGUMP
                 if (ProfileManager.CurrentProfile.OnCastingGump)
@@ -751,6 +755,7 @@ public static void CastSpell(int index)
                 // ## BEGIN - END ## // ONCASTINGGUMP
 
                 LastSpellIndex = index;
+
                 Socket.Send_CastSpell(index);
             }
         }

diff --git a/src/ClassicUO.Client/Game/GameObjects/Views/LandView.cs b/src/ClassicUO.Client/Game/GameObjects/Views/LandView.cs
@@ -91,7 +91,7 @@ public override bool Draw(UltimaBatcher2D batcher, int posX, int posY, float dep
             }
             if (ProfileManager.CurrentProfile.HighlightTileAtRangeSpell)
             {
-                if (GameCursor._spellTime >= 1 && Distance == ProfileManager.CurrentProfile.HighlightTileAtRangeRangeSpell)
+                if (GameActions.LastSpellIndexCursor > 0 && Distance == ProfileManager.CurrentProfile.HighlightTileAtRangeRangeSpell)
                 {
                     hueVec.X = ProfileManager.CurrentProfile.HighlightTileRangeHueSpell;
                     hueVec.Y = 1;

diff --git a/src/ClassicUO.Client/Game/GameObjects/Views/MultiView.cs b/src/ClassicUO.Client/Game/GameObjects/Views/MultiView.cs
@@ -123,7 +123,7 @@ public override bool Draw(UltimaBatcher2D batcher, int posX, int posY, float dep
             }
             if (ProfileManager.CurrentProfile.HighlightTileAtRangeSpell)
             {
-                if (GameCursor._spellTime >= 1 && Distance == ProfileManager.CurrentProfile.HighlightTileAtRangeRangeSpell)
+                if (GameActions.LastSpellIndexCursor > 0 && Distance == ProfileManager.CurrentProfile.HighlightTileAtRangeRangeSpell)
                 {
                     hueVec.X = ProfileManager.CurrentProfile.HighlightTileRangeHueSpell;
                     hueVec.Y = 1;

diff --git a/src/ClassicUO.Client/Game/GameObjects/Views/StaticView.cs b/src/ClassicUO.Client/Game/GameObjects/Views/StaticView.cs
@@ -102,7 +102,7 @@ public override bool Draw(UltimaBatcher2D batcher, int posX, int posY, float dep
             }
             if (ProfileManager.CurrentProfile.HighlightTileAtRangeSpell)
             {
-                if (GameCursor._spellTime >= 1 && Distance == ProfileManager.CurrentProfile.HighlightTileAtRangeRangeSpell)
+                if (GameActions.LastSpellIndexCursor > 0 && Distance == ProfileManager.CurrentProfile.HighlightTileAtRangeRangeSpell)
                 {
                     hueVec.X = ProfileManager.CurrentProfile.HighlightTileRangeHueSpell;
                     hueVec.Y = 1;

diff --git a/src/ClassicUO.Client/Game/Managers/WorldMapEntityManager.cs b/src/ClassicUO.Client/Game/Managers/WorldMapEntityManager.cs
@@ -40,6 +40,7 @@
 using ClassicUO.Network;
 using ClassicUO.Network.Encryption;
 using ClassicUO.Utility.Logging;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace ClassicUO.Game.Managers
 {
@@ -65,44 +66,44 @@ public string GetName(uint serial)
             Entity e = World.Get(serial);
 
 
-            if (mob != null)
+            if (mob != null && !mob.IsDestroyed)
             {
                 WMapEntity wme = World.WMapManager.GetEntity(mob);
 
                 if (wme != null)
                 {
                     if (string.IsNullOrEmpty(wme.Name))
                     {
+
                         wme.Name = mob.Name;
                         Name = wme.Name;
                         nameCache[serial] = Name;
+                        GameActions.Print("Mob  is not null Is wme != null  " + wme.Serial + " Name: " + mob.Name + " nameCache: " + nameCache[serial]);
                     }
                 }
             }
-            if (e != null && !e.IsDestroyed)
+            if (e != null)
             {
                 Name = e.Name;
                 serial = e.Serial;
                 nameCache[serial] = Name;
+                GameActions.Print("Entity  is not null Is wme != null  " + e.Name + " Name: " + mob.Name + " nameCache: " + nameCache[serial]);
             }
-
-            // Entity e = World.Get(Serial);
-            // Mobile mob = World.Mobiles.Get(Serial);
-
-            // if (e != null && !e.IsDestroyed && !string.IsNullOrEmpty(e.Name) && Name != e.Name)
-            //{
-            //     Name = e.Name;
-            //}
-
+
+
             if (nameCache.TryGetValue(serial, out string cachedName))
             {
-
+                var teste = string.IsNullOrEmpty(Name) ? cachedName : Name;
+                GameActions.Print("Entity  is not null Is wme != null  " + teste);
                 return string.IsNullOrEmpty(Name) ? cachedName : Name;
             }
             else
             {
-                return string.IsNullOrEmpty(Name) ? "Out of range" : Name;
+                return string.IsNullOrEmpty(Name) ? "<out of range>" : Name;
             }
+
+
+
 
             // ## BEGIN - END ## // DUST765 - Fix to use cache for name in Map Gump
         }

diff --git a/src/ClassicUO.Client/Network/PacketHandlers.cs b/src/ClassicUO.Client/Network/PacketHandlers.cs
@@ -1798,7 +1798,7 @@ private static void DeathScreen(ref StackDataReader p)
                     Map = World.Map.Index,
                     LastUpdate = Time.Ticks + (1000 * 60 * 5),
                     IsGuild = false,
-                    Name = $"Your Corpse"
+                    Name = $"YOUR CORPOSE"
                 };
                 // ## BEGIN - END ## // TAZUO
             }