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.

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

Alquimia #445

Merged
merged 20 commits into from
Dec 30, 2023
45 changes: 45 additions & 0 deletions Codigo/Declares.bas
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,28 @@ Public Const LingoteOro As Integer = 388 'OK
Public Const Wood As Integer = 58 'OK
Public Const ElvenWood As Integer = 2781 'OK
Public Const Raices As Integer = 888 'OK
Public Const Botella As Integer = 2097 'OK
Public Const Cuchara As Integer = 163 'OK
Public Const Mortero As Integer = 4304
Public Const FrascoAlq As Integer = 4305
Public Const FrascoElixir As Integer = 4306
Public Const Dosificador As Integer = 4307
Public Const Orquidea As Integer = 4308
Public Const Carmesi As Integer = 4309
Public Const HongoDeLuz As Integer = 4310
Public Const Esporas As Integer = 4311
Public Const Tuna As Integer = 4312
Public Const Cala As Integer = 4313
Public Const ColaDeZorro As Integer = 4314
Public Const FlorOceano As Integer = 4315
Public Const FlorRoja As Integer = 4316
Public Const Hierva As Integer = 4317
Public Const HojasDeRin As Integer = 4318
Public Const HojasRojas As Integer = 4319
Public Const SemillasPros As Integer = 4320
Public Const Pimiento As Integer = 4321


Public Const PieldeLobo As Integer = 414 'OK
Public Const PieldeOsoPardo As Integer = 415 'OK
Public Const PieldeOsoPolar As Integer = 416 'OK
Expand Down Expand Up @@ -841,6 +863,7 @@ Public Enum e_OBJType
OtQuest = 51
otFishingPool = 52
otUsableOntarget = 53
otPlantas = 54
otCualquiera = 100
End Enum

Expand Down Expand Up @@ -1641,7 +1664,29 @@ Public Type t_ObjData
MaderaElfica As Integer
MaderaPino As Integer

Hechizo As Integer
Raices As Integer
Cuchara As Integer
Botella As Integer
Mortero As Integer
FrascoAlq As Integer
FrascoElixir As Integer
Dosificador As Integer
Orquidea As Integer
Carmesi As Integer
HongoDeLuz As Integer
Esporas As Integer
Tuna As Integer
Cala As Integer
ColaDeZorro As Integer
FlorOceano As Integer
FlorRoja As Integer
Hierva As Integer
HojasDeRin As Integer
HojasRojas As Integer
SemillasPros As Integer
Pimiento As Integer

SkPociones As Byte

PielLobo As Integer
Expand Down
22 changes: 21 additions & 1 deletion Codigo/FileIO.bas
Original file line number Diff line number Diff line change
Expand Up @@ -1364,9 +1364,29 @@ Sub LoadOBJData()
252 .TipoPocion = val(Leer.GetValue(ObjKey, "TipoPocion"))
254 .MaxModificador = val(Leer.GetValue(ObjKey, "MaxModificador"))
256 .MinModificador = val(Leer.GetValue(ObjKey, "MinModificador"))

258 .DuracionEfecto = val(Leer.GetValue(ObjKey, "DuracionEfecto"))
.Hechizo = val(Leer.GetValue(ObjKey, "Hechizo"))
260 .Raices = val(Leer.GetValue(ObjKey, "Raices"))
.Cuchara = val(Leer.GetValue(ObjKey, "Cuchara"))
.Botella = val(Leer.GetValue(ObjKey, "Botella"))
.Mortero = val(Leer.GetValue(ObjKey, "Mortero"))
.FrascoAlq = val(Leer.GetValue(ObjKey, "FrascoAlq"))
.FrascoElixir = val(Leer.GetValue(ObjKey, "FrascoElixir"))
.Dosificador = val(Leer.GetValue(ObjKey, "Dosificador"))
.Orquidea = val(Leer.GetValue(ObjKey, "Orquidea"))
.Carmesi = val(Leer.GetValue(ObjKey, "Carmesi"))
.HongoDeLuz = val(Leer.GetValue(ObjKey, "HongoDeLuz"))
.Esporas = val(Leer.GetValue(ObjKey, "Esporas"))
.Tuna = val(Leer.GetValue(ObjKey, "Tuna"))
.Cala = val(Leer.GetValue(ObjKey, "Cala"))
.ColaDeZorro = val(Leer.GetValue(ObjKey, "ColaDeZorro"))
.FlorOceano = val(Leer.GetValue(ObjKey, "FlorOceano"))
.FlorRoja = val(Leer.GetValue(ObjKey, "FlorRoja"))
.Hierva = val(Leer.GetValue(ObjKey, "Hierva"))
.HojasDeRin = val(Leer.GetValue(ObjKey, "HojasDeRin"))
.HojasRojas = val(Leer.GetValue(ObjKey, "HojasRojas"))
.SemillasPros = val(Leer.GetValue(ObjKey, "SemillasPros"))
.Pimiento = val(Leer.GetValue(ObjKey, "Pimiento"))
262 .SkPociones = val(Leer.GetValue(ObjKey, "SkPociones"))
264 .Porcentaje = val(Leer.GetValue(ObjKey, "Porcentaje"))

Expand Down
18 changes: 9 additions & 9 deletions Codigo/Protocol.bas
Original file line number Diff line number Diff line change
Expand Up @@ -2816,17 +2816,17 @@ Private Sub HandleCraftAlquimia(ByVal UserIndex As Integer)

On Error GoTo HandleCraftAlquimia_Err

'***************************************************
'Author: Juan Martín Sotuyo Dodero (Maraxus)
'Last Modification: 05/17/06
'
'***************************************************


Dim Item As Integer
102 Item = Reader.ReadInt16()

104 If Item < 1 Then Exit Sub
Item = Reader.ReadInt16()

110 If Item < 1 Then Exit Sub


112 Call AlquimistaConstruirItem(UserIndex, Item)


Exit Sub

HandleCraftAlquimia_Err:
Expand Down Expand Up @@ -3196,7 +3196,7 @@ Private Sub HandleWorkLeftClick(ByVal UserIndex As Integer)
End If

'¡Hay un arbol donde clickeo?
440 If ObjData(DummyInt).OBJType = e_OBJType.otArboles Then
440 If ObjData(DummyInt).OBJType = e_OBJType.otPlantas Then
RecoX marked this conversation as resolved.
Show resolved Hide resolved
442 Call SendData(SendTarget.ToPCAliveArea, UserIndex, PrepareMessagePlayWave(SND_TIJERAS, .Pos.X, .Pos.y))
444 Call DoRaices(UserIndex, X, Y)

Expand Down
Loading