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

Fix npcs

Browse source
This commit is contained in:
SilicaAndPina 2021-02-04 17:24:02 +13:00
parent 3cad676e66
commit 02f5af9995
6 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Horse Isle Server/HorseIsleServer/Game/Messages.cs
View file

@ -518,6 +518,13 @@ namespace HISP.Game
public static string LongFullLine;
public static string MetaTerminator;
// Drawing room
public static string DrawingLastToDrawFormat;
public static string DrawingContentsSavedInSlotFormat;
public static string DrawingContentsLoadedFromSlotFormat;
public static string DrawingPlzClearLoad;
public static string DrawingPlzClearDraw;
// Birckpoet
public static string LastPoetFormat;
@ -557,6 +564,18 @@ namespace HISP.Game
// Click
public static string NothingInterestingHere;
public static string FormatDrawingRoomSaved(int slot)
{
return DrawingContentsSavedInSlotFormat.Replace("%SLOT%", slot.ToString("N0"));
}
public static string FormatDrawingRoomLoaded(int slot)
{
return DrawingContentsLoadedFromSlotFormat.Replace("%SLOT%", slot.ToString("N0"));
}
public static string FormatLastToDraw(string username)
{
return DrawingLastToDrawFormat.Replace("%USERNAME%", username);
}
public static string FormatGroomerApplyAllService(int count, int price)
{
return GroomerApplyServiceForAllFormat.Replace("%PRICE%", price.ToString("N0")).Replace("%COUNT%", count.ToString("N0"));

18
Horse Isle Server/HorseIsleServer/Game/Meta.cs
View file

@ -228,6 +228,16 @@ namespace HISP.Game
message += Messages.FormatLastPoet(username);
}
if(id[0] == 'D') // Drawning room
{
int lastDraw = Database.GetLastPlayer(id);
string username = "";
if (lastDraw != -1)
username = Database.GetUsername(lastDraw);
message += Messages.FormatLastToDraw(username);
}
message += Messages.ExitThisPlace;
message += Messages.MetaTerminator;
return message;
@ -264,11 +274,11 @@ namespace HISP.Game
continue;
if (ent.RequiresQuestIdCompleted != 0)
if (user.Quests.GetTrackedQuestAmount(ent.RequiresQuestIdNotCompleted) <= 0)
if (user.Quests.GetTrackedQuestAmount(ent.RequiresQuestIdCompleted) <= 0)
continue;
if (ent.RequiresQuestIdNotCompleted != 0)
if (user.Quests.GetTrackedQuestAmount(ent.RequiresQuestIdCompleted) >= 1)
if (user.Quests.GetTrackedQuestAmount(ent.RequiresQuestIdNotCompleted) >= 1)
continue;
message += Messages.FormatNpcStartChatMessage(ent.IconId, ent.Name, ent.ShortDescription, ent.Id);
@ -1519,7 +1529,7 @@ namespace HISP.Game
message += Messages.BackToHorse;
return message;
}
public static string BuildChatpoint(User user, Npc.NpcEntry npc, Npc.NpcChat chatpoint)
public static string BuildNpcChatpoint(User user, Npc.NpcEntry npc, Npc.NpcChat chatpoint)
{
bool hideReplys = false;
if (chatpoint.ActivateQuestId != 0)
@ -1556,7 +1566,7 @@ namespace HISP.Game
if (user.Quests.GetTrackedQuestAmount(reply.RequiresQuestIdCompleted) <= 0)
continue;
if (reply.RequiresQuestIdNotCompleted != 0)
if (user.Quests.GetTrackedQuestAmount(reply.RequiresQuestIdCompleted) >= 1)
if (user.Quests.GetTrackedQuestAmount(reply.RequiresQuestIdNotCompleted) >= 1)
continue;
if (hideReplys)
continue;