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

Fix #486: Hechizo heroismo debe interrumpir la meditacion #504

Merged
merged 1 commit into from
Feb 24, 2024
Merged

Fix #486: Hechizo heroismo debe interrumpir la meditacion #504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions Codigo/modHechizos.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4605,14 +4605,25 @@ Public Sub UseSpellSlot(ByVal UserIndex As Integer, ByVal SpellSlot As Integer)
116 If (.flags.Privilegios And e_PlayerType.Consejero) = 0 Then
If .Stats.UserHechizos(SpellSlot) <> 0 Then
120 If Hechizos(.Stats.UserHechizos(SpellSlot)).AutoLanzar = 1 Then
122 Call SetUserRef(UserList(UserIndex).flags.TargetUser, UserIndex)
124 Call LanzarHechizo(.flags.Hechizo, UserIndex)
122 If .flags.Descansar Then Exit Sub

124 If .flags.Meditando Then
126 .flags.Meditando = False
128 .Char.FX = 0
130 Call SendData(SendTarget.ToPCAliveArea, UserIndex, PrepareMessageMeditateToggle(.Char.charindex, 0))
End If

'If exiting, cancel
132 Call CancelExit(UserIndex)

134 Call SetUserRef(UserList(UserIndex).flags.TargetUser, UserIndex)
136 Call LanzarHechizo(.flags.Hechizo, UserIndex)
Else
If IsValidUserRef(.flags.GMMeSigue) Then
Call WriteNofiticarClienteCasteo(.flags.GMMeSigue.ArrayIndex, 1)
End If
If Hechizos(.Stats.UserHechizos(SpellSlot)).AreaAfecta > 0 Then
126 Call WriteWorkRequestTarget(UserIndex, e_Skill.Magia, True, Hechizos(.Stats.UserHechizos(SpellSlot)).AreaRadio)
138 Call WriteWorkRequestTarget(UserIndex, e_Skill.Magia, True, Hechizos(.Stats.UserHechizos(SpellSlot)).AreaRadio)
Else
Call WriteWorkRequestTarget(UserIndex, e_Skill.Magia)
End If
Expand All @@ -4623,5 +4634,5 @@ Public Sub UseSpellSlot(ByVal UserIndex As Integer, ByVal SpellSlot As Integer)
End With
Exit Sub
UseSpellSlot_Err:
128 Call TraceError(Err.Number, Err.Description, "Protocol.UseSpellSlot", Erl)
140 Call TraceError(Err.Number, Err.Description, "Protocol.UseSpellSlot", Erl)
End Sub