IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-06-06 11:01:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add/Fix wagon tp.

Browse source
This commit is contained in:
SilicaAndPina 2021-02-11 12:34:20 +13:00
parent a20656a9aa
commit 9e7743e24d
5 changed files with 58 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs
View file

@ -881,6 +881,9 @@ namespace HISP.Server
Messages.CantAffordTransport = gameData.messages.transport.not_enough_money;
Messages.WelcomeToAreaFormat = gameData.messages.transport.welcome_to_format;
Messages.TransportFormat = gameData.messages.meta.transport_format;
Messages.TransportCostFormat = gameData.messages.meta.transport_cost;
Messages.TransportWagonFree = gameData.messages.meta.transport_free;
// Abuse Reports
Messages.AbuseReportMetaFormat = gameData.messages.meta.abuse_report.options_format;
@ -1187,7 +1190,6 @@ namespace HISP.Server
Messages.AreaFormat = gameData.messages.meta.area_format;
Messages.Seperator = gameData.messages.meta.seperator;
Messages.TileFormat = gameData.messages.meta.tile_format;
Messages.TransportFormat = gameData.messages.meta.transport_format;
Messages.ExitThisPlace = gameData.messages.meta.exit_this_place;
Messages.BackToMap = gameData.messages.meta.back_to_map;
Messages.BackToMapHorse = gameData.messages.meta.back_to_map_horse;

32
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -1375,9 +1375,21 @@ namespace HISP.Server
}
Transport.TransportPoint newPoint = Transport.TransportPoints[smalestTransportPointId];
int newX = newPoint.X;
int newY = newPoint.Y;
if (World.InSpecialTile(newX, newY))
{
World.SpecialTile tile = World.GetSpecialTile(newX, newY);
if (tile.ExitX != 0)
newX = tile.ExitX;
if (tile.ExitY != 0)
newY = tile.ExitY;
}
byte[] transported = PacketBuilder.CreateChat(Messages.RanchWagonDroppedYouOff, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(transported);
sender.LoggedinUser.Teleport(newPoint.X, newPoint.Y);
sender.LoggedinUser.Teleport(newX, newY);
}
}
break;
@ -2912,12 +2924,21 @@ namespace HISP.Server
}
Transport.TransportLocation transportLocation = Transport.GetTransportLocation(transportid);
int cost = transportLocation.Cost;
if (sender.LoggedinUser.Money >= transportLocation.Cost)
if (transportLocation.Type == "WAGON")
{
if(sender.LoggedinUser.OwnedRanch != null)
{
if(sender.LoggedinUser.OwnedRanch.GetBuildingCount(7) > 0) // Wagon
{
cost = 0;
}
}
}
if (sender.LoggedinUser.Money >= cost)
{
string swfToLoad = Messages.BoatCutscene;
if (transportLocation.Type == "WAGON")
swfToLoad = Messages.WagonCutscene;
@ -2940,7 +2961,8 @@ namespace HISP.Server
byte[] welcomeToIslePacket = PacketBuilder.CreateChat(Messages.FormatWelcomeToAreaMessage(transportLocation.LocationTitle), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(welcomeToIslePacket);
sender.LoggedinUser.Money -= transportLocation.Cost;
if(cost > 0)
sender.LoggedinUser.Money -= cost;
}
else
{