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

Update Server

Browse source
This commit is contained in:
SilicaAndPina 2020-10-19 10:54:09 +13:00
parent 48d1b9e100
commit 43035bbf05
7 changed files with 8939 additions and 8867 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17689
DataCollection/gamedata.json
View file

File diff suppressed because it is too large Load diff

1
Horse Isle Server/Horse Isle Server/Database.cs
View file

@ -137,6 +137,7 @@ namespace Horse_Isle_Server
} }
public static string GetWorldWeather() public static string GetWorldWeather()
{ {
MySqlCommand sqlCommand = db.CreateCommand(); MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "SELECT Weather FROM World"; sqlCommand.CommandText = "SELECT Weather FROM World";
string Weather = sqlCommand.ExecuteScalar().ToString(); string Weather = sqlCommand.ExecuteScalar().ToString();

8
Horse Isle Server/Horse Isle Server/Gamedata.cs
View file

@ -81,8 +81,10 @@ namespace Horse_Isle_Server
specialTile.Title = gameData.places.special_tiles[i].title; specialTile.Title = gameData.places.special_tiles[i].title;
specialTile.Description = gameData.places.special_tiles[i].description; specialTile.Description = gameData.places.special_tiles[i].description;
specialTile.Code = gameData.places.special_tiles[i].code; specialTile.Code = gameData.places.special_tiles[i].code;
specialTile.ExitX = gameData.places.special_tiles[i].exit_x; if(gameData.places.special_tiles[i].exit_x != null)
specialTile.ExitY = gameData.places.special_tiles[i].exit_y; specialTile.ExitX = gameData.places.special_tiles[i].exit_x;
if(gameData.places.special_tiles[i].exit_x != null)
specialTile.ExitY = gameData.places.special_tiles[i].exit_y;
specialTile.AutoplaySwf = gameData.places.special_tiles[i].autoplay_swf; specialTile.AutoplaySwf = gameData.places.special_tiles[i].autoplay_swf;
specialTile.TypeFlag = gameData.places.special_tiles[i].type_flag; specialTile.TypeFlag = gameData.places.special_tiles[i].type_flag;
@ -181,6 +183,8 @@ namespace Horse_Isle_Server
Messages.Seperator = gameData.messages.meta.seperator; Messages.Seperator = gameData.messages.meta.seperator;
Messages.TileFormat = gameData.messages.meta.tile_format; Messages.TileFormat = gameData.messages.meta.tile_format;
Messages.NothingMessage = gameData.messages.meta.nothing_message; Messages.NothingMessage = gameData.messages.meta.nothing_message;
Messages.ExitThisPlace = gameData.messages.meta.exit_this_place;
Messages.MetaTerminator = gameData.messages.meta.end_of_meta;
Messages.NearbyPlayers = gameData.messages.meta.nearby.players_nearby; Messages.NearbyPlayers = gameData.messages.meta.nearby.players_nearby;
Messages.North = gameData.messages.meta.nearby.north; Messages.North = gameData.messages.meta.nearby.north;

27
Horse Isle Server/Horse Isle Server/Map.cs
View file

@ -39,27 +39,36 @@ namespace Horse_Isle_Server
} }
public static bool CheckPassable(int x, int y) public static bool CheckPassable(int x, int y)
{ {
int tileId = GetTileId(x, y, false); int tileId = GetTileId(x, y, false) - 1;
int otileId = GetTileId(x, y, true); int otileId = GetTileId(x, y, true) - 1;
bool terrainPassable = TerrainTiles[tileId - 1].Passable; bool terrainPassable = TerrainTiles[tileId].Passable;
int tileset = 0; int tileset = 0;
if (otileId > 190)
if (otileId > 192)
{ {
otileId -= 192;
if (World.InIsle(x, y)) if (World.InIsle(x, y))
tileset = World.GetIsle(x, y).Tileset+1; tileset = World.GetIsle(x, y).Tileset;
otileId = otileId + 64 * tileset;
} }
otileId = (otileId - 1) * (tileset+1);
bool overlayPassable = OverlayTilesetPassibility[otileId]; int tileDepth = OverlayTileDepth[otileId];
bool overlayPassable = false;
if (tileDepth == 0)
overlayPassable = false;
if (tileDepth == 1)
overlayPassable = false;
if (tileDepth == 2)
overlayPassable = true;
if (tileDepth == 3)
overlayPassable = true;
bool tilePassable = false; bool tilePassable = false;
if (terrainPassable || overlayPassable) if (terrainPassable || overlayPassable)
tilePassable = true; tilePassable = true;
if (!overlayPassable && otileId != 1) if (!overlayPassable && otileId != 0)
tilePassable = false; tilePassable = false;

2
Horse Isle Server/Horse Isle Server/Messages.cs
View file

@ -61,6 +61,8 @@ namespace Horse_Isle_Server
public static string TileFormat; public static string TileFormat;
public static string NothingMessage; public static string NothingMessage;
public static string Seperator; public static string Seperator;
public static string ExitThisPlace;
public static string MetaTerminator;
// Disconnect Messages // Disconnect Messages
public static string BanMessage; public static string BanMessage;

2
Horse Isle Server/Horse Isle Server/PacketBuilder.cs
View file

@ -46,7 +46,7 @@ namespace Horse_Isle_Server
public const byte MOVE_RIGHT = 0x16; public const byte MOVE_RIGHT = 0x16;
public const byte MOVE_LEFT = 0x17; public const byte MOVE_LEFT = 0x17;
public const byte MOVE_ESCAPE = 0x18; public const byte MOVE_ESCAPE = 0x18;
public const byte MOVE_EXIT = 0x10; public const byte MOVE_UPDATE = 0x0A;
public const byte CHAT_BOTTOM_LEFT = 0x14; public const byte CHAT_BOTTOM_LEFT = 0x14;
public const byte CHAT_BOTTOM_RIGHT = 0x15; public const byte CHAT_BOTTOM_RIGHT = 0x15;

77
Horse Isle Server/Horse Isle Server/Server.cs
View file

@ -174,9 +174,60 @@ namespace Horse_Isle_Server
} }
User loggedInUser = sender.LoggedinUser; User loggedInUser = sender.LoggedinUser;
byte movementDirection = packet[1]; byte movementDirection = packet[1];
if (movementDirection == PacketBuilder.MOVE_UP) if (movementDirection == PacketBuilder.MOVE_ESCAPE)
{
byte Direction;
if (World.InSpecialTile(loggedInUser.X, loggedInUser.Y))
{
int newX = loggedInUser.X;
int newY = loggedInUser.Y;
World.SpecialTile tile = World.GetSpecialTile(loggedInUser.X, loggedInUser.Y);
if (tile.ExitX != 0)
newX = tile.ExitX;
if (tile.ExitY != 0)
newY = tile.ExitY;
else
if (Map.CheckPassable(loggedInUser.X, loggedInUser.Y + 1))
newY += 1;
if (loggedInUser.X + 1 == newX && loggedInUser.Y == newY)
Direction = PacketBuilder.DIRECTION_RIGHT;
else if (loggedInUser.X - 1 == newX && loggedInUser.Y == newY)
Direction = PacketBuilder.DIRECTION_LEFT;
else if (loggedInUser.Y + 1 == newY && loggedInUser.X == newX)
Direction = PacketBuilder.DIRECTION_DOWN;
else if (loggedInUser.Y - 1 == newY && loggedInUser.X == newX)
Direction = PacketBuilder.DIRECTION_UP;
else
Direction = PacketBuilder.DIRECTION_TELEPORT;
loggedInUser.X = newX;
loggedInUser.Y = newY;
}
else
{
if (Map.CheckPassable(loggedInUser.X, loggedInUser.Y + 1))
loggedInUser.Y += 1;
Direction = PacketBuilder.DIRECTION_DOWN;
}
if (loggedInUser.X == 0 && loggedInUser.Y == 0)
Logger.ErrorPrint("Impossible bug occured.");
Logger.DebugPrint("Exiting player: " + loggedInUser.Username + " to: " + loggedInUser.X + "," + loggedInUser.Y);
byte[] moveResponse = PacketBuilder.CreateMovementPacket(loggedInUser.X, loggedInUser.Y, loggedInUser.CharacterId, Direction, Direction, true);
sender.SendPacket(moveResponse);
}
if (movementDirection == PacketBuilder.MOVE_UP)
{ {
loggedInUser.Facing = PacketBuilder.DIRECTION_UP; loggedInUser.Facing = PacketBuilder.DIRECTION_UP;
if (Map.CheckPassable(loggedInUser.X, loggedInUser.Y - 1)) if (Map.CheckPassable(loggedInUser.X, loggedInUser.Y - 1))
@ -222,7 +273,7 @@ namespace Horse_Isle_Server
sender.SendPacket(moveLeftResponse); sender.SendPacket(moveLeftResponse);
} }
} }
else if (movementDirection == PacketBuilder.MOVE_DOWN || movementDirection == PacketBuilder.MOVE_ESCAPE) else if (movementDirection == PacketBuilder.MOVE_DOWN)
{ {
loggedInUser.Facing = PacketBuilder.DIRECTION_DOWN; loggedInUser.Facing = PacketBuilder.DIRECTION_DOWN;
if (Map.CheckPassable(loggedInUser.X, loggedInUser.Y + 1)) if (Map.CheckPassable(loggedInUser.X, loggedInUser.Y + 1))
@ -238,6 +289,11 @@ namespace Horse_Isle_Server
} }
} }
else if(movementDirection == PacketBuilder.MOVE_UPDATE)
{
Update(sender, true);
return;
}
Update(sender); Update(sender);
@ -401,7 +457,7 @@ namespace Horse_Isle_Server
connectedClients.Remove(sender); connectedClients.Remove(sender);
} }
public static void UpdateArea(Client forClient) public static void UpdateArea(Client forClient, bool justArea=false)
{ {
if (!forClient.LoggedIn) if (!forClient.LoggedIn)
{ {
@ -417,12 +473,12 @@ namespace Horse_Isle_Server
else else
{ {
World.SpecialTile specialTile = World.GetSpecialTile(forClient.LoggedinUser.X, forClient.LoggedinUser.Y); World.SpecialTile specialTile = World.GetSpecialTile(forClient.LoggedinUser.X, forClient.LoggedinUser.Y);
if(specialTile.AutoplaySwf != null && specialTile.AutoplaySwf != "") if(specialTile.AutoplaySwf != null && specialTile.AutoplaySwf != "" && !justArea)
{ {
byte[] swfModulePacket = PacketBuilder.CreateSwfModulePacket(specialTile.AutoplaySwf); byte[] swfModulePacket = PacketBuilder.CreateSwfModulePacket(specialTile.AutoplaySwf);
forClient.SendPacket(swfModulePacket); forClient.SendPacket(swfModulePacket);
} }
if(specialTile.Code != null) if(specialTile.Code != null && !justArea)
if (!ProcessMapCode(forClient, specialTile.Code)) if (!ProcessMapCode(forClient, specialTile.Code))
return; return;
LocationStr = Meta.BuildSpecialTileInfo(specialTile); LocationStr = Meta.BuildSpecialTileInfo(specialTile);
@ -572,13 +628,14 @@ namespace Horse_Isle_Server
Update(client); Update(client);
} }
public static void Update(Client client) public static void Update(Client client, bool justArea = false)
{ {
UpdateUserInfo(client.LoggedinUser); UpdateArea(client, justArea);
UpdateArea(client);
foreach (User nearbyUser in Server.GetNearbyUsers(client.LoggedinUser.X, client.LoggedinUser.Y, false, false)) foreach (User nearbyUser in Server.GetNearbyUsers(client.LoggedinUser.X, client.LoggedinUser.Y, false, false))
if (nearbyUser.Id != client.LoggedinUser.Id) if (nearbyUser.Id != client.LoggedinUser.Id)
UpdateArea(nearbyUser.LoggedinClient); UpdateArea(nearbyUser.LoggedinClient, justArea);
UpdateUserInfo(client.LoggedinUser);
} }
public static bool ProcessMapCode(Client forClient, string mapCode) public static bool ProcessMapCode(Client forClient, string mapCode)