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

Add tag and fix socials crashing

Browse source
This commit is contained in:
SilicaAndPina 2021-03-08 14:58:06 +13:00
parent b686afed61
commit a116a27f0a
5 changed files with 83 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,10 @@ namespace HISP.Game
public static string AddBuddyOtherPendingFormat;
public static string AddBuddyYourNowBuddiesFormat;
// Tag
public static string TagYourItFormat;
public static string TagOtherBuddiesOnlineFormat;
// Socials
public static string SocialButton;
public static string SocialMessageFormat;
@ -1025,6 +1029,14 @@ namespace HISP.Game
// Click
public static string NothingInterestingHere;
public static string FormatTagTotalBuddies(int count)
{
return TagOtherBuddiesOnlineFormat.Replace("%TOTALBUDDIESON%", count.ToString("N0", CultureInfo.InvariantCulture));
}
public static string FormatTagYourIt(string taggedPlayer, string tagger)
{
return TagYourItFormat.Replace("%PLAYERNAME%", taggedPlayer).Replace("%USERNAME%", tagger);
}
public static string FormatAddBuddyConfirmed(string playername)
{
return AddBuddyYourNowBuddiesFormat.Replace("%PLAYERNAME%", playername);

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

@ -834,6 +834,7 @@ namespace HISP.Server
Map.NewUserStartX = gameData.messages.new_user.starting_x;
Map.NewUserStartY = gameData.messages.new_user.starting_y;
// Warp Command
Messages.SuccessfullyWarpedToPlayer = gameData.messages.commands.warp.player;
@ -847,6 +848,9 @@ namespace HISP.Server
Map.ModIsleX = gameData.messages.commands.mod_isle.x;
Map.ModIsleY = gameData.messages.commands.mod_isle.y;
// Tag
Messages.TagYourItFormat = gameData.messages.meta.player_interaction.tag.tag_player;
Messages.TagOtherBuddiesOnlineFormat = gameData.messages.meta.player_interaction.tag.total_buddies;
// Add Buddy
Messages.AddBuddyPending = gameData.messages.meta.player_interaction.add_buddy.add_pending;

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

@ -263,6 +263,45 @@ namespace HISP.Server
sender.SendPacket(metaTag);
}
break;
case PacketBuilder.PLAYER_INTERACTION_TAG:
packetStr = Encoding.UTF8.GetString(packet);
playerIdStr = packetStr.Substring(2, packetStr.Length - 4);
playerId = -1;
try
{
playerId = int.Parse(playerIdStr);
}
catch (FormatException)
{
Logger.ErrorPrint(sender.LoggedinUser.Username + " tried to trade with User ID NaN.");
break;
}
if (IsUserOnline(playerId))
{
User user = GetUserById(playerId);;
string TAGYourIT = Messages.FormatTagYourIt(user.Username, sender.LoggedinUser.Username);
int totalBuds = 0;
foreach(int friendId in sender.LoggedinUser.Friends.List)
{
if (friendId == sender.LoggedinUser.Id)
continue;
if(IsUserOnline(friendId))
{
User buddy = GetUserById(friendId);
byte[] tagYourItPacket = PacketBuilder.CreateChat(TAGYourIT, PacketBuilder.CHAT_BOTTOM_RIGHT);
buddy.LoggedinClient.SendPacket(tagYourItPacket);
totalBuds++;
}
}
string budStr = Messages.FormatTagTotalBuddies(totalBuds);
byte[] tagYouItPacket = PacketBuilder.CreateChat(TAGYourIT + budStr, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(tagYouItPacket);
}
break;
case PacketBuilder.PLAYER_INTERACTION_ADD_BUDDY:
packetStr = Encoding.UTF8.GetString(packet);
playerIdStr = packetStr.Substring(2, packetStr.Length - 4);
@ -454,8 +493,11 @@ namespace HISP.Server
if (user.MuteAll || user.MuteSocials)
continue;
string socialTarget = "";
if(sender.LoggedinUser.SocializingWith != null)
socialTarget = sender.LoggedinUser.SocializingWith.Username;
byte[] msgEveryone = PacketBuilder.CreateChat(Messages.FormatSocialMessage(social.ForEveryone, sender.LoggedinUser.SocializingWith.Username, sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
byte[] msgEveryone = PacketBuilder.CreateChat(Messages.FormatSocialMessage(social.ForEveryone, socialTarget, sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
user.LoggedinClient.SendPacket(msgEveryone);
}
if(social.ForTarget != null)
@ -474,12 +516,14 @@ namespace HISP.Server
}
if(social.ForSender != null)
{
string socialTarget = "";
if (sender.LoggedinUser.SocializingWith != null)
{
byte[] msgSender = PacketBuilder.CreateChat(Messages.FormatSocialMessage(social.ForSender, sender.LoggedinUser.SocializingWith.Username, sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msgSender);
socialTarget = sender.LoggedinUser.SocializingWith.Username;
}
byte[] msgSender = PacketBuilder.CreateChat(Messages.FormatSocialMessage(social.ForSender, socialTarget, sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msgSender);
}
foreach(User user in GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, true, true))

1
Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs
View file

@ -57,6 +57,7 @@ namespace HISP.Server
public const byte SOCIALS_USE = 0x15;
public const byte PLAYER_INTERACTION_PROFILE = 0x14;
public const byte PLAYER_INTERACTION_TAG = 0x23;
public const byte PLAYER_INTERACTION_TRADE = 0x28;
public const byte PLAYER_INTERACTION_ADD_ITEM = 0x29;
public const byte PLAYER_INTERACTION_ACCEPT = 0x2A;