diff --git a/DataCollection/gamedata.json b/DataCollection/gamedata.json index 89a22a9..536b262 100644 --- a/DataCollection/gamedata.json +++ b/DataCollection/gamedata.json @@ -87,6 +87,7 @@ "location_format":" You are%META% ", "tile_format":"%TILENAME%", "private_notes_format":"^ATMy Private Game Notes^H^PB160|%PRIVATENOTES%^PS7|SAVE NOTES", + "transport_format":"^R1^LTransport via %METHOD% to %PLACE%^R1^I%ICON%^T4Trip Costs $%COST% one way. ^B1M%XY%^BY%ID%", "exit_this_place":"^X", "end_of_meta":"^Z", "back_to_map":"^M", diff --git a/Horse Isle Server/Horse Isle Server/Game/DroppedItems.cs b/Horse Isle Server/Horse Isle Server/Game/DroppedItems.cs index 9ecd362..761abe6 100644 --- a/Horse Isle Server/Horse Isle Server/Game/DroppedItems.cs +++ b/Horse Isle Server/Horse Isle Server/Game/DroppedItems.cs @@ -62,14 +62,7 @@ namespace HISP.Game { int randomId = item.instance.RandomId; Database.RemoveDroppedItem(randomId); - for (int i = 0; i < droppedItemsList.Count; i++) - { - if(droppedItemsList[i].instance.RandomId == randomId) - { - droppedItemsList.RemoveAt(i); - return; - } - } + droppedItemsList.Remove(item); } diff --git a/Horse Isle Server/Horse Isle Server/Game/Meta.cs b/Horse Isle Server/Horse Isle Server/Game/Meta.cs index e0e6ea4..ae263e7 100644 --- a/Horse Isle Server/Horse Isle Server/Game/Meta.cs +++ b/Horse Isle Server/Horse Isle Server/Game/Meta.cs @@ -322,9 +322,10 @@ namespace HISP.Game int transportLocationId = transportPoint.Locations[i]; Transport.TransportLocation transportLocation = Transport.GetTransportLocation(transportLocationId); message += Messages.FormatTransportMessage(transportLocation.Type, transportLocation.LocationTitle, transportLocation.Cost, transportLocation.Id, transportLocation.GotoX, transportLocation.GotoY); - if(i + 1 != transportPoint.Locations.Length) - message += "^R1"; } + message += "^R1"; + message += Messages.ExitThisPlace; + message += Messages.MetaTerminator; return message; } public static string BuildStatsMenu(User user) diff --git a/Horse Isle Server/Horse Isle Server/Server/GameServer.cs b/Horse Isle Server/Horse Isle Server/Server/GameServer.cs index e896c5c..6ae13a8 100644 --- a/Horse Isle Server/Horse Isle Server/Server/GameServer.cs +++ b/Horse Isle Server/Horse Isle Server/Server/GameServer.cs @@ -54,7 +54,6 @@ namespace HISP.Server Database.IncAllUsersFreeTime(1); } Database.IncPlayerTirednessForOfflineUsers(); - DroppedItems.Update(); minuteTimer.Change(oneMinute, oneMinute); }