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

Fix Server shutdown

Browse source
This commit is contained in:
Li 2022-11-27 11:19:41 +13:00
parent 7ed10a6bca
commit 245f2d3e48
8 changed files with 276 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
HorseIsleServer/HISPd/Program.cs
View file

@ -11,7 +11,7 @@ namespace HISP.Cli
private static StreamWriter sw = null; private static StreamWriter sw = null;
private static FileStream fs = null; private static FileStream fs = null;
private static string logFile; private static string logFile;
private static EventWaitHandle shutdownHandle; private static EventWaitHandle shutdownHandle = null;
public static bool ShuttingDown = false; public static bool ShuttingDown = false;
public static string BaseDir; public static string BaseDir;
@ -44,22 +44,34 @@ namespace HISP.Cli
public static void OnShutdown() public static void OnShutdown()
{ {
if(fs != null) try
{ {
fs.Flush(); if (sw != null)
fs.Close(); {
fs.Dispose(); sw.Flush();
fs = null; sw.Close();
} sw.Dispose();
if(sw != null) sw = null;
{ }
sw.Flush();
sw.Close();
sw.Dispose();
sw = null;
}
shutdownHandle.Set(); }
catch (Exception) { };
try
{
if (fs != null)
{
fs.Flush();
fs.Close();
fs.Dispose();
fs = null;
}
}
catch (Exception) { };
if(shutdownHandle != null)
shutdownHandle.Set();
} }
private static string formatMessage(string type, string text) private static string formatMessage(string type, string text)
@ -70,7 +82,12 @@ namespace HISP.Cli
string newline = "\n"; string newline = "\n";
#endif #endif
return DateTime.Now.ToString("MM-dd-yyyy HH:mm:dd") + ": [" + type + "] " + text + newline; string msg = DateTime.Now.ToString("MM dd yyyy HH:mm:dd") + ": [" + type + "] ";
if (text.Length > (Console.WindowWidth - msg.Length) - newline.Length)
text = text.Substring(0, (Console.WindowWidth - msg.Length) - newline.Length);
return msg + text + newline;
} }
public static void LogToFile(bool error, string type,string text) public static void LogToFile(bool error, string type,string text)
@ -89,6 +106,7 @@ namespace HISP.Cli
Console.Error.WriteAsync(formatMessage(type, text)); Console.Error.WriteAsync(formatMessage(type, text));
else else
Console.Out.WriteAsync(formatMessage(type, text)); Console.Out.WriteAsync(formatMessage(type, text));
} }
catch (Exception) { }; catch (Exception) { };
} }

4
HorseIsleServer/HISPd/Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.59.0")] [assembly: AssemblyVersion("1.8.61.0")]
[assembly: AssemblyFileVersion("1.8.59.0")] [assembly: AssemblyFileVersion("1.8.61.0")]

2
HorseIsleServer/HISPd/Resources/DEBIAN/control
View file

@ -1,5 +1,5 @@
Package: hisp Package: hisp
Version: 1.8.59 Version: 1.8.61
Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
Maintainer: Li Maintainer: Li
Homepage: https://islehorse.com Homepage: https://islehorse.com

4
HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.59.0")] [assembly: AssemblyVersion("1.8.61.0")]
[assembly: AssemblyFileVersion("1.8.59.0")] [assembly: AssemblyFileVersion("1.8.61.0")]

17
HorseIsleServer/LibHISP/Server/GameClient.cs
View file

@ -104,23 +104,32 @@ namespace HISP.Server
} }
catch (Exception) { }; catch (Exception) { };
} }
private static bool acceptConnections(SocketAsyncEventArgs e)
{
try
{
if (e == null) return false;
if (GameServer.ServerSocket == null) return false;
return !GameServer.ServerSocket.AcceptAsync(e);
}
catch (Exception) { return false; }
}
public static void CreateClient(object sender, SocketAsyncEventArgs e) public static void CreateClient(object sender, SocketAsyncEventArgs e)
{ {
do do
{ {
Socket clientSocket = e.AcceptSocket; Socket clientSocket = e.AcceptSocket;
if (GameServer.ServerSocket == null)
return;
if (clientSocket == null) if (clientSocket == null)
continue; continue;
if (clientSocket.RemoteEndPoint == null) if (clientSocket.RemoteEndPoint == null)
continue; continue;
connectedClients.Add(new GameClient(clientSocket)); connectedClients.Add(new GameClient(clientSocket));
e.AcceptSocket = null; e.AcceptSocket = null;
} while (!GameServer.ServerSocket.AcceptAsync(e)); } while (acceptConnections(e));
} }
private void timeoutTimerTick(object state) private void timeoutTimerTick(object state)
{ {

293
HorseIsleServer/LibHISP/Server/GameDataJson.cs
View file

@ -1,6 +1,13 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Globalization;
using System;
using System.Dynamic;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using HISP.Game; using HISP.Game;
using HISP.Game.Chat; using HISP.Game.Chat;
using HISP.Player; using HISP.Player;
@ -8,19 +15,16 @@ using HISP.Game.Services;
using HISP.Game.SwfModules; using HISP.Game.SwfModules;
using HISP.Game.Horse; using HISP.Game.Horse;
using HISP.Game.Items; using HISP.Game.Items;
using System.Globalization;
using HISP.Security; using HISP.Security;
using System;
using HISP.Game.Events; using HISP.Game.Events;
using System.Dynamic;
using Newtonsoft.Json.Linq;
namespace HISP.Server namespace HISP.Server
{ {
public class GameDataJson public class GameDataJson
{ {
private static dynamic gameData; private static dynamic gameData;
public static void ReadGamedata()
private static void readGamedataFiles()
{ {
Logger.DebugPrint("Reading GAMEDATA"); Logger.DebugPrint("Reading GAMEDATA");
if (Directory.Exists(ConfigReader.GameData)) if (Directory.Exists(ConfigReader.GameData))
@ -28,9 +32,9 @@ namespace HISP.Server
Logger.DebugPrint("Found GAMEDATA DIR ... "); Logger.DebugPrint("Found GAMEDATA DIR ... ");
gameData = new JObject(); gameData = new JObject();
string[] files = Directory.GetFiles(ConfigReader.GameData); string[] files = Directory.GetFiles(ConfigReader.GameData);
foreach(string file in files) foreach (string file in files)
{ {
Logger.DebugPrint("Reading: "+file); Logger.DebugPrint("Reading: " + file);
string jsonData = File.ReadAllText(file); string jsonData = File.ReadAllText(file);
JObject thisData = (JObject)JsonConvert.DeserializeObject(jsonData); JObject thisData = (JObject)JsonConvert.DeserializeObject(jsonData);
JObject jData = (JObject)gameData; JObject jData = (JObject)gameData;
@ -48,12 +52,13 @@ namespace HISP.Server
else else
{ {
Logger.ErrorPrint("Could not find GAMEDATA, configured as; " + ConfigReader.GameData + " But no file or directory exists!"); Logger.ErrorPrint("Could not find GAMEDATA, configured as; " + ConfigReader.GameData + " But no file or directory exists!");
GameServer.ShutdownServer(); GameServer.ShutdownServer("Unable to find GAMEDATA");
return; return;
} }
}
// Register Towns private static void registerTowns()
{
int totalTowns = gameData.places.towns.Count; int totalTowns = gameData.places.towns.Count;
for (int i = 0; i < totalTowns; i++) for (int i = 0; i < totalTowns; i++)
{ {
@ -68,8 +73,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Town: " + town.Name + " X " + town.StartX + "-" + town.EndX + " Y " + town.StartY + "-" + town.EndY); Logger.DebugPrint("Registered Town: " + town.Name + " X " + town.StartX + "-" + town.EndX + " Y " + town.StartY + "-" + town.EndY);
World.Towns.Add(town); World.Towns.Add(town);
} }
}
// Register Zones private static void registerZones()
{
int totalZones = gameData.places.zones.Count; int totalZones = gameData.places.zones.Count;
for (int i = 0; i < totalZones; i++) for (int i = 0; i < totalZones; i++)
{ {
@ -85,7 +92,9 @@ namespace HISP.Server
World.Zones.Add(zone); World.Zones.Add(zone);
} }
// Register Areas }
private static void registerAreas()
{
int totalAreas = gameData.places.areas.Count; int totalAreas = gameData.places.areas.Count;
for (int i = 0; i < totalAreas; i++) for (int i = 0; i < totalAreas; i++)
{ {
@ -100,8 +109,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Area: " + area.Name + " X " + area.StartX + "-" + area.EndX + " Y " + area.StartY + "-" + area.EndY); Logger.DebugPrint("Registered Area: " + area.Name + " X " + area.StartX + "-" + area.EndX + " Y " + area.StartY + "-" + area.EndY);
World.Areas.Add(area); World.Areas.Add(area);
} }
}
private static void registerIsles()
{
// Register Isles
int totalIsles = gameData.places.isles.Count; int totalIsles = gameData.places.isles.Count;
for (int i = 0; i < totalIsles; i++) for (int i = 0; i < totalIsles; i++)
{ {
@ -117,7 +128,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Isle: " + isle.Name + " X " + isle.StartX + "-" + isle.EndX + " Y " + isle.StartY + "-" + isle.EndY + " tileset: " + isle.Tileset); Logger.DebugPrint("Registered Isle: " + isle.Name + " X " + isle.StartX + "-" + isle.EndX + " Y " + isle.StartY + "-" + isle.EndY + " tileset: " + isle.Tileset);
World.Isles.Add(isle); World.Isles.Add(isle);
} }
}
private static void registerWaypoints()
{
int totalWaypoints = gameData.places.waypoints.Count; int totalWaypoints = gameData.places.waypoints.Count;
for (int i = 0; i < totalWaypoints; i++) for (int i = 0; i < totalWaypoints; i++)
{ {
@ -131,8 +145,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Waypoint: " + waypoint.PosX.ToString() + ", " + waypoint.PosY.ToString() + " TYPE: " + waypoint.Type); Logger.DebugPrint("Registered Waypoint: " + waypoint.PosX.ToString() + ", " + waypoint.PosY.ToString() + " TYPE: " + waypoint.Type);
World.Waypoints.Add(waypoint); World.Waypoints.Add(waypoint);
} }
}
// Register Special Tiles private static void registerSpecialTiles()
{
int totalSpecialTiles = gameData.places.special_tiles.Count; int totalSpecialTiles = gameData.places.special_tiles.Count;
for (int i = 0; i < totalSpecialTiles; i++) for (int i = 0; i < totalSpecialTiles; i++)
{ {
@ -153,8 +168,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Special Tile: " + specialTile.Title + " X " + specialTile.X + " Y: " + specialTile.Y); Logger.DebugPrint("Registered Special Tile: " + specialTile.Title + " X " + specialTile.X + " Y: " + specialTile.Y);
World.SpecialTiles.Add(specialTile); World.SpecialTiles.Add(specialTile);
} }
}
// Register Filter Reasons private static void registerChatWarningReasons()
{
int totalReasons = gameData.messages.chat.reason_messages.Count; int totalReasons = gameData.messages.chat.reason_messages.Count;
for (int i = 0; i < totalReasons; i++) for (int i = 0; i < totalReasons; i++)
{ {
@ -165,8 +181,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Chat Warning Reason: " + reason.Name + " (Message: " + reason.Message + ")"); Logger.DebugPrint("Registered Chat Warning Reason: " + reason.Name + " (Message: " + reason.Message + ")");
} }
// Register Filters
}
private static void registerFilteredWords()
{
int totalFilters = gameData.messages.chat.filter.Count; int totalFilters = gameData.messages.chat.filter.Count;
for (int i = 0; i < totalFilters; i++) for (int i = 0; i < totalFilters; i++)
{ {
@ -178,8 +196,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Filtered Word: " + filter.FilteredWord + " With reason: " + filter.Reason.Name + " (Matching all: " + filter.MatchAll + ")"); Logger.DebugPrint("Registered Filtered Word: " + filter.FilteredWord + " With reason: " + filter.Reason.Name + " (Matching all: " + filter.MatchAll + ")");
} }
}
// Register Corrections private static void registerWordCorrections()
{
int totalCorrections = gameData.messages.chat.correct.Count; int totalCorrections = gameData.messages.chat.correct.Count;
for (int i = 0; i < totalCorrections; i++) for (int i = 0; i < totalCorrections; i++)
{ {
@ -190,9 +209,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Word Correction: " + correction.FilteredWord + " to " + correction.ReplacedWord); Logger.DebugPrint("Registered Word Correction: " + correction.FilteredWord + " to " + correction.ReplacedWord);
} }
}
// Register Transports private static void registerTransportPoints()
{
int totalTransportPoints = gameData.transport.transport_points.Count; int totalTransportPoints = gameData.transport.transport_points.Count;
for (int i = 0; i < totalTransportPoints; i++) for (int i = 0; i < totalTransportPoints; i++)
{ {
@ -204,7 +223,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Transport Point: At X: " + transportPoint.X + " Y: " + transportPoint.Y); Logger.DebugPrint("Registered Transport Point: At X: " + transportPoint.X + " Y: " + transportPoint.Y);
} }
}
private static void registerTransportLocations()
{
int totalTransportPlaces = gameData.transport.transport_places.Count; int totalTransportPlaces = gameData.transport.transport_places.Count;
for (int i = 0; i < totalTransportPlaces; i++) for (int i = 0; i < totalTransportPlaces; i++)
{ {
@ -219,8 +241,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Transport Location: " + transportPlace.LocationTitle + " To Goto X: " + transportPlace.GotoX + " Y: " + transportPlace.GotoY); Logger.DebugPrint("Registered Transport Location: " + transportPlace.LocationTitle + " To Goto X: " + transportPlace.GotoX + " Y: " + transportPlace.GotoY);
} }
}
// Register Items private static void registerItems()
{
int totalItems = gameData.item.item_list.Count; int totalItems = gameData.item.item_list.Count;
for (int i = 0; i < totalItems; i++) for (int i = 0; i < totalItems; i++)
{ {
@ -257,7 +280,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Item ID: " + item.Id + " Name: " + item.Name + " spawns on: " + item.SpawnParamaters.SpawnOnTileType); Logger.DebugPrint("Registered Item ID: " + item.Id + " Name: " + item.Name + " spawns on: " + item.SpawnParamaters.SpawnOnTileType);
Item.AddItemInfo(item); Item.AddItemInfo(item);
} }
// Register Throwables }
private static void registerThrowables()
{
int totalThrowable = gameData.item.throwable.Count; int totalThrowable = gameData.item.throwable.Count;
for (int i = 0; i < totalThrowable; i++) for (int i = 0; i < totalThrowable; i++)
{ {
@ -268,8 +293,10 @@ namespace HISP.Server
throwableItem.HitYourselfMessage = gameData.item.throwable[i].message_hit_yourself; throwableItem.HitYourselfMessage = gameData.item.throwable[i].message_hit_yourself;
Item.AddThrowableItem(throwableItem); Item.AddThrowableItem(throwableItem);
} }
}
// Register NPCs private static void registerNpcs()
{
Logger.DebugPrint("Registering NPCS: "); Logger.DebugPrint("Registering NPCS: ");
int totalNpcs = gameData.npc_list.Count; int totalNpcs = gameData.npc_list.Count;
for (int i = 0; i < totalNpcs; i++) for (int i = 0; i < totalNpcs; i++)
@ -344,9 +371,10 @@ namespace HISP.Server
npcEntry.Chatpoints = chats.ToArray(); npcEntry.Chatpoints = chats.ToArray();
Npc.AddNpc(npcEntry); Npc.AddNpc(npcEntry);
} }
}
// Register Quests private static void registerQuests()
{
Logger.DebugPrint("Registering Quests: "); Logger.DebugPrint("Registering Quests: ");
int totalQuests = gameData.quest_list.Count; int totalQuests = gameData.quest_list.Count;
for (int i = 0; i < totalQuests; i++) for (int i = 0; i < totalQuests; i++)
@ -420,6 +448,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Quest: " + quest.Id); Logger.DebugPrint("Registered Quest: " + quest.Id);
Quest.AddQuestEntry(quest); Quest.AddQuestEntry(quest);
} }
}
private static void registerShops()
{
int totalShops = gameData.shop_list.Count; int totalShops = gameData.shop_list.Count;
for (int i = 0; i < totalShops; i++) for (int i = 0; i < totalShops; i++)
@ -433,9 +465,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Shop ID: " + shop.Id + " Selling items at " + shop.SellPricePercentage + "% and buying at " + shop.BuyPricePercentage); Logger.DebugPrint("Registered Shop ID: " + shop.Id + " Selling items at " + shop.SellPricePercentage + "% and buying at " + shop.BuyPricePercentage);
} }
}
// Register awards private static void registerAwards()
{
int totalAwards = gameData.award_list.Count; int totalAwards = gameData.award_list.Count;
Award.GlobalAwardList = new Award.AwardEntry[totalAwards]; Award.GlobalAwardList = new Award.AwardEntry[totalAwards];
for (int i = 0; i < totalAwards; i++) for (int i = 0; i < totalAwards; i++)
@ -454,9 +487,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Award ID: " + award.Id + " - " + award.Title); Logger.DebugPrint("Registered Award ID: " + award.Id + " - " + award.Title);
} }
}
// Register Abuse Report Reasons private static void registerAbuseReportReasons()
{
int totalAbuseReportReasons = gameData.messages.meta.abuse_report.reasons.Count; int totalAbuseReportReasons = gameData.messages.meta.abuse_report.reasons.Count;
for (int i = 0; i < totalAbuseReportReasons; i++) for (int i = 0; i < totalAbuseReportReasons; i++)
{ {
@ -467,10 +500,9 @@ namespace HISP.Server
AbuseReport.AddReason(reason); AbuseReport.AddReason(reason);
Logger.DebugPrint("Registered Abuse Report Reason: " + reason.Name); Logger.DebugPrint("Registered Abuse Report Reason: " + reason.Name);
} }
}
/// Map Data private static void registerOverlayTileDepth()
{
// Overlay tile depth;
List<Map.TileDepth> overlayTilesDepth = new List<Map.TileDepth>(); List<Map.TileDepth> overlayTilesDepth = new List<Map.TileDepth>();
int totalOverlayTileDepth = gameData.tile_paramaters.overlay_tiles.Count; int totalOverlayTileDepth = gameData.tile_paramaters.overlay_tiles.Count;
for (int i = 0; i < totalOverlayTileDepth; i++) for (int i = 0; i < totalOverlayTileDepth; i++)
@ -482,8 +514,9 @@ namespace HISP.Server
overlayTilesDepth.Add(tileDepth); overlayTilesDepth.Add(tileDepth);
} }
Map.OverlayTileDepth = overlayTilesDepth.ToArray(); Map.OverlayTileDepth = overlayTilesDepth.ToArray();
}
// Terrain tile types and passable; private static void registerTerrianTileTypes()
{
List<Map.TerrainTile> terrainTiles = new List<Map.TerrainTile>(); List<Map.TerrainTile> terrainTiles = new List<Map.TerrainTile>();
int totalTerrainTiles = gameData.tile_paramaters.terrain_tiles.Count; int totalTerrainTiles = gameData.tile_paramaters.terrain_tiles.Count;
for (int i = 0; i < totalTerrainTiles; i++) for (int i = 0; i < totalTerrainTiles; i++)
@ -495,9 +528,9 @@ namespace HISP.Server
terrainTiles.Add(tile); terrainTiles.Add(tile);
} }
Map.TerrainTiles = terrainTiles.ToArray(); Map.TerrainTiles = terrainTiles.ToArray();
}
// Register Abuse Report Reasons private static void registerInns()
{
int totalInns = gameData.inns.Count; int totalInns = gameData.inns.Count;
for (int i = 0; i < totalInns; i++) for (int i = 0; i < totalInns; i++)
{ {
@ -509,7 +542,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Inn: " + inn.Id + " Buying at: " + inn.BuyPercentage.ToString() + "%!"); Logger.DebugPrint("Registered Inn: " + inn.Id + " Buying at: " + inn.BuyPercentage.ToString() + "%!");
} }
}
private static void registerPoets()
{
int totalPoets = gameData.poetry.Count; int totalPoets = gameData.poetry.Count;
for (int i = 0; i < totalPoets; i++) for (int i = 0; i < totalPoets; i++)
{ {
@ -521,8 +557,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered poet: " + entry.Id.ToString() + " word: " + entry.Word + " in room " + entry.Room.ToString()); Logger.DebugPrint("Registered poet: " + entry.Id.ToString() + " word: " + entry.Word + " in room " + entry.Room.ToString());
} }
}
// Register Horse Breeds private static void registerBreeds()
{
int totalBreeds = gameData.horses.breeds.Count; int totalBreeds = gameData.horses.breeds.Count;
for (int i = 0; i < totalBreeds; i++) for (int i = 0; i < totalBreeds; i++)
{ {
@ -553,7 +591,10 @@ namespace HISP.Server
HorseInfo.AddBreed(horseBreed); HorseInfo.AddBreed(horseBreed);
Logger.DebugPrint("Registered Horse Breed: #" + horseBreed.Id + ": " + horseBreed.Name); Logger.DebugPrint("Registered Horse Breed: #" + horseBreed.Id + ": " + horseBreed.Name);
} }
// Register Breed Prices @ Pawneer Order }
private static void registerBreedPricesPawneerOrder()
{
int totalBreedPrices = gameData.horses.pawneer_base_price.Count; int totalBreedPrices = gameData.horses.pawneer_base_price.Count;
for (int i = 0; i < totalBreedPrices; i++) for (int i = 0; i < totalBreedPrices; i++)
{ {
@ -563,7 +604,10 @@ namespace HISP.Server
Pawneer.AddPawneerPriceModel(pawneerPricing); Pawneer.AddPawneerPriceModel(pawneerPricing);
Logger.DebugPrint("Registered Pawneer Base Price " + pawneerPricing.BreedId + " for $" + pawneerPricing.BasePrice.ToString("N0", CultureInfo.InvariantCulture)); Logger.DebugPrint("Registered Pawneer Base Price " + pawneerPricing.BreedId + " for $" + pawneerPricing.BasePrice.ToString("N0", CultureInfo.InvariantCulture));
} }
}
private static void registerHorseCategorys()
{
int totalCategories = gameData.horses.categorys.Count; int totalCategories = gameData.horses.categorys.Count;
for (int i = 0; i < totalCategories; i++) for (int i = 0; i < totalCategories; i++)
{ {
@ -574,6 +618,11 @@ namespace HISP.Server
HorseInfo.AddHorseCategory(category); HorseInfo.AddHorseCategory(category);
Logger.DebugPrint("Registered horse category type: " + category.Name); Logger.DebugPrint("Registered horse category type: " + category.Name);
} }
}
private static void registerTrackedItems()
{
int totalTrackedItems = gameData.messages.meta.misc_stats.tracked_items.Count; int totalTrackedItems = gameData.messages.meta.misc_stats.tracked_items.Count;
for (int i = 0; i < totalTrackedItems; i++) for (int i = 0; i < totalTrackedItems; i++)
{ {
@ -583,8 +632,9 @@ namespace HISP.Server
Tracking.TrackedItemsStatsMenu.Add(trackedItem); Tracking.TrackedItemsStatsMenu.Add(trackedItem);
Logger.DebugPrint("Registered Tracked Item: " + trackedItem.What + " value: " + trackedItem.Value); Logger.DebugPrint("Registered Tracked Item: " + trackedItem.What + " value: " + trackedItem.Value);
} }
// Register Services }
private static void registerVets()
{
int totalVets = gameData.services.vet.price_multipliers.Count; int totalVets = gameData.services.vet.price_multipliers.Count;
for (int i = 0; i < totalVets; i++) for (int i = 0; i < totalVets; i++)
{ {
@ -593,7 +643,10 @@ namespace HISP.Server
Vet vet = new Vet(id, cost); Vet vet = new Vet(id, cost);
Logger.DebugPrint("Registered Vet: " + vet.Id + " selling at: " + vet.PriceMultiplier.ToString(CultureInfo.InvariantCulture)); Logger.DebugPrint("Registered Vet: " + vet.Id + " selling at: " + vet.PriceMultiplier.ToString(CultureInfo.InvariantCulture));
} }
}
private static void registerGroomers()
{
int totalGroomers = gameData.services.groomer.price_multipliers.Count; int totalGroomers = gameData.services.groomer.price_multipliers.Count;
for (int i = 0; i < totalGroomers; i++) for (int i = 0; i < totalGroomers; i++)
{ {
@ -604,6 +657,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Groomer: " + groomer.Id + " selling at: " + groomer.PriceMultiplier.ToString(CultureInfo.InvariantCulture)); Logger.DebugPrint("Registered Groomer: " + groomer.Id + " selling at: " + groomer.PriceMultiplier.ToString(CultureInfo.InvariantCulture));
} }
}
private static void registerFarriers()
{
int totalFarriers = gameData.services.farrier.price_multipliers.Count; int totalFarriers = gameData.services.farrier.price_multipliers.Count;
for (int i = 0; i < totalFarriers; i++) for (int i = 0; i < totalFarriers; i++)
{ {
@ -616,7 +673,10 @@ namespace HISP.Server
Farrier farrier = new Farrier(id, steel, steelcost, iron, ironcost); Farrier farrier = new Farrier(id, steel, steelcost, iron, ironcost);
Logger.DebugPrint("Registered Farrier: " + farrier.Id); Logger.DebugPrint("Registered Farrier: " + farrier.Id);
} }
}
private static void registerBarns()
{
int totalBarns = gameData.services.barn.price_multipliers.Count; int totalBarns = gameData.services.barn.price_multipliers.Count;
for (int i = 0; i < totalBarns; i++) for (int i = 0; i < totalBarns; i++)
{ {
@ -629,9 +689,10 @@ namespace HISP.Server
Barn barn = new Barn(id, tired_cost, hunger_cost, thirst_cost); Barn barn = new Barn(id, tired_cost, hunger_cost, thirst_cost);
Logger.DebugPrint("Registered Barn: " + barn.Id); Logger.DebugPrint("Registered Barn: " + barn.Id);
} }
}
private static void registerLibaryBooks()
// Register Libary Books {
int totalBooks = gameData.books.Count; int totalBooks = gameData.books.Count;
for (int i = 0; i < totalBooks; i++) for (int i = 0; i < totalBooks; i++)
{ {
@ -640,11 +701,12 @@ namespace HISP.Server
string title = gameData.books[i].title; string title = gameData.books[i].title;
string text = gameData.books[i].text; string text = gameData.books[i].text;
Book book = new Book(id, title, author, text); Book book = new Book(id, title, author, text);
Logger.DebugPrint("Registered Libary Book: " + book.Id + " " + book.Title + " by " + book.Author); Logger.DebugPrint("Registered Library Book: " + book.Id + " " + book.Title + " by " + book.Author);
} }
}
// Register Crafts private static void registerCrafts()
{
int totalWorkshops = gameData.workshop.Count; int totalWorkshops = gameData.workshop.Count;
for (int i = 0; i < totalWorkshops; i++) for (int i = 0; i < totalWorkshops; i++)
{ {
@ -673,7 +735,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Workshop at X: " + wkShop.X + " Y: " + wkShop.Y); Logger.DebugPrint("Registered Workshop at X: " + wkShop.X + " Y: " + wkShop.Y);
} }
// Register Ranch Buildings }
private static void registerRanchBuildings()
{
int totalRanchBuildings = gameData.ranch.ranch_buildings.buildings.Count; int totalRanchBuildings = gameData.ranch.ranch_buildings.buildings.Count;
for (int i = 0; i < totalRanchBuildings; i++) for (int i = 0; i < totalRanchBuildings; i++)
{ {
@ -693,7 +758,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Ranch Building: " + building.Title); Logger.DebugPrint("Registered Ranch Building: " + building.Title);
} }
// Register Ranch Upgrades }
private static void registerRanchUpgrades()
{
int totalRanchUpgrades = gameData.ranch.ranch_buildings.upgrades.Count; int totalRanchUpgrades = gameData.ranch.ranch_buildings.upgrades.Count;
for (int i = 0; i < totalRanchUpgrades; i++) for (int i = 0; i < totalRanchUpgrades; i++)
{ {
@ -715,7 +783,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Ranch Upgrade: " + upgrade.Title); Logger.DebugPrint("Registered Ranch Upgrade: " + upgrade.Title);
} }
// Register Ranches }
private static void registerRanchs()
{
int totalRanchLocations = gameData.ranch.ranch_locations.Count; int totalRanchLocations = gameData.ranch.ranch_locations.Count;
for (int i = 0; i < totalRanchLocations; i++) for (int i = 0; i < totalRanchLocations; i++)
{ {
@ -728,7 +799,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Ranch id " + id + " at X: " + ranch.X + " Y: " + ranch.Y); Logger.DebugPrint("Registered Ranch id " + id + " at X: " + ranch.X + " Y: " + ranch.Y);
} }
// Register Riddles }
private static void registerRiddlerRiddles()
{
int totalRiddles = gameData.riddle_room.Count; int totalRiddles = gameData.riddle_room.Count;
for (int i = 0; i < totalRiddles; i++) for (int i = 0; i < totalRiddles; i++)
{ {
@ -740,8 +814,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Riddler Riddle: " + riddlerRiddle.Riddle); Logger.DebugPrint("Registered Riddler Riddle: " + riddlerRiddle.Riddle);
} }
}
// Register BBCODE private static void registerBBCodes()
{
int totalBBocdes = gameData.bbcode.Count; int totalBBocdes = gameData.bbcode.Count;
for (int i = 0; i < totalBBocdes; i++) for (int i = 0; i < totalBBocdes; i++)
{ {
@ -750,8 +825,9 @@ namespace HISP.Server
BBCode code = new BBCode(tag, meta); BBCode code = new BBCode(tag, meta);
Logger.DebugPrint("Registered BBCODE: " + code.Tag + " to " + code.MetaTranslation); Logger.DebugPrint("Registered BBCODE: " + code.Tag + " to " + code.MetaTranslation);
} }
}
// Register Training Pens private static void registerTrainingPens()
{
int totalTrainingPens = gameData.training_pens.Count; int totalTrainingPens = gameData.training_pens.Count;
for (int i = 0; i < totalTrainingPens; i++) for (int i = 0; i < totalTrainingPens; i++)
{ {
@ -768,7 +844,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Training Pen: " + trainer.Id + " for " + trainer.ImprovesStat); Logger.DebugPrint("Registered Training Pen: " + trainer.Id + " for " + trainer.ImprovesStat);
} }
// Register Arenas }
private static void registerArenas()
{
int totalArenas = gameData.arena.arena_list.Count; int totalArenas = gameData.arena.arena_list.Count;
for (int i = 0; i < totalArenas; i++) for (int i = 0; i < totalArenas; i++)
{ {
@ -783,8 +862,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Arena: " + arena.Id.ToString() + " as " + arena.Type); Logger.DebugPrint("Registered Arena: " + arena.Id.ToString() + " as " + arena.Type);
} }
Arena.ExpRewards = gameData.arena.arena_exp.ToObject<int[]>(); Arena.ExpRewards = gameData.arena.arena_exp.ToObject<int[]>();
}
// Register Leaser private static void registerLeasers()
{
int totalLeasers = gameData.leaser.Count; int totalLeasers = gameData.leaser.Count;
for (int i = 0; i < totalLeasers; i++) for (int i = 0; i < totalLeasers; i++)
{ {
@ -836,8 +917,10 @@ namespace HISP.Server
Leaser.AddHorseLeaser(leaser); Leaser.AddHorseLeaser(leaser);
Logger.DebugPrint("Registered Leaser: " + leaser.LeaseId.ToString() + " For a " + leaser.HorseName); Logger.DebugPrint("Registered Leaser: " + leaser.LeaseId.ToString() + " For a " + leaser.HorseName);
} }
}
// Register Socials private static void registerSocials()
{
int totalSocials = gameData.social_types.Count; int totalSocials = gameData.social_types.Count;
for (int i = 0; i < totalSocials; i++) for (int i = 0; i < totalSocials; i++)
{ {
@ -858,8 +941,10 @@ namespace HISP.Server
Logger.DebugPrint("Registered Social: " + social.ButtonName); Logger.DebugPrint("Registered Social: " + social.ButtonName);
} }
} }
}
// Register Events : Real Time Riddle private static void registerRealTimeRiddleEvents()
{
int totalRealTimeRiddles = gameData.events.real_time_riddle.Count; int totalRealTimeRiddles = gameData.events.real_time_riddle.Count;
for (int i = 0; i < totalRealTimeRiddles; i++) for (int i = 0; i < totalRealTimeRiddles; i++)
{ {
@ -869,11 +954,13 @@ namespace HISP.Server
int reward = gameData.events.real_time_riddle[i].money_reward; int reward = gameData.events.real_time_riddle[i].money_reward;
RealTimeRiddle riddle = new RealTimeRiddle(id, riddleText, riddleAnswers, reward); RealTimeRiddle riddle = new RealTimeRiddle(id, riddleText, riddleAnswers, reward);
Logger.DebugPrint("Registered Riddle #" + riddle.RiddleId.ToString()); Logger.DebugPrint("Registered Riddle #" + riddle.RiddleId.ToString());
} }
}
// Register Events : Real Time Quiz private static void registerRealTimeQuizEvents()
{
int totalRealTimeQuizCategories = gameData.events.real_time_quiz.Count; int totalRealTimeQuizCategories = gameData.events.real_time_quiz.Count;
RealTimeQuiz.Categories = new RealTimeQuiz.QuizCategory[totalRealTimeQuizCategories]; // initalize array RealTimeQuiz.Categories = new RealTimeQuiz.QuizCategory[totalRealTimeQuizCategories]; // initalize array
for (int i = 0; i < totalRealTimeQuizCategories; i++) for (int i = 0; i < totalRealTimeQuizCategories; i++)
@ -885,7 +972,7 @@ namespace HISP.Server
quizCategory.Name = name; quizCategory.Name = name;
quizCategory.Questions = new RealTimeQuiz.QuizQuestion[totalQuestions]; quizCategory.Questions = new RealTimeQuiz.QuizQuestion[totalQuestions];
for(int ii = 0; ii < totalQuestions; ii++) for (int ii = 0; ii < totalQuestions; ii++)
{ {
quizCategory.Questions[ii] = new RealTimeQuiz.QuizQuestion(quizCategory); quizCategory.Questions[ii] = new RealTimeQuiz.QuizQuestion(quizCategory);
quizCategory.Questions[ii].Question = gameData.events.real_time_quiz[i].questons[ii].question; quizCategory.Questions[ii].Question = gameData.events.real_time_quiz[i].questons[ii].question;
@ -897,9 +984,9 @@ namespace HISP.Server
Logger.DebugPrint("Registered Real Time Quiz Category: " + name); Logger.DebugPrint("Registered Real Time Quiz Category: " + name);
} }
}
// Register Random Event private static void registerRandomEvents()
{
int totalRandomEvent = gameData.events.random_events.Count; int totalRandomEvent = gameData.events.random_events.Count;
for (int i = 0; i < totalRandomEvent; i++) for (int i = 0; i < totalRandomEvent; i++)
{ {
@ -911,19 +998,69 @@ namespace HISP.Server
int id = gameData.events.random_events[i].id; int id = gameData.events.random_events[i].id;
string txt = gameData.events.random_events[i].text; string txt = gameData.events.random_events[i].text;
if(gameData.events.random_events[i].min_money != null) if (gameData.events.random_events[i].min_money != null)
minmoney = gameData.events.random_events[i].min_money; minmoney = gameData.events.random_events[i].min_money;
if(gameData.events.random_events[i].max_money != null) if (gameData.events.random_events[i].max_money != null)
maxmoney = gameData.events.random_events[i].max_money; maxmoney = gameData.events.random_events[i].max_money;
if(gameData.events.random_events[i].lower_horse_health != null) if (gameData.events.random_events[i].lower_horse_health != null)
lowerHorseHealth = gameData.events.random_events[i].lower_horse_health; lowerHorseHealth = gameData.events.random_events[i].lower_horse_health;
if(gameData.events.random_events[i].give_object != null) if (gameData.events.random_events[i].give_object != null)
giveObj = gameData.events.random_events[i].give_object; giveObj = gameData.events.random_events[i].give_object;
new RandomEvent(id, txt, minmoney, maxmoney, lowerHorseHealth, giveObj); new RandomEvent(id, txt, minmoney, maxmoney, lowerHorseHealth, giveObj);
Logger.DebugPrint("Registered Random Event: " + txt); Logger.DebugPrint("Registered Random Event: " + txt);
} }
}
public static void ReadGamedata()
{
readGamedataFiles();
registerTowns();
registerZones();
registerAreas();
registerIsles();
registerWaypoints();
registerSpecialTiles();
registerChatWarningReasons();
registerFilteredWords();
registerWordCorrections();
registerTransportPoints();
registerTransportLocations();
registerItems();
registerThrowables();
registerNpcs();
registerQuests();
registerShops();
registerAwards();
registerAbuseReportReasons();
registerOverlayTileDepth();
registerTerrianTileTypes();
registerInns();
registerPoets();
registerBreeds();
registerBreedPricesPawneerOrder();
registerHorseCategorys();
registerTrackedItems();
registerVets();
registerGroomers();
registerFarriers();
registerBarns();
registerLibaryBooks();
registerCrafts();
registerRanchBuildings();
registerRanchUpgrades();
registerRanchs();
registerRiddlerRiddles();
registerBBCodes();
registerTrainingPens();
registerArenas();
registerLeasers();
registerSocials();
registerRealTimeRiddleEvents();
registerRealTimeQuizEvents();
registerRandomEvents();
// the rest is easier;
HorseInfo.HorseNames = gameData.horses.names.ToObject<string[]>(); HorseInfo.HorseNames = gameData.horses.names.ToObject<string[]>();
@ -953,15 +1090,15 @@ namespace HISP.Server
ChatMsg.PrivateMessageSound = gameData.messages.chat.pm_sound; ChatMsg.PrivateMessageSound = gameData.messages.chat.pm_sound;
// HISP Specific ...
Messages.HISPHelpCommandUsageFormat = gameData.hisp_specific.HISP_help_command_usage_format;
// New Users // New Users
Messages.NewUserMessage = gameData.messages.new_user.starting_message; Messages.NewUserMessage = gameData.messages.new_user.starting_message;
Map.NewUserStartX = gameData.messages.new_user.starting_x; Map.NewUserStartX = gameData.messages.new_user.starting_x;
Map.NewUserStartY = gameData.messages.new_user.starting_y; Map.NewUserStartY = gameData.messages.new_user.starting_y;
// HISP Specific ...
Messages.HISPHelpCommandUsageFormat = gameData.hisp_specific.HISP_help_command_usage_format;
// Timed Messages // Timed Messages
Messages.PlaytimeMessageFormat = gameData.messages.timed_messages.playtime_message; Messages.PlaytimeMessageFormat = gameData.messages.timed_messages.playtime_message;
@ -1885,7 +2022,7 @@ namespace HISP.Server
Messages.RequiredChatViolations = gameData.messages.chat.violation_points_required; Messages.RequiredChatViolations = gameData.messages.chat.violation_points_required;
Messages.GlobalChatFormatForModerators = gameData.messages.chat.for_others.global_format_moderator; Messages.GlobalChatFormatForModerators = gameData.messages.chat.for_others.global_format_moderator;
// Messages.DirectChatFormatForModerators = gameData.messages.chat.for_others.dm_format_moderator; Messages.DirectChatFormatForModerators = gameData.messages.chat.for_others.dm_format_moderator;
Messages.YouWereSentToPrisionIsle = gameData.messages.starved_horse; Messages.YouWereSentToPrisionIsle = gameData.messages.starved_horse;

14
HorseIsleServer/LibHISP/Server/Logger.cs
View file

@ -11,7 +11,7 @@ namespace HISP.Server
private static Action<bool, string, string> logFunction = defaultCallbackFunc; private static Action<bool, string, string> logFunction = defaultCallbackFunc;
private void log(bool error, string type, string text) private static void log(bool error, string type, string text)
{ {
string[] msgs = text.Replace("\r", "").Split("\n"); string[] msgs = text.Replace("\r", "").Split("\n");
foreach(string msg in msgs) foreach(string msg in msgs)
@ -28,31 +28,31 @@ namespace HISP.Server
public static void ErrorPrint(string text) public static void ErrorPrint(string text)
{ {
if (ConfigReader.LogLevel >= 1) if (ConfigReader.LogLevel >= 1)
logFunction(true, "ERROR", text); log(true, "ERROR", text);
} }
public static void WarnPrint(string text) public static void WarnPrint(string text)
{ {
if (ConfigReader.LogLevel >= 2) if (ConfigReader.LogLevel >= 2)
logFunction(false, "WARN", text); log(false, "WARN", text);
} }
public static void HackerPrint(string text) public static void HackerPrint(string text)
{ {
if (ConfigReader.LogLevel >= 3) if (ConfigReader.LogLevel >= 3)
logFunction(false, "HACK", text); log(false, "HACK", text);
} }
public static void InfoPrint(string text) public static void InfoPrint(string text)
{ {
if (ConfigReader.LogLevel >= 4) if (ConfigReader.LogLevel >= 4)
logFunction(false, "INFO", text); log(false, "INFO", text);
} }
public static void DebugPrint(string text) public static void DebugPrint(string text)
{ {
if (ConfigReader.LogLevel >= 5) if (ConfigReader.LogLevel >= 5)
logFunction(false, "DEBUG", text); log(false, "DEBUG", text);
} }
public static void CrashPrint(string text) public static void CrashPrint(string text)
{ {
logFunction(true, "CRASH", text); log(true, "CRASH", text);
} }
} }
} }

4
HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.59.0")] [assembly: AssemblyVersion("1.8.61.0")]
[assembly: AssemblyFileVersion("1.8.59.0")] [assembly: AssemblyFileVersion("1.8.61.0")]