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

Flautas para invocar #652

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Flautas para invocar #652

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion Codigo/Declares.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,7 @@ Public Type t_Hechizo
Target As e_TargetType
RequireTransform As Integer
NeedStaff As Integer
RequiereInstrumento As Integer
StaffAffected As Boolean
EotId As Integer
SpellRequirementMask As Long
Expand Down Expand Up @@ -1575,7 +1576,7 @@ Public Type t_ObjData
MinELV As Byte
SkillIndex As Byte ' El indice de Skill para equipar el item
SkillRequerido As Byte ' El valor MINIMO requerido de skillIndex para equipar el item

InstrumentoRequerido As Integer
CreaGRH As String
SndAura As Integer
Intirable As Byte
Expand Down
2 changes: 2 additions & 0 deletions Codigo/FileIO.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,7 @@ Public Sub CargarHechizos()
278 frmCargando.cargar.value = frmCargando.cargar.value + 1

280 Hechizos(Hechizo).NeedStaff = val(Leer.GetValue("Hechizo" & Hechizo, "NeedStaff"))
Hechizos(Hechizo).RequiereInstrumento = val(Leer.GetValue("Hechizo" & Hechizo, "RequiereInstrumento"))
281 Hechizos(Hechizo).StaffAffected = CBool(val(Leer.GetValue("Hechizo" & Hechizo, "StaffAffected")))
282 Hechizos(Hechizo).EotId = val(Leer.GetValue("Hechizo" & Hechizo, "EOTID"))

Expand Down Expand Up @@ -1288,6 +1289,7 @@ Sub LoadOBJData()
146 .QueAtributo = val(Leer.GetValue(ObjKey, "queatributo"))
148 .CuantoAumento = val(Leer.GetValue(ObjKey, "cuantoaumento"))
150 .MinELV = val(Leer.GetValue(ObjKey, "MinELV"))
.InstrumentoRequerido = val(Leer.GetValue(ObjKey, "InstrumentoRequerido"))
152 .Subtipo = val(Leer.GetValue(ObjKey, "Subtipo"))
154 .Dorada = val(Leer.GetValue(ObjKey, "Dorada"))
155 .Blodium = val(Leer.GetValue(ObjKey, "Blodium"))
Expand Down
10 changes: 10 additions & 0 deletions Codigo/modHechizos.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,16 @@ Private Function PuedeLanzar(ByVal UserIndex As Integer, ByVal HechizoIndex As I
End If
End If
End If

If .clase = e_Class.Druid Then
If Hechizos(HechizoIndex).RequiereInstrumento > 0 Then
If .invent.DañoMagicoEqpSlot = 0 Or ObjData(.invent.DañoMagicoEqpObjIndex).InstrumentoRequerido <> 1 Then
Call WriteConsoleMsg(UserIndex, "Necesitás una flauta para invocar o desinvocar a tus mascotas.", e_FontTypeNames.FONTTYPE_INFO)
Exit Function
End If
End If
End If

If Hechizos(HechizoIndex).RequireWeaponType > 0 Then
If .invent.WeaponEqpObjIndex = 0 Then
Call WriteLocaleMsg(UserIndex, GetRequiredWeaponLocaleId(Hechizos(HechizoIndex).RequireWeaponType), e_FontTypeNames.FONTTYPE_INFO)
Expand Down