* fix /class not working

* HS-1323: DisplayEffect should now work on reactors
hybrasyl · Apr 21, 2024 · 2e33365 · 2e33365
1 parent 348b9e7
commit 2e33365
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/hybrasyl/ChatCommands/Stats.cs b/hybrasyl/ChatCommands/Stats.cs
@@ -24,6 +24,7 @@
 using Hybrasyl.Xml.Objects;
 using System;
 using System.Linq;
+using Hybrasyl.Utility;
 
 namespace Hybrasyl.ChatCommands;
 
@@ -306,11 +307,12 @@ internal class ClassCommand : ChatCommand
 
     public new static ChatCommandResult Run(User user, params string[] args)
     {
-        var cls = args[0].ToLower();
-        var classId = Game.ActiveConfiguration.GetClassId(args[0].ToLower());
+        var cls = args[0].ToLower().Capitalize();
+
+        var classId = Game.ActiveConfiguration.GetClassId(cls);
         if (classId == 254) return Fail("I know nothing about that class");
         user.Class = (Class) classId;
-        return Success($"Class changed to {args[0]}");
+        return Success($"Class changed to {cls}");
 
     }
 }

diff --git a/hybrasyl/Monolith.cs b/hybrasyl/Monolith.cs
@@ -28,7 +28,6 @@
 using System.Drawing;
 using System.Linq;
 using System.Threading;
-using Hybrasyl.Xml.Interfaces;
 using Creature = Hybrasyl.Xml.Objects.Creature;
 
 

diff --git a/hybrasyl/Objects/Reactor.cs b/hybrasyl/Objects/Reactor.cs
@@ -141,7 +141,7 @@ public bool VisibleTo(IVisible obj)
         var casterObj = Caster?.GetUserObject();
         if (casterObj == null) return false;
         if (VisibleToOwner && user.Name == Caster.Name) return true;
-        if (VisibleToGroup && casterObj != null && (casterObj.Group?.Contains(user) ?? false)) return true;
+        if (VisibleToGroup && (casterObj.Group?.Contains(user) ?? false)) return true;
         if (VisibleToCookies.Any(x => user.HasCookie(x))) return true;
         if (user.CurrentStatusInfo.Any(x => VisibleToStatuses.Contains(x.Name))) return true;
 

diff --git a/hybrasyl/Scripting/HybrasylWorldObject.cs b/hybrasyl/Scripting/HybrasylWorldObject.cs
@@ -445,7 +445,7 @@ public void DisplayEffect(ushort effect, short speed = 100, bool global = true)
     {
         if (Obj is not VisibleObject vo) return;
         if (!global && Obj is User u)
-            u.SendEffect(u.Id, effect, speed);
+            u.SendEffect(vo.X, vo.Y, effect, speed);
         else
             vo.Effect(effect, speed);
     }
@@ -467,7 +467,7 @@ public void DisplayEffectAtCoords(short x, short y, ushort effect, short speed =
         if (Obj is not VisibleObject vo) return;
 
         if (!global && Obj is User u)
-                u.SendEffect(x, y, effect, speed);
+            u.SendEffect(x, y, effect, speed);
         else
             vo.Effect(x, y, effect, speed);
     }

diff --git a/hybrasyl/Utility.cs b/hybrasyl/Utility.cs
@@ -25,6 +25,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using Hybrasyl.ChatCommands;
+using Hybrasyl.Dialogs;
 
 namespace Hybrasyl
 {
@@ -317,15 +319,8 @@ public static class StringExtensions
             public static bool Contains(this string source, string toCheck, StringComparison comparision) =>
                 source?.IndexOf(toCheck, comparision) >= 0;
 
-            public static string Capitalize(this string s)
-            {
-                if (string.IsNullOrEmpty(s))
-                    return string.Empty;
-
-                var a = s.ToCharArray();
-                a[0] = char.ToUpper(a[0]);
-                return new string(a);
-            }
+            public static string Capitalize(this string s) =>
+                 string.IsNullOrEmpty(s) ? string.Empty : string.Concat(s[0].ToString().ToUpper(), s.AsSpan(1));
 
             public static string Normalize(string key) => Regex.Replace(key.ToLower(), @"\s+", "");
         }