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

5
DataCollection/gamedata.json
View file

@ -225,8 +225,9 @@
"saved_profile":"Saved profile for horse %HORSENAME%.", "saved_profile":"Saved profile for horse %HORSENAME%.",
"horse_set_new_category":"Horse set as %CATEGORY%", "horse_set_new_category":"Horse set as %CATEGORY%",
"back_to_horse":"^R1^D5|BACK TO HORSE^R1", "back_to_horse":"^R1^D5|BACK TO HORSE^R1",
"pet_horse":"Your horse whinnies lightly. (+%MOOD% mood / -%TIREDNESS% tiredness)", "pet_horse":"%MESSAGES%Your horse whinnies lightly. (+%MOOD% mood / -%TIREDNESS% tiredness)",
"pet_horse_too_happy":"Your horse is as happy as it can be now. Your horse whinnies lightly. (+%MOOD% mood / -%TIREDNESS% tiredness)", "pet_horse_too_happy":"Your horse is as happy as it can be now. ",
"pet_horse_too_sleepy":"It can barely keep its eyes open. ",
"description_edit":"^PLHorse's Name:|%HORSENAME%^D11|GENERATE RANDOM HORSE NAME^R1^LDescription: (reset if you generate name)^R1^PB120|%DESCRIPTION%^PS5|SAVE CHANGES", "description_edit":"^PLHorse's Name:|%HORSENAME%^D11|GENERATE RANDOM HORSE NAME^R1^LDescription: (reset if you generate name)^R1^PB120|%DESCRIPTION%^PS5|SAVE CHANGES",
"tack_fail_autosell":"You cannot put tack on a horse with Auto-Sell set.", "tack_fail_autosell":"You cannot put tack on a horse with Auto-Sell set.",
"horse_release":"<B>Are you SURE you want to let the horse go?</B>^T2If so, click ^B3X%RANDOMID%^R6", "horse_release":"<B>Are you SURE you want to let the horse go?</B>^T2If so, click ^B3X%RANDOMID%^R6",

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

@ -289,7 +289,8 @@ namespace HISP.Game
public static string HorseStopRidingMessage; public static string HorseStopRidingMessage;
public static string HorsePetMessageFormat; public static string HorsePetMessageFormat;
public static string HorsePetTooHappyFormat; public static string HorsePetTooHappy;
public static string HorsePetTooTired;
public static string HorseSetNewCategoryMessageFormat; public static string HorseSetNewCategoryMessageFormat;
public static string HorseAutoSellMenuFormat; public static string HorseAutoSellMenuFormat;
@ -815,15 +816,10 @@ namespace HISP.Game
{ {
return HorseDescriptionEditFormat.Replace("%HORSENAME%", username).Replace("%DESCRIPTION%", description); 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) public static string FormatHorseCurrentStatus(string name)
{ {
return HorseCurrentStatusFormat.Replace("%HORSENAME%", 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); string npc = buildNpc(user, specialTile.X, specialTile.Y);
message += npc; message += npc;
if (specialTile.Code == null) if (specialTile.Code == null || specialTile.Code == "")
message += buildCommonInfo(specialTile.X, specialTile.Y); message += buildCommonInfo(specialTile.X, specialTile.Y);
else else
{ {

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

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

3
Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs
View file

@ -835,7 +835,8 @@ namespace HISP.Server
Messages.HorseStopRidingMessage = gameData.messages.meta.horse.stop_riding_message; Messages.HorseStopRidingMessage = gameData.messages.meta.horse.stop_riding_message;
Messages.HorsePetMessageFormat = gameData.messages.meta.horse.pet_horse; Messages.HorsePetMessageFormat = gameData.messages.meta.horse.pet_horse;
Messages.HorsePetTooHappyFormat = gameData.messages.meta.horse.pet_horse_too_happy; Messages.HorsePetTooHappy = gameData.messages.meta.horse.pet_horse_too_happy;
Messages.HorsePetTooTired = gameData.messages.meta.horse.pet_horse_too_sleepy;
Messages.HorseSetNewCategoryMessageFormat = gameData.messages.meta.horse.horse_set_new_category; Messages.HorseSetNewCategoryMessageFormat = gameData.messages.meta.horse.horse_set_new_category;
Messages.HorseAutoSellMenuFormat = gameData.messages.meta.horse.auto_sell.auto_sell_meta; Messages.HorseAutoSellMenuFormat = gameData.messages.meta.horse.auto_sell.auto_sell_meta;

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

@ -61,8 +61,6 @@ namespace HISP.Server
Database.IncAllUsersFreeTime(1); Database.IncAllUsersFreeTime(1);
} }
if(totalMinutesElapsed % 20 == 0)
Database.DoIntrestPayments(ConfigReader.IntrestRate);
if (totalMinutesElapsed % 25 == 0) if (totalMinutesElapsed % 25 == 0)
@ -202,18 +200,19 @@ namespace HISP.Server
string message = ""; string msgs = "";
if(horseInst.BasicStats.Mood + randMoodAddition > 1000) if (horseInst.BasicStats.Mood + randMoodAddition >= 1000)
message = Messages.FormatHorsePetMessage(randMoodAddition, randTiredMinus); msgs += Messages.HorsePetTooHappy;
else if (horseInst.BasicStats.Tiredness - randTiredMinus <= 0)
message = Messages.FormatHorsePetTooHappyMessage(randMoodAddition, randTiredMinus); msgs += Messages.HorsePetTooTired;
horseInst.BasicStats.Tiredness -= randTiredMinus; horseInst.BasicStats.Tiredness -= randTiredMinus;
horseInst.BasicStats.Mood += randMoodAddition; horseInst.BasicStats.Mood += randMoodAddition;
byte[] petMessagePacket = PacketBuilder.CreateChat(message, PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] petMessagePacket = PacketBuilder.CreateChat(Messages.FormatHorsePetMessage(msgs,randMoodAddition, randTiredMinus), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(petMessagePacket); sender.SendPacket(petMessagePacket);
break; break;
@ -716,9 +715,9 @@ namespace HISP.Server
{ {
if(sender.LoggedinUser.CurrentlyRidingHorse.RandomId == sender.LoggedinUser.LastViewedHorse.RandomId) if(sender.LoggedinUser.CurrentlyRidingHorse.RandomId == sender.LoggedinUser.LastViewedHorse.RandomId)
{ {
sender.LoggedinUser.CurrentlyRidingHorse = null;
sender.LoggedinUser.Facing %= 5;
byte[] disMounted = PacketBuilder.CreateChat(Messages.FormatHorseDismountedBecauseTackedMessage(sender.LoggedinUser.CurrentlyRidingHorse.Name), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] disMounted = PacketBuilder.CreateChat(Messages.FormatHorseDismountedBecauseTackedMessage(sender.LoggedinUser.CurrentlyRidingHorse.Name), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.LoggedinUser.Facing %= 5;
sender.LoggedinUser.CurrentlyRidingHorse = null;
sender.SendPacket(disMounted); sender.SendPacket(disMounted);
} }
} }
@ -2572,7 +2571,7 @@ namespace HISP.Server
newY -= 1; newY -= 1;
if (loggedInUser.Facing == (direction + (onHorse * 5))&& onHorse != 0) // Double move if (loggedInUser.CurrentlyRidingHorse != null && !World.InTown(loggedInUser.X, loggedInUser.Y)) // Double move
if (Map.CheckPassable(newX, newY - 1) || loggedInUser.NoClip) if (Map.CheckPassable(newX, newY - 1) || loggedInUser.NoClip)
{ {
newY -= 1; newY -= 1;
@ -2586,7 +2585,7 @@ namespace HISP.Server
newX -= 1; newX -= 1;
if (loggedInUser.Facing == (direction + (onHorse * 5)) && onHorse != 0) // Double move if (loggedInUser.CurrentlyRidingHorse != null && !World.InTown(loggedInUser.X, loggedInUser.Y)) // Double move
if (Map.CheckPassable(newX - 1, newY) || loggedInUser.NoClip) if (Map.CheckPassable(newX - 1, newY) || loggedInUser.NoClip)
{ {
newX -= 1; newX -= 1;
@ -2600,7 +2599,7 @@ namespace HISP.Server
newX += 1; newX += 1;
if (loggedInUser.Facing == (direction + (onHorse * 5)) && onHorse != 0) // Double move if (loggedInUser.CurrentlyRidingHorse != null && !World.InTown(loggedInUser.X, loggedInUser.Y)) // Double move
if (Map.CheckPassable(newX + 1, newY) || loggedInUser.NoClip) if (Map.CheckPassable(newX + 1, newY) || loggedInUser.NoClip)
{ {
newX += 1; newX += 1;
@ -2614,7 +2613,7 @@ namespace HISP.Server
newY += 1; newY += 1;
if (loggedInUser.Facing == (direction + (onHorse * 5)) && onHorse != 0) // Double move if (loggedInUser.CurrentlyRidingHorse != null && !World.InTown(loggedInUser.X, loggedInUser.Y)) // Double move
if (Map.CheckPassable(newX, newY + 1) || loggedInUser.NoClip) if (Map.CheckPassable(newX, newY + 1) || loggedInUser.NoClip)
{ {
newY += 1; newY += 1;
@ -3439,6 +3438,8 @@ namespace HISP.Server
for(int i = 0; i < reqItem.RequiredItemCount; i++) for(int i = 0; i < reqItem.RequiredItemCount; i++)
sender.LoggedinUser.Inventory.Remove(sender.LoggedinUser.Inventory.GetItemByItemId(reqItem.RequiredItemId).ItemInstances[0]); sender.LoggedinUser.Inventory.Remove(sender.LoggedinUser.Inventory.GetItemByItemId(reqItem.RequiredItemId).ItemInstances[0]);
sender.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.Crafting).Count++;
byte[] itemCraftSuccess = PacketBuilder.CreateChat(Messages.WorkshopCraftingSuccess, PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] itemCraftSuccess = PacketBuilder.CreateChat(Messages.WorkshopCraftingSuccess, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(itemCraftSuccess); sender.SendPacket(itemCraftSuccess);
break; break;