fix: finished the say hello feature.

ArchiDog1998 · Apr 5, 2023 · 840c314 · 840c314
1 parent 1c06b15
commit 840c314
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/RotationSolver.Extra/AssemblyInfo.cs b/RotationSolver.Extra/AssemblyInfo.cs
@@ -0,0 +1 @@
+[assembly: AuthorHash("Ig4lHXUohMZNIeheUtAtRg==")]
diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs
@@ -1,4 +1,5 @@
 using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
@@ -67,9 +68,9 @@ public unsafe RotationSolverPlugin(DalamudPluginInterface pluginInterface)
 
         RotationUpdater.GetAllCustomRotations();
 
-        LinkPayload = pluginInterface.AddChatLinkHandler(6, (id, str) =>
+        LinkPayload = pluginInterface.AddChatLinkHandler(0, (id, str) =>
         {
-            if(id == 6) OpenConfigWindow();
+            if(id == 0) OpenConfigWindow();
         });
     }
 
@@ -113,9 +114,11 @@ internal static void OpenConfigWindow()
         _comboConfigWindow.Toggle();
     }
 
+    static RandomDelay validDelay = new RandomDelay(() => (0.2f, 0.2f));
+
     internal static void UpdateDisplayWindow()
     {
-        var isValid = MajorUpdater.IsValid
+        var isValid = validDelay.Delay(MajorUpdater.IsValid
         && (!Service.Config.OnlyShowWithHostileOrInDuty
                 || Service.Conditions[ConditionFlag.BoundByDuty]
                 || DataCenter.AllHostileTargets.Any(o => o.DistanceToPlayer() <= 25))
@@ -125,7 +128,7 @@ internal static void UpdateDisplayWindow()
             && !Service.Conditions[ConditionFlag.BetweenAreas]
             && !Service.Conditions[ConditionFlag.BetweenAreas51]
             && !Service.Conditions[ConditionFlag.WaitingForDuty]
-            && !Service.Conditions[ConditionFlag.OccupiedInQuestEvent];
+            && !Service.Conditions[ConditionFlag.OccupiedInQuestEvent]);
 
         _controlWindow.IsOpen = isValid && Service.Config.ShowControlWindow;
         _nextActionWindow.IsOpen = isValid && Service.Config.ShowNextActionWindow;

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -98,7 +98,7 @@ internal static void Disable()
     static RandomDelay socialDelay = new RandomDelay(() => (3, 5));
     internal static async void UpdateSocial()
     {
-        if (DataCenter.InCombat || DataCenter.PartyMembers.Count() < 2) return;
+        if (DataCenter.InCombat) return;
         if (_canSaying && socialDelay.Delay(CanSocial))
         {
             _canSaying = false;
@@ -137,10 +137,21 @@ private static async void SayHelloToAuthor()
             Service.TargetManager.SetTarget(author.c);
             Service.SubmitToChat($"/{_macroToAuthor[new Random().Next(_macroToAuthor.Count)]} <t>");
 #endif
-            var message = new SeString(new PlayerPayload(author.c.Name.TextValue, author.c.HomeWorld.Id),
-                          new TextPayload($"({author.nameDesc}) is probably one of the authors of the "),
+            var message = new SeString(new IconPayload(BitmapFontIcon.Mentor),
+
+                          new UIForegroundPayload(31),
+                          new PlayerPayload(author.c.Name.TextValue, author.c.HomeWorld.Id),
+                          UIForegroundPayload.UIForegroundOff,
+
+                          new TextPayload($"({author.nameDesc}) is one of the authors of "),
+
+                          new IconPayload(BitmapFontIcon.DPS),
                           RotationSolverPlugin.LinkPayload,
+                          new UIForegroundPayload(31),
                           new TextPayload("Rotation Solver"),
+                          UIForegroundPayload.UIForegroundOff,
+                          RawPayload.LinkTerminator,
+
                           new TextPayload(", so say hello to him/her!"));
 
             Service.ChatGui.PrintChat(new Dalamud.Game.Text.XivChatEntry()