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 Training not showing in barns.

Browse source 
Fix Crash on invalid ranch loading
Add "Player here" click message.
This commit is contained in:
SilicaAndPina 2021-02-12 21:47:42 +13:00
parent 2d2d6235e3
commit afc232352d
6 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DataCollection/gamedata.json
View file

@ -12,6 +12,7 @@
"playtime_timeout":"You have run out of playtime for now. In one minute you will be disconnected. You gain one minute of playtime every 8 minutes. Please come back later!",
"random_movement":"You are sooo <B>%STAT%</B>. You wander dizzily in a different direction.",
"incorrect_password":"Incorrect. You will have to find the correct answer somewhere...",
"player_here":"%USERNAME% here",
"treasure":{
"pirate_treasure":"Wow! You found buried treasure worth $%PRIZE%! Gotta love those pirates!",
"pot_of_gold":"YEA! You found the fabled pot of gold at the end of the rainbow! It was worth $%PRIZE%!"
@ -2406,7 +2407,7 @@
"categorys":[
{"name":"LEASED","message":"^LLEASED - Horses only temporarily cared for, limited use:^R1","message_others":"^LLEASED - Horses only temporarily cared for, limited use:^R1"},
{"name":"KEEPER","message":"^LKEEPERS - Horses I would not sell for any price:^R1","message_others":"^LKEEPERS - Horses not for sale for any price^R1"},
{"name":"TRAINING","message":"^LTRAINING - Horses I am actively training and competing with:^R1","message_others":"TRAINING - Horses actively being trained and competed with:^R1"},
{"name":"TRAINING","message":"^LTRAINING - Horses I am actively training and competing with:^R1","message_others":"^LTRAINING - Horses actively being trained and competed with:^R1"},
{"name":"TRADING","message":"^LTRADING - Horses I am trading or auctioning:^R1","message_others":"^LTRADING - Horses for trading or auctioning:^R1"},
{"name":"RETIRED","message":"^LRETIRED - Horses that are still special to me but not used:^R1","message_others":"^LRETIRED - Horses that are still special to player but not used:^R1"}
],

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

@ -12,6 +12,9 @@ namespace HISP.Game
// Mod isle
public static string ModIsleMessage;
// Click
public static string PlayerHereFormat;
// Ranch
public static string RanchUnownedRanchFormat;
public static string RanchYouCouldPurchaseThisRanch;
@ -682,6 +685,11 @@ namespace HISP.Game
public static string NothingInterestingHere;
public static string FormatPlayerHereMessage(string playerName)
{
return PlayerHereFormat.Replace("%USERNAME%", playerName);
}
// Farrier Formats
public static string FormatFarrierPutOnSteelShoesAllMesssage(int curShoes, int maxShoes)
{

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

@ -1197,6 +1197,13 @@ namespace HISP.Game
{
string message = "";
if(!Ranch.RanchExists(ranchId)) // Ghost ranchs exist.. apparently?
{
user.MetaPriority = false;
return BuildMetaInfo(user, user.X, user.Y);
}
Ranch ranch = Ranch.GetRanchById(ranchId);
bool mine = (ranch.OwnerId == user.Id);
string swfModule = ranch.GetSwf(mine);

9
Horse Isle Server/HorseIsleServer/Game/Ranch.cs
View file

@ -405,6 +405,15 @@ namespace HISP.Game
}
return false;
}
public static bool RanchExists(int ranchId)
{
foreach (Ranch ranch in Ranches)
{
if (ranch.Id == ranchId)
return true;
}
return false;
}
public static Ranch GetRanchById(int ranchId)
{
foreach (Ranch ranch in Ranches)

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

@ -686,6 +686,9 @@ namespace HISP.Server
Map.ModIsleX = gameData.messages.commands.mod_isle.x;
Map.ModIsleY = gameData.messages.commands.mod_isle.y;
// Click
Messages.PlayerHereFormat = gameData.messages.player_here;
// Ranch
Messages.RanchUnownedRanchFormat = gameData.messages.meta.ranch.unowned_ranch;
Messages.RanchYouCouldPurchaseThisRanch = gameData.messages.meta.ranch.you_could_purchase_this;

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

@ -3618,7 +3618,7 @@ namespace HISP.Server
if (tile.Title != null)
returnedMsg = tile.Title;
}
if(Ranch.IsRanchHere(x, y))
if(Ranch.IsRanchHere(x, y)) // Ranch here?
{
Ranch ranch = Ranch.GetRanchAt(x, y);
if(ranch.OwnerId == -1)
@ -3633,6 +3633,10 @@ namespace HISP.Server
returnedMsg = Messages.FormatRanchClickMessage(Database.GetUsername(ranch.OwnerId), title);
}
}
if(GetUsersAt(x,y, false, true).Length > 0) // Player here?
{
returnedMsg = Messages.FormatPlayerHereMessage(GetUsersAt(x, y, false, true)[0].Username);
}
byte[] tileInfoPacket = PacketBuilder.CreateClickTileInfoPacket(returnedMsg);
sender.SendPacket(tileInfoPacket);