Set last skill when using macros or scripts

markdwags · markdwags · commit b5079d0f0188 · 2021-04-30T12:55:29.000-05:00
diff --git a/Razor/Macros/Actions.cs b/Razor/Macros/Actions.cs
@@ -1925,6 +1925,8 @@ public override bool Perform()
                 StealthSteps.Hide();
             }
 
+            World.Player.LastSkill = m_Skill;
+
             return true;
         }
 
diff --git a/Razor/Scripts/Commands.cs b/Razor/Scripts/Commands.cs
@@ -758,6 +758,8 @@ private static bool UseSkill(string command, Argument[] args, bool quiet, bool f
             else if (SkillHotKeys.UsableSkillsByName.TryGetValue(args[0].AsString().ToLower(), out skillId))
             {
                 Client.Instance.SendToServer(new UseSkill(skillId));
+
+                World.Player.LastSkill = skillId;
             }
 
             if (skillId == (int)SkillName.Stealth && !World.Player.Visible)

Original file line number	Diff line number	Diff line change
`@@ -1925,6 +1925,8 @@ public override bool Perform()`
`1925`	`1925`	`StealthSteps.Hide();`
`1926`	`1926`	`}`
`1927`	`1927`
	`1928`	`+ World.Player.LastSkill = m_Skill;`
	`1929`	`+`
`1928`	`1930`	`return true;`
`1929`	`1931`	`}`
`1930`	`1932`
Original file line number	Diff line number	Diff line change
`@@ -758,6 +758,8 @@ private static bool UseSkill(string command, Argument[] args, bool quiet, bool f`
`758`	`758`	`else if (SkillHotKeys.UsableSkillsByName.TryGetValue(args[0].AsString().ToLower(), out skillId))`
`759`	`759`	`{`
`760`	`760`	`Client.Instance.SendToServer(new UseSkill(skillId));`
	`761`	`+`
	`762`	`+ World.Player.LastSkill = skillId;`
`761`	`763`	`}`
`762`	`764`
`763`	`765`	`if (skillId == (int)SkillName.Stealth && !World.Player.Visible)`