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

make more efficent location (and more accurate to pinto) update packets

Browse source
This commit is contained in:
SilicaAndPina 2021-06-28 23:49:48 +12:00
parent 831523da45
commit e8e445a751
4 changed files with 192 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DataCollection/gamedata.json
View file

@ -341,7 +341,7 @@
}, },
"player_interaction":{ "player_interaction":{
"players_here":"<B>Players Here:</B>", "players_here":"<B>Players Here:</B>",
"menu":"^I%PLAYERICON%^T1%PLAYERNAME%%BUTTONS%^R1", "menu":"%PLAYERICON%^T1%PLAYERNAME%%BUTTONS%^R1",
"profiile_button":"^B1L%PLAYERID%", "profiile_button":"^B1L%PLAYERID%",
"social_button":"^B1S%PLAYERID%", "social_button":"^B1S%PLAYERID%",
"trade_button":"^B1T%PLAYERID%", "trade_button":"^B1T%PLAYERID%",

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

@ -1519,7 +1519,10 @@ namespace HISP.Game
} }
public static string FormatPlayerHereMenu(int playerIcon, string playerName, string button) public static string FormatPlayerHereMenu(int playerIcon, string playerName, string button)
{ {
return PlayerHereMenuFormat.Replace("%PLAYERICON%", playerIcon.ToString()).Replace("%PLAYERNAME%", playerName).Replace("%BUTTONS%", button); string vstr = "^I" + playerIcon.ToString();
if (playerIcon == -1)
vstr = "";
return PlayerHereMenuFormat.Replace("%PLAYERICON%", vstr).Replace("%PLAYERNAME%", playerName).Replace("%BUTTONS%", button);
} }
// Auctions // Auctions

67
Horse Isle Server/HorseIsleServer/Player/User.cs
View file

@ -6,6 +6,7 @@ using HISP.Player.Equips;
using HISP.Game.Services; using HISP.Game.Services;
using HISP.Game.Inventory; using HISP.Game.Inventory;
using HISP.Game.Horse; using HISP.Game.Horse;
using System.Linq;
namespace HISP.Player namespace HISP.Player
{ {
@ -484,12 +485,78 @@ namespace HISP.Player
{ {
Logger.DebugPrint("Teleporting: " + Username + " to: " + newX.ToString() + "," + newY.ToString()); Logger.DebugPrint("Teleporting: " + Username + " to: " + newX.ToString() + "," + newY.ToString());
User[] onScreenBefore = GameServer.GetOnScreenUsers(X, Y, true, true);
X = newX; X = newX;
Y = newY; Y = newY;
byte[] MovementPacket = PacketBuilder.CreateMovementPacket(X, Y, CharacterId, Facing, PacketBuilder.DIRECTION_TELEPORT, true); byte[] MovementPacket = PacketBuilder.CreateMovementPacket(X, Y, CharacterId, Facing, PacketBuilder.DIRECTION_TELEPORT, true);
LoggedinClient.SendPacket(MovementPacket); LoggedinClient.SendPacket(MovementPacket);
GameServer.UpdateWeather(LoggedinClient); GameServer.UpdateWeather(LoggedinClient);
User[] onScreenNow = GameServer.GetOnScreenUsers(X, Y, true, true);
User[] goneOffScreen = onScreenBefore.Except(onScreenNow).ToArray();
User[] goneOnScreen = onScreenNow.Except(onScreenBefore).ToArray();
foreach(User offScreenUsers in goneOffScreen)
{
if (offScreenUsers.Id == this.Id)
continue;
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(1000 + 4, 1000 + 1, Facing, CharacterId, Username);
offScreenUsers.LoggedinClient.SendPacket(playerInfoBytes);
}
foreach (User onScreenUsers in goneOnScreen)
{
if (onScreenUsers.Id == this.Id)
continue;
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(onScreenUsers.X, onScreenUsers.Y, onScreenUsers.Facing, onScreenUsers.CharacterId, onScreenUsers.Username);
LoggedinClient.SendPacket(playerInfoBytes);
}
// Players now offscreen tell the client is at 1000,1000.
/* foreach (User onScreenBeforeUser in onScreenBefore)
{
bool found = false;
foreach (User onScreenNowUser in onScreenNow)
{
if (onScreenNowUser.Id == onScreenBeforeUser.Id)
{
found = true;
break;
}
}
if (!found)
{
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(1000 + 4, 1000 + 1, Facing, CharacterId, Username);
onScreenBeforeUser.LoggedinClient.SendPacket(playerInfoBytes);
}
}
// Players now onscreen tell the client there real pos
foreach (User onScreenNowUser in onScreenNow)
{
bool found = false;
foreach (User onScreenBeforeUser in onScreenBefore)
{
if (onScreenNowUser.Id == onScreenBeforeUser.Id)
{
found = true;
break;
}
}
if (!found)
{
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(onScreenNowUser.X, onScreenNowUser.Y, onScreenNowUser.Facing, onScreenNowUser.CharacterId, onScreenNowUser.Username);
LoggedinClient.SendPacket(playerInfoBytes);
}
}
*/
GameServer.Update(LoggedinClient); GameServer.Update(LoggedinClient);
} }

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

@ -198,7 +198,7 @@ namespace HISP.Server
if (client.LoggedIn) if (client.LoggedIn)
{ {
if (!client.LoggedinUser.MetaPriority) if (!client.LoggedinUser.MetaPriority)
Update(client); UpdateArea(client);
byte[] BaseStatsPacketData = PacketBuilder.CreatePlayerData(client.LoggedinUser.Money, GameServer.GetNumberOfPlayers(), client.LoggedinUser.MailBox.UnreadMailCount); byte[] BaseStatsPacketData = PacketBuilder.CreatePlayerData(client.LoggedinUser.Money, GameServer.GetNumberOfPlayers(), client.LoggedinUser.MailBox.UnreadMailCount);
client.SendPacket(BaseStatsPacketData); client.SendPacket(BaseStatsPacketData);
@ -4756,19 +4756,19 @@ namespace HISP.Server
return; return;
} }
User loggedInUser = sender.LoggedinUser; User loggedInUser = sender.LoggedinUser;
/* /*
* Player stuff * Player stuff
*/ */
// Store this for later... do it now to avoid TOCTOU.
User[] onScreenBefore = GetOnScreenUsers(loggedInUser.X, loggedInUser.Y, true, true);
// Leave Multirooms // Leave Multirooms
Multiroom.LeaveAllMultirooms(loggedInUser); Multiroom.LeaveAllMultirooms(loggedInUser);
// Cancel Trades
if (loggedInUser.TradingWith != null)
if((loggedInUser.TradingWith.Trader.X != loggedInUser.X) && (loggedInUser.TradingWith.Trader.Y != loggedInUser.Y))
loggedInUser.TradingWith.CancelTradeMoved();
loggedInUser.PendingBuddyRequestTo = null; loggedInUser.PendingBuddyRequestTo = null;
// Close Social Windows // Close Social Windows
@ -4777,16 +4777,6 @@ namespace HISP.Server
loggedInUser.BeingSocializedBy.Clear(); loggedInUser.BeingSocializedBy.Clear();
// Pac-man the world.
if (loggedInUser.X > Map.Width)
loggedInUser.Teleport(2, loggedInUser.Y);
else if (loggedInUser.X < 2)
loggedInUser.Teleport(Map.Width-2, loggedInUser.Y);
else if (loggedInUser.Y > Map.Height-2)
loggedInUser.Teleport(loggedInUser.X, 2);
else if (loggedInUser.Y < 2)
loggedInUser.Teleport(loggedInUser.X, Map.Height-2);
if (loggedInUser.CurrentlyRidingHorse != null) if (loggedInUser.CurrentlyRidingHorse != null)
{ {
if(loggedInUser.CurrentlyRidingHorse.BasicStats.Experience < 25) if(loggedInUser.CurrentlyRidingHorse.BasicStats.Experience < 25)
@ -4858,6 +4848,8 @@ namespace HISP.Server
byte direction = 0; byte direction = 0;
int newX = loggedInUser.X; int newX = loggedInUser.X;
int newY = loggedInUser.Y; int newY = loggedInUser.Y;
bool moveTwo = false; bool moveTwo = false;
if (movementDirection == PacketBuilder.MOVE_ESCAPE) // Exit this place / X Button if (movementDirection == PacketBuilder.MOVE_ESCAPE) // Exit this place / X Button
@ -4906,8 +4898,7 @@ namespace HISP.Server
Logger.DebugPrint("Exiting player: " + loggedInUser.Username + " to: " + loggedInUser.X + "," + loggedInUser.Y); Logger.DebugPrint("Exiting player: " + loggedInUser.Username + " to: " + loggedInUser.X + "," + loggedInUser.Y);
byte[] moveResponse = PacketBuilder.CreateMovementPacket(loggedInUser.X, loggedInUser.Y, loggedInUser.CharacterId, loggedInUser.Facing, Direction, true); byte[] moveResponse = PacketBuilder.CreateMovementPacket(loggedInUser.X, loggedInUser.Y, loggedInUser.CharacterId, loggedInUser.Facing, Direction, true);
sender.SendPacket(moveResponse); sender.SendPacket(moveResponse);
Update(sender); goto Complete;
return;
} }
if (movementDirection == PacketBuilder.MOVE_UP) if (movementDirection == PacketBuilder.MOVE_UP)
@ -4972,6 +4963,8 @@ namespace HISP.Server
return; return;
} }
loggedInUser.Facing = direction + (onHorse * 5); loggedInUser.Facing = direction + (onHorse * 5);
if (loggedInUser.Y != newY || loggedInUser.X != newX) if (loggedInUser.Y != newY || loggedInUser.X != newX)
{ {
@ -4988,8 +4981,7 @@ namespace HISP.Server
if (treasure.Type == "RAINBOW") if (treasure.Type == "RAINBOW")
{ {
treasure.CollectTreasure(loggedInUser); treasure.CollectTreasure(loggedInUser);
Update(sender); goto Complete;
return;
} }
} }
@ -5001,7 +4993,88 @@ namespace HISP.Server
byte[] moveResponse = PacketBuilder.CreateMovementPacket(loggedInUser.X, loggedInUser.Y, loggedInUser.CharacterId, loggedInUser.Facing, PacketBuilder.DIRECTION_NONE, false); byte[] moveResponse = PacketBuilder.CreateMovementPacket(loggedInUser.X, loggedInUser.Y, loggedInUser.CharacterId, loggedInUser.Facing, PacketBuilder.DIRECTION_NONE, false);
sender.SendPacket(moveResponse); sender.SendPacket(moveResponse);
} }
Complete:;
// Cancel Trades
if (loggedInUser.TradingWith != null)
if ((loggedInUser.TradingWith.Trader.X != loggedInUser.X) && (loggedInUser.TradingWith.Trader.Y != loggedInUser.Y))
loggedInUser.TradingWith.CancelTradeMoved();
// Pac-man the world.
if (loggedInUser.X > Map.Width)
loggedInUser.Teleport(2, loggedInUser.Y);
else if (loggedInUser.X < 2)
loggedInUser.Teleport(Map.Width - 2, loggedInUser.Y);
else if (loggedInUser.Y > Map.Height - 2)
loggedInUser.Teleport(loggedInUser.X, 2);
else if (loggedInUser.Y < 2)
loggedInUser.Teleport(loggedInUser.X, Map.Height - 2);
User[] onScreenNow = GetOnScreenUsers(loggedInUser.X, loggedInUser.Y, true, true);
User[] goneOffScreen = onScreenBefore.Except(onScreenNow).ToArray();
User[] goneOnScreen = onScreenNow.Except(onScreenBefore).ToArray();
foreach (User offScreenUsers in goneOffScreen)
{
if (offScreenUsers.Id == loggedInUser.Id)
continue;
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(1000 + 4, 1000 + 1, loggedInUser.Facing, loggedInUser.CharacterId, loggedInUser.Username);
offScreenUsers.LoggedinClient.SendPacket(playerInfoBytes);
}
foreach (User onScreenUsers in goneOnScreen)
{
if (onScreenUsers.Id == loggedInUser.Id)
continue;
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(onScreenUsers.X, onScreenUsers.Y, onScreenUsers.Facing, onScreenUsers.CharacterId, onScreenUsers.Username);
loggedInUser.LoggedinClient.SendPacket(playerInfoBytes);
}
/*
// Players now offscreen tell the client is at 1000,1000.
foreach (User onScreenBeforeUser in onScreenBefore)
{
bool found = false;
foreach(User onScreenNowUser in onScreenNow)
{
if(onScreenNowUser.Id == onScreenBeforeUser.Id)
{
found = true;
break;
}
}
if (!found)
{
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(1000+4, 1000+1, loggedInUser.Facing, loggedInUser.CharacterId, loggedInUser.Username);
onScreenBeforeUser.LoggedinClient.SendPacket(playerInfoBytes);
}
}
// Players now onscreen tell the client there real pos
foreach (User onScreenNowUser in onScreenNow)
{
bool found = false;
foreach (User onScreenBeforeUser in onScreenBefore)
{
if (onScreenNowUser.Id == onScreenBeforeUser.Id)
{
found = true;
break;
}
}
if (!found)
{
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(onScreenNowUser.X, onScreenNowUser.Y, onScreenNowUser.Facing, onScreenNowUser.CharacterId, onScreenNowUser.Username);
loggedInUser.LoggedinClient.SendPacket(playerInfoBytes);
}
}
*/
Update(sender); Update(sender);
} }
@ -7328,6 +7401,30 @@ namespace HISP.Server
return usersNearby.ToArray(); return usersNearby.ToArray();
} }
public static User[] GetOnScreenUsers(int x, int y, bool includeStealth = false, bool includeMuted = false)
{
int startX = x - 9;
int endX = x + 9;
int startY = y - 8;
int endY = y + 9;
List<User> usersOnScreen = new List<User>();
foreach (GameClient client in ConnectedClients)
if (client.LoggedIn)
{
if (!includeStealth && client.LoggedinUser.Stealth)
continue;
if (!includeMuted && client.LoggedinUser.MuteNear)
continue;
if (startX <= client.LoggedinUser.X && endX >= client.LoggedinUser.X && startY <= client.LoggedinUser.Y && endY >= client.LoggedinUser.Y)
usersOnScreen.Add(client.LoggedinUser);
}
return usersOnScreen.ToArray();
}
public static User[] GetNearbyUsers(int x, int y, bool includeStealth=false, bool includeMuted=false) public static User[] GetNearbyUsers(int x, int y, bool includeStealth=false, bool includeMuted=false)
{ {
int startX = x - 15; int startX = x - 15;
@ -7552,16 +7649,14 @@ namespace HISP.Server
byte[] PlayerData = PacketBuilder.CreatePlayerData(forClient.LoggedinUser.Money, GameServer.GetNumberOfPlayers(), forClient.LoggedinUser.MailBox.UnreadMailCount); byte[] PlayerData = PacketBuilder.CreatePlayerData(forClient.LoggedinUser.Money, GameServer.GetNumberOfPlayers(), forClient.LoggedinUser.MailBox.UnreadMailCount);
forClient.SendPacket(PlayerData); forClient.SendPacket(PlayerData);
} }
public static void UpdateUserFacingAndLocation(User user) public static void UpdateUserFacingAndLocation(User user)
{ {
byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(user.X, user.Y, user.Facing, user.CharacterId, user.Username); byte[] playerInfoBytes = PacketBuilder.CreatePlayerInfoUpdateOrCreate(user.X, user.Y, user.Facing, user.CharacterId, user.Username);
foreach (GameClient client in ConnectedClients) foreach (User onScreenUser in GetOnScreenUsers(user.X, user.Y, true, true))
if (client.LoggedIn) if (onScreenUser.Id != user.Id)
{ onScreenUser.LoggedinClient.SendPacket(playerInfoBytes);
if (client.LoggedinUser.Id != user.Id)
client.SendPacket(playerInfoBytes);
}
} }
public static void UpdateAreaForAll(int x, int y, bool ignoreMetaPrio=false, User exceptMe=null) public static void UpdateAreaForAll(int x, int y, bool ignoreMetaPrio=false, User exceptMe=null)
{ {