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

fix some stuf

Browse source
This commit is contained in:
SilicaAndPina 2021-02-07 13:21:15 +13:00
parent af1ce516f4
commit 48c9760599
6 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -289,7 +289,8 @@ namespace HISP.Game
public static string HorseStopRidingMessage;
public static string HorsePetMessageFormat;
public static string HorsePetTooHappyFormat;
public static string HorsePetTooHappy;
public static string HorsePetTooTired;
public static string HorseSetNewCategoryMessageFormat;
public static string HorseAutoSellMenuFormat;
@ -815,15 +816,10 @@ namespace HISP.Game
{
return HorseDescriptionEditFormat.Replace("%HORSENAME%", username).Replace("%DESCRIPTION%", description);
}
public static string FormatHorsePetMessage(int mood, int tiredness)
public static string FormatHorsePetMessage(string messages, int mood, int tiredness)
{
return HorsePetMessageFormat.Replace("%MOOD%", mood.ToString()).Replace("%TIREDNESS%", tiredness.ToString());
return HorsePetMessageFormat.Replace("%MESSAGES%", messages).Replace("%MOOD%", mood.ToString()).Replace("%TIREDNESS%", tiredness.ToString());
}
public static string FormatHorsePetTooHappyMessage(int mood, int tiredness)
{
return HorsePetTooHappyFormat.Replace("%MOOD%", mood.ToString()).Replace("%TIREDNESS%", tiredness.ToString());
}
public static string FormatHorseCurrentStatus(string name)
{
return HorseCurrentStatusFormat.Replace("%HORSENAME%", name);

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

@ -1088,7 +1088,7 @@ namespace HISP.Game
string npc = buildNpc(user, specialTile.X, specialTile.Y);
message += npc;
if (specialTile.Code == null)
if (specialTile.Code == null || specialTile.Code == "")
message += buildCommonInfo(specialTile.X, specialTile.Y);
else
{

2
Horse Isle Server/HorseIsleServer/Game/World.cs
View file

@ -201,6 +201,8 @@ namespace HISP.Game
{
ServerTime.Days += 1;
ServerTime.Minutes = 0;
Database.DoIntrestPayments(ConfigReader.IntrestRate);
}
if (ServerTime.Days == 366) // 1 year!