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 npc support sorta

Browse source
This commit is contained in:
SilicaAndPina 2020-10-29 22:03:22 +13:00
parent 5819441222
commit c245f267f5
10 changed files with 4022 additions and 3917 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7809
DataCollection/gamedata.json
View file

File diff suppressed because it is too large Load diff

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

@ -163,6 +163,9 @@ namespace Horse_Isle_Server
case PacketBuilder.PACKET_ITEM_INTERACTION:
Server.OnItemInteraction(this,Packet);
break;
case PacketBuilder.PACKET_NPC:
Server.OnNpcInteraction(this, Packet);
break;
default:
Logger.ErrorPrint("Unimplemented Packet: " + BitConverter.ToString(Packet).Replace('-', ' '));
break;

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

@ -247,7 +247,6 @@ namespace Horse_Isle_Server
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;
@ -367,7 +366,12 @@ namespace Horse_Isle_Server
Messages.ItemConsumeButton = gameData.messages.meta.inventory.item_consume_button;
Messages.ItemUseButton = gameData.messages.meta.inventory.item_use_button;
Messages.ItemReadButton = gameData.messages.meta.inventory.item_read_button;
// Npc
Messages.NpcStartChatFormat = gameData.messages.npc.start_chat_format;
Messages.NpcChatpointFormat = gameData.messages.npc.chatpoint_format;
Messages.NpcReplyFormat = gameData.messages.npc.reply_format;
// Map Data

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

@ -75,6 +75,11 @@ namespace Horse_Isle_Server
public static string ItemUseButton;
public static string ItemReadButton;
// Npc
public static string NpcStartChatFormat;
public static string NpcChatpointFormat;
public static string NpcReplyFormat;
// Meta
public static string IsleFormat;
public static string TownFormat;
@ -82,6 +87,8 @@ namespace Horse_Isle_Server
public static string LocationFormat;
public static string TransportFormat;
public static string NearbyPlayers;
public static string North;
public static string East;
@ -104,6 +111,20 @@ namespace Horse_Isle_Server
public static string BoatCutscene;
public static string WagonCutscene;
public static string BallonCutscene;
public static string FormatNpcChatpoint(string name, string shortDescription, string chatText)
{
return NpcChatpointFormat.Replace("%NAME%", name).Replace("%DESCRIPTION%", shortDescription).Replace("%TEXT%", chatText);
}
public static string FormatNpcReply(string replyText, int replyId)
{
return NpcReplyFormat.Replace("%TEXT%", replyText).Replace("%ID%", replyId.ToString());
}
public static string FormatNpcStartChatMessage(int iconId, string name, string shortDescription, int npcId)
{
return NpcStartChatFormat.Replace("%ICONID%", iconId.ToString()).Replace("%NAME%", name).Replace("%DESCRIPTION%", shortDescription).Replace("%ID%", npcId.ToString());
}
public static string FormatGlobalChatViolationMessage(Chat.Reason violationReason)
{

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

@ -124,6 +124,12 @@ namespace Horse_Isle_Server
if (specialTile.Description != null && specialTile.Description != "")
message += specialTile.Description;
Npc.NpcEntry[] entries = Npc.GetNpcByXAndY(specialTile.X, specialTile.Y);
if(entries.Length > 0)
message += Messages.Seperator;
foreach(Npc.NpcEntry ent in entries)
message += Messages.FormatNpcStartChatMessage(ent.IconId, ent.Name, ent.ShortDescription, ent.Id);
if (specialTile.Code == null)
message += buildCommonInfo(specialTile.X, specialTile.Y);
if (specialTile.Code == "TRANSPORT")
@ -135,6 +141,8 @@ namespace Horse_Isle_Server
if (specialTile.ExitX != 0 && specialTile.ExitY != 0)
message += Messages.ExitThisPlace + Messages.MetaTerminator;
Logger.DebugPrint(message);
return message;
}
@ -175,14 +183,31 @@ namespace Horse_Isle_Server
message += Messages.BackToMap;
message += Messages.MetaTerminator;
Logger.DebugPrint(message);
return message;
}
public static string BuildChatpoint(Npc.NpcEntry npc, Npc.NpcChat chatpoint)
{
string message = "";
message += Messages.FormatNpcChatpoint(npc.Name, npc.ShortDescription, chatpoint.ChatText);
foreach(Npc.NpcReply reply in chatpoint.Replies)
{
message += Messages.FormatNpcReply(reply.ReplyText, reply.Id);
}
return message;
}
public static string BuildMetaInfo(int x, int y)
{
string message = "";
message += buildLocationString(x, y);
Npc.NpcEntry[] entries = Npc.GetNpcByXAndY(x, y);
if (entries.Length > 0)
message += Messages.Seperator;
foreach (Npc.NpcEntry ent in entries)
message += Messages.FormatNpcStartChatMessage(ent.IconId, ent.Name, ent.ShortDescription, ent.Id);
message += buildCommonInfo(x, y);
return message;
}

21
Horse Isle Server/Horse Isle Server/Npc.cs
View file

@ -10,7 +10,6 @@ namespace Horse_Isle_Server
{
public struct NpcReply
{
public int RandomId;
public int Id;
public string ReplyText;
public int GotoChatpoint;
@ -50,28 +49,28 @@ namespace Horse_Isle_Server
public static List<NpcEntry> NpcList = new List<NpcEntry>();
public NpcReply GetNpcReply(NpcEntry npc, int randomid)
public NpcReply GetNpcReply(NpcEntry npc, int id)
{
foreach (NpcChat chatpoint in npc.Chatpoints)
{
foreach (NpcReply reply in chatpoint.Replies)
{
if (reply.RandomId == randomid)
if (reply.Id == id)
return reply;
}
}
throw new KeyNotFoundException("Npc reply with " + randomid + " not found!");
throw new KeyNotFoundException("Npc reply with " + id + " not found!");
}
public static NpcReply GetNpcReply(NpcChat chatpoint, int randomid)
public static NpcReply GetNpcReply(NpcChat chatpoint, int id)
{
foreach(NpcReply reply in chatpoint.Replies)
{
if (reply.RandomId == randomid)
if (reply.Id == id)
return reply;
}
throw new KeyNotFoundException("Npc reply with " + randomid + " not found!");
throw new KeyNotFoundException("Npc reply with " + id + " not found!");
}
public static NpcEntry GetNpcById(int id)
{
@ -83,14 +82,16 @@ namespace Horse_Isle_Server
throw new KeyNotFoundException("Npc id: " + id + " not found!");
}
public static NpcEntry GetNpcByXAndY(int x, int y)
public static NpcEntry[] GetNpcByXAndY(int x, int y)
{
List<NpcEntry> npcs = new List<NpcEntry>();
foreach(NpcEntry npc in NpcList)
{
if (npc.X == x && npc.Y == y)
return npc;
npcs.Add(npc);
}
throw new KeyNotFoundException("Npc at X " + x + ", Y " + y + " not found!");
return npcs.ToArray();
}
}

3
Horse Isle Server/Horse Isle Server/PacketBuilder.cs
View file

@ -31,9 +31,10 @@ namespace Horse_Isle_Server
public const byte PACKET_TRANSPORT = 0x29;
public const byte PACKET_KICK = 0x80;
public const byte PACKET_LEAVE = 0x7D;
public const byte PACKET_NPC = 0x28;
public const byte PACKET_PLAYERINFO = 0x16;
public const byte NPC_START_CHAT = 0x14;
public const byte PLAYERINFO_LEAVE = 0x16;
public const byte PLAYERINFO_UPDATE_OR_CREATE = 0x15;

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

@ -297,7 +297,45 @@ namespace Horse_Isle_Server
Update(sender);
}
public static void OnNpcInteraction(Client sender, byte[] packet)
{
if (!sender.LoggedIn)
{
Logger.ErrorPrint(sender.RemoteIp + " Sent npc interaction packet when not logged in.");
return;
}
if (packet.Length < 3)
{
Logger.ErrorPrint(sender.RemoteIp + " Sent an invalid npc interaction packet.");
return;
}
byte action = packet[1];
if(action == PacketBuilder.NPC_START_CHAT)
{
string packetStr = Encoding.UTF8.GetString(packet);
string number = packetStr.Substring(2, packetStr.Length - 4);
int chatId = 0;
try
{
chatId = int.Parse(number);
}
catch(InvalidOperationException)
{
Logger.ErrorPrint(sender.LoggedinUser.Username + " Tried to use a transport with id that is NaN.");
return;
}
Npc.NpcEntry entry = Npc.GetNpcById(chatId);
string metaInfo = Meta.BuildChatpoint(entry, entry.Chatpoints[0]);
byte[] metaPacket = PacketBuilder.CreateMetaPacket(metaInfo);
sender.SendPacket(metaPacket);
}
else
{
Logger.ErrorPrint("Unknown npc interaction! - Packet Dump: " + BitConverter.ToString(packet).Replace('-', ' '));
}
}
public static void OnTransportUsed(Client sender, byte[] packet)
{
if (!sender.LoggedIn)
@ -322,7 +360,7 @@ namespace Horse_Isle_Server
}
catch(InvalidOperationException)
{
Logger.ErrorPrint(sender.RemoteIp + " Tried to use a transport with id that is NaN.");
Logger.ErrorPrint(sender.LoggedinUser.Username + " Tried to use a transport with id that is NaN.");
return;
}
try

4
WebInterface/game-site/config.php Normal file
View file

@ -0,0 +1,4 @@
<?php
$server_ip = '127.0.0.1';
$server_port = 12321;
?>

3
WebInterface/game-site/horseisle.php
View file

@ -1,3 +1,6 @@
<?php
include("config.php");
?>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />