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

AbcAbcAbc

Browse source
This commit is contained in:
SilicaAndPina 2020-10-29 10:18:55 +13:00
parent 4bf39e0db3
commit 180708bb76
8 changed files with 323658 additions and 945 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

324476
DataCollection/gamedata.json
View file

File diff suppressed because one or more lines are too long

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

@ -274,8 +274,8 @@ namespace Horse_Isle_Server
sqlCommand.CommandText = "INSERT INTO Inventory VALUES(@playerId,@randomId,@itemId)"; sqlCommand.CommandText = "INSERT INTO Inventory VALUES(@playerId,@randomId,@itemId)";
sqlCommand.Parameters.AddWithValue("@playerId", playerId); sqlCommand.Parameters.AddWithValue("@playerId", playerId);
sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomID); sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId);
sqlCommand.Parameters.AddWithValue("@itemId", instance.ItemID); sqlCommand.Parameters.AddWithValue("@itemId", instance.ItemId);
sqlCommand.Prepare(); sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery(); sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose(); sqlCommand.Dispose();
@ -291,7 +291,7 @@ namespace Horse_Isle_Server
sqlCommand.CommandText = "DELETE FROM Inventory WHERE (PlayerId=@playerId AND RandomId=@randomId)"; sqlCommand.CommandText = "DELETE FROM Inventory WHERE (PlayerId=@playerId AND RandomId=@randomId)";
sqlCommand.Parameters.AddWithValue("@playerId", playerId); sqlCommand.Parameters.AddWithValue("@playerId", playerId);
sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomID); sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId);
sqlCommand.Prepare(); sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery(); sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose(); sqlCommand.Dispose();
@ -350,8 +350,8 @@ namespace Horse_Isle_Server
sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer)"; sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer)";
sqlCommand.Parameters.AddWithValue("@x", item.X); sqlCommand.Parameters.AddWithValue("@x", item.X);
sqlCommand.Parameters.AddWithValue("@y", item.Y); sqlCommand.Parameters.AddWithValue("@y", item.Y);
sqlCommand.Parameters.AddWithValue("@randomId", item.instance.RandomID); sqlCommand.Parameters.AddWithValue("@randomId", item.instance.RandomId);
sqlCommand.Parameters.AddWithValue("@itemId", item.instance.ItemID); sqlCommand.Parameters.AddWithValue("@itemId", item.instance.ItemId);
sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer); sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer);
sqlCommand.Prepare(); sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery(); sqlCommand.ExecuteNonQuery();

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

@ -24,7 +24,7 @@ namespace Horse_Isle_Server
int count = 0; int count = 0;
foreach(DroppedItem droppedItem in dropedItems) foreach(DroppedItem droppedItem in dropedItems)
{ {
if(droppedItem.instance.ItemID == item.Id) if(droppedItem.instance.ItemId == item.Id)
{ {
count++; count++;
} }
@ -62,11 +62,11 @@ namespace Horse_Isle_Server
} }
public static void RemoveDroppedItem(DroppedItem item) public static void RemoveDroppedItem(DroppedItem item)
{ {
int randomId = item.instance.RandomID; int randomId = item.instance.RandomId;
Database.RemoveDroppedItem(randomId); Database.RemoveDroppedItem(randomId);
for (int i = 0; i < droppedItemsList.Count; i++) for (int i = 0; i < droppedItemsList.Count; i++)
{ {
if(droppedItemsList[i].instance.RandomID == randomId) if(droppedItemsList[i].instance.RandomId == randomId)
{ {
droppedItemsList.RemoveAt(i); droppedItemsList.RemoveAt(i);
return; return;
@ -81,7 +81,7 @@ namespace Horse_Isle_Server
foreach (DroppedItem item in dropedItems) foreach (DroppedItem item in dropedItems)
{ {
if(item.instance.RandomID == randomId) if(item.instance.RandomId == randomId)
{ {
return item; return item;
} }
@ -175,7 +175,7 @@ namespace Horse_Isle_Server
droppedItem.instance = instance; droppedItem.instance = instance;
droppedItemsList.Add(droppedItem); droppedItemsList.Add(droppedItem);
Database.AddDroppedItem(droppedItem); Database.AddDroppedItem(droppedItem);
Logger.DebugPrint("Created Item ID: " + instance.ItemID + " in " + isle.Name + " at: X: " + droppedItem.X + " Y: " + droppedItem.Y); Logger.DebugPrint("Created Item ID: " + instance.ItemId + " in " + isle.Name + " at: X: " + droppedItem.X + " Y: " + droppedItem.Y);
newItems++; newItems++;
break; break;

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

@ -201,6 +201,74 @@ namespace Horse_Isle_Server
Item.ThrowableItems.Add(throwableItem); Item.ThrowableItems.Add(throwableItem);
} }
// Register NPCs
Logger.DebugPrint("Registering NPCS: ");
int totalNpcs = gameData.npc_list.Count;
for(int i = 0; i < totalNpcs; i++)
{
Npc.NpcEntry npcEntry = new Npc.NpcEntry();
npcEntry.Id = gameData.npc_list[i].id;
npcEntry.Name = gameData.npc_list[i].name;
npcEntry.AdminDescription = gameData.npc_list[i].admin_description;
npcEntry.ShortDescription = gameData.npc_list[i].short_description;
npcEntry.LongDescription = gameData.npc_list[i].long_description;
npcEntry.Moves = gameData.npc_list[i].moves;
npcEntry.X = gameData.npc_list[i].x;
npcEntry.Y = gameData.npc_list[i].y;
if (gameData.npc_list[i].stay_on != null)
npcEntry.StayOn = gameData.npc_list[i].stay_on;
if (gameData.npc_list[i].requires_questid_completed != null)
npcEntry.RequiresQuestIdCompleted = gameData.npc_list[i].requires_questid_completed;
if (gameData.npc_list[i].requires_questid_not_completed != null)
npcEntry.RequiresQuestIdNotCompleted = gameData.npc_list[i].requires_questid_not_completed;
if (gameData.npc_list[i].udlr_script != null)
npcEntry.UDLRScript = gameData.npc_list[i].udlr_script;
if (gameData.npc_list[i].udlr_start_x != null)
npcEntry.UDLRStartX = gameData.npc_list[i].udlr_start_x;
if (gameData.npc_list[i].udlr_start_y != null)
npcEntry.UDLRStartY = gameData.npc_list[i].udlr_start_y;
npcEntry.AdminOnly = gameData.npc_list[i].admin_only;
npcEntry.LibarySearchable = gameData.npc_list[i].libary_searchable;
npcEntry.IconId = gameData.npc_list[i].icon_id;
Logger.DebugPrint("\tNPC ID:" + npcEntry.Id.ToString() + " NAME: " + npcEntry.Name);
List<Npc.NpcChat> chats = new List<Npc.NpcChat>();
int totalNpcChat = gameData.npc_list[i].chatpoints.Count;
for (int ii = 0; ii < totalNpcChat; ii++)
{
Npc.NpcChat npcChat = new Npc.NpcChat();
npcChat.Id = gameData.npc_list[i].chatpoints[ii].chatpoint_id;
npcChat.ChatText = gameData.npc_list[i].chatpoints[ii].chat_text;
npcChat.ActivateQuestId = gameData.npc_list[i].chatpoints[ii].activate_questid;
Logger.DebugPrint("\t\tCHATPOINT ID: " + npcChat.Id.ToString() + " TEXT: " + npcChat.ChatText);
int totalNpcReply = gameData.npc_list[i].chatpoints[ii].replies.Count;
List<Npc.NpcReply> replys = new List<Npc.NpcReply>();
for (int iii = 0; iii < totalNpcReply; iii++)
{
Npc.NpcReply npcReply = new Npc.NpcReply();
npcReply.RandomId = RandomID.NextRandomId();
npcReply.Id = gameData.npc_list[i].chatpoints[ii].replies[iii].reply_id;
npcReply.ReplyText = gameData.npc_list[i].chatpoints[ii].replies[iii].reply_text;
npcReply.GotoChatpoint = gameData.npc_list[i].chatpoints[ii].replies[iii].goto_chatpoint;
if (gameData.npc_list[i].chatpoints[ii].replies[iii].requires_questid_completed != null)
npcReply.RequiresQuestIdCompleted = gameData.npc_list[i].chatpoints[ii].replies[iii].requires_questid_completed;
if (gameData.npc_list[i].chatpoints[ii].replies[iii].requires_questid_not_completed != null)
npcReply.RequiresQuestIdNotCompleted = gameData.npc_list[i].chatpoints[ii].replies[iii].requires_questid_not_completed;
Logger.DebugPrint("\t\t\tREPLY ID: " + npcReply.Id.ToString() + " TEXT: " + npcReply.ReplyText);
replys.Add(npcReply);
}
npcChat.Replies = replys.ToArray();
chats.Add(npcChat);
}
npcEntry.Chatpoints = chats.ToArray();
Npc.NpcList.Add(npcEntry);
}
Item.Present = gameData.item.special.present; Item.Present = gameData.item.special.present;
Item.MailMessage = gameData.item.special.mail_message; Item.MailMessage = gameData.item.special.mail_message;
Item.DorothyShoes = gameData.item.special.dorothy_shoes; Item.DorothyShoes = gameData.item.special.dorothy_shoes;

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

@ -91,6 +91,7 @@
<Compile Include="Messages.cs" /> <Compile Include="Messages.cs" />
<Compile Include="Item.cs" /> <Compile Include="Item.cs" />
<Compile Include="Meta.cs" /> <Compile Include="Meta.cs" />
<Compile Include="Npc.cs" />
<Compile Include="PacketBuilder.cs" /> <Compile Include="PacketBuilder.cs" />
<Compile Include="PlayerInventory.cs" /> <Compile Include="PlayerInventory.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
@ -100,6 +101,7 @@
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<Compile Include="RandomID.cs" />
<Compile Include="Server.cs" /> <Compile Include="Server.cs" />
<Compile Include="Transport.cs" /> <Compile Include="Transport.cs" />
<Compile Include="User.cs" /> <Compile Include="User.cs" />

19
Horse Isle Server/Horse Isle Server/ItemInstance.cs
View file

@ -8,29 +8,22 @@ namespace Horse_Isle_Server
{ {
class ItemInstance class ItemInstance
{ {
public int RandomID; public int RandomId;
public int ItemID; public int ItemId;
private static int prevId = 0;
public Item.ItemInformation GetItemInfo() public Item.ItemInformation GetItemInfo()
{ {
return Item.GetItemById(ItemID); return Item.GetItemById(ItemId);
} }
public ItemInstance(int id,int randomId = -1) public ItemInstance(int id,int randomId = -1)
{ {
prevId++; RandomId = RandomID.NextRandomId(randomId);
if (randomId == -1)
RandomID = prevId;
else
RandomID = randomId;
if (RandomID > prevId) ItemId = id;
prevId = RandomID + 1;
ItemID = id;
} }

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

@ -92,7 +92,7 @@ namespace Horse_Isle_Server
foreach(DroppedItems.DroppedItem item in Items) foreach(DroppedItems.DroppedItem item in Items)
{ {
Item.ItemInformation itemInfo = item.instance.GetItemInfo(); Item.ItemInformation itemInfo = item.instance.GetItemInfo();
message += Messages.FormatGrabItemMessage(itemInfo.Name, item.instance.RandomID, itemInfo.IconId); message += Messages.FormatGrabItemMessage(itemInfo.Name, item.instance.RandomId, itemInfo.IconId);
} }
if(Items.Length > 1) if(Items.Length > 1)
message += Messages.GrabAllItemsButton; message += Messages.GrabAllItemsButton;
@ -153,7 +153,7 @@ namespace Horse_Isle_Server
message += Messages.FormatPlayerInventoryItemMeta(itemInfo.IconId, item.ItemInstances.Count, title); message += Messages.FormatPlayerInventoryItemMeta(itemInfo.IconId, item.ItemInstances.Count, title);
int randomId = item.ItemInstances[0].RandomID; int randomId = item.ItemInstances[0].RandomId;
if (itemInfo.Id == Item.Present || itemInfo.Id == Item.DorothyShoes || itemInfo.Id == Item.Telescope) if (itemInfo.Id == Item.Present || itemInfo.Id == Item.DorothyShoes || itemInfo.Id == Item.Telescope)
message += Messages.FormatItemUseButton(randomId); message += Messages.FormatItemUseButton(randomId);

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

@ -36,7 +36,7 @@ namespace Horse_Isle_Server
foreach (InventoryItem invetoryItem in inventoryItems) foreach (InventoryItem invetoryItem in inventoryItems)
{ {
if (invetoryItem.ItemId == item.ItemID) if (invetoryItem.ItemId == item.ItemId)
{ {
invetoryItem.ItemInstances.Add(item); invetoryItem.ItemInstances.Add(item);
return; return;
@ -45,7 +45,7 @@ namespace Horse_Isle_Server
InventoryItem inventoryItem = new InventoryItem(); InventoryItem inventoryItem = new InventoryItem();
inventoryItem.ItemId = item.ItemID; inventoryItem.ItemId = item.ItemId;
inventoryItem.ItemInstances.Add(item); inventoryItem.ItemInstances.Add(item);
inventoryItems.Add(inventoryItem); inventoryItems.Add(inventoryItem);
} }
@ -67,11 +67,11 @@ namespace Horse_Isle_Server
foreach (InventoryItem inventoryItem in inventoryItems) foreach (InventoryItem inventoryItem in inventoryItems)
{ {
if(item.ItemID == inventoryItem.ItemId) if(item.ItemId == inventoryItem.ItemId)
{ {
foreach(ItemInstance instance in inventoryItem.ItemInstances) foreach(ItemInstance instance in inventoryItem.ItemInstances)
{ {
if(instance.RandomID == item.RandomID) if(instance.RandomId == item.RandomId)
{ {
inventoryItem.ItemInstances.Remove(instance); inventoryItem.ItemInstances.Remove(instance);
@ -84,7 +84,7 @@ namespace Horse_Isle_Server
} }
} }
Logger.ErrorPrint("Tried to remove item : " + item.RandomID + " from inventory when it was not in it"); Logger.ErrorPrint("Tried to remove item : " + item.RandomId + " from inventory when it was not in it");
} }
public bool HasItem(int randomId) public bool HasItem(int randomId)
@ -95,7 +95,7 @@ namespace Horse_Isle_Server
ItemInstance[] instances = item.ItemInstances.ToArray(); ItemInstance[] instances = item.ItemInstances.ToArray();
foreach(ItemInstance instance in instances) foreach(ItemInstance instance in instances)
{ {
if (instance.RandomID == randomId) if (instance.RandomId == randomId)
return true; return true;
} }
} }
@ -137,7 +137,7 @@ namespace Horse_Isle_Server
ItemInstance[] instances = item.ItemInstances.ToArray(); ItemInstance[] instances = item.ItemInstances.ToArray();
foreach (ItemInstance instance in instances) foreach (ItemInstance instance in instances)
{ {
if (instance.RandomID == randomId) if (instance.RandomId == randomId)
return item; return item;
} }
} }