IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-07 13:45:42 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DataCollection/Useful Info/MaxDrawing.txt Normal file
View file

File diff suppressed because one or more lines are too long

11
DataCollection/gamedata.json
View file

@ -133,13 +133,22 @@
"venus_flytrap_format":"The Giant Venus Flytrap chomped at you!<BR><B>OUCH!!</B><BR>It chomped your pocket, taking $%MONEY% with it!!",
"password_input":"<BR>^PLReply:|^PS14|ANSWER^R1",
"last_poet":"^R1^LLast Player Poet:%USERNAME% ^R1",
"drawing_rooms":{
"last_draw":"^R1^LLast Player to Draw:%USERNAME% ^R1",
"saved":"Current contents of the Drawing Room saved in your slot #%SLOT%.",
"load":"Current contents of the Drawing Room loaded from your slot #%SLOT%.",
"plz_clear_load":"Drawing room memory is full. Please CLEAR to start a new drawing.",
"plz_clear_draw":"Drawing room memory is full. Your additional drawing is not being seen. Please CLEAR to start a new drawing."
},
"groomer":{
"groomed_best_it_can":"Your horse %HORSEBREED% is now groomed as best as this groomer can!",
"cannot_afford_service":"You cannot afford the groomer's services at this time.",
"currently_at":"^LYour horse %HORSENAME%: groom currently %TOTAL%/%MAX%^R1",
"apply_service":"^I258^T8Apply grooming services for $%PRICE% ^B3G%RANDOMID%^R1",
"apply_all":"^R1^R1^I258^T8Groom all %COUNT% horses for $%PRICE% ^B3g^R1",
"cannot_improve":"^I258^T9This groomer cannot improve this horse's groom.^R1"
"cannot_improve":"^I258^T9This groomer cannot improve this horse's groom.^R1",
"not_subscribed_draw":"Drawing not sent to other players when you are not a subscriber.",
"not_subscribed_load":"Cannot load drawings when you are not a subscriber.",
},
"farrier":{
"shoes_total":"^LYour horse %HORSENAME%: shoes currently %TOTAL%/%MAX%^R1",

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;

4
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -2458,7 +2458,7 @@ namespace HISP.Server
int defaultChatpointId = Npc.GetDefaultChatpoint(sender.LoggedinUser, entry);
Npc.NpcChat startingChatpoint = Npc.GetNpcChatpoint(entry, defaultChatpointId);
string metaInfo = Meta.BuildChatpoint(sender.LoggedinUser, entry, startingChatpoint);
string metaInfo = Meta.BuildNpcChatpoint(sender.LoggedinUser, entry, startingChatpoint);
byte[] metaPacket = PacketBuilder.CreateMetaPacket(metaInfo);
sender.SendPacket(metaPacket);
@ -2497,7 +2497,7 @@ namespace HISP.Server
return;
}
sender.LoggedinUser.MetaPriority = true;
string metaInfo = Meta.BuildChatpoint(sender.LoggedinUser, lastNpc, Npc.GetNpcChatpoint(lastNpc, reply.GotoChatpoint));
string metaInfo = Meta.BuildNpcChatpoint(sender.LoggedinUser, lastNpc, Npc.GetNpcChatpoint(lastNpc, reply.GotoChatpoint));
byte[] metaPacket = PacketBuilder.CreateMetaPacket(metaInfo);
sender.SendPacket(metaPacket);
return;

BIN
WebInterface/game-site/horseisle_wasd.swf Normal file
View file

Binary file not shown.