Merge pull request #234 from jsebold666/hotfix-update-disarm

Hotfix update disarm
jsebold666 · Oct 1, 2024 · 1b418b3 · 1b418b3
2 parents 34ef782 + aeaccfa
commit 1b418b3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/src/ClassicUO.Client/ClassicUO.Client.csproj b/src/ClassicUO.Client/ClassicUO.Client.csproj
@@ -5,8 +5,8 @@
  <ApplicationIcon>cuoicon.ico</ApplicationIcon>
  <AssemblyName>ClassicUO</AssemblyName>
  <RootNamespace>ClassicUO</RootNamespace>
- <AssemblyVersion>3.23.1</AssemblyVersion>
- <FileVersion>3.23.1</FileVersion>
+ <AssemblyVersion>3.23.2</AssemblyVersion>
+ <FileVersion>3.23.2</FileVersion>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(Configuration)'=='Release'">

diff --git a/src/ClassicUO.Client/Game/GameActions.cs b/src/ClassicUO.Client/Game/GameActions.cs
@@ -830,12 +830,21 @@ public static void UseSecondaryAbility()
  {
  World.Player.Abilities[i] &= (Ability)0x7F;
  }
-
- Socket.Send_UseCombatAbility((byte)ability);
+ if (Client.Version >= ClientVersion.CV_308Z) {
+ Socket.Send_StunRequest();
+ } else {
+ Socket.Send_UseCombatAbility((byte)ability);
+ }
+
  }
  else
  {
- Socket.Send_UseCombatAbility(0);
+ if (Client.Version >= ClientVersion.CV_308Z) {
+ Socket.Send_DisarmRequest();
+ } else {
+ Socket.Send_UseCombatAbility(0);
+ }
+
  }
 
  ability ^= (Ability)0x80;

diff --git a/src/ClassicUO.Client/Game/Managers/MacroManager.cs b/src/ClassicUO.Client/Game/Managers/MacroManager.cs
@@ -1515,6 +1515,17 @@ private int Process(MacroObject macro)
 
  break;
 
+ case MacroType.DisarmAbility:
+ NetClient.Socket.Send_DisarmRequest();
+
+ break;
+
+ case MacroType.StunAbility:
+ NetClient.Socket.Send_StunRequest();
+
+ break;
+
+
  case MacroType.ToggleGargoyleFly:
 
  if (World.Player.Race == RaceType.GARGOYLE)
@@ -2426,6 +2437,8 @@ public enum MacroType
  KillGumpOpen,
  PrimaryAbility,
  SecondaryAbility,
+ StunAbility,
+ DisarmAbility,
  EquipLastWeapon,
  SetUpdateRange,
  ModifyUpdateRange,
@@ -2452,7 +2465,7 @@ public enum MacroType
  Zoom,
  ToggleChatVisibility,
  INVALID,
- Aura = 62,
+ Aura,
  AuraOnOff,
  Grab,
  SetGrabBag,

diff --git a/src/ClassicUO.Client/Game/Managers/TargetManager.cs b/src/ClassicUO.Client/Game/Managers/TargetManager.cs
@@ -42,6 +42,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text.RegularExpressions;
 
 namespace ClassicUO.Game.Managers
 {

diff --git a/src/ClassicUO.Client/Game/UI/Gumps/VersionHistory.cs b/src/ClassicUO.Client/Game/UI/Gumps/VersionHistory.cs
@@ -8,6 +8,10 @@ namespace ClassicUO.Game.UI.Gumps
  internal class VersionHistory : Gump
  {
  private static string[] updateTexts = {
+
+ "/c[white][3.23.2]/cd\n" +
+ "- Fixed Disarm and Stun Hability AOS",
+
  "/c[white][3.23.1]/cd\n" +
  "- Fixed Weird lines if show Nameplate",