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

Add npcs.json

Browse source
This commit is contained in:
SilicaAndPina 2020-10-04 00:34:51 +13:00
parent b315fda096
commit 7759940f20
4 changed files with 324593 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

324583
DataCollection/npcs.json Normal file
View file

File diff suppressed because it is too large Load diff

5
Horse Isle Server/Horse Isle Server/Chat.cs
View file

@ -37,6 +37,7 @@ namespace Horse_Isle_Server
Mod = 0x1c, Mod = 0x1c,
Admin = 0x1b Admin = 0x1b
} }
public static string PrivateMessageSound;
public static List<Filter> FilteredWords = new List<Filter>(); public static List<Filter> FilteredWords = new List<Filter>();
public static List<Correction> CorrectedWords = new List<Correction>(); public static List<Correction> CorrectedWords = new List<Correction>();
@ -366,10 +367,10 @@ namespace Horse_Isle_Server
int nearbyUsers = Server.GetNearbyUsers(user.X, user.Y, false, false).Length -1; int nearbyUsers = Server.GetNearbyUsers(user.X, user.Y, false, false).Length -1;
return Messages.FormatNearChatMessageForSender(nearbyUsers, user.Username, message); return Messages.FormatNearChatMessageForSender(nearbyUsers, user.Username, message);
case ChatChannel.Mod: case ChatChannel.Mod:
int modsOnline = Server.GetNumberOfModsOnline(); int modsOnline = Server.GetNumberOfModsOnline() - 1;
return Messages.FormatModChatForSender(modsOnline, user.Username, message); return Messages.FormatModChatForSender(modsOnline, user.Username, message);
case ChatChannel.Admin: case ChatChannel.Admin:
int adminsOnline = Server.GetNumberOfAdminsOnline(); int adminsOnline = Server.GetNumberOfAdminsOnline() - 1;
return Messages.FormatAdminChatForSender(adminsOnline, user.Username, message); return Messages.FormatAdminChatForSender(adminsOnline, user.Username, message);
case ChatChannel.Dm: case ChatChannel.Dm:
return Messages.FormatDirectChatMessageForSender(user.Username, dmRecipiant, message); return Messages.FormatDirectChatMessageForSender(user.Username, dmRecipiant, message);

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

@ -19,6 +19,7 @@ namespace Horse_Isle_Server
public static string Motd; public static string Motd;
public static string MapFile; public static string MapFile;
public static string GameDataFile; public static string GameDataFile;
public static string NpcDataFile;
public static string CrossDomainPolicyFile; public static string CrossDomainPolicyFile;
public static bool Debug; public static bool Debug;
@ -87,6 +88,9 @@ namespace Horse_Isle_Server
case "gamedata": case "gamedata":
GameDataFile = data; GameDataFile = data;
break; break;
case "npc":
NpcDataFile = data;
break;
case "crossdomain": case "crossdomain":
CrossDomainPolicyFile = data; CrossDomainPolicyFile = data;
break; break;

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

@ -15,8 +15,10 @@ db_port=3306
# Map Data # Map Data
map=MapDataCombined.bmp map=MapDataCombined.bmp
# Game Data JSON # JSON Format Data
gamedata=gamedata.json gamedata=gamedata.json
npc=npcs.json
# Cross-Domain Policy File # Cross-Domain Policy File
crossdomain=CrossDomainPolicy.xml crossdomain=CrossDomainPolicy.xml