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

Nuevos viajes en barco #598

Merged
merged 2 commits into from
Jun 9, 2024
Merged

Nuevos viajes en barco #598

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
6212d52
Nuevos viajes en barco
valencata Jun 7, 2024
3153785
Merge branch 'ao-org:master' into master
valencata Jun 7, 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
7 changes: 4 additions & 3 deletions Codigo/Declares.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,10 +1295,9 @@ Public Enum e_TrapEffect
End Enum

Public Enum e_TripState
eNixToForgat = 1
eForgatToNix
eNixToArghal
eArghalToForgat
eForgatToArghal
End Enum

Public Type t_Transport
Expand Down Expand Up @@ -2983,7 +2982,9 @@ Public Renacimiento As t_WorldPos
Public NixDock As t_Transport
Public ForgatDock As t_Transport
Public ArghalDock As t_Transport
Public BarcoNavegando As t_Transport
Public BarcoNavegandoForgatNix As t_Transport
Public BarcoNavegandoNixArghal As t_Transport
Public BarcoNavegandoArghalForgat As t_Transport

Public TotalMapasCiudades() As String
Public Ayuda As New cCola
Expand Down
54 changes: 40 additions & 14 deletions Codigo/FileIO.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2563,17 +2563,43 @@ Sub CargarCiudades()
.y = val(Lector.GetValue("Renacimiento", "Y"))
End With

With BarcoNavegando
.Map = val(Lector.GetValue("BarcoNavegando", "Mapa"))
.StartX = val(Lector.GetValue("BarcoNavegando", "StartX"))
.StartY = val(Lector.GetValue("BarcoNavegando", "StartY"))
.EndX = val(Lector.GetValue("BarcoNavegando", "EndX"))
.EndY = val(Lector.GetValue("BarcoNavegando", "EndY"))
.DestX = val(Lector.GetValue("BarcoNavegando", "DestX"))
.DestY = val(Lector.GetValue("BarcoNavegando", "DestY"))
.DockX = val(Lector.GetValue("BarcoNavegando", "DockX"))
.DockY = val(Lector.GetValue("BarcoNavegando", "DockY"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegando", "RequiredPassID"))
With BarcoNavegandoForgatNix
.Map = val(Lector.GetValue("BarcoNavegandoForgatNix", "Mapa"))
.startX = val(Lector.GetValue("BarcoNavegandoForgatNix", "StartX"))
.startY = val(Lector.GetValue("BarcoNavegandoForgatNix", "StartY"))
.EndX = val(Lector.GetValue("BarcoNavegandoForgatNix", "EndX"))
.EndY = val(Lector.GetValue("BarcoNavegandoForgatNix", "EndY"))
.DestX = val(Lector.GetValue("BarcoNavegandoForgatNix", "DestX"))
.DestY = val(Lector.GetValue("BarcoNavegandoForgatNix", "DestY"))
.DockX = val(Lector.GetValue("BarcoNavegandoForgatNix", "DockX"))
.DockY = val(Lector.GetValue("BarcoNavegandoForgatNix", "DockY"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegandoForgatNix", "RequiredPassID"))
End With

With BarcoNavegandoNixArghal
.Map = val(Lector.GetValue("BarcoNavegandoNixArghal", "Mapa"))
.startX = val(Lector.GetValue("BarcoNavegandoNixArghal", "StartX"))
.startY = val(Lector.GetValue("BarcoNavegandoNixArghal", "StartY"))
.EndX = val(Lector.GetValue("BarcoNavegandoNixArghal", "EndX"))
.EndY = val(Lector.GetValue("BarcoNavegandoNixArghal", "EndY"))
.DestX = val(Lector.GetValue("BarcoNavegandoNixArghal", "DestX"))
.DestY = val(Lector.GetValue("BarcoNavegandoNixArghal", "DestY"))
.DockX = val(Lector.GetValue("BarcoNavegandoNixArghal", "DockX"))
.DockY = val(Lector.GetValue("BarcoNavegandoNixArghal", "DockY"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegandoNixArghal", "RequiredPassID"))
End With

With BarcoNavegandoArghalForgat
.Map = val(Lector.GetValue("BarcoNavegandoArghalForgat", "Mapa"))
.startX = val(Lector.GetValue("BarcoNavegandoArghalForgat", "StartX"))
.startY = val(Lector.GetValue("BarcoNavegandoArghalForgat", "StartY"))
.EndX = val(Lector.GetValue("BarcoNavegandoArghalForgat", "EndX"))
.EndY = val(Lector.GetValue("BarcoNavegandoArghalForgat", "EndY"))
.DestX = val(Lector.GetValue("BarcoNavegandoArghalForgat", "DestX"))
.DestY = val(Lector.GetValue("BarcoNavegandoArghalForgat", "DestY"))
.DockX = val(Lector.GetValue("BarcoNavegandoArghalForgat", "DockX"))
.DockY = val(Lector.GetValue("BarcoNavegandoArghalForgat", "DockY"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegandoArghalForgat", "RequiredPassID"))
End With

With ForgatDock
Expand All @@ -2586,7 +2612,7 @@ Sub CargarCiudades()
.DestY = val(Lector.GetValue("ForgatDock", "DestY"))
.DockX = val(Lector.GetValue("ForgatDock", "DockX"))
.DockY = val(Lector.GetValue("ForgatDock", "DockY"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegando", "RequiredPassID"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegandoForgatNix", "RequiredPassID"))
End With

With NixDock
Expand All @@ -2599,7 +2625,7 @@ Sub CargarCiudades()
.DestY = val(Lector.GetValue("NixDock", "DestY"))
.DockX = val(Lector.GetValue("NixDock", "DockX"))
.DockY = val(Lector.GetValue("NixDock", "DockY"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegando", "RequiredPassID"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegandoNixArghal", "RequiredPassID"))
End With

With ArghalDock
Expand All @@ -2612,7 +2638,7 @@ Sub CargarCiudades()
.DestY = val(Lector.GetValue("ArghalDock", "DestY"))
.DockX = val(Lector.GetValue("ArghalDock", "DockX"))
.DockY = val(Lector.GetValue("ArghalDock", "DockY"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegando", "RequiredPassID"))
.RequiredPassID = val(Lector.GetValue("BarcoNavegandoArghalForgat", "RequiredPassID"))
End With


Expand Down
4 changes: 3 additions & 1 deletion Codigo/General.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,9 @@ Sub Main()
.tControlHechizos.Interval = 60000
If IsFeatureEnabled("ShipTravelEnabled") Then
.TimerBarco.Enabled = True
MapInfo(BarcoNavegando.map).ForceUpdate = True
MapInfo(BarcoNavegandoForgatNix.Map).ForceUpdate = True
MapInfo(BarcoNavegandoNixArghal.Map).ForceUpdate = True
MapInfo(BarcoNavegandoArghalForgat.Map).ForceUpdate = True
End If


Expand Down
5 changes: 4 additions & 1 deletion Codigo/LocaleDef.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@ Public Const MsgNavalBattleRewardBroadcast = 486
Public Const MsgBoardcastInscriptionPrice = 487
Public Const MsgMatchComplete = 488
Public Const MsgInvalidPassword = 489
Public Const MsgThanksForTravelArghal = 490
Public Const MsgPassArghal = 490
Public Const MsgThanksForTravelArghal = 491



Public Function GetRequiredWeaponLocaleId(ByVal WeaponType As e_WeaponType) As Integer
Select Case WeaponType
Expand Down
Loading