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

Add presents and fix bugs

Browse source
This commit is contained in:
SilicaAndPina 2021-02-15 17:22:53 +13:00
parent d9cdd05acb
commit 0cf1665a11
12 changed files with 273 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Horse Isle Server/HorseIsleServer/Game/Items/DroppedItems.cs
View file

@ -18,6 +18,7 @@ namespace HISP.Game.Items
public int Y;
public int DespawnTimer;
public ItemInstance Instance;
public int Data;
}
private static List<DroppedItem> droppedItemsList = new List<DroppedItem>();
public static int GetCountOfItem(Item.ItemInformation item)
@ -110,13 +111,14 @@ namespace HISP.Game.Items
if (droppedItemsList[i] == null) // Item removed in another thread.
continue;
droppedItemsList[i].DespawnTimer-=5;
droppedItemsList[i].DespawnTimer -= 5;
if(droppedItemsList[i].DespawnTimer <= 0)
{
if (GameServer.GetUsersAt(droppedItemsList[i].X, droppedItemsList[i].Y, true, true).Length > 0) // Dont despawn items players are standing on
continue;
Logger.DebugPrint("Despawned Item at " + droppedItemsList[i].X + ", " + droppedItemsList[i].Y);
RemoveDroppedItem(droppedItemsList[i]);
droppedItemsList.Remove(droppedItemsList[i]);
}
}
}
@ -130,7 +132,7 @@ namespace HISP.Game.Items
droppedItemsList.Add(droppedItem);
Database.AddDroppedItem(droppedItem);
}
public static void GenerateItems(bool randomizeDespawnTime)
public static void GenerateItems()
{
Logger.InfoPrint("Generating items, (this may take awhile on a fresh database!)");
@ -143,9 +145,7 @@ namespace HISP.Game.Items
{
count++;
int despawnTimer = 1500;
if(randomizeDespawnTime)
despawnTimer = GameServer.RandomNumberGenerator.Next(900, 1500);
int despawnTimer = 1440;
if (item.SpawnParamaters.SpawnInZone != null)
{
@ -326,7 +326,7 @@ namespace HISP.Game.Items
public static void Init()
{
ReadFromDatabase();
GenerateItems(true);
GenerateItems();
}
}

6
Horse Isle Server/HorseIsleServer/Game/Items/ItemInstance.cs
View file

@ -6,7 +6,7 @@ namespace HISP.Game.Items
{
public int RandomId;
public int ItemId;
public int Data;
public Item.ItemInformation GetItemInfo()
@ -15,10 +15,10 @@ namespace HISP.Game.Items
}
public ItemInstance(int id,int randomId = -1)
public ItemInstance(int id,int randomId = -1, int data=0)
{
RandomId = RandomID.NextRandomId(randomId);
Data = data;
ItemId = id;
}