Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfix update disarm #234

Merged
merged 5 commits into from
Oct 1, 2024
+33 −6
Merged

Hotfix update disarm #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
511cd07
fix
jeannsebold6666 Aug 23, 2024
f498a87
update version
jeannsebold6666 Aug 23, 2024
206c20b
fix to change
jeannsebold6666 Aug 23, 2024
263f66f
fix erros
jeannsebold6666 Aug 23, 2024
aeaccfa
fix macros
jeannsebold6666 Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ClassicUO.Client/ClassicUO.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down
15 changes: 12 additions & 3 deletions src/ClassicUO.Client/Game/GameActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
15 changes: 14 additions & 1 deletion src/ClassicUO.Client/Game/Managers/MacroManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -2426,6 +2437,8 @@ public enum MacroType
KillGumpOpen,
PrimaryAbility,
SecondaryAbility,
StunAbility,
DisarmAbility,
EquipLastWeapon,
SetUpdateRange,
ModifyUpdateRange,
Expand All @@ -2452,7 +2465,7 @@ public enum MacroType
Zoom,
ToggleChatVisibility,
INVALID,
Aura = 62,
Aura,
AuraOnOff,
Grab,
SetGrabBag,
Expand Down
1 change: 1 addition & 0 deletions src/ClassicUO.Client/Game/Managers/TargetManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using System.Text.RegularExpressions;

namespace ClassicUO.Game.Managers
{
Expand Down
4 changes: 4 additions & 0 deletions src/ClassicUO.Client/Game/UI/Gumps/VersionHistory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down
Loading