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

Add inventory support

Browse source
This commit is contained in:
SilicaAndPina 2020-10-22 19:46:17 +13:00
parent 74aeb84494
commit 0d64c3e22c
13 changed files with 1702 additions and 1568 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3047
DataCollection/gamedata.json
View file

File diff suppressed because it is too large Load diff

1
Horse Isle Server/Horse Isle Server/Client.cs
View file

@ -49,7 +49,6 @@ namespace Horse_Isle_Server
}
private void updateTimerTick(object state)
{
Server.UpdateArea(this);
Server.UpdateWorld(this);
Server.UpdatePlayer(this);
}

35
Horse Isle Server/Horse Isle Server/Database.cs
View file

@ -329,7 +329,7 @@ namespace Horse_Isle_Server
droppedItem.X = reader.GetInt32(0);
droppedItem.Y = reader.GetInt32(1);
droppedItem.DespawnTimer = reader.GetInt32(4);
ItemInstance instance = new ItemInstance(reader.GetInt32(3),reader.GetInt32(4));
ItemInstance instance = new ItemInstance(reader.GetInt32(3),reader.GetInt32(2));
droppedItem.instance = instance;
itemList.Add(droppedItem);
}
@ -338,35 +338,28 @@ namespace Horse_Isle_Server
}
return itemList.ToArray();
}
public static void AddDroppedItems(DroppedItems.DroppedItem[] items)
public static void AddDroppedItem(DroppedItems.DroppedItem item)
{
using (MySqlConnection db = new MySqlConnection(ConnectionString))
{
db.Open();
MySqlTransaction transaction = db.BeginTransaction();
foreach (DroppedItems.DroppedItem item in items)
{
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer)";
sqlCommand.Parameters.AddWithValue("@x", item.X);
sqlCommand.Parameters.AddWithValue("@y", item.Y);
sqlCommand.Parameters.AddWithValue("@randomId", item.instance.RandomID);
sqlCommand.Parameters.AddWithValue("@itemId", item.instance.ItemID);
sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer);
sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose();
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.Transaction = transaction;
sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer)";
sqlCommand.Parameters.AddWithValue("@x", item.X);
sqlCommand.Parameters.AddWithValue("@y", item.Y);
sqlCommand.Parameters.AddWithValue("@randomId", item.instance.RandomID);
sqlCommand.Parameters.AddWithValue("@itemId", item.instance.ItemID);
sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer);
sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose();
}
transaction.Commit();
}
}
public static void AddMail(int toId, string fromName, string subject, string message)
{
using (MySqlConnection db = new MySqlConnection(ConnectionString))

7
Horse Isle Server/Horse Isle Server/DroppedItems.cs
View file

@ -69,7 +69,7 @@ namespace Horse_Isle_Server
if(droppedItemsList[i].instance.RandomID == randomId)
{
droppedItemsList.RemoveAt(i);
return;
}
}
@ -164,6 +164,7 @@ namespace Horse_Isle_Server
droppedItem.DespawnTimer = despawnTimer;
droppedItem.instance = instance;
droppedItemsList.Add(droppedItem);
Database.AddDroppedItem(droppedItem);
Logger.DebugPrint("Created Item ID: " + instance.ItemID + " in " + isle.Name + " at: X: " + droppedItem.X + " Y: " + droppedItem.Y);
newItems++;
break;
@ -187,10 +188,6 @@ namespace Horse_Isle_Server
}
}
if(newItems > 0)
{
Database.AddDroppedItems(droppedItemsList.ToArray());
}
}
public static void Init()

16
Horse Isle Server/Horse Isle Server/Gamedata.cs
View file

@ -206,6 +206,11 @@ namespace Horse_Isle_Server
Messages.LoginMessageForamt = gameData.messages.login_format;
Messages.LogoutMessageFormat = gameData.messages.logout_format;
// Transport
Messages.CantAffordTransport = gameData.messages.transport.not_enough_money;
Messages.WelcomeToAreaFormat = gameData.messages.transport.welcome_to_format;
// Chat
Messages.ChatViolationMessageFormat = gameData.messages.chat.violation_format;
@ -246,7 +251,6 @@ namespace Horse_Isle_Server
Messages.Seperator = gameData.messages.meta.seperator;
Messages.TileFormat = gameData.messages.meta.tile_format;
Messages.TransportFormat = gameData.messages.meta.transport_format;
Messages.InventoryFormat = gameData.messages.meta.inventory_format;
Messages.ExitThisPlace = gameData.messages.meta.exit_this_place;
Messages.BackToMap = gameData.messages.meta.back_to_map;
Messages.LongFullLine = gameData.messages.meta.long_full_line;
@ -255,6 +259,7 @@ namespace Horse_Isle_Server
Messages.NothingMessage = gameData.messages.meta.dropped_items.nothing_message;
Messages.ItemsOnGroundMessage = gameData.messages.meta.dropped_items.items_message;
Messages.GrabItemFormat = gameData.messages.meta.dropped_items.item_format;
Messages.GrabAllItemsButton = gameData.messages.meta.dropped_items.grab_all;
Messages.GrabbedItemMessage = gameData.messages.grab_message;
Messages.GrabAllItemsMessage = gameData.messages.grab_all_message;
@ -264,6 +269,14 @@ namespace Horse_Isle_Server
Messages.South = gameData.messages.meta.nearby.south;
Messages.West = gameData.messages.meta.nearby.west;
// Inventory
Messages.InventoryHeaderFormat = gameData.messages.meta.inventory.header_format;
Messages.InventoryItemFormat = gameData.messages.meta.inventory.item_entry;
Messages.ItemInformationButton = gameData.messages.meta.inventory.item_info_button;
Messages.ItemDropItemButton = gameData.messages.meta.inventory.item_drop_button;
// Map Data
Map.OverlayTileDepth = gameData.tile_paramaters.overlay_tiles.tile_depth.ToObject<int[]>();
@ -294,6 +307,7 @@ namespace Horse_Isle_Server
// Inventory
Messages.DefaultInventoryMax = gameData.item.max_carryable;
// Swf
Messages.WagonCutscene = gameData.transport.wagon_cutscene;

13
Horse Isle Server/Horse Isle Server/IInventory.cs
View file

@ -6,6 +6,17 @@ using System.Threading.Tasks;
namespace Horse_Isle_Server
{
class InventoryItem
{
public InventoryItem()
{
ItemInstances = new List<ItemInstance>();
}
public int ItemId;
public List<ItemInstance> ItemInstances;
}
interface IInventory
{
@ -17,7 +28,7 @@ namespace Horse_Isle_Server
get;
}
ItemInstance[] GetItemList();
InventoryItem[] GetItemList();
}

45
Horse Isle Server/Horse Isle Server/Messages.cs
View file

@ -48,15 +48,28 @@ namespace Horse_Isle_Server
public static string PasswordNotice;
public static string CapsNotice;
// Transport
public static string CantAffordTransport;
public static string WelcomeToAreaFormat;
//Dropped Items
public static string NothingMessage;
public static string ItemsOnGroundMessage;
public static string GrabItemFormat;
public static string GrabAllItemsButton;
public static string GrabAllItemsMessage;
public static string GrabbedItemMessage;
public static string GrabbedAllObjectsMessage;
// Inventory
public static string InventoryItemFormat;
public static string InventoryHeaderFormat;
public static string ItemDropItemButton;
public static string ItemInformationButton;
// Meta
public static string IsleFormat;
public static string TownFormat;
@ -72,8 +85,7 @@ namespace Horse_Isle_Server
public static string TileFormat;
public static string Seperator;
public static string InventoryFormat;
public static string ExitThisPlace;
public static string BackToMap;
public static string LongFullLine;
@ -95,9 +107,30 @@ namespace Horse_Isle_Server
public static string FormatPlayerInventoryHeaderMeta(int itemCount, int maxItems)
{
return InventoryFormat.Replace("%ITEMCOUNT%", itemCount.ToString()).Replace("%MAXITEMS%", maxItems.ToString());
return InventoryHeaderFormat.Replace("%ITEMCOUNT%", itemCount.ToString()).Replace("%MAXITEMS%", maxItems.ToString());
}
public static string FormatPlayerInventoryItemMeta(int iconid, int count, string name)
{
return InventoryItemFormat.Replace("%ICONID%", iconid.ToString()).Replace("%COUNT%", count.ToString()).Replace("%TITLE%", name);
}
public static string FormatItemInformationButton(int randomid)
{
return ItemInformationButton.Replace("%RANDOMID%", randomid.ToString());
}
public static string FormatItemDropItemButton(int randomid)
{
return ItemDropItemButton.Replace("%RANDOMID%", randomid.ToString());
}
// Meta
public static string FormatTileName(string name)
{
return Messages.TileFormat.Replace("%TILENAME%", name);
}
public static string FormatGrabItemMessage(string name, int randomid, int iconid)
{
return GrabItemFormat.Replace("%ICONID%",iconid.ToString()).Replace("%ITEMNAME%", name).Replace("%RANDOMID%", randomid.ToString());
@ -227,6 +260,12 @@ namespace Horse_Isle_Server
return WelcomeFormat.Replace("%USERNAME%", username);
}
// Transport
public static string FormatWelcomeToAreaMessage(string placeName)
{
return WelcomeToAreaFormat.Replace("%PLACE%", placeName);
}
// Disconnect
public static string FormatIdleKickMessage()
{

41
Horse Isle Server/Horse Isle Server/Meta.cs
View file

@ -80,7 +80,7 @@ namespace Horse_Isle_Server
{
string message = "";
message += Messages.Seperator + buildNearbyString(x, y);
message += buildNearbyString(x, y);
// Dropped Items
DroppedItems.DroppedItem[] Items = DroppedItems.GetItemsAt(x, y);
@ -94,9 +94,9 @@ namespace Horse_Isle_Server
Item.ItemInformation itemInfo = item.instance.GetItemInfo();
message += Messages.FormatGrabItemMessage(itemInfo.Name, item.instance.RandomID, itemInfo.IconId);
}
message += Messages.GrabAllItemsMessage;
if(Items.Length > 1)
message += Messages.GrabAllItemsButton;
}
Logger.DebugPrint(message);
return message;
}
public static string BuildTransportInfo(Transport.TransportPoint transportPoint)
@ -114,13 +114,15 @@ namespace Horse_Isle_Server
{
string message = "";
if (specialTile.Title != null)
message += Messages.TileFormat.Replace("%TILENAME%", specialTile.Title);
else
message += buildLocationString(specialTile.X, specialTile.Y);
if (specialTile.Code == null)
message += buildLocationString(specialTile.X, specialTile.Y)+Messages.Seperator;
if (specialTile.Description != null)
message += Messages.Seperator + specialTile.Description;
if (specialTile.Title != null && specialTile.Title != "")
message += Messages.FormatTileName(specialTile.Title) + Messages.Seperator;
if (specialTile.Description != null && specialTile.Description != "")
message += specialTile.Description;
if (specialTile.Code == null)
message += buildCommonInfo(specialTile.X, specialTile.Y);
@ -140,6 +142,27 @@ namespace Horse_Isle_Server
{
string message = "";
message += Messages.FormatPlayerInventoryHeaderMeta(inv.Count, Messages.DefaultInventoryMax);
InventoryItem[] items = inv.GetItemList();
foreach(InventoryItem item in items)
{
Item.ItemInformation itemInfo = Item.GetItemById(item.ItemId);
string title = itemInfo.Name;
if (item.ItemInstances.Count > 1 && itemInfo.PluralName != "")
title = itemInfo.PluralName;
message += Messages.FormatPlayerInventoryItemMeta(itemInfo.IconId, item.ItemInstances.Count, title);
int randomId = item.ItemInstances[0].RandomID;
int sortBy = itemInfo.SortBy
if(sortBy == 2) // all items with sort 2 are throwable-
message += Messages.FormatItemDropItemButton(randomId);
message += Messages.FormatItemInformationButton(randomId);
message += "^R1";
}
Logger.DebugPrint(message);
return message;
}
public static string BuildMetaInfo(int x, int y)

55
Horse Isle Server/Horse Isle Server/PlayerInventory.cs
View file

@ -9,37 +9,74 @@ namespace Horse_Isle_Server
class PlayerInventory : IInventory
{
private User baseUser;
private List<ItemInstance> instances = new List<ItemInstance>();
private List<InventoryItem> inventoryItems;
public PlayerInventory(User forUser)
{
inventoryItems = new List<InventoryItem>();
baseUser = forUser;
instances = Database.GetPlayerInventory(baseUser.Id);
ItemInstance[] instances = Database.GetPlayerInventory(baseUser.Id).ToArray();
foreach(ItemInstance instance in instances)
{
Add(instance);
}
}
public int Count
{
get
{
return instances.Count;
return inventoryItems.Count;
}
}
public void Add(ItemInstance item)
{
instances.Add(item);
Database.AddItemToInventory(baseUser.Id, item);
foreach (InventoryItem invetoryItem in inventoryItems)
{
if (invetoryItem.ItemId == item.ItemID)
{
invetoryItem.ItemInstances.Add(item);
return;
}
}
InventoryItem inventoryItem = new InventoryItem();
inventoryItem.ItemId = item.ItemID;
inventoryItem.ItemInstances.Add(item);
inventoryItems.Add(inventoryItem);
}
public ItemInstance[] GetItemList()
public InventoryItem[] GetItemList()
{
return instances.ToArray();
return inventoryItems.OrderBy(o => o.ItemInstances[0].GetItemInfo().SortBy).ToArray();
}
public void Remove(ItemInstance item)
{
instances.Remove(item);
Database.RemoveItemFromInventory(baseUser.Id, item);
foreach (InventoryItem inventoryItem in inventoryItems)
{
if(item.ItemID == inventoryItem.ItemId)
{
foreach(ItemInstance instance in inventoryItem.ItemInstances)
{
if(instance.RandomID == item.RandomID)
{
inventoryItem.ItemInstances.Remove(instance);
return;
}
}
}
}
Logger.ErrorPrint("Tried to remove item : " + item.RandomID + " from inventory when it was not in it");
}
}
}

10
Horse Isle Server/Horse Isle Server/Server.cs
View file

@ -339,7 +339,7 @@ namespace Horse_Isle_Server
if (sender.LoggedinUser.Money >= transportLocation.Cost)
{
string swfToLoad = Messages.BoatCutscene;
if (transportLocation.Type == "WAGON")
@ -353,8 +353,16 @@ namespace Horse_Isle_Server
Teleport(sender, transportLocation.GotoX, transportLocation.GotoY);
byte[] welcomeToIslePacket = PacketBuilder.CreateChat(Messages.FormatWelcomeToAreaMessage(transportLocation.LocationTitle), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(welcomeToIslePacket);
sender.LoggedinUser.Money -= transportLocation.Cost;
}
else
{
byte[] cantAfford = PacketBuilder.CreateChat(Messages.FormatWelcomeToAreaMessage(transportLocation.LocationTitle), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(cantAfford);
}
}
catch (KeyNotFoundException)
{

BIN
WebInterface/game-site/mod/conformation.swf Normal file
View file

Binary file not shown.

BIN
WebInterface/game-site/mod/draftarena.swf Normal file
View file

Binary file not shown.

BIN
WebInterface/game-site/mod/racingarena.swf Normal file
View file

Binary file not shown.