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

block socials when target player leaves the same spot

Browse source
This commit is contained in:
SilicaAndPina 2021-03-08 15:17:50 +13:00
parent a116a27f0a
commit 6d1d0165c1
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DataCollection/gamedata.json
View file

@ -237,7 +237,8 @@
"socials":{ "socials":{
"socials_button":"^B5%ID%%SOCIALNAME%", "socials_button":"^B5%ID%%SOCIALNAME%",
"socials_message":"<FONT COLOR='#BA0042'>* %SOCIALMSG% *</FONT>", "socials_message":"<FONT COLOR='#BA0042'>* %SOCIALMSG% *</FONT>",
"socials_menu_type":"^L%TYPE%:^R1" "socials_menu_type":"^L%TYPE%:^R1",
"no_longer_nearby":"Player is no longer nearby!",
}, },
"trade":{ "trade":{
"trading_with":"^ATTrading with %PLAYERNAME%", "trading_with":"^ATTrading with %PLAYERNAME%",

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

@ -26,6 +26,7 @@ namespace HISP.Game
public static string SocialButton; public static string SocialButton;
public static string SocialMessageFormat; public static string SocialMessageFormat;
public static string SocialTypeFormat; public static string SocialTypeFormat;
public static string SocialPlayerNoLongerNearby;
// Trading // Trading
public static string TradeWithPlayerFormat; public static string TradeWithPlayerFormat;

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

@ -862,6 +862,7 @@ namespace HISP.Server
Messages.SocialButton = gameData.messages.meta.player_interaction.socials.socials_button; Messages.SocialButton = gameData.messages.meta.player_interaction.socials.socials_button;
Messages.SocialMessageFormat = gameData.messages.meta.player_interaction.socials.socials_message; Messages.SocialMessageFormat = gameData.messages.meta.player_interaction.socials.socials_message;
Messages.SocialTypeFormat = gameData.messages.meta.player_interaction.socials.socials_menu_type; Messages.SocialTypeFormat = gameData.messages.meta.player_interaction.socials.socials_menu_type;
Messages.SocialPlayerNoLongerNearby = gameData.messages.meta.player_interaction.socials.no_longer_nearby;
// Trade // Trade

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

@ -480,9 +480,19 @@ namespace HISP.Server
break; break;
case PacketBuilder.SOCIALS_USE: case PacketBuilder.SOCIALS_USE:
int socialId = Convert.ToInt32(packet[2] - (byte)0x21); int socialId = Convert.ToInt32(packet[2] - (byte)0x21);
SocialType.Social social = SocialType.GetSocial(socialId); SocialType.Social social = SocialType.GetSocial(socialId);
foreach(User user in GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, true, true)) if(sender.LoggedinUser.SocializingWith != null)
{
if(sender.LoggedinUser.SocializingWith.X == sender.LoggedinUser.X && sender.LoggedinUser.SocializingWith.Y == sender.LoggedinUser.Y)
{
byte[] playerNotNearby = PacketBuilder.CreateChat(Messages.SocialPlayerNoLongerNearby, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(playerNotNearby);
}
}
foreach (User user in GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, true, true))
{ {
if (social.BaseSocialType.Type != "GROUP") if (social.BaseSocialType.Type != "GROUP")
if (user.Id == sender.LoggedinUser.SocializingWith.Id) if (user.Id == sender.LoggedinUser.SocializingWith.Id)