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

FIx som stuff

Browse source
This commit is contained in:
SilicaAndPina 2020-10-22 00:28:40 +13:00
parent 2a241c35aa
commit 74aeb84494
7 changed files with 53 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
DataCollection/HI1.MAP Normal file
View file

Binary file not shown.

2
DataCollection/gamedata.json
View file

@ -42,7 +42,7 @@
"end_of_meta":"^Z", "end_of_meta":"^Z",
"back_to_map":"^M", "back_to_map":"^M",
"long_full_line":"^L", "long_full_line":"^L",
"inventory_format":"^ATYour Inventory^H<B>You are carrying the following %ITEMCOUNT% different items:</B> (%% max)", "inventory_format":"^ATYour Inventory^H<B>You are carrying the following %ITEMCOUNT% different items:</B> (%MAX%)",
"dropped_items":{ "dropped_items":{
"nothing_message":"^LYou see nothing on the ground of interest.^R1", "nothing_message":"^LYou see nothing on the ground of interest.^R1",
"items_message":"^LYou see the following on the ground:^R1", "items_message":"^LYou see the following on the ground:^R1",

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

@ -305,7 +305,7 @@ namespace Horse_Isle_Server
db.Open(); db.Open();
MySqlCommand sqlCommand = db.CreateCommand(); MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "DELETE FROM Inventory WHERE (RandomId=@randomId)"; sqlCommand.CommandText = "DELETE FROM DroppedItems WHERE (RandomId=@randomId)";
sqlCommand.Parameters.AddWithValue("@randomId", randomId); sqlCommand.Parameters.AddWithValue("@randomId", randomId);
sqlCommand.Prepare(); sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery(); sqlCommand.ExecuteNonQuery();

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

@ -57,14 +57,22 @@ namespace Horse_Isle_Server
int epoch_new = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; int epoch_new = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
DespawnItems(epoch, epoch_new); DespawnItems(epoch, epoch_new);
epoch = epoch_new;
GenerateItems(); GenerateItems();
} }
public static void RemoveDroppedItem(DroppedItem item) public static void RemoveDroppedItem(DroppedItem item)
{ {
Database.RemoveDroppedItem(item.instance.RandomID); int randomId = item.instance.RandomID;
droppedItemsList.Remove(item); Database.RemoveDroppedItem(randomId);
for (int i = 0; i < droppedItemsList.Count; i++)
{
if(droppedItemsList[i].instance.RandomID == randomId)
{
droppedItemsList.RemoveAt(i);
}
}
} }
public static DroppedItem GetDroppedItemById(int randomId) public static DroppedItem GetDroppedItemById(int randomId)
{ {
@ -84,17 +92,21 @@ namespace Horse_Isle_Server
} }
public static void DespawnItems(int old_epoch, int new_epoch) public static void DespawnItems(int old_epoch, int new_epoch)
{ {
int removedCount = 0;
DroppedItem[] items = droppedItemsList.ToArray(); DroppedItem[] items = droppedItemsList.ToArray();
foreach (DroppedItem item in items) foreach (DroppedItem item in items)
{ {
if(old_epoch + item.DespawnTimer < new_epoch) if(new_epoch + item.DespawnTimer < old_epoch)
{ {
if(Server.GetUsersAt(item.X, item.Y,true,true).Length == 0) if(Server.GetUsersAt(item.X, item.Y,true,true).Length == 0)
{ {
RemoveDroppedItem(item); RemoveDroppedItem(item);
removedCount++;
} }
} }
} }
if(removedCount > 0)
epoch = new_epoch;
} }
public static void GenerateItems() public static void GenerateItems()
{ {
@ -176,7 +188,9 @@ namespace Horse_Isle_Server
} }
if(newItems > 0) if(newItems > 0)
{
Database.AddDroppedItems(droppedItemsList.ToArray()); Database.AddDroppedItems(droppedItemsList.ToArray());
}
} }
public static void Init() public static void Init()

38
Horse Isle Server/Horse Isle Server/Map.cs
View file

@ -18,23 +18,28 @@ namespace Horse_Isle_Server
public static int[] OverlayTileDepth; public static int[] OverlayTileDepth;
public static TerrainTile[] TerrainTiles; public static int Width;
public static int Height;
public static Bitmap MapData; public static byte[] MapData;
public static byte[] oMapData;
public static TerrainTile[] TerrainTiles;
public static int NewUserStartX; public static int NewUserStartX;
public static int NewUserStartY; public static int NewUserStartY;
public static int GetTileId(int x, int y, bool overlay) public static int GetTileId(int x, int y, bool overlay)
{ {
if ((x > MapData.Width || x < 0) || (y > MapData.Height || y < 0)) // Outside map? if ((x > Width || x < 0) || (y > Height || y < 0)) // Outside map?
return 0x1; return 0x1;
int pos = ((x * Height) + y);
if (overlay) if (overlay)
return MapData.GetPixel(x, y).R; return oMapData[pos];
else else
return MapData.GetPixel(x, y).B; return MapData[pos];
} }
public static bool CheckPassable(int x, int y) public static bool CheckPassable(int x, int y)
{ {
@ -83,7 +88,26 @@ namespace Horse_Isle_Server
return; return;
} }
MapData = new Bitmap(ConfigReader.MapFile);
byte[] worldMap = File.ReadAllBytes(ConfigReader.MapFile);
Width = BitConverter.ToInt32(worldMap, 0);
Height = BitConverter.ToInt32(worldMap, 4);
MapData = new byte[Width * Height];
oMapData = new byte[Width * Height];
int ii = 8;
for (int i = 0; i < MapData.Length; i++)
{
oMapData[i] = worldMap[ii];
MapData[i] = worldMap[ii+ 1];
ii += 2;
}
worldMap = null;
} }
} }
} }

2
Horse Isle Server/Horse Isle Server/Resources/server.properties
View file

@ -13,7 +13,7 @@ db_password=test123
db_port=3306 db_port=3306
# Map Data # Map Data
map=MapDataCombined.bmp map=HI1.MAP
# JSON Format Data # JSON Format Data

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

@ -476,7 +476,7 @@ namespace Horse_Isle_Server
sender.LoggedinUser.Inventory.Add(item.instance); sender.LoggedinUser.Inventory.Add(item.instance);
DroppedItems.RemoveDroppedItem(item); DroppedItems.RemoveDroppedItem(item);
UpdateAreaForAll(item.X, item.Y); UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y);
byte[] chatMessage = PacketBuilder.CreateChat(Messages.GrabbedItemMessage, PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] chatMessage = PacketBuilder.CreateChat(Messages.GrabbedItemMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(chatMessage); sender.SendPacket(chatMessage);