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

Localizacion del server: agregamos nuevos ID para msg al cliente #668

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Localizacion del server: agregamos nuevos ID para msg al cliente #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cabb20
Update InvUsuario.bas
ReyarB Dec 7, 2024
b0e6124
Update Server.VBP
RecoX Dec 10, 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
27 changes: 21 additions & 6 deletions Codigo/Acciones.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ Public Sub CompletarAccionFin(ByVal UserIndex As Integer)

'
Case e_AccionBarra.Resucitar
Call WriteConsoleMsg(UserIndex, "¡Has sido resucitado!", e_FontTypeNames.FONTTYPE_INFO)
' Msg585=¡Has sido resucitado!
Call WriteLocaleMsg(UserIndex, "585", e_FontTypeNames.FONTTYPE_INFO)
Call SendData(SendTarget.ToPCArea, UserIndex, PrepareMessageParticleFX(UserList(UserIndex).Char.CharIndex, e_ParticulasIndex.Resucitar, 250, True))
Call SendData(SendTarget.ToPCArea, UserIndex, PrepareMessagePlayWave("117", UserList(UserIndex).Pos.X, UserList(UserIndex).Pos.y))
Call RevivirUsuario(UserIndex, True)
Expand Down Expand Up @@ -426,6 +427,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,

'¿Esta el user muerto? Si es asi no puede comerciar
114 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
116 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub

Expand Down Expand Up @@ -454,6 +456,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,

'¿Esta el user muerto? Si es asi no puede comerciar
132 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
134 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub
End If
Expand All @@ -472,6 +475,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,

'¿Esta el user muerto? Si es asi no puede comerciar
146 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
148 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub
End If
Expand Down Expand Up @@ -515,7 +519,8 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,

'Revivimos si es necesario
178 If UserList(UserIndex).flags.Muerto = 1 And (NpcList(TempCharIndex).NPCtype = e_NPCType.Revividor Or EsNewbie(UserIndex)) Then
180 Call WriteConsoleMsg(UserIndex, "¡Has sido resucitado!", e_FontTypeNames.FONTTYPE_INFO)
180 ' Msg585=¡Has sido resucitado!
Call WriteLocaleMsg(UserIndex, "585", e_FontTypeNames.FONTTYPE_INFO)
182 Call RevivirUsuario(UserIndex)
184 Call SendData(SendTarget.ToPCArea, UserIndex, PrepareMessageParticleFX(UserList(UserIndex).Char.CharIndex, e_ParticulasIndex.Resucitar, 30, False))
186 Call SendData(SendTarget.ToPCArea, UserIndex, PrepareMessagePlayWave("117", UserList(UserIndex).Pos.X, UserList(UserIndex).Pos.Y))
Expand Down Expand Up @@ -546,6 +551,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,
204 ElseIf NpcList(TempCharIndex).NPCtype = e_NPCType.Subastador Then

206 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
208 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub

Expand All @@ -564,6 +570,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,
220 ElseIf NpcList(TempCharIndex).NPCtype = e_NPCType.Quest Then

222 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
224 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub
End If
Expand All @@ -574,6 +581,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,
232 ElseIf NpcList(TempCharIndex).NPCtype = e_NPCType.Enlistador Then

234 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
236 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub

Expand Down Expand Up @@ -603,6 +611,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,
256 ElseIf NpcList(TempCharIndex).NPCtype = e_NPCType.Gobernador Then

258 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
260 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFOIAO)
Exit Sub

Expand Down Expand Up @@ -708,6 +717,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,
End If
ElseIf NpcList(TempCharIndex).NPCtype = e_NPCType.AO20Shop Then
322 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
324 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFOIAO)
Exit Sub
End If
Expand All @@ -716,13 +726,15 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,

ElseIf NpcList(TempCharIndex).NPCtype = e_NPCType.AO20ShopPjs Then
323 If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
325 Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFOIAO)
Exit Sub
End If

Call WriteShopPjsInit(UserIndex)
ElseIf NpcList(TempCharIndex).npcType = e_NPCType.EventMaster Then
If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
Call WriteLocaleMsg(UserIndex, 77, e_FontTypeNames.FONTTYPE_INFO)
Exit Sub
End If
Expand All @@ -734,6 +746,7 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,
Call WriteUpdateLobbyList(UserIndex)
320 ElseIf NpcList(TempCharIndex).Craftea > 0 Then
If UserList(UserIndex).flags.Muerto = 1 Then
'Msg77=¡¡Estás muerto!!.
Call WriteLocaleMsg(UserIndex, "77", e_FontTypeNames.FONTTYPE_INFOIAO)
Exit Sub
End If
Expand Down Expand Up @@ -761,7 +774,8 @@ Sub Accion(ByVal UserIndex As Integer, ByVal Map As Integer, ByVal X As Integer,

346 Case e_OBJType.OtCorreo 'Es un cartel
'Call AccionParaCorreo(Map, x, Y, UserIndex)
Call WriteConsoleMsg(UserIndex, "El correo está temporalmente deshabilitado.", e_FontTypeNames.FONTTYPE_EJECUCION)
' Msg586=El correo está temporalmente deshabilitado.
Call WriteLocaleMsg(UserIndex, "586", e_FontTypeNames.FONTTYPE_EJECUCION)

356 Case e_OBJType.otYunque 'Pozos
358 Call AccionParaYunque(Map, X, Y, UserIndex)
Expand Down Expand Up @@ -833,7 +847,8 @@ Sub AccionParaYunque(ByVal Map As Integer, ByVal X As Integer, ByVal Y As Intege

106 If Distancia(Pos, UserList(UserIndex).Pos) > 2 Then
108 Call WriteLocaleMsg(UserIndex, "8", e_FontTypeNames.FONTTYPE_INFO)
Call WriteConsoleMsg(UserIndex, "Estas demasiado lejos.", e_FontTypeNames.FONTTYPE_INFO)
' Msg8=Estas demasiado lejos.
Call WriteLocaleMsg(UserIndex, "8", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub

End If
Expand Down Expand Up @@ -984,8 +999,8 @@ Sub AccionParaRamita(ByVal Map As Integer, ByVal X As Integer, ByVal Y As Intege
106 With UserList(UserIndex)

108 If Distancia(Pos, .Pos) > 2 Then
110 Call WriteLocaleMsg(UserIndex, "8", e_FontTypeNames.FONTTYPE_INFO)
' Call WriteConsoleMsg(UserIndex, "Estas demasiado lejos.", e_FontTypeNames.FONTTYPE_INFO)
110 ' Msg8=Estas demasiado lejos.
Call WriteLocaleMsg(UserIndex, "8", e_FontTypeNames.FONTTYPE_INFO)
Exit Sub

End If
Expand Down
6 changes: 4 additions & 2 deletions Codigo/Comercio.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ Public Sub Comercio(ByVal Modo As eModoComercio, ByVal UserIndex As Integer, ByV
Exit Sub

186 ElseIf UserList(UserIndex).flags.Privilegios And (e_PlayerType.Consejero Or e_PlayerType.SemiDios) Then
188 Call WriteConsoleMsg(UserIndex, "No podés vender items.", e_FontTypeNames.FONTTYPE_WARNING)
188 ' Msg767=No podés vender items.
Call WriteLocaleMsg(UserIndex, "767", e_FontTypeNames.FONTTYPE_WARNING)
Exit Sub

End If
Expand Down Expand Up @@ -243,7 +244,8 @@ Public Sub IniciarComercioNPC(ByVal UserIndex As Integer)
On Error GoTo IniciarComercioNPC_Err

If Not IsValidNpcRef(UserList(UserIndex).flags.TargetNPC) Then
Call WriteConsoleMsg(UserIndex, "El comerciante no esta disponible.", e_FontTypeNames.FONTTYPE_WARNING)
' Msg770=El comerciante no está disponible.
Call WriteLocaleMsg(UserIndex, "770", e_FontTypeNames.FONTTYPE_WARNING)
Exit Sub
End If
100 Call UpdateNpcInv(True, UserIndex, UserList(UserIndex).flags.TargetNPC.ArrayIndex, 0)
Expand Down
Loading