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

Arenas, /est e items nws en boveda. #650

Merged
merged 1 commit into from
Oct 26, 2024
Merged

Arenas, /est e items nws en boveda. #650

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
14 changes: 13 additions & 1 deletion Codigo/InvUsuario.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,25 @@ Sub QuitarNewbieObj(ByVal UserIndex As Integer)

110 Next j
End If

' Eliminar items newbie de la boveda
For j = 1 To MAX_BANCOINVENTORY_SLOTS
If UserList(UserIndex).BancoInvent.Object(j).ObjIndex > 0 Then
If ObjData(UserList(UserIndex).BancoInvent.Object(j).ObjIndex).Newbie = 1 Then
UserList(UserIndex).BancoInvent.Object(j).ObjIndex = 0
UserList(UserIndex).BancoInvent.Object(j).amount = 0
Call UpdateBanUserInv(False, UserIndex, j, "QuitarNewbieObj")
End If
End If
Next j


'Si el usuario dejó de ser Newbie, y estaba en el Newbie Dungeon

'Mandamos a la Isla de la Fortuna

Call WarpUserChar(UserIndex, Renacimiento.Map, Renacimiento.x, Renacimiento.y, True)
Call WriteConsoleMsg(UserIndex, "Has dejado de ser Newbie, Te orientaremos que hacer ahora.", e_FontTypeNames.FONTTYPE_INFO)
Call WriteConsoleMsg(UserIndex, "Has dejado de ser Newbie.", e_FontTypeNames.FONTTYPE_INFO)

Exit Sub

Expand Down
13 changes: 10 additions & 3 deletions Codigo/Modulo_UsUaRiOs.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,9 +881,13 @@ Sub ActStats(ByVal VictimIndex As Integer, ByVal AttackerIndex As Integer)
End If

130 Call UserMod.UserDie(VictimIndex)
132 If UserList(AttackerIndex).Stats.UsuariosMatados < MAXUSERMATADOS Then
134 UserList(AttackerIndex).Stats.UsuariosMatados = UserList(AttackerIndex).Stats.UsuariosMatados + 1

If TriggerZonaPelea(attackerIndex, attackerIndex) <> TRIGGER6_PERMITE Then
132 If UserList(attackerIndex).Stats.UsuariosMatados < MAXUSERMATADOS Then
134 UserList(attackerIndex).Stats.UsuariosMatados = UserList(attackerIndex).Stats.UsuariosMatados + 1
End If
End If

Exit Sub

ActStats_Err:
Expand Down Expand Up @@ -1819,6 +1823,7 @@ Sub SendUserStatsTxt(ByVal sendIndex As Integer, ByVal UserIndex As Integer)
146 Call WriteConsoleMsg(sendIndex, "Total: " & TempStr, e_FontTypeNames.FONTTYPE_INFO)
#End If

Call LoadPatronCreditsFromDB(UserIndex)
148 Call WriteConsoleMsg(sendIndex, "Oro: " & UserList(UserIndex).Stats.GLD, e_FontTypeNames.FONTTYPE_INFO)
150 Call WriteConsoleMsg(sendIndex, "Dados: " & UserList(UserIndex).Stats.UserAtributos(e_Atributos.Fuerza) & ", " & UserList(UserIndex).Stats.UserAtributos(e_Atributos.Agilidad) & ", " & UserList(UserIndex).Stats.UserAtributos(e_Atributos.Inteligencia) & ", " & UserList(UserIndex).Stats.UserAtributos(e_Atributos.Constitucion) & ", " & UserList(UserIndex).Stats.UserAtributos(e_Atributos.Carisma), e_FontTypeNames.FONTTYPE_INFO)
152 Call WriteConsoleMsg(sendIndex, "Veces que Moriste: " & UserList(UserIndex).flags.VecesQueMoriste, e_FontTypeNames.FONTTYPE_INFO)
Expand Down Expand Up @@ -2186,7 +2191,9 @@ Sub UserDie(ByVal UserIndex As Integer)

End If

188 .flags.VecesQueMoriste = .flags.VecesQueMoriste + 1
If TriggerZonaPelea(UserIndex, UserIndex) <> TRIGGER6_PERMITE Then
.flags.VecesQueMoriste = .flags.VecesQueMoriste + 1
End If

' << Restauramos los atributos >>
190 If .flags.TomoPocion Then
Expand Down