From e9de494463b3b2af48e4b353c0040fc2a93c4f9a Mon Sep 17 00:00:00 2001 From: Fernando Arzola <17498701+Arufonsu@users.noreply.github.com> Date: Sun, 21 Jul 2024 23:10:30 -0400 Subject: [PATCH] chore: server core localized strings (#2338) * server localization chore: AccountNamespace and General - Alphabetically sorted the properties. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Changed the property name none to None to follow PascalCase naming convention. - Improved the string messages grammar where necessary. - Adds new messages for notice and error notice. - Removed unused messages - Fixed issue with swapped messages order within the ErrorMessagePacket handler * server localization chore: BagsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: BankNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: ChatNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: ClassNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: ColorNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: CombatNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. - Removed unused messages. * server localization chore: CommandOutputNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. - Removed unused messages. * server localization chore: CraftingNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: DatabaseNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: ErrorsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: EventsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. - Deleted unused messages (also a few outside the scope of EventsNamespace). * server localization chore: FormulasNamespace - Removed unused messages. - Improved strings grammar where necessary. * server localization chore: FriendsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: GeneralNamespace (again) - Removes unused messages. * server localization chore: GuildsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: IntroNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: ItemsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. - Solves a TODO leftover. - Removes unused messages. * server localization chore: MappingNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: MigrationNamespace - Alphabetically sorted properties. - Improved grammar where necessary. - Removed unused messages * server localization chore: NetDebugNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Improved strings grammar where necessary. * server localization chore: NetworkingNamespace - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. - Removed unused messages. * server localization chore: NotificationsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Improved strings grammar where necessary. * server localization chore: PartiesNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: PasswordResetNotificationNamespace - Renamed property to follow PascalCase naming convention. * server localization chore: PlayerNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. - Removed unused properties. * server localization chore: PortcheckingNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. - Removed unused properties. * server localization chore: QuestsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Improved strings grammar where necessary. * server localization chore: RegexNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Removed unused properties. * server localization chore: ShopsNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: TradingNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. * server localization chore: UpnpNamespace - Alphabetically sorted the properties and Renamed them to follow PascalCase naming convention. - Added [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] to all properties. - Improved strings grammar where necessary. --- Intersect.Client/Networking/PacketHandler.cs | 2 +- Intersect.Server.Core/Core/Bootstrapper.cs | 16 +- Intersect.Server.Core/Core/ServerContext.cs | 4 +- Intersect.Server.Core/Database/DbInterface.cs | 26 +- .../Database/PlayerData/Ban.cs | 2 +- .../Database/PlayerData/Mute.cs | 4 +- .../Database/PlayerData/Players/Guild.cs | 4 +- .../Database/PlayerData/User.cs | 14 +- .../Entities/BankInterface.cs | 14 +- Intersect.Server.Core/Entities/Entity.cs | 34 +- .../Entities/Events/CommandProcessing.cs | 32 +- .../Entities/Events/Event.cs | 8 +- Intersect.Server.Core/Entities/Player.cs | 174 +-- Intersect.Server.Core/General/Formulas.cs | 2 +- Intersect.Server.Core/Localization/Strings.cs | 1238 +++++++---------- .../Networking/PacketHandler.cs | 142 +- .../Networking/PacketSender.cs | 4 +- .../Admin/Actions/ActionProcessing.cs | 46 +- Intersect.Server/Core/Commands/ApiCommand.cs | 6 +- .../Core/Commands/ApiGrantCommand.cs | 10 +- .../Core/Commands/ApiRevokeCommand.cs | 6 +- .../Core/Commands/ApiRolesCommand.cs | 4 +- Intersect.Server/Core/Commands/BanCommand.cs | 8 +- Intersect.Server/Core/Commands/CpsCommand.cs | 2 +- Intersect.Server/Core/Commands/HelpCommand.cs | 4 +- Intersect.Server/Core/Commands/KickCommand.cs | 6 +- Intersect.Server/Core/Commands/KillCommand.cs | 6 +- .../Core/Commands/MetricsCommand.cs | 2 +- .../Core/Commands/ModeratorActionCommand.cs | 2 +- Intersect.Server/Core/Commands/MuteCommand.cs | 8 +- .../Core/Commands/OnlineListCommand.cs | 16 +- .../Core/Commands/PowerAccountCommand.cs | 2 +- .../Core/Commands/PowerCommand.cs | 10 +- .../Core/Commands/UnbanCommand.cs | 2 +- .../Core/Commands/UnmuteCommand.cs | 2 +- .../Core/ConsoleService.ConsoleThread.cs | 2 +- Intersect.Server/Core/FullServerContext.cs | 30 +- .../Networking/Helpers/NetDebug.cs | 6 +- Intersect.Server/Networking/Helpers/UPnP.cs | 18 +- .../Networking/NetworkedPacketHandler.cs | 22 +- .../Notifications/Notification.cs | 4 +- .../Notifications/ResetPassword.cs | 2 +- .../Web/RestApi/Routes/V1/GuildController.cs | 2 +- .../Web/RestApi/Routes/V1/PlayerController.cs | 24 +- .../Web/RestApi/Routes/V1/UserController.cs | 38 +- 45 files changed, 890 insertions(+), 1120 deletions(-) diff --git a/Intersect.Client/Networking/PacketHandler.cs b/Intersect.Client/Networking/PacketHandler.cs index d548ef619a..9b8d356755 100644 --- a/Intersect.Client/Networking/PacketHandler.cs +++ b/Intersect.Client/Networking/PacketHandler.cs @@ -1193,7 +1193,7 @@ public void HandlePacket(IPacketSender packetSender, ErrorMessagePacket packet) { Fade.FadeIn(ClientConfiguration.Instance.FadeDurationMs); Globals.WaitingOnServer = false; - Interface.Interface.ShowError(packet.Header, packet.Error); + Interface.Interface.ShowError(packet.Error, packet.Header); Interface.Interface.MenuUi?.Reset(); } diff --git a/Intersect.Server.Core/Core/Bootstrapper.cs b/Intersect.Server.Core/Core/Bootstrapper.cs index bf967a692c..721c62415c 100644 --- a/Intersect.Server.Core/Core/Bootstrapper.cs +++ b/Intersect.Server.Core/Core/Bootstrapper.cs @@ -114,11 +114,11 @@ public static void Start(params string[] args) { if (noHaltOnError) { - Console.WriteLine(Strings.Errors.errorservercrashnohalt); + Console.WriteLine(Strings.Errors.ErrorServerCrashNoHalt); } else { - Console.WriteLine(Strings.Errors.errorservercrash); + Console.WriteLine(Strings.Errors.ErrorServerCrash); Console.ReadLine(); } } @@ -181,7 +181,7 @@ private static bool PreContextSetup(params string[] args) if (!Options.LoadFromDisk()) { - Console.WriteLine(Strings.Errors.errorloadingconfig); + Console.WriteLine(Strings.Errors.ErrorLoadingConfiguration); Console.ReadKey(); return false; @@ -281,7 +281,7 @@ private static bool PostContextSetup() Console.WriteLine(Strings.Commandoutput.EventCount.ToString(EventBase.Lookup.Count)); Console.WriteLine(Strings.Commandoutput.ItemCount.ToString(ItemBase.Lookup.Count)); Console.WriteLine(); - Console.WriteLine(Strings.Commandoutput.gametime.ToString(Time.GetTime().ToString("F"))); + Console.WriteLine(Strings.Commandoutput.GameTime.ToString(Time.GetTime().ToString("F"))); Console.WriteLine(); PacketSender.CacheGameDataPacket(); @@ -304,12 +304,12 @@ private static void PrintIntroduction() Console.WriteLine(@" | | | '_ \| __/ _ \ '__/ __|/ _ \/ __| __|"); Console.WriteLine(@" _| |_| | | | || __/ | \__ \ __/ (__| |_ "); Console.WriteLine(@" |_____|_| |_|\__\___|_| |___/\___|\___|\__|"); - Console.WriteLine(Strings.Intro.tagline); + Console.WriteLine(Strings.Intro.Tagline); Console.WriteLine(@"Copyright (C) 2020 Ascension Game Dev"); - Console.WriteLine(Strings.Intro.version.ToString(Assembly.GetExecutingAssembly().GetName().Version)); - Console.WriteLine(Strings.Intro.support); + Console.WriteLine(Strings.Intro.Version.ToString(Assembly.GetExecutingAssembly().GetName().Version)); + Console.WriteLine(Strings.Intro.Support); Console.WriteLine(); - Console.WriteLine(Strings.Intro.loading); + Console.WriteLine(Strings.Intro.Loading); } #endregion diff --git a/Intersect.Server.Core/Core/ServerContext.cs b/Intersect.Server.Core/Core/ServerContext.cs index 423469998d..eecfa00a9d 100644 --- a/Intersect.Server.Core/Core/ServerContext.cs +++ b/Intersect.Server.Core/Core/ServerContext.cs @@ -252,7 +252,7 @@ protected virtual void InternalStartNetworking() } else { - Console.WriteLine(Strings.Intro.started.ToString(Options.ServerPort)); + Console.WriteLine(Strings.Intro.ServerStarted.ToString(Options.ServerPort)); } } @@ -263,7 +263,7 @@ protected virtual void InternalStartNetworking() #region Exception Handling protected override void NotifyNonTerminatingExceptionOccurred() => - Console.WriteLine(Strings.Errors.errorlogged); + Console.WriteLine(Strings.Errors.ErrorLogged); internal static void DispatchUnhandledException(Exception exception, bool isTerminating = true) { diff --git a/Intersect.Server.Core/Database/DbInterface.cs b/Intersect.Server.Core/Database/DbInterface.cs index 9ab4dd6576..e6d2d474a9 100644 --- a/Intersect.Server.Core/Database/DbInterface.cs +++ b/Intersect.Server.Core/Database/DbInterface.cs @@ -358,9 +358,9 @@ private static bool EnsureUpdated(IServerContext serverContext) else { Console.WriteLine(); - Console.WriteLine(Strings.Database.upgraderequired); + Console.WriteLine(Strings.Database.UpgradeRequired); Console.WriteLine( - Strings.Database.upgradebackup.ToString(Strings.Database.upgradeready, Strings.Database.upgradeexit) + Strings.Database.UpgradeBackup.ToString(Strings.Database.UpgradeReady, Strings.Database.UpgradeExit) ); Console.WriteLine(); @@ -368,7 +368,7 @@ private static bool EnsureUpdated(IServerContext serverContext) { Console.Write("> "); var input = Console.ReadLine().Trim(); - if (input == Strings.Database.upgradeready.ToString().Trim()) + if (input == Strings.Database.UpgradeReady.ToString().Trim()) { break; } @@ -376,7 +376,7 @@ private static bool EnsureUpdated(IServerContext serverContext) if ( !string.Equals( input, - Strings.Database.upgradeexit.ToString().Trim(), + Strings.Database.UpgradeExit.ToString().Trim(), StringComparison.CurrentCultureIgnoreCase ) ) @@ -463,7 +463,7 @@ public static void SetPlayerPower(string username, UserRights power) } else { - Console.WriteLine(Strings.Account.doesnotexist); + Console.WriteLine(Strings.Account.AccountDoesNotExist); } } @@ -478,7 +478,7 @@ public static bool SetPlayerPower(User user, UserRights power) } else { - Console.WriteLine(Strings.Account.doesnotexist); + Console.WriteLine(Strings.Account.AccountDoesNotExist); return false; } @@ -1421,7 +1421,7 @@ private static void OnMapsLoaded() { if (MapBase.Lookup.Count == 0) { - Console.WriteLine(Strings.Database.nomaps); + Console.WriteLine(Strings.Database.NoMaps); AddGameObject(GameObjectType.Map); } @@ -1439,7 +1439,7 @@ private static void OnClassesLoaded() { if (ClassBase.Lookup.Count == 0) { - Console.WriteLine(Strings.Database.noclasses); + Console.WriteLine(Strings.Database.NoClasses); var cls = (ClassBase)AddGameObject(GameObjectType.Class); cls.Name = Strings.Database.Default; var defaultMale = new ClassSprite() @@ -1477,8 +1477,8 @@ public static void CachePlayerVariableEventTextLookups() { if (!string.IsNullOrWhiteSpace(variable.TextId) && !addedIds.Contains(variable.TextId)) { - lookup.Add(Strings.Events.playervar + "{" + variable.TextId + "}", variable); - lookup.Add(Strings.Events.playerswitch + "{" + variable.TextId + "}", variable); + lookup.Add(Strings.Events.PlayerVariable + "{" + variable.TextId + "}", variable); + lookup.Add(Strings.Events.PlayerSwitch + "{" + variable.TextId + "}", variable); addedIds.Add(variable.TextId); } } @@ -1493,8 +1493,8 @@ public static void CacheServerVariableEventTextLookups() { if (!string.IsNullOrWhiteSpace(variable.TextId) && !addedIds.Contains(variable.TextId)) { - lookup.Add(Strings.Events.globalvar + "{" + variable.TextId + "}", variable); - lookup.Add(Strings.Events.globalswitch + "{" + variable.TextId + "}", variable); + lookup.Add(Strings.Events.GlobalVariable + "{" + variable.TextId + "}", variable); + lookup.Add(Strings.Events.GlobalSwitch + "{" + variable.TextId + "}", variable); addedIds.Add(variable.TextId); } } @@ -1509,7 +1509,7 @@ public static void CacheGuildVariableEventTextLookups() { if (!string.IsNullOrWhiteSpace(variable.TextId) && !addedIds.Contains(variable.TextId)) { - lookup.Add(Strings.Events.guildvar + "{" + variable.TextId + "}", variable); + lookup.Add(Strings.Events.GuildVariable + "{" + variable.TextId + "}", variable); addedIds.Add(variable.TextId); } } diff --git a/Intersect.Server.Core/Database/PlayerData/Ban.cs b/Intersect.Server.Core/Database/PlayerData/Ban.cs index 6476f5a0e1..3cebb00365 100644 --- a/Intersect.Server.Core/Database/PlayerData/Ban.cs +++ b/Intersect.Server.Core/Database/PlayerData/Ban.cs @@ -237,7 +237,7 @@ public static string CheckBan(User user, string ip) return expired ? null - : Strings.Account.banstatus.ToString(ban.StartTime, ban.Banner, ban.EndTime, ban.Reason); + : Strings.Account.BanStatus.ToString(ban.StartTime, ban.Banner, ban.EndTime, ban.Reason); } public static bool IsBanned(IPAddress ipAddress, [NotNullWhen(true)] out string? message) diff --git a/Intersect.Server.Core/Database/PlayerData/Mute.cs b/Intersect.Server.Core/Database/PlayerData/Mute.cs index 57bd227eb9..973eadaaa7 100644 --- a/Intersect.Server.Core/Database/PlayerData/Mute.cs +++ b/Intersect.Server.Core/Database/PlayerData/Mute.cs @@ -236,7 +236,7 @@ string ip return expired ? null - : Strings.Account.mutestatus.ToString(mute.StartTime, mute.Muter, mute.EndTime, mute.Reason); + : Strings.Account.MuteStatus.ToString(mute.StartTime, mute.Muter, mute.EndTime, mute.Reason); } catch (Exception ex) { @@ -270,7 +270,7 @@ string ip return expired ? null - : Strings.Account.mutestatus.ToString(mute.StartTime, mute.Muter, mute.EndTime, mute.Reason); + : Strings.Account.MuteStatus.ToString(mute.StartTime, mute.Muter, mute.EndTime, mute.Reason); } catch (Exception ex) { diff --git a/Intersect.Server.Core/Database/PlayerData/Players/Guild.cs b/Intersect.Server.Core/Database/PlayerData/Players/Guild.cs index 254b0b37e1..6487a2c189 100644 --- a/Intersect.Server.Core/Database/PlayerData/Players/Guild.cs +++ b/Intersect.Server.Core/Database/PlayerData/Players/Guild.cs @@ -106,7 +106,7 @@ public static Guild CreateGuild(Player creator, string name) { name = name.Trim(); - if (creator != null && FieldChecking.IsValidGuildName(name, Strings.Regex.guildname)) + if (creator != null && FieldChecking.IsValidGuildName(name, Strings.Regex.GuildName)) { using (var context = DbInterface.CreatePlayerContext(readOnly: false)) { @@ -708,7 +708,7 @@ public void ExpandBankSlots(int count) /// The player who initiated this change (null if done by the api or some other method). public bool Rename(string name, Player initiator = null) { - if (GuildExists(name) || !FieldChecking.IsValidGuildName(name, Strings.Regex.guildname)) + if (GuildExists(name) || !FieldChecking.IsValidGuildName(name, Strings.Regex.GuildName)) { return false; } diff --git a/Intersect.Server.Core/Database/PlayerData/User.cs b/Intersect.Server.Core/Database/PlayerData/User.cs index d220939201..8c7f26aaae 100644 --- a/Intersect.Server.Core/Database/PlayerData/User.cs +++ b/Intersect.Server.Core/Database/PlayerData/User.cs @@ -870,19 +870,19 @@ public static bool TryRegister( if (Options.BlockClientRegistrations) { - error = Strings.Account.registrationsblocked; + error = Strings.Account.RegistrationsBlocked; return false; } - if (!FieldChecking.IsValidUsername(username, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(username, Strings.Regex.Username)) { - error = Strings.Account.invalidname; + error = Strings.Account.InvalidName; return false; } - if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.email)) + if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.Email)) { - error = Strings.Account.invalidemail; + error = Strings.Account.InvalidEmail; return false; } @@ -894,13 +894,13 @@ public static bool TryRegister( if (UserExists(username)) { - error = Strings.Account.exists; + error = Strings.Account.AccountAlreadyExists; return false; } if (UserExists(email)) { - error = Strings.Account.emailexists; + error = Strings.Account.EmailExists; return false; } diff --git a/Intersect.Server.Core/Entities/BankInterface.cs b/Intersect.Server.Core/Entities/BankInterface.cs index 4d035a6439..ccb9dc993c 100644 --- a/Intersect.Server.Core/Entities/BankInterface.cs +++ b/Intersect.Server.Core/Entities/BankInterface.cs @@ -102,7 +102,7 @@ public bool TryDepositItem(Item? slot, int inventorySlotIndex, int quantityHint, { PacketSender.SendChatMsg( mPlayer, - Strings.Banks.depositinvalid, + Strings.Banks.DepositInvalid, ChatMessageType.Bank, CustomColors.Alerts.Error ); @@ -114,7 +114,7 @@ public bool TryDepositItem(Item? slot, int inventorySlotIndex, int quantityHint, if (!canBank) { - PacketSender.SendChatMsg(mPlayer, Strings.Items.nobank, ChatMessageType.Bank, CustomColors.Items.Bound); + PacketSender.SendChatMsg(mPlayer, Strings.Items.NoBank, ChatMessageType.Bank, CustomColors.Items.Bound); return false; } @@ -139,7 +139,7 @@ public bool TryDepositItem(Item? slot, int inventorySlotIndex, int quantityHint, { PacketSender.SendChatMsg( mPlayer, - Strings.Banks.banknospace, + Strings.Items.NoSpaceForItem, ChatMessageType.Bank, CustomColors.Alerts.Error ); @@ -165,7 +165,7 @@ out var slotIndicesToRemoveFrom { PacketSender.SendChatMsg( mPlayer, - Strings.Banks.withdrawinvalid, + Strings.Banks.WithdrawInvalid, ChatMessageType.Bank, CustomColors.Alerts.Error ); @@ -322,7 +322,7 @@ public bool TryWithdrawItem(Item? slot, int bankSlotIndex, int quantityHint, int { PacketSender.SendChatMsg( mPlayer, - Strings.Banks.withdrawinvalid, + Strings.Banks.WithdrawInvalid, ChatMessageType.Bank, CustomColors.Alerts.Error ); @@ -350,7 +350,7 @@ public bool TryWithdrawItem(Item? slot, int bankSlotIndex, int quantityHint, int { PacketSender.SendChatMsg( mPlayer, - Strings.Banks.inventorynospace, + Strings.Items.NoSpaceForItem, ChatMessageType.Inventory, CustomColors.Alerts.Error ); @@ -376,7 +376,7 @@ out var slotIndicesToRemoveFrom { PacketSender.SendChatMsg( mPlayer, - Strings.Banks.withdrawinvalid, + Strings.Banks.WithdrawInvalid, ChatMessageType.Bank, CustomColors.Alerts.Error ); diff --git a/Intersect.Server.Core/Entities/Entity.cs b/Intersect.Server.Core/Entities/Entity.cs index fca7eb022d..a8a480b120 100644 --- a/Intersect.Server.Core/Entities/Entity.cs +++ b/Intersect.Server.Core/Entities/Entity.cs @@ -1814,7 +1814,7 @@ public virtual void TryAttack( } PacketSender.SendActionMsg( - target, Strings.Combat.status[(int)spellBase.Combat.Effect], CustomColors.Combat.Status + target, Strings.Combat.Status[(int)spellBase.Combat.Effect], CustomColors.Combat.Status ); //If an onhit or shield status bail out as we don't want to do any damage. @@ -1923,7 +1923,7 @@ public virtual void TryAttack(Entity target, { if (Target != target) { - PacketSender.SendActionMsg(this, Strings.Combat.miss, CustomColors.Combat.Missed); + PacketSender.SendActionMsg(this, Strings.Combat.Miss, CustomColors.Combat.Missed); return; } @@ -1941,7 +1941,7 @@ public virtual void TryAttack(Entity target, status.Type == SpellEffect.Blind || status.Type == SpellEffect.Sleep) { - PacketSender.SendActionMsg(this, Strings.Combat.miss, CustomColors.Combat.Missed); + PacketSender.SendActionMsg(this, Strings.Combat.Miss, CustomColors.Combat.Missed); PacketSender.SendEntityAttack(this, CalculateAttackTime()); return; @@ -2035,12 +2035,12 @@ public void Attack( player.AddVital(Vital.Health, absorptionAmount); PacketSender.SendActionMsg( - enemy, Strings.Combat.addsymbol + Math.Abs(absorptionAmount), + enemy, Strings.Combat.AddSymbol + Math.Abs(absorptionAmount), CustomColors.Combat.Heal ); } - PacketSender.SendActionMsg(enemy, Strings.Combat.blocked, CustomColors.Combat.Blocked); + PacketSender.SendActionMsg(enemy, Strings.Combat.Blocked, CustomColors.Combat.Blocked); } } } @@ -2058,7 +2058,7 @@ public void Attack( { if (isCrit) { - PacketSender.SendActionMsg(enemy, Strings.Combat.critical, CustomColors.Combat.Critical); + PacketSender.SendActionMsg(enemy, Strings.Combat.Critical, CustomColors.Combat.Critical); } enemy.SubVital(Vital.Health, baseDamage); @@ -2066,20 +2066,20 @@ public void Attack( { case DamageType.Physical: PacketSender.SendActionMsg( - enemy, Strings.Combat.removesymbol + baseDamage, + enemy, Strings.Combat.RemoveSymbol + baseDamage, CustomColors.Combat.PhysicalDamage ); break; case DamageType.Magic: PacketSender.SendActionMsg( - enemy, Strings.Combat.removesymbol + baseDamage, CustomColors.Combat.MagicDamage + enemy, Strings.Combat.RemoveSymbol + baseDamage, CustomColors.Combat.MagicDamage ); break; case DamageType.True: PacketSender.SendActionMsg( - enemy, Strings.Combat.removesymbol + baseDamage, CustomColors.Combat.TrueDamage + enemy, Strings.Combat.RemoveSymbol + baseDamage, CustomColors.Combat.TrueDamage ); break; @@ -2113,7 +2113,7 @@ public void Attack( { enemy.AddVital(Vital.Health, -baseDamage); PacketSender.SendActionMsg( - enemy, Strings.Combat.addsymbol + Math.Abs(baseDamage), CustomColors.Combat.Heal + enemy, Strings.Combat.AddSymbol + Math.Abs(baseDamage), CustomColors.Combat.Heal ); } } @@ -2134,7 +2134,7 @@ public void Attack( //If we took damage lets reset our combat timer enemy.SubVital(Vital.Mana, secondaryDamage); PacketSender.SendActionMsg( - enemy, Strings.Combat.removesymbol + secondaryDamage, CustomColors.Combat.RemoveMana + enemy, Strings.Combat.RemoveSymbol + secondaryDamage, CustomColors.Combat.RemoveMana ); //No Matter what, if we attack the entitiy, make them chase us @@ -2149,7 +2149,7 @@ public void Attack( { enemy.AddVital(Vital.Mana, -secondaryDamage); PacketSender.SendActionMsg( - enemy, Strings.Combat.addsymbol + Math.Abs(secondaryDamage), CustomColors.Combat.AddMana + enemy, Strings.Combat.AddSymbol + Math.Abs(secondaryDamage), CustomColors.Combat.AddMana ); } } @@ -2173,7 +2173,7 @@ public void Attack( AddVital(Vital.Health, (int)actualHealthRecovered); PacketSender.SendActionMsg( this, - Strings.Combat.addsymbol + (int)actualHealthRecovered, + Strings.Combat.AddSymbol + (int)actualHealthRecovered, CustomColors.Combat.Heal ); } @@ -2189,7 +2189,7 @@ public void Attack( enemy.SubVital(Vital.Mana, (int)actualManaRecovered); PacketSender.SendActionMsg( this, - Strings.Combat.addsymbol + (int)actualManaRecovered, + Strings.Combat.AddSymbol + (int)actualManaRecovered, CustomColors.Combat.AddMana ); } @@ -2201,7 +2201,7 @@ public void Attack( enemy.SubVital(Vital.Health, (int)remainingManaRecovery); PacketSender.SendActionMsg( enemy, - Strings.Combat.removesymbol + remainingManaRecovery, + Strings.Combat.RemoveSymbol + remainingManaRecovery, CustomColors.Combat.TrueDamage ); } @@ -2517,7 +2517,7 @@ public virtual void CastSpell(Guid spellId, int spellSlot = -1) PacketSender.SendActionMsg( this, - Strings.Combat.status[(int)spellBase.Combat.Effect], + Strings.Combat.Status[(int)spellBase.Combat.Effect], CustomColors.Combat.Status ); } @@ -2555,7 +2555,7 @@ public virtual void CastSpell(Guid spellId, int spellSlot = -1) break; case SpellType.Dash: - PacketSender.SendActionMsg(this, Strings.Combat.dash, CustomColors.Combat.Dash); + PacketSender.SendActionMsg(this, Strings.Combat.Dash, CustomColors.Combat.Dash); var dash = new Dash( this, spellBase.Combat.CastRange, diff --git a/Intersect.Server.Core/Entities/Events/CommandProcessing.cs b/Intersect.Server.Core/Entities/Events/CommandProcessing.cs index 2a1bfa1fea..e6c6aebf89 100644 --- a/Intersect.Server.Core/Entities/Events/CommandProcessing.cs +++ b/Intersect.Server.Core/Entities/Events/CommandProcessing.cs @@ -131,7 +131,7 @@ Stack callStack ) { var txt = ParseEventText(command.Text, player, instance); - var color = Color.FromName(command.Color, Strings.Colors.presets); + var color = Color.FromName(command.Color, Strings.Colors.Presets); switch (command.Channel) { case ChatboxChannel.Player: @@ -732,7 +732,7 @@ Stack callStack } PacketSender.SendEntityDataToProximity(player); - PacketSender.SendChatMsg(player, Strings.Player.powerchanged, ChatMessageType.Notice, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.PowerChanged, ChatMessageType.Notice, Color.Red); player.UnequipInvalidItems(); } @@ -1415,7 +1415,7 @@ Stack callStack var gname = player.GetVariable(playerVariable.Id)?.Value.String?.Trim(); // Can we use this name according to our configuration? - if (gname != null && FieldChecking.IsValidGuildName(gname, Strings.Regex.guildname)) + if (gname != null && FieldChecking.IsValidGuildName(gname, Strings.Regex.GuildName)) { // Is the name already in use? if (Guild.GetGuild(gname) == null) @@ -1758,18 +1758,18 @@ public static string ParseEventText(string input, Player player, Event instance) var time = Time.GetTime(); var replacements = new Dictionary() { - { Strings.Events.playernamecommand, player.Name }, - { Strings.Events.playerguildcommand, player.Guild?.Name ?? "" }, - { Strings.Events.timehour, Time.Hour }, - { Strings.Events.militaryhour, Time.MilitaryHour }, - { Strings.Events.timeminute, Time.Minute }, - { Strings.Events.timesecond, Time.Second }, - { Strings.Events.timeperiod, time.Hour >= 12 ? Strings.Events.periodevening : Strings.Events.periodmorning }, - { Strings.Events.onlinecountcommand, Player.OnlineCount.ToString() }, - { Strings.Events.onlinelistcommand, input.Contains(Strings.Events.onlinelistcommand) ? string.Join(", ", Player.OnlineList.Select(p => p.Name).ToList()) : "" }, - { Strings.Events.eventnamecommand, instance?.PageInstance?.Name ?? "" }, - { Strings.Events.commandparameter, instance?.PageInstance?.Param ?? "" }, - { Strings.Events.eventparams, (instance != null && input.Contains(Strings.Events.eventparams)) ? instance.FormatParameters(player) : "" }, + { Strings.Events.PlayerNameCommand, player.Name }, + { Strings.Events.PlayerGuildCommand, player.Guild?.Name ?? "" }, + { Strings.Events.TimeHour, Time.Hour }, + { Strings.Events.MilitaryHour, Time.MilitaryHour }, + { Strings.Events.TimeMinute, Time.Minute }, + { Strings.Events.TimeSecond, Time.Second }, + { Strings.Events.TimePeriod, time.Hour >= 12 ? Strings.Events.PeriodEvening : Strings.Events.PeriodMorning }, + { Strings.Events.OnlineCountCommand, Player.OnlineCount.ToString() }, + { Strings.Events.OnlineListCommand, input.Contains(Strings.Events.OnlineListCommand) ? string.Join(", ", Player.OnlineList.Select(p => p.Name).ToList()) : "" }, + { Strings.Events.EventNameCommand, instance?.PageInstance?.Name ?? "" }, + { Strings.Events.CommandParameter, instance?.PageInstance?.Param ?? "" }, + { Strings.Events.EventParameters, (instance != null && input.Contains(Strings.Events.EventParameters)) ? instance.FormatParameters(player) : "" }, }; @@ -1808,7 +1808,7 @@ public static string ParseEventText(string input, Player player, Event instance) var parms = instance.GetParams(player); foreach (var val in parms) { - sb.Replace(Strings.Events.eventparam + "{" + val.Key + "}", val.Value); + sb.Replace(Strings.Events.EventParameter + "{" + val.Key + "}", val.Value); } } diff --git a/Intersect.Server.Core/Entities/Events/Event.cs b/Intersect.Server.Core/Entities/Events/Event.cs index e96f887fe4..6059ba8676 100644 --- a/Intersect.Server.Core/Entities/Events/Event.cs +++ b/Intersect.Server.Core/Entities/Events/Event.cs @@ -248,21 +248,21 @@ public void Update(long timeMs, MapController map) CallStack.Clear(); //Killing this event, we're over it. if (this.BaseEvent.MapId == Guid.Empty) { - Log.Error(Strings.Events.watchdogkillcommon.ToString(BaseEvent.Name)); + Log.Error(Strings.Events.WatchdogKillCommon.ToString(BaseEvent.Name)); if (Player.Power.IsModerator) { PacketSender.SendChatMsg( - Player, Strings.Events.watchdogkillcommon.ToString(BaseEvent.Name), ChatMessageType.Error, Color.Red + Player, Strings.Events.WatchdogKillCommon.ToString(BaseEvent.Name), ChatMessageType.Error, Color.Red ); } } else { - Log.Error(Strings.Events.watchdogkill.ToString(map.Name, BaseEvent.Name)); + Log.Error(Strings.Events.WatchdogKill.ToString(map.Name, BaseEvent.Name)); if (Player.Power.IsModerator) { PacketSender.SendChatMsg( - Player, Strings.Events.watchdogkill.ToString(map.Name, BaseEvent.Name), + Player, Strings.Events.WatchdogKill.ToString(map.Name, BaseEvent.Name), ChatMessageType.Error, Color.Red ); } diff --git a/Intersect.Server.Core/Entities/Player.cs b/Intersect.Server.Core/Entities/Player.cs index 7d86d7a25b..b23d674e02 100644 --- a/Intersect.Server.Core/Entities/Player.cs +++ b/Intersect.Server.Core/Entities/Player.cs @@ -384,7 +384,7 @@ public void SetOnline() var onlineFriend = Player.FindOnline(friend.Key); if (onlineFriend != null) { - PacketSender.SendChatMsg(onlineFriend, Strings.Friends.LoggedIn.ToString(Name), ChatMessageType.Friend, CustomColors.Alerts.Info, Name); + PacketSender.SendChatMsg(onlineFriend, Strings.Friends.FriendLoggedIn.ToString(Name), ChatMessageType.Friend, CustomColors.Alerts.Info, Name); } } } @@ -506,9 +506,9 @@ private void Logout(bool softLogout = false) PacketSender.SendEntityLeave(this); - if (!string.IsNullOrWhiteSpace(Strings.Player.left.ToString())) + if (!string.IsNullOrWhiteSpace(Strings.Player.Left.ToString())) { - PacketSender.SendGlobalMsg(Strings.Player.left.ToString(Name, Options.Instance.GameName)); + PacketSender.SendGlobalMsg(Strings.Player.Left.ToString(Name, Options.Instance.GameName)); } // Remove this player from the online list @@ -1215,15 +1215,15 @@ public void LevelUp(bool resetExperience = true, int levels = 1) if (TryTeachSpell(spellInstance, true)) { messages.Add( - Strings.Player.spelltaughtlevelup.ToString(SpellBase.GetName(spellInstance.SpellId)) + Strings.Player.SpellTaughtLevelUp.ToString(SpellBase.GetName(spellInstance.SpellId)) ); } } } } - PacketSender.SendChatMsg(this, Strings.Player.levelup.ToString(Level), ChatMessageType.Experience, CustomColors.Combat.LevelUp, Name); - PacketSender.SendActionMsg(this, Strings.Combat.levelup, CustomColors.Combat.LevelUp); + PacketSender.SendChatMsg(this, Strings.Player.LevelUp.ToString(Level), ChatMessageType.Experience, CustomColors.Combat.LevelUp, Name); + PacketSender.SendActionMsg(this, Strings.Combat.LevelUp, CustomColors.Combat.LevelUp); foreach (var message in messages) { PacketSender.SendChatMsg(this, message, ChatMessageType.Experience, CustomColors.Alerts.Info, Name); @@ -1232,7 +1232,7 @@ public void LevelUp(bool resetExperience = true, int levels = 1) if (StatPoints > 0) { PacketSender.SendChatMsg( - this, Strings.Player.statpoints.ToString(StatPoints), ChatMessageType.Experience, CustomColors.Combat.StatPoints, Name + this, Strings.Player.StatPoints.ToString(StatPoints), ChatMessageType.Experience, CustomColors.Combat.StatPoints, Name ); } @@ -1386,7 +1386,7 @@ public void UpdateQuestKillTasks(Entity en) PacketSender.SendQuestsProgress(this); PacketSender.SendChatMsg( this, - Strings.Quests.npctask.ToString( + Strings.Quests.NpcTask.ToString( quest.Name, questProgress.TaskProgress, questTask.Quantity, NpcBase.GetName(questTask.TargetId) ), @@ -1440,7 +1440,7 @@ public override void TryAttack(Entity target, } else { - PacketSender.SendChatMsg(this, Strings.Combat.resourcereqs, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Combat.ResourceRequirements, ChatMessageType.Error); } return; @@ -1451,7 +1451,7 @@ public override void TryAttack(Entity target, if (parentItem == null || descriptor.Tool != parentItem.Tool) { PacketSender.SendChatMsg( - this, Strings.Combat.toolrequired.ToString(Options.ToolTypes[descriptor.Tool]), ChatMessageType.Error + this, Strings.Combat.ToolRequired.ToString(Options.ToolTypes[descriptor.Tool]), ChatMessageType.Error ); return; @@ -1531,7 +1531,7 @@ public bool ValidTauntTarget(Entity target) if (Target != target) { - PacketSender.SendActionMsg(this, Strings.Combat.miss, CustomColors.Combat.Missed); + PacketSender.SendActionMsg(this, Strings.Combat.Miss, CustomColors.Combat.Missed); return false; } @@ -1544,7 +1544,7 @@ public void TryAttack(Entity target) { if (Options.Combat.EnableCombatChatMessages) { - PacketSender.SendChatMsg(this, Strings.Combat.channelingnoattack, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.ChannelingNoAttack, ChatMessageType.Combat); } return; @@ -1587,7 +1587,7 @@ public void TryAttack(Entity target) } else { - PacketSender.SendChatMsg(this, Strings.Combat.resourcereqs, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Combat.ResourceRequirements, ChatMessageType.Error); } return; @@ -1598,7 +1598,7 @@ public void TryAttack(Entity target) if (weapon == null || descriptor.Tool != weapon.Tool) { PacketSender.SendChatMsg( - this, Strings.Combat.toolrequired.ToString(Options.ToolTypes[descriptor.Tool]), ChatMessageType.Error + this, Strings.Combat.ToolRequired.ToString(Options.ToolTypes[descriptor.Tool]), ChatMessageType.Error ); return; @@ -3103,7 +3103,7 @@ public bool TryDropItemFrom(int slotIndex, int amount) if (Equipment?.Any(equipmentSlotIndex => equipmentSlotIndex == slotIndex) ?? false) { - PacketSender.SendChatMsg(this, Strings.Items.equipped, ChatMessageType.Inventory, CustomColors.Items.Bound); + PacketSender.SendChatMsg(this, Strings.Items.Equipped, ChatMessageType.Inventory, CustomColors.Items.Bound); return false; } @@ -3115,13 +3115,13 @@ public bool TryDropItemFrom(int slotIndex, int amount) if (!itemDescriptor.CanDrop) { - PacketSender.SendChatMsg(this, Strings.Items.bound, ChatMessageType.Inventory, CustomColors.Items.Bound); + PacketSender.SendChatMsg(this, Strings.Items.Bound, ChatMessageType.Inventory, CustomColors.Items.Bound); return false; } if (itemInSlot.TryGetBag(out var bag) && !bag.IsEmpty) { - PacketSender.SendChatMsg(this, Strings.Bags.dropnotempty, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Bags.DropNotEmpty, ChatMessageType.Inventory, CustomColors.Alerts.Error); return false; } @@ -3194,14 +3194,14 @@ public void UseItem(int slot, Entity target = null) { if (status.Type == SpellEffect.Stun) { - PacketSender.SendChatMsg(this, Strings.Items.stunned, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Items.Stunned, ChatMessageType.Error); return; } if (status.Type == SpellEffect.Sleep) { - PacketSender.SendChatMsg(this, Strings.Items.sleep, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Items.Sleep, ChatMessageType.Error); return; } @@ -3223,7 +3223,7 @@ public void UseItem(int slot, Entity target = null) } else { - PacketSender.SendChatMsg(this, Strings.Items.dynamicreq, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Items.DynamicRequirement, ChatMessageType.Error); } return; @@ -3233,7 +3233,7 @@ public void UseItem(int slot, Entity target = null) if (!itemBase.IgnoreGlobalCooldown && mGlobalCooldownTimer > Timing.Global.MillisecondsUtc) { //Cooldown warning! - PacketSender.SendChatMsg(this, Strings.Items.cooldown, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Items.Cooldown, ChatMessageType.Error); return; } @@ -3241,7 +3241,7 @@ public void UseItem(int slot, Entity target = null) if (ItemCooldowns.ContainsKey(itemBase.Id) && ItemCooldowns[itemBase.Id] > Timing.Global.MillisecondsUtc) { //Cooldown warning! - PacketSender.SendChatMsg(this, Strings.Items.cooldown, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Items.Cooldown, ChatMessageType.Error); return; } @@ -3258,7 +3258,7 @@ public void UseItem(int slot, Entity target = null) } else { - PacketSender.SendChatMsg(this, Strings.Items.cannotuse, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Items.CannotUse, ChatMessageType.Error); } return; @@ -3310,7 +3310,7 @@ public void UseItem(int slot, Entity target = null) throw new IndexOutOfRangeException(); } - var symbol = value < 0 ? Strings.Combat.removesymbol : Strings.Combat.addsymbol; + var symbol = value < 0 ? Strings.Combat.RemoveSymbol : Strings.Combat.AddSymbol; var number = $"{symbol}{Math.Abs(value)}"; PacketSender.SendActionMsg(this, number, color); @@ -3392,7 +3392,7 @@ public void UseItem(int slot, Entity target = null) break; default: - PacketSender.SendChatMsg(this, Strings.Items.notimplemented, ChatMessageType.Error); + PacketSender.SendChatMsg(this, Strings.Items.NotImplemented, ChatMessageType.Error); return; } @@ -3801,7 +3801,7 @@ public void SellItem(int slot, int amount) { if (!itemDescriptor.CanSell) { - PacketSender.SendChatMsg(this, Strings.Shops.bound, ChatMessageType.Inventory, CustomColors.Items.Bound); + PacketSender.SendChatMsg(this, Strings.Shops.Bound, ChatMessageType.Inventory, CustomColors.Items.Bound); return; } @@ -3813,7 +3813,7 @@ public void SellItem(int slot, int amount) { if (!bag.IsEmpty) { - PacketSender.SendChatMsg(this, Strings.Bags.onlysellempty, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Bags.OnlySellEmpty, ChatMessageType.Inventory, CustomColors.Alerts.Error); return; } } @@ -3825,7 +3825,7 @@ public void SellItem(int slot, int amount) { if (!shop.BuyingWhitelist) { - PacketSender.SendChatMsg(this, Strings.Shops.doesnotaccept, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Shops.DoesNotAccept, ChatMessageType.Inventory, CustomColors.Alerts.Error); return; } @@ -3843,7 +3843,7 @@ public void SellItem(int slot, int amount) { if (shop.BuyingWhitelist) { - PacketSender.SendChatMsg(this, Strings.Shops.doesnotaccept, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Shops.DoesNotAccept, ChatMessageType.Inventory, CustomColors.Alerts.Error); return; } @@ -3944,13 +3944,13 @@ public void BuyItem(int slot, int amount) var itemCostTotal = boughtItem.CostItemQuantity * boughtItemAmount; if (currencyAmount < itemCostTotal) { - PacketSender.SendChatMsg(this, Strings.Shops.cantafford, ChatMessageType.Inventory, CustomColors.Alerts.Error, Name); + PacketSender.SendChatMsg(this, Strings.Shops.CannotAfford, ChatMessageType.Inventory, CustomColors.Alerts.Error, Name); return; } if (!CanGiveItem(boughtItemBase.Id, boughtItemAmount)) { - PacketSender.SendChatMsg(this, Strings.Shops.inventoryfull, ChatMessageType.Inventory, CustomColors.Alerts.Error, Name); + PacketSender.SendChatMsg(this, Strings.Shops.InventoryFull, ChatMessageType.Inventory, CustomColors.Alerts.Error, Name); return; } @@ -3968,7 +3968,7 @@ public void BuyItem(int slot, int amount) if (!TryTakeItem(itemSlot, quantityToRemove)) { success = false; - Log.Warn(Strings.Shops.FailedRemovedItem.ToString(itemSlot, Id, quantityToRemove, "BuyItem(int slot, int amount)")); + Log.Warn(Strings.Shops.FailedToRemoveItem.ToString(itemSlot, Id, quantityToRemove, "BuyItem(int slot, int amount)")); break; } @@ -4127,7 +4127,7 @@ public void CraftItem() if (TryGiveItem(craftItem.Id, quantity)) { PacketSender.SendChatMsg( - this, Strings.Crafting.crafted.ToString(craftItem.Name), ChatMessageType.Crafting, + this, Strings.Crafting.Crafted.ToString(craftItem.Name), ChatMessageType.Crafting, CustomColors.Alerts.Success ); @@ -4145,7 +4145,7 @@ public void CraftItem() PacketSender.SendInventory(this); PacketSender.SendChatMsg( - this, Strings.Crafting.nospace.ToString(craftItem.Name), ChatMessageType.Crafting, + this, Strings.Crafting.NoSpace.ToString(craftItem.Name), ChatMessageType.Crafting, CustomColors.Alerts.Error ); } @@ -4535,20 +4535,20 @@ public void StoreBagItem(int inventorySlotIndex, int amount, int bagSlotIndex) if (!itemDescriptor.CanBag) { - PacketSender.SendChatMsg(this, Strings.Items.nobag, ChatMessageType.Inventory, CustomColors.Items.Bound); + PacketSender.SendChatMsg(this, Strings.Items.NoBag, ChatMessageType.Inventory, CustomColors.Items.Bound); return; } // Make Sure we are not Storing a Bag inside of itself if (inventorySlot.Bag == InBag) { - PacketSender.SendChatMsg(this, Strings.Bags.baginself, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Bags.BagInSelf, ChatMessageType.Inventory, CustomColors.Alerts.Error); return; } if (itemDescriptor.ItemType == ItemType.Bag) { - PacketSender.SendChatMsg(this, Strings.Bags.baginbag, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Bags.BagInBag, ChatMessageType.Inventory, CustomColors.Alerts.Error); return; } @@ -4598,7 +4598,7 @@ public void StoreBagItem(int inventorySlotIndex, int amount, int bagSlotIndex) if (!TryFillBagStacksOfItemFromInventorySlot(bag, inventorySlotIndex, relevantSlots, itemDescriptor, amount)) { // If we're STILL not done, alert the user that we didn't have enough slots - PacketSender.SendChatMsg(this, Strings.Bags.bagnospace, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Items.NoSpaceForItem, ChatMessageType.Inventory, CustomColors.Alerts.Error); } } @@ -4667,7 +4667,7 @@ public void RetrieveBagItem(int slot, int amount, int invSlot) if (!TryFillInventoryStacksOfItemFromBagSlot(bag, slot, relevantSlots, itemBase, amount)) { // If we're STILL not done, alert the user that we didn't have enough slots - PacketSender.SendChatMsg(this, Strings.Bags.withdrawinvalid, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Bags.WithdrawInvalid, ChatMessageType.Inventory, CustomColors.Alerts.Error); } } @@ -4721,12 +4721,12 @@ public void FriendRequest(Player fromPlayer) { FriendRequester = fromPlayer; PacketSender.SendFriendRequest(this, fromPlayer); - PacketSender.SendChatMsg(fromPlayer, Strings.Friends.sent, ChatMessageType.Friend, CustomColors.Alerts.RequestSent); + PacketSender.SendChatMsg(fromPlayer, Strings.Friends.FriendRequestSent, ChatMessageType.Friend, CustomColors.Alerts.RequestSent); } else { PacketSender.SendChatMsg( - fromPlayer, Strings.Friends.busy.ToString(Name), ChatMessageType.Friend, CustomColors.Alerts.Error + fromPlayer, Strings.Friends.Busy.ToString(Name), ChatMessageType.Friend, CustomColors.Alerts.Error ); } } @@ -4767,7 +4767,7 @@ public void InviteToTrade(Player fromPlayer) if (Trading.Requests.ContainsKey(fromPlayer) && Trading.Requests[fromPlayer] > Timing.Global.Milliseconds) { - PacketSender.SendChatMsg(fromPlayer, Strings.Trading.alreadydenied, ChatMessageType.Trading, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(fromPlayer, Strings.Trading.AlreadyDenied, ChatMessageType.Trading, CustomColors.Alerts.Error); } else { @@ -4779,7 +4779,7 @@ public void InviteToTrade(Player fromPlayer) else { PacketSender.SendChatMsg( - fromPlayer, Strings.Trading.busy.ToString(Name), ChatMessageType.Trading, CustomColors.Alerts.Error + fromPlayer, Strings.Trading.Busy.ToString(Name), ChatMessageType.Trading, CustomColors.Alerts.Error ); } } @@ -4813,7 +4813,7 @@ public void OfferItem(int slot, int amount) //Check if the item is bound.. if so don't allow trade if (!itemBase.CanTrade) { - PacketSender.SendChatMsg(this, Strings.Bags.tradebound, ChatMessageType.Trading, CustomColors.Items.Bound); + PacketSender.SendChatMsg(this, Strings.Trading.Bound, ChatMessageType.Trading, CustomColors.Items.Bound); return; } @@ -4825,7 +4825,7 @@ public void OfferItem(int slot, int amount) { if (!bag.IsEmpty) { - PacketSender.SendChatMsg(this, Strings.Bags.onlytradeempty, ChatMessageType.Trading, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Bags.OnlyTradeEmpty, ChatMessageType.Trading, CustomColors.Alerts.Error); return; } } @@ -4888,11 +4888,11 @@ public void OfferItem(int slot, int amount) } } - PacketSender.SendChatMsg(this, Strings.Trading.tradenospace, ChatMessageType.Trading, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Items.NoSpaceForItem, ChatMessageType.Trading, CustomColors.Alerts.Error); } else { - PacketSender.SendChatMsg(this, Strings.Trading.offerinvalid, ChatMessageType.Trading, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Trading.InvalidOffer, ChatMessageType.Trading, CustomColors.Alerts.Error); } } } @@ -4917,7 +4917,7 @@ public void RevokeItem(int slot, int amount) if (Trading.Offer[slot] == null || Trading.Offer[slot].ItemId == Guid.Empty) { - PacketSender.SendChatMsg(this, Strings.Trading.revokeinvalid, ChatMessageType.Trading, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Trading.InvalidRevoke, ChatMessageType.Trading, CustomColors.Alerts.Error); return; } @@ -4962,7 +4962,7 @@ public void RevokeItem(int slot, int amount) if (!TryFillInventoryStacksOfItemForTradeOffer(tradeItem, slot, relevantSlots, itemBase, amount)) { // If we're STILL not done, alert the user that we didn't have enough slots - PacketSender.SendChatMsg(this, Strings.Bags.withdrawinvalid, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Bags.WithdrawInvalid, ChatMessageType.Inventory, CustomColors.Alerts.Error); } } @@ -4983,7 +4983,7 @@ public void ReturnTradeItems() if (!TryGiveItem(offer, -1) && MapController.TryGetInstanceFromMap(MapId, MapInstanceId, out var instance)) { instance.SpawnItem(X, Y, offer, offer.Quantity, Id); - PacketSender.SendChatMsg(this, Strings.Trading.itemsdropped, ChatMessageType.Inventory, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Trading.ItemsDropped, ChatMessageType.Inventory, CustomColors.Alerts.Error); } offer.ItemId = Guid.Empty; @@ -5001,12 +5001,12 @@ public void CancelTrade() } Trading.Counterparty.ReturnTradeItems(); - PacketSender.SendChatMsg(Trading.Counterparty, Strings.Trading.declined, ChatMessageType.Trading, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(Trading.Counterparty, Strings.Trading.Declined, ChatMessageType.Trading, CustomColors.Alerts.Error); PacketSender.SendTradeClose(Trading.Counterparty); Trading.Counterparty.Trading.Counterparty = null; ReturnTradeItems(); - PacketSender.SendChatMsg(this, Strings.Trading.declined, ChatMessageType.Trading, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Trading.Declined, ChatMessageType.Trading, CustomColors.Alerts.Error); PacketSender.SendTradeClose(this); Trading.Counterparty = null; } @@ -5021,7 +5021,7 @@ public void InviteToParty(Player fromPlayer) if (Party.Count != 0) { - PacketSender.SendChatMsg(fromPlayer, Strings.Parties.inparty.ToString(Name), ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(fromPlayer, Strings.Parties.InParty.ToString(Name), ChatMessageType.Party, CustomColors.Alerts.Error); return; } @@ -5040,7 +5040,7 @@ public void InviteToParty(Player fromPlayer) if (PartyRequests.ContainsKey(fromPlayer) && PartyRequests[fromPlayer] > Timing.Global.Milliseconds) { - PacketSender.SendChatMsg(fromPlayer, Strings.Parties.alreadydenied, ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(fromPlayer, Strings.Parties.AlreadyDenied, ChatMessageType.Party, CustomColors.Alerts.Error); } else { @@ -5052,7 +5052,7 @@ public void InviteToParty(Player fromPlayer) else { PacketSender.SendChatMsg( - fromPlayer, Strings.Parties.busy.ToString(Name), ChatMessageType.Party, CustomColors.Alerts.Error + fromPlayer, Strings.Parties.Busy.ToString(Name), ChatMessageType.Party, CustomColors.Alerts.Error ); } } @@ -5069,7 +5069,7 @@ public bool TryAddParty(Player target) { if (PartyLeader != this) { - PacketSender.SendChatMsg(this, Strings.Parties.leaderinvonly, ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Parties.LeaderInviteOnly, ChatMessageType.Party, CustomColors.Alerts.Error); return false; } @@ -5086,7 +5086,7 @@ public bool TryAddParty(Player target) if (Party.Count >= Options.Party.MaximumMembers) { - PacketSender.SendChatMsg(this, Strings.Parties.limitreached, ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Parties.LimitReached, ChatMessageType.Party, CustomColors.Alerts.Error); return false; } @@ -5100,7 +5100,7 @@ public bool TryAddParty(Player target) member.Party = cachedParty; PacketSender.SendParty(member); PacketSender.SendChatMsg( - member, Strings.Parties.joined.ToString(target.Name), ChatMessageType.Party, CustomColors.Alerts.Accepted + member, Strings.Parties.Joined.ToString(target.Name), ChatMessageType.Party, CustomColors.Alerts.Accepted ); } return true; @@ -5117,7 +5117,7 @@ public void KickParty(Guid target) { oldMember.Party = new List(); PacketSender.SendParty(oldMember); - PacketSender.SendChatMsg(oldMember, Strings.Parties.kicked, ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(oldMember, Strings.Parties.Kicked, ChatMessageType.Party, CustomColors.Alerts.Error); // Kick the player out of your shared instance! if (Options.Instance.Instancing.KickPartyMembersOnKick && oldMember.InstanceType == MapInstanceType.Shared) @@ -5135,7 +5135,7 @@ public void KickParty(Guid target) Party[i].Party = Party; PacketSender.SendParty(Party[i]); PacketSender.SendChatMsg( - Party[i], Strings.Parties.memberkicked.ToString(oldMember.Name), + Party[i], Strings.Parties.MemberKicked.ToString(oldMember.Name), ChatMessageType.Party, CustomColors.Alerts.Error ); @@ -5146,7 +5146,7 @@ public void KickParty(Guid target) var remainder = Party[0]; remainder.Party.Clear(); PacketSender.SendParty(remainder); - PacketSender.SendChatMsg(remainder, Strings.Parties.disbanded, ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(remainder, Strings.Parties.Disbanded, ChatMessageType.Party, CustomColors.Alerts.Error); } } } @@ -5170,8 +5170,8 @@ public void LeaveParty() currentParty.Remove(this); string partyMessage = currentParty.Count > 1 - ? Strings.Parties.memberleft.ToString(Name) - : Strings.Parties.disbanded; + ? Strings.Parties.MemberLeft.ToString(Name) + : Strings.Parties.Disbanded; // Update all members of the party with the new list foreach (var partyMember in currentParty) @@ -5188,7 +5188,7 @@ public void LeaveParty() Party = new List(); PacketSender.SendParty(this); - PacketSender.SendChatMsg(this, Strings.Parties.left, ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(this, Strings.Parties.Left, ChatMessageType.Party, CustomColors.Alerts.Error); } public bool InParty(Player member) @@ -5249,7 +5249,7 @@ public bool TryTeachSpell(Spell spell, bool sendUpdate = true) { PacketSender.SendPlayerSpellUpdate(this, i); PacketSender.SendChatMsg(this, - Strings.Player.spelltaughtlevelup.ToString(SpellBase.GetName(spell.SpellId)), + Strings.Player.SpellTaughtLevelUp.ToString(SpellBase.GetName(spell.SpellId)), ChatMessageType.Experience, CustomColors.Alerts.Info, Name); } @@ -5305,7 +5305,7 @@ public void ForgetSpell(int spellSlot, bool removeBoundSpell = false) } else { - PacketSender.SendChatMsg(this, Strings.Combat.tryforgetboundspell, ChatMessageType.Spells); + PacketSender.SendChatMsg(this, Strings.Combat.TryForgetBoundSpell, ChatMessageType.Spells); } } @@ -5342,7 +5342,7 @@ public bool TryForgetSpell(Spell spell, bool sendUpdate = true) if (spellBase.Bound) { - PacketSender.SendChatMsg(this, Strings.Combat.tryforgetboundspell, ChatMessageType.Spells); + PacketSender.SendChatMsg(this, Strings.Combat.TryForgetBoundSpell, ChatMessageType.Spells); return false; } @@ -5398,31 +5398,31 @@ public override bool CanCastSpell(SpellBase spell, Entity target, bool checkVita switch (reason) { case SpellCastFailureReason.InsufficientMP: - PacketSender.SendChatMsg(this, Strings.Combat.lowmana, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.LowMana, ChatMessageType.Combat); break; case SpellCastFailureReason.InsufficientHP: - PacketSender.SendChatMsg(this, Strings.Combat.lowhealth, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.LowHealth, ChatMessageType.Combat); break; case SpellCastFailureReason.InvalidTarget: PacketSender.SendChatMsg(this, Strings.Combat.InvalidTarget, ChatMessageType.Combat); break; case SpellCastFailureReason.Silenced: - PacketSender.SendChatMsg(this, Strings.Combat.silenced, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.Silenced, ChatMessageType.Combat); break; case SpellCastFailureReason.Stunned: - PacketSender.SendChatMsg(this, Strings.Combat.stunned, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.Stunned, ChatMessageType.Combat); break; case SpellCastFailureReason.Asleep: - PacketSender.SendChatMsg(this, Strings.Combat.sleep, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.Sleep, ChatMessageType.Combat); break; case SpellCastFailureReason.Snared: PacketSender.SendChatMsg(this, Strings.Combat.Snared, ChatMessageType.Combat); break; case SpellCastFailureReason.OutOfRange: - PacketSender.SendChatMsg(this, Strings.Combat.targetoutsiderange, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.TargetOutOfRange, ChatMessageType.Combat); break; case SpellCastFailureReason.OnCooldown: - PacketSender.SendChatMsg(this, Strings.Combat.cooldown, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.Cooldown, ChatMessageType.Combat); break; } } @@ -5433,7 +5433,7 @@ public override bool CanCastSpell(SpellBase spell, Entity target, bool checkVita if (!spell.IgnoreGlobalCooldown && mGlobalCooldownTimer > Timing.Global.MillisecondsUtc) { // Notify our user! - PacketSender.SendChatMsg(this, Strings.Combat.cooldown, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.Cooldown, ChatMessageType.Combat); return false; } @@ -5446,7 +5446,7 @@ public override bool CanCastSpell(SpellBase spell, Entity target, bool checkVita } else { - PacketSender.SendChatMsg(this, Strings.Combat.dynamicreq, ChatMessageType.Spells); + PacketSender.SendChatMsg(this, Strings.Combat.DynamicRequirement, ChatMessageType.Spells); } reason = SpellCastFailureReason.ConditionsNotMet; @@ -5472,7 +5472,7 @@ public override bool CanCastSpell(SpellBase spell, Entity target, bool checkVita if (Options.Combat.EnableCombatChatMessages) { PacketSender.SendChatMsg( - this, Strings.Items.notenough.ToString(ItemBase.GetName(projectileBase.AmmoItemId)), + this, Strings.Items.NotEnough.ToString(ItemBase.GetName(projectileBase.AmmoItemId)), ChatMessageType.Inventory, CustomColors.Alerts.Error ); @@ -5562,7 +5562,7 @@ public void UseSpell(int spellSlot, Entity target) { if (Options.Combat.EnableCombatChatMessages) { - PacketSender.SendChatMsg(this, Strings.Combat.channeling, ChatMessageType.Combat); + PacketSender.SendChatMsg(this, Strings.Combat.Channeling, ChatMessageType.Combat); } } } @@ -6105,7 +6105,7 @@ public void StartQuest(QuestBase quest) EnqueueStartCommonEvent(EventBase.Get(quest.StartEventId)); PacketSender.SendChatMsg( - this, Strings.Quests.started.ToString(quest.Name), ChatMessageType.Quest, CustomColors.QuestAlert.Started + this, Strings.Quests.Started.ToString(quest.Name), ChatMessageType.Quest, CustomColors.QuestAlert.Started ); PacketSender.SendQuestsProgress(this); @@ -6156,7 +6156,7 @@ public void DeclineQuest(Guid questId) { QuestOffers.Remove(questId); PacketSender.SendChatMsg( - this, Strings.Quests.declined.ToString(QuestBase.GetName(questId)), ChatMessageType.Quest, CustomColors.QuestAlert.Declined + this, Strings.Quests.Declined.ToString(QuestBase.GetName(questId)), ChatMessageType.Quest, CustomColors.QuestAlert.Declined ); foreach (var evt in EventLookup) @@ -6198,7 +6198,7 @@ public void CancelQuest(Guid questId) questProgress.TaskId = Guid.Empty; questProgress.TaskProgress = -1; PacketSender.SendChatMsg( - this, Strings.Quests.abandoned.ToString(QuestBase.GetName(questId)), ChatMessageType.Quest, + this, Strings.Quests.Abandoned.ToString(QuestBase.GetName(questId)), ChatMessageType.Quest, CustomColors.QuestAlert.Abandoned ); @@ -6224,7 +6224,7 @@ public void CompleteQuestTask(Guid questId, Guid taskId) { if (quest.Tasks[i].Id == taskId) { - PacketSender.SendChatMsg(this, Strings.Quests.taskcompleted, ChatMessageType.Quest); + PacketSender.SendChatMsg(this, Strings.Quests.TaskCompleted, ChatMessageType.Quest); if (i == quest.Tasks.Count - 1) { //Complete Quest @@ -6238,7 +6238,7 @@ public void CompleteQuestTask(Guid questId, Guid taskId) EnqueueStartCommonEvent(EventBase.Get(quest.EndEventId)); PacketSender.SendChatMsg( - this, Strings.Quests.completed.ToString(quest.Name), ChatMessageType.Quest, + this, Strings.Quests.Completed.ToString(quest.Name), ChatMessageType.Quest, CustomColors.QuestAlert.Completed ); } @@ -6258,7 +6258,7 @@ public void CompleteQuestTask(Guid questId, Guid taskId) } PacketSender.SendChatMsg( - this, Strings.Quests.updated.ToString(quest.Name), + this, Strings.Quests.Updated.ToString(quest.Name), ChatMessageType.Quest, CustomColors.QuestAlert.TaskUpdated ); @@ -6289,7 +6289,7 @@ public void CompleteQuest(Guid questId, bool skipCompletionEvent) { EnqueueStartCommonEvent(EventBase.Get(quest.EndEventId)); PacketSender.SendChatMsg( - this, Strings.Quests.completed.ToString(quest.Name), ChatMessageType.Quest, + this, Strings.Quests.Completed.ToString(quest.Name), ChatMessageType.Quest, CustomColors.QuestAlert.Completed ); } @@ -6329,7 +6329,7 @@ private void UpdateGatherItemQuests(Guid itemId) PacketSender.SendQuestsProgress(this); PacketSender.SendChatMsg( this, - Strings.Quests.itemtask.ToString( + Strings.Quests.ItemTask.ToString( quest.Name, questProgress.TaskProgress, questTask.Quantity, ItemBase.GetName(questTask.TargetId) ), @@ -7461,7 +7461,7 @@ private void RemoveStaleItemCooldowns() public bool TryChangeName(string newName) { // Is the name available? - if (!FieldChecking.IsValidUsername(newName, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(newName, Strings.Regex.Username)) { return false; } diff --git a/Intersect.Server.Core/General/Formulas.cs b/Intersect.Server.Core/General/Formulas.cs index 91f26fa6b0..92e35a773d 100644 --- a/Intersect.Server.Core/General/Formulas.cs +++ b/Intersect.Server.Core/General/Formulas.cs @@ -47,7 +47,7 @@ public static void LoadFormulas() } catch (Exception ex) { - throw new Exception(Strings.Formulas.missing, ex); + throw new Exception(Strings.Formulas.Missing, ex); } } diff --git a/Intersect.Server.Core/Localization/Strings.cs b/Intersect.Server.Core/Localization/Strings.cs index 3592dcc1b9..a367f20778 100644 --- a/Intersect.Server.Core/Localization/Strings.cs +++ b/Intersect.Server.Core/Localization/Strings.cs @@ -8,251 +8,218 @@ namespace Intersect.Server.Localization; - public static partial class Strings { public sealed partial class AccountNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString adminonly = - @"The server is currently allowing only admins to connect. Come back later!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString alreadybanned = @"{00} has already been banned!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString alreadymuted = @"{00} has already been muted!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString badaccess = @"Access denied! Invalid power level!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString badlogin = @"Username or password incorrect."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString banned = @"{00} has been banned!"; + public readonly LocalizedString AccountAlreadyExists = @"Account already exists!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UnbanSuccess = @"{00} has been unbanned!"; + public readonly LocalizedString AccountDoesNotExist = @"Account does not exist."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UnbanFail = @"Failed to unban {00}. The user is not banned!"; + public readonly LocalizedString AdminOnly = @"The server is currently allowing only admins to connect. Please come back later!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotAllowed = @"You do not have the permission to do this."; + public readonly LocalizedString AlreadyBanned = @"{00} has already been banned!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString banstatus = - @"Your account has been banned since: {00} (UTC) by {01}. Ban expires: {02} (UTC). Reason for ban: {03}"; + public readonly LocalizedString AlreadyMuted = @"{00} has already been muted!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString characterexists = - @"An account with this character name exists. Please choose another."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString deletechar = @"The character has been deleted."; + public readonly LocalizedString BadAccess = @"Access denied! Invalid power level!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString deleted = @"Delete Character"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString deletecharerror = @"This character cannot be deleted, they may be stuck online in combat."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString deletederror = @"Error Deleting Character"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString BadLogin = @"Username or password incorrect."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString doesnotexist = @"Account does not exist."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString BanStatus = @"Your account has been banned since: {00} (UTC) by {01}. Ban expires: {02} (UTC). Reason for ban: {03}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString emailexists = @"An account with this email address already exists."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Banned = @"{00} has been banned!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString exists = @"Account already exists!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString CharacterExists = @"An account with this character name already exists. Please choose another."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString invalidclass = @"Invalid class selected. Try again."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString CharacterDeleted = @"The character has been deleted."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString invalidemail = - @"The chosen email does not meet requirements set by the server."; + public readonly LocalizedString DeleteCharacterError = @"This character cannot be deleted, they may be stuck online in combat."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString invalidname = - @"The chosen name does not meet requirements set by the server."; + public readonly LocalizedString EmailExists = @"An account with this email address already exists."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString loadfail = @"Failed to load account. Please try logging in again."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString EmailFail = @"Failed to send your password reset email at this time. Please try again later."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString maxchars = - @"You have already created the maximum number of characters. Delete one before creating a new one."; + public readonly LocalizedString InvalidClass = @"Invalid class selected. Please try again."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString muted = @"{00} has been muted!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString InvalidEmail = @"The chosen email does not meet the requirements set by the server."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UnmuteSuccess = @"{00} has been unmuted!"; + public readonly LocalizedString InvalidName = @"The chosen name does not meet the requirements set by the server."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UnmuteFail = @"Failed to unmute {00}. The user is not muted!"; + public readonly LocalizedString LoadFail = @"Failed to load account. Please try logging in again."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString mutestatus = - @"Your account has been muted since: {00} by {01}. Mute expires: {02}. Reason for mute: {03}"; + public readonly LocalizedString MaxCharacters = @"You have already created the maximum number of characters. Delete one before creating a new one."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString notfound = @"Error: Account {00} was not found!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Muted = @"{00} has been muted!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString registrationsblocked = - @"Account registrations are currently blocked by the server."; + public readonly LocalizedString MuteStatus = @"Your account has been muted since: {00} by {01}. Mute expires: {02}. Reason for mute: {03}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString emailfail = @"Failed to send your password reset email at this time. Please try again later."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString NotAllowed = @"You do not have the permission to do this."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UnknownError = @"An unknown error occurred while saving the user."; - } + public readonly LocalizedString NotFound = @"Error: Account {00} was not found!"; - public sealed partial class BagsNamespace : LocaleNamespace - { + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString RegistrationsBlocked = @"Account registrations are currently blocked by the server."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString baginbag = @"You cannot store a bag inside another bag!"; + public readonly LocalizedString UnbanFail = @"Failed to unban {00}. The user is not banned!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString baginself = @"You cannot store a bag in within itself!"; + public readonly LocalizedString UnbanSuccess = @"{00} has been unbanned!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString bagnospace = @"There is no space left in your bag for that item!"; + public readonly LocalizedString UnknownError = @"An unknown error occurred while saving the user."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString depositinvalid = @"Invalid item selected to store!"; + public readonly LocalizedString UnmuteFail = @"Failed to unmute {00}. The user is not muted!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString dropnotempty = @"You cannot drop a bag unless it's empty!"; + public readonly LocalizedString UnmuteSuccess = @"{00} has been unmuted!"; + } + public sealed partial class BagNamespace : LocaleNamespace + { [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString inventorynospace = - @"There is no space left in your inventory for that item!"; + public readonly LocalizedString BagInBag = @"You cannot store a bag inside another bag!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString onlysellempty = @"Cannot sell bag unless it's empty!"; + public readonly LocalizedString BagInSelf = @"You cannot store a bag within itself!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString onlytradeempty = @"Cannot trade bag unless it's empty!"; + public readonly LocalizedString DropNotEmpty = @"You cannot drop a bag unless it's empty!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString SlotOccupied = @"That slot is occupied by another item!"; + public readonly LocalizedString OnlySellEmpty = @"Cannot sell the bag unless it's empty!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString tradebound = @"Cannot trade bound items!"; + public readonly LocalizedString OnlyTradeEmpty = @"Cannot trade the bag unless it's empty!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString withdrawinvalid = @"Invalid item selected to retreive!"; + public readonly LocalizedString SlotOccupied = @"That slot is occupied by another item!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString WithdrawInvalid = @"Invalid item selected to retrieve!"; } - public sealed partial class BanksNamespace : LocaleNamespace + public sealed partial class BankNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString banknospace = @"There is no space left in your bank for that item!"; + public readonly LocalizedString DepositInvalid = @"Invalid item selected to deposit!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString depositinvalid = @"Invalid item selected to deposit!"; + public readonly LocalizedString DepositSuccessNonStackable = @"You have stored: {00}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString DepositSuccessStackable = - @"You have stored: {00} {01}"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString DepositSuccessNonStackable = - @"You have stored: {00}"; + public readonly LocalizedString DepositSuccessStackable = @"You have stored: {00} {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString InvalidSlotToSwap = @"Invalid slots to swap!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString inventorynospace = - @"There is no space left in your inventory for that item!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString withdrawinvalid = @"Invalid item selected to withdraw!"; + public readonly LocalizedString WithdrawInvalid = @"Invalid item selected to withdraw!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString WithdrawSuccessStackable = - @"You have withdrawn: {00} {01}"; + public readonly LocalizedString WithdrawSuccessNonStackable = @"You have withdrawn: {00}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString WithdrawSuccessNonStackable = - @"You have withdrawn: {00}"; - + public readonly LocalizedString WithdrawSuccessStackable = @"You have withdrawn: {00} {01}"; } public sealed partial class ChatNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString admin = @"[ADMIN] {00}: {01}"; + public readonly LocalizedString Admin = @"[ADMIN] {00}: {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString admincmd = @"/admin"; + public readonly LocalizedString AdminCommand = @"/admin"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString allcmd = @"/all"; + public readonly LocalizedString AllCommand = @"/all"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString announcement = @"[ANNOUNCEMENT] {00}: {01}"; + public readonly LocalizedString Announcement = @"[ANNOUNCEMENT] {00}: {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString announcementcmd = @"/announcement"; + public readonly LocalizedString AnnouncementCommand = @"/announcement"; - [JsonProperty("global", NullValueHandling = NullValueHandling.Ignore)] + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString Global = @"[GLOBAL] {00}: {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString globalcmd = @"/global"; + public readonly LocalizedString GlobalCommand = @"/global"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString local = @"{00}: {01}"; + public readonly LocalizedString Local = @"{00}: {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString localcmd = @"/local"; + public readonly LocalizedString LocalCommand = @"/local"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString messagecmd = @"/message"; + public readonly LocalizedString MessageCommand = @"/message"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString party = @"[PARTY] {00}: {01}"; + public readonly LocalizedString Party = @"[PARTY] {00}: {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString partycmd = @"/party"; + public readonly LocalizedString PartyCommand = @"/party"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString pmcmd = @"/pm"; + public readonly LocalizedString PrivateFrom = @"[PM] From {00}: {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PrivateTo = @"[PM] To {00}: {01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString PrivateFrom = @"[PM] From {00}: {01}"; + public readonly LocalizedString PrivateMessageCommand = @"/pm"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString rcmd = @"/r"; + public readonly LocalizedString ReplyCommand = @"/reply"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString replycmd = @"/reply"; + public readonly LocalizedString ReplyShortcutCommand = @"/r"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString toofast = @"You are chatting too fast!"; - + public readonly LocalizedString TooFast = @"You are chatting too fast!"; } - public sealed partial class ClassesNamespace : LocaleNamespace + public sealed partial class ClassNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString lastclass = @"Last Class"; + public readonly LocalizedString LastClass = @"Last Class"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString lastclasserror = - @"Failed to delete class, you must have at least one class at all times!"; - + public readonly LocalizedString LastClassError = @"Failed to delete class. You must have at least one class at all times!"; } - public sealed partial class ColorsNamespace : LocaleNamespace + public sealed partial class ColorNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocaleDictionary presets = new LocaleDictionary( - new Dictionary + public readonly LocaleDictionary Presets = + new LocaleDictionary(new Dictionary { {0, @"Black"}, {1, @"White"}, @@ -267,311 +234,255 @@ public sealed partial class ColorsNamespace : LocaleNamespace {10, @"Cyan"} } ); - } public sealed partial class CombatNamespace : LocaleNamespace { - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString addsymbol = @"+"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString blocked = @"BLOCKED!"; + public readonly LocalizedString AddSymbol = @"+"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString channeling = @"You are currently channeling another skill."; + public readonly LocalizedString Blocked = @"BLOCKED!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString channelingnoattack = - @"You are currently channeling a spell, you cannot attack."; + public readonly LocalizedString Channeling = @"You are currently channeling another skill."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString cooldown = @"This skill is on cooldown."; + public readonly LocalizedString ChannelingNoAttack = @"You are currently channeling a spell, you cannot attack."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString critical = @"CRITICAL HIT!"; + public readonly LocalizedString Cooldown = @"This skill is on cooldown."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocaleDictionary damagetypes = - new LocaleDictionary( - new Dictionary - { - {0, @"Physical"}, - {1, @"Magic"}, - {2, @"True"} - } - ); + public readonly LocalizedString Critical = @"CRITICAL HIT!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString dash = @"DASH!"; + public readonly LocalizedString Dash = @"DASH!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString dynamicreq = @"You do not meet the requirements to cast the spell!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString exp = @"Experience"; + public readonly LocalizedString DynamicRequirement = @"You do not meet the requirements to cast the spell!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString ImmuneToEffect = @"IMMUNE!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString invulnerable = @"INVULNERABLE!"; + public readonly LocalizedString LevelUp = @"LEVEL UP!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString levelreq = @"You are not a high enough level to use this ability."; + public readonly LocalizedString LowHealth = @"Not enough health."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString levelup = @"LEVEL UP!"; + public readonly LocalizedString LowMana = @"Not enough mana."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString lowhealth = @"Not enough health."; + public readonly LocalizedString Miss = @"MISS!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString lowmana = @"Not enough mana."; + public readonly LocalizedString RemoveSymbol = @"-"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString miss = @"MISS!"; + public readonly LocalizedString ResourceRequirements = @"You do not meet the requirements to harvest this resource!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notarget = @"No Target!"; + public readonly LocalizedString Silenced = @"You cannot cast this ability while silenced."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString removesymbol = @"-"; + public readonly LocalizedString Sleep = @"You cannot cast this ability while asleep."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString - resourcereqs = @"You do not meet the requirements to harvest this resource!"; + public readonly LocalizedString Snared = @"You cannot cast this ability while snared."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString silenced = @"You cannot cast this ability whilst silenced."; + public readonly LocalizedString SleepAttacking = @"You are asleep and can't attack."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString sleep = @"You cannot cast this ability whilst asleep"; + public readonly LocalizedString SleepBlocking = @"You are asleep and can't block."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString Snared = @"You cannot cast this ability whilst snared"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString sleepattacking = @"You are asleep and can't attack."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString sleepblocking = @"You are asleep and can't block."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString statreq = - @"You do not possess the correct combat stats to use this ability."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocaleDictionary stats = new LocaleDictionary( - new Dictionary - { - {0, @"Attack"}, - {1, @"Ability Power"}, - {2, @"Defense"}, - {3, @"Magic Resist"}, - {4, @"Speed"} - } - ); - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocaleDictionary status = new LocaleDictionary( + public readonly LocaleDictionary Status = new LocaleDictionary( new Dictionary { - {0, @"NONE!"}, - {1, @"SILENCED!"}, - {2, @"STUNNED!"}, - {3, @"SNARED!"}, - {4, @"BLINDED!"}, - {5, @"STEALTH!"}, - {6, @"TRANSFORMED!"}, - {7, @"CLEANSED!"}, - {8, @"INVULNERABLE!"}, - {9, @"SHIELD!"}, - {10, @"SLEEP!"}, - {11, @"ON HIT!"}, - {12, @"TAUNT!"}, + {0, @"NONE!"}, + {1, @"SILENCED!"}, + {2, @"STUNNED!"}, + {3, @"SNARED!"}, + {4, @"BLINDED!"}, + {5, @"STEALTH!"}, + {6, @"TRANSFORMED!"}, + {7, @"CLEANSED!"}, + {8, @"INVULNERABLE!"}, + {9, @"SHIELD!"}, + {10, @"SLEEP!"}, + {11, @"ON HIT!"}, + {12, @"TAUNT!"}, } ); [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString stunattacking = @"You are stunned and can't attack."; + public readonly LocalizedString StunAttacking = @"You are stunned and can't attack."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString stunblocking = @"You are stunned and can't block."; + public readonly LocalizedString StunBlocking = @"You are stunned and can't block."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString stunned = @"You cannot cast this ability whilst stunned."; + public readonly LocalizedString Stunned = @"You cannot cast this ability while stunned."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString targetoutsiderange = @"Target is out of range!"; + public readonly LocalizedString TargetOutOfRange = @"Target is out of range!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString toolrequired = @"You require a {00} to interact with this resource!"; + public readonly LocalizedString ToolRequired = @"You require a {00} to interact with this resource!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString tryforgetboundspell = @"You cannot forget this spell."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocaleDictionary vitals = new LocaleDictionary( - new Dictionary - { - {0, @"Health"}, - {1, @"Mana"} - } - ); - + public readonly LocalizedString TryForgetBoundSpell = @"You cannot forget this spell."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString InvalidTarget = @"Invalid target for this spell."; } - public sealed partial class CommandoutputNamespace : LocaleNamespace + public sealed partial class CommandOutputNamespace : LocaleNamespace { [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString OnlineListActiveConnectionsN = @"Active connections: {00}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString OnlineListNoClientsConnected = @"No clients connected"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString OnlineListStrayConnectionsN = @"Stray connections: {00}"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString apigranted = @"{00} now has api access!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString apirevoked = @"{00} has had their api access revoked!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString apirolegranted = @"{00} now has the {01} api role!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString apirolenotfound = @"Api role {00} not found!"; + public readonly LocalizedString AccountCount = @" - {00} Accounts."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString apirolenotgranted = - @"Failed to assign api role {00}, api access must be enabled for {01} first!"; + public readonly LocalizedString ActiveConnections = @"Active connections: {00}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString - apiroleprereq = @"Api role {00} could not be granted! Depends on {01} role."; + public readonly LocalizedString ApiAccessGranted = @"{00} now has API access!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString apirolerevoked = @"{00} has had their {01} api role revoked!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString apiroles = @"Api roles for {00}:"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ApiAccessRevoked = @"{00} has had their API access revoked!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString cps = @"Current CPS: {00}"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ApiRoleGranted = @"{00} now has the {01} API role!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString cpslocked = @"CPS Locked"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ApiRoleNotFound = @"API role {00} not found!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString cpsunlocked = @"CPS Unlocked"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ApiRoleNotGranted = @"Failed to assign API role {00}, API access must be enabled for {01} first!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString VariableChanged = @"'{01}' set to {02} (was {03}) ({00})"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ApiRolePrerequisite = @"API role {00} could not be granted! Depends on {01} role."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString VariableNotFound = @"Variable '{00}' not found"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ApiRoleRevoked = @"{00} has had their {01} API role revoked!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString VariablePrint = @"{00} {01} = {02}"; + public readonly LocalizedString ApiRoles = @"API roles for {00}:"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString VariableListEmpty = @"There are no variables to display."; + public readonly LocalizedString CharacterCount = @" - {00} Characters."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString ExperimentalFeatureEnablement = @"{00} is {01}."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString CpsLocked = @"CPS Locked"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString gametime = @"Game time is now: {00}"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString CpsUnlocked = @"CPS Unlocked"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString helpfooter = - @"Type in any command followed by {00} for parameters and usage information."; + public readonly LocalizedString EventCount = @" - {00} Events."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString helpheader = @"List of available commands:"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ExperimentalFeatureEnablement = @"{00} is {01}."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString invalidparameters = - @"Invalid parameters provided! Use {00} to get more info about a command."; + public readonly LocalizedString GameTime = @"Game time is now: {00}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString killsuccess = @"{00} has been killed!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString HelpFooter = @"Type in any command followed by {00} for parameters and usage information."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString listaccount = @"Account"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString HelpHeader = @"List of available commands:"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString listcharacter = @"Character"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ItemCount = @" - {00} Items."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString listid = @"ID"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString KillSuccess = @"{00} has been killed!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString metricsenabled = @"Metrics collection enabled"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ListAccount = @"Account"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString metricsdisabled = @"Metrics collection disabled"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ListCharacter = @"Character"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notfound = - @"Command not recoginized. Enter help for a list of commands. Remember console commands are case sensitive!"; + public readonly LocalizedString ListId = @"ID"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString parseerror = - @"Parse Error: Parameter could not be read. Type {00} {01} for usage information."; + public readonly LocalizedString MapCount = @" - {00} Maps."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString ServerInfo = @"Server has:"; - + public readonly LocalizedString MetricsDisabled = @"Metrics collection disabled"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString AccountCount = @" - {00} accounts."; - + public readonly LocalizedString MetricsEnabled = @"Metrics collection enabled"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString CharacterCount = @" - {00} characters."; - + public readonly LocalizedString NoClientsConnected = @"No clients connected"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString NpcCount = @" - {00} NPCs."; - + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString SpellCount = @" - {00} spells."; + public readonly LocalizedString PowerChanged = @"{00} has had their power updated!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString MapCount = @" - {00} maps."; - + public readonly LocalizedString ServerInfo = @"Server has:"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString EventCount = @" - {00} events."; - + public readonly LocalizedString SpellCount = @" - {00} Spells."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString ItemCount = @" - {00} items."; + public readonly LocalizedString StrayConnections = @"Stray connections: {00}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString powerchanged = @"{00} has had their power updated!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString VariableChanged = @"'{01}' set to {02} (was {03}) ({00})"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString powerlevel = @"{00}'s power has been set to {01}!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString VariableListEmpty = @"There are no variables to display."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString syntaxerror = - @"Syntax Error: Expected parameter not found. Type {00} {01} for usage information."; + public readonly LocalizedString VariableNotFound = @"Variable '{00}' not found"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString VariablePrint = @"{00} {01} = {02}"; } public sealed partial class CraftingNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString crafted = @"You successfully crafted {00}!"; + public readonly LocalizedString AlreadyCrafting = @"You are already crafting an item!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString nospace = @"You do not have enough inventory space to craft {00}!"; + public readonly LocalizedString CraftFailure = @"The attempt to craft the item {00} failed!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString CraftFailure = @"The attempt to create the item {00} failed!"; + public readonly LocalizedString CraftFailureLostItems = @"The attempt to craft the item {00} failed, and you lost the materials!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString CraftFailureLostItems = @"The attempt to create the item {00} failed and you lost the materials!"; + public readonly LocalizedString Crafted = @"You have successfully crafted {00}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InJournalMode = @"You cannot craft from your crafting journal!"; + public readonly LocalizedString InJournalMode = @"You cannot craft items from your crafting journal!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString RequirementsNotMet = @"You do not meet the requirements in order to craft this item!"; + public readonly LocalizedString NoSpace = @"You do not have enough inventory space to craft {00}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString AlreadyCrafting = @"You are already crafting!"; - + public readonly LocalizedString RequirementsNotMet = @"You do not meet the requirements to craft this item!"; } public sealed partial class DatabaseNamespace : LocaleNamespace { + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocaleDictionary DatabaseTypes = new( new Dictionary { - { DatabaseType.Sqlite, "SQLite" }, - { DatabaseType.MySql, "MySql" } + { DatabaseType.Sqlite, "SQLite" }, + { DatabaseType.MySql, "MySql" } } ); @@ -579,429 +490,358 @@ public sealed partial class DatabaseNamespace : LocaleNamespace public readonly LocalizedString Default = @"Default"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString MigratingAutomatically = @"The --migrate-automatically flag was passed to the server on startup and the user will not be prompted..."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString noclasses = @"No classes found! - Creating a default class!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString nomaps = @"No maps found! - Creating an empty map!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString nullerror = @"Tried to load one or more null game objects!"; + public readonly LocalizedString MigratingAutomatically = @"The --migrate-automatically flag was passed to the server on startup, so the user will not be prompted."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString nullfound = @"Tried to load null value for index {00} of {01}"; + public readonly LocalizedString NoClasses = @"No classes found! Creating a default class."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString upgradebackup = - @"Please make a backup of your game and player databases, and then type '{00}' to continue or '{01}' to quit."; + public readonly LocalizedString NoMaps = @"No maps found! Creating an empty map."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString upgradeexit = @"EXIT"; + public readonly LocalizedString UpgradeBackup = @"Please make a backup of your game and player databases, then type '{00}' to continue or '{01}' to quit."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString upgradepleasewait = - @"Please wait! Migrations can take several minutes, and even longer if you are using MySQL databases!"; + public readonly LocalizedString UpgradeExit = @"EXIT"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString upgradeready = @"READY"; + public readonly LocalizedString UpgradeReady = @"READY"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString upgraderequired = - @"Your databases need to be upgraded! This process could corrupt your game data if any errors are encountered."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString usingsqlite = @"Using SQLite Database for account and data storage."; - + public readonly LocalizedString UpgradeRequired = @"Your databases need to be upgraded! This process could corrupt your game data if any errors are encountered."; } public sealed partial class ErrorsNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString errorloadingconfig = - @"Failed to load server options! Press any key to shut down."; + public readonly LocalizedString ErrorFloodBurst = @"[Flood]: {00} Burst Packets [User: {01} | Player: {02} | IP {03}]"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString - ErrorLoadingStrings = @"Failed to load strings! Press any key to shut down."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString errorlogged = @"An error was logged into errors.log"; + public readonly LocalizedString ErrorFloodSize = @"[Flood]: Packet Size: {00} [User: {01} | Player: {02} | IP {03}]"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString errorservercrash = - @"The Intersect server has encountered an error and must close. Error information can be found in resources/logs/errors.log. Press enter to exit."; + public readonly LocalizedString ErrorLoadingConfiguration = @"Failed to load server options! Press any key to shut down."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString errorservercrashnohalt = - @"The Intersect server has encountered an error and must close. Error information can be found in resources/logs/errors.log."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString errortimeout = @"Too many failed requests. Please wait and try again!"; + public readonly LocalizedString ErrorLoadingStrings = @"Failed to load strings! Press any key to shut down."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString floodaverage = - @"[Flood]: 3+ Rapid Detections. Total Detections: {00} [User: {01} | Player: {02} | IP {03}]"; + public readonly LocalizedString ErrorLogged = @"An error was logged into errors.log."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString floodburst = - @"[Flood]: {00} Burst Packets [User: {01} | Player: {02} | IP {03}]"; + public readonly LocalizedString ErrorServerCrash = @"The Intersect server has encountered an error and must close. Error information can be found in resources/logs/errors.log. Press enter to exit."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString floodsize = - @"[Flood]: Packet Size: {00} [User: {01} | Player: {02} | IP {03}]"; + public readonly LocalizedString ErrorServerCrashNoHalt = @"The Intersect server has encountered an error and must close. Error information can be found in resources/logs/errors.log."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString warpfail = @"Failed to warp player to new map -- warping to spawn."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ErrorTimeout = @"Too many failed requests. Please wait and try again!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString UnknownErrorTryAgain = @"An unknown error occurred, please try again."; - } public sealed partial class EventsNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString commandparameter = @"\param"; + public readonly LocalizedString CommandParameter = @"\param"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString eventnamecommand = @"\en"; + public readonly LocalizedString EventNameCommand = @"\en"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString eventparam = @"\evtparam"; + public readonly LocalizedString EventParameter = @"\evtparam"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString eventparams = @"\evtparams"; + public readonly LocalizedString EventParameters = @"\evtparams"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString globalswitch = @"\gs"; + public readonly LocalizedString GlobalSwitch = @"\gs"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString globalvar = @"\gv"; + public readonly LocalizedString GlobalVariable = @"\gv"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString militaryhour = @"\24hour"; + public readonly LocalizedString GuildVariable = @"\guildvar"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString onlinecountcommand = @"\onlinecount"; + public readonly LocalizedString MilitaryHour = @"\24hour"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString onlinelistcommand = @"\onlinelist"; + public readonly LocalizedString OnlineCountCommand = @"\onlinecount"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString periodevening = @"PM"; + public readonly LocalizedString OnlineListCommand = @"\onlinelist"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString periodmorning = @"AM"; + public readonly LocalizedString PeriodEvening = @"PM"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString playernamecommand = @"\pn"; + public readonly LocalizedString PeriodMorning = @"AM"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString playerguildcommand = @"\pg"; + public readonly LocalizedString PlayerGuildCommand = @"\pg"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString playerswitch = @"\ps"; + public readonly LocalizedString PlayerNameCommand = @"\pn"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString playervar = @"\pv"; + public readonly LocalizedString PlayerSwitch = @"\ps"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString timehour = @"\hour"; + public readonly LocalizedString PlayerVariable = @"\pv"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString timeminute = @"\minute"; + public readonly LocalizedString TimeHour = @"\hour"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString timeperiod = @"\period"; + public readonly LocalizedString TimeMinute = @"\minute"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString timesecond = @"\second"; + public readonly LocalizedString TimePeriod = @"\period"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString watchdogkill = - @"Event killed due to commands processed in a single frame surpassing Event Watchdog Threshhold. (Map: {00} Event: {01})"; + public readonly LocalizedString TimeSecond = @"\second"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString watchdogkillcommon = - @"Common event killed due to commands processed in a single frame surpassing the Event Watchdog Threshhold. (Event {00})"; + public readonly LocalizedString UserVariable = @"\uservar"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString guildvar = @"\guildvar"; + public readonly LocalizedString WatchdogKill = @"Event killed due to commands processed in a single frame surpassing Event Watchdog Threshold. (Map: {00} Event: {01})"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UserVariable = @"\uservar"; - + public readonly LocalizedString WatchdogKillCommon = @"Common event killed due to commands processed in a single frame surpassing the Event Watchdog Threshold. (Event {00})"; } public sealed partial class FormulasNamespace : LocaleNamespace { - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString loadfailed = @"Failed to load formulas! Press any key to shut down."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString missing = @"Formulas.json missing. Generated default formulas file."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString syntax = - @"Error loading formulas! Please make sure the file exists and is free on syntax errors."; - + public readonly LocalizedString Missing = @"Formulas.json file is missing. A default formulas file has been generated."; } public sealed partial class FriendsNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString accept = @"{00} has accepted your friend request!"; + public readonly LocalizedString Accept = @"{00} has accepted your friend request!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString alreadyfriends = @"You are already friends with {00}."; + public readonly LocalizedString AlreadyFriends = @"You are already friends with {00}."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString busy = @"{00} is busy. Please try again later!"; + public readonly LocalizedString Busy = @"{00} is currently busy. Please try again later."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notification = @"You are now friends with {00}!"; + public readonly LocalizedString FriendLoggedIn = @"{00} has logged in."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString remove = @"Friend removed."; + public readonly LocalizedString FriendNotification = @"You are now friends with {00}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString sent = @"Friend request sent."; + public readonly LocalizedString FriendRemoved = @"Friend has been removed."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString LoggedIn = @"{00} has logged in."; - + public readonly LocalizedString FriendRequestSent = @"Friend request has been sent."; } public sealed partial class GeneralNamespace : LocaleNamespace - { - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString Disabled = @"Disabled"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString DisabledLowerCase = @"disabled"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString Enabled = @"Enabled"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString EnabledLowerCase = @"enabled"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString none = @"None"; - - } - - public sealed partial class GuildsNamespace : LocaleNamespace { [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString VariableNotString = @"The given guild name does not contain any text."; + public readonly LocalizedString DisabledLowerCase = @"disabled"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString VariableInvalid = @"Invalid guild name!"; + public readonly LocalizedString EnabledLowerCase = @"enabled"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString VariableNoText = @"A guild name can not be empty!"; + public readonly LocalizedString Notice = @"Notice"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString GuildNameInUse = @"Your chosen guild name is already in use!"; + public readonly LocalizedString NoticeError = @"Error Notice"; + } + public sealed partial class GuildsNamespace : LocaleNamespace + { [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString AlreadyInGuild = @"You are already in a guild!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString Welcome = @"Welcome to {00}!"; + public readonly LocalizedString Demoted = @"{00} has been demoted to {01}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotInGuild = @"You are not in a guild."; + public readonly LocalizedString DisbandGuild = @"{00} has been disbanded!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotReceivedInvite = @"You've not received any guild invites yet."; + public readonly LocalizedString GuildChat = @"[{00}] {01}: {02}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotAllowed = @"You do not have the permission to do this."; + public readonly LocalizedString GuildCommand = @"/guild"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InviteNotOnline = @"The player you're trying to invite is either not online or does not exist."; + public readonly LocalizedString GuildLeaderLeave = @"A Guildmaster cannot leave their own guild. Please transfer ownership rights first!"; + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString GuildNameInUse = @"Your chosen guild name is already in use!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString InviteAlreadyInGuild = @"The player you're trying to invite is already in a guild or has a pending invite."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InviteSent = @"You've invited {00} to join {01}!"; + public readonly LocalizedString InviteDeclined = @"You have declined the request to join {00}."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString InviteDeclinedResponse = @"{00} has declined your request for them to join {01}."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InviteDeclined = @"You have declined the request to join {00}."; + public readonly LocalizedString InviteNotOnline = @"The player you're trying to invite is either not online or does not exist."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString GuildLeaderLeave = @"A Guildmaster can not leave their own guild, please transfer ownership rights first!"; + public readonly LocalizedString InviteSent = @"You've invited {00} to join {01}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NoSuchPlayer = @"There is no such player in this guild."; + public readonly LocalizedString NoLongerAllowedInInstance = @"You are no longer in the guild whose instance you were logged into. You have been warped back to the overworld."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString Promoted = @"{00} has been promoted to {01}!"; + public readonly LocalizedString NoSuchPlayer = @"There is no such player in this guild."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString PromotionFailed = @"{00} can not be promoted any further."; + public readonly LocalizedString NotAllowed = @"You do not have permission to do this."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString Demoted = @"{00} has been demoted to {01}!"; + public readonly LocalizedString NotAllowedDeposit = @"You do not have permission to deposit items into {00}'s guild bank!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString DemotionFailed = @"{00} can not be demoted any further."; + public readonly LocalizedString NotAllowedInInstance = @"You must be in a guild to warp to a guild instance."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString DisbandGuild = @"{00} has been disbanded!"; + public readonly LocalizedString NotAllowedSwap = @"You do not have permission to swap items around within {00}'s guild bank!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString deleteguildleader = @"You can not delete a character that is a guild {00}, please disband the guild or transfer ownership before trying again."; + public readonly LocalizedString NotAllowedWithdraw = @"You do not have permission to withdraw from {00}'s guild bank!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString guildcmd = @"/guild"; + public readonly LocalizedString NotInGuild = @"You are not in a guild."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString guildchat = @"[{00}] {01}: {02}"; + public readonly LocalizedString NotReceivedInvite = @"You've not received any guild invites yet."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString Transferred = @"Guild ownership of {00} has been transferred from {01} to {02}!"; + public readonly LocalizedString Promoted = @"{00} has been promoted to {01}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotAllowedWithdraw = @"You do not have permission to withdraw from {00}'s guild bank!"; + public readonly LocalizedString RankLimit = @"Failed to join {00} because their guild is full!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotAllowedDeposit = @"You do not have permission to deposit items into {00}'s guild bank!"; + public readonly LocalizedString RankLimitResponse = @"This guild has already hit its member limit for the rank of {00}. Promote or demote other members to make room for {01}."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotAllowedSwap = @"You do not have permission to swap items around within {00}'s guild bank!"; + public readonly LocalizedString Transferred = @"Guild ownership of {00} has been transferred from {01} to {02}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString RankLimit = @"Failed to join {00} because their guild is full!"; + public readonly LocalizedString VariableInvalid = @"Invalid guild name!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString RankLimitResponse = @"This guild has already hit it's member limit for the rank of {00}. Promote or demote other members in order to make room for {01}."; + public readonly LocalizedString VariableNotString = @"The given guild name does not contain any text."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotAllowedInInstance = @"You must be in a guild to warp to a guild instance."; + public readonly LocalizedString Welcome = @"Welcome to {00}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NoLongerAllowedInInstance = @"You are no longer in the guild who's instance you were logged into. You have been warped back to the overworld."; + public readonly LocalizedString DeleteGuildLeader = @"You cannot delete a character that is a guild {00}. Please disband the guild or transfer ownership before trying again."; } public sealed partial class IntroNamespace : LocaleNamespace { - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString api = @"API listening on '{00}'."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString apifailed = @"Failed to start API."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString consoleactive = - @"Type exit to shutdown the server, or help for a list of commands."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString exit = @"Press enter to exit."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString loading = @"Loading, please wait."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString started = @"Server Started. Using UDP Port #{00}"; + public readonly LocalizedString ConsoleActive = @"Type 'exit' to shut down the server, or 'help' for a list of commands."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString support = - @"For help, support, and updates visit: https://www.ascensiongamedev.com"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString tagline = @" free 2d orpg engine"; + public readonly LocalizedString Loading = @"Loading, please wait."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString title = @"Intersect Server"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ServerStarted = @"Server started. Using UDP Port #{00}."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString version = @"Version {00}"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Support = @"For help, support, and updates, visit: https://www.ascensiongamedev.com"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString websocketstarted = - @"Websocket listener started for Unity WebGL Clients using Port #{00}"; + public readonly LocalizedString Tagline = @" Free 2D ORPG engine"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Version = @"Version {00}"; } public sealed partial class ItemsNamespace : LocaleNamespace { - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString bound = @"You cannot drop this item."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString nobag = @"You cannot store this item in a bag."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString nobank = @"You cannot store this item in a bank."; + public readonly LocalizedString Bound = @"You cannot drop this item."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString cannotuse = @"You cannot use this item!"; + public readonly LocalizedString CannotUse = @"You cannot use this item!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString cooldown = @"You must wait before using this item again!"; + public readonly LocalizedString Cooldown = @"You must wait before using this item again!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString dynamicreq = @"You do not meet the requirements to use this item!"; + public readonly LocalizedString DynamicRequirement = @"You do not meet the requirements to use this item!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString equipped = @"You cannot drop equipped items."; + public readonly LocalizedString Equipped = @"You cannot drop equipped items."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notenough = @"Not enough {00}s!"; + public readonly LocalizedString NoBag = @"You cannot store this item in a bag."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notimplemented = @"Use of this item type is not yet implemented."; + public readonly LocalizedString NoBank = @"You cannot store this item in a bank."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString sleep = @"You cannot use this item whilst asleep."; + public readonly LocalizedString NoSpaceForItem = @"There is no space left for that item!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString statreq = @"You do not possess the correct combat stats to use this item."; + public readonly LocalizedString NotEnough = @"Not enough {00}s!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString stunned = @"You cannot use this item whilst stunned."; + public readonly LocalizedString NotImplemented = @"Use of this item type is not yet implemented."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NotYours = @"This item does not belong to you!"; + public readonly LocalizedString Sleep = @"You cannot use this item while asleep."; - // TODO: Generalize this shit. It's everywhere! [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InventoryNoSpace = - @"There is no space left in your inventory for that item!"; - + public readonly LocalizedString Stunned = @"You cannot use this item while stunned."; } public sealed partial class MappingNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString lastmap = @"Last Map"; + public readonly LocalizedString LastMap = @"Last Map"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString lastmaperror = - @"Failed to delete map, you must have at least one map at all times!"; + public readonly LocalizedString LastMapError = @"Failed to delete the map. You must have at least one map at all times!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString linkfail = @"Map Link Failure"; + public readonly LocalizedString LinkFailure = @"Map Link Failure"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString linkfailerror = - @"Failed to link map {00} to map {01}. If this merge were to happen, maps {02} and {03} would occupy the same space in the world."; + public readonly LocalizedString LinkFailureError = @"Failed to link map {00} to map {01}. If this merge were to happen, maps {02} and {03} would occupy the same space in the world."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString newfolder = @"New Folder"; - + public readonly LocalizedString NewFolder = @"New Folder"; } public sealed partial class MigrationNamespace : LocaleNamespace { [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString AlreadyUsingProvider = - @" Migration Error: {00} database is already using {01}!"; + public readonly LocalizedString AlreadyUsingProvider = @"Migration Error: The {00} database is already using {01}!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString Cancel = @" Press any other key to cancel migration."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Cancel = @"Press any other key to cancel the migration."; + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ConfirmCharacter = @"y"; + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString DatabaseFileAlreadyExists = @"{00} already exists. Overwrite? (y/n)"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString CurrentlyUsing = @"currently using {00}"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString DefaultDatabase = @"intersect_{00}_{01}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString DefaultHost = @"localhost"; @@ -1013,522 +853,452 @@ public sealed partial class MigrationNamespace : LocaleNamespace public readonly LocalizedString DefaultUsername = @"root"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString DefaultDatabase = "intersect_{00}_{01}"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString EnterConnectionStringParameters = @"Please enter your connection string parameters:"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString GameDatabaseName = @"Game"; + public readonly LocalizedString EnterConnectionStringParameters = @"Please enter your connection string parameters:"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString LoggingDatabaseName = @"Logging"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString OptionMySql = @" [2] Mysql"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString GameDatabaseName = @"Game"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString OptionSqlite = @" [1] Sqlite"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString LoggingDatabaseName = @"Logging"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString MigratingDbSet = @"Migrating entities in {00}..."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString MigrationCanceled = @"Migration Cancelled"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString MigrationComplete = @"Migration complete! Press enter to exit."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString MySqlConnecting = @"Please wait, attempting to connect to database..."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString MySqlConnectionError = @"Error opening db connection! Error: {00}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString MySqlNotEmpty = - @"Database must be empty before migration! Please delete any tables before proceeding! Migration Cancelled."; + public readonly LocalizedString MigrationCanceled = @"Migration Canceled"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString MySqlTryAgain = - @"Would you like to try entering your connection info again? (y/n) "; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString ConfirmCharacter = @"y"; + public readonly LocalizedString MigrationComplete = @"Migration complete! Press enter to exit."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PlayerDatabaseName = @"Player"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PromptDatabase = @"Database ({00}): "; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PromptHost = @"Host ({00}): "; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PromptPassword = @"Password (empty): "; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString MySqlConnecting = @"Please wait, attempting to connect to the database..."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PromptPort = @"Port ({00}): "; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString MySqlConnectionError = @"Error opening database connection! Error: {00}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PromptUsername = @"User ({00}): "; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString MySqlNotEmpty = @"The database must be empty before migration! Please delete any tables before proceeding. Migration Canceled."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString SelectContext = @"Which database would you like to migrate:"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString MySqlTryAgain = @"Would you like to try entering your connection information again? (y/n)"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString SelectProvider = @"Select which engine to migrate the {00} database to:"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString PlayerDatabaseName = @"Player"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString SqliteRecommended = "Sqlite strongly recommended!"; + public readonly LocalizedString PromptDatabase = @"Database ({00}):"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString SelectDatabase = @" [{00}] {01} (currently using {02}) {03}"; + public readonly LocalizedString PromptHost = @"Host ({00}):"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString SelectDatabaseType = @" [{00}] {01}"; + public readonly LocalizedString PromptPassword = @"Password (empty):"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString SelectGameDatabaseProvider = - " [1] Game Database ({00}) - Sqlite Strongly Recommended!"; + public readonly LocalizedString PromptPort = @"Port ({00}):"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString SelectGameDatabaseKey = @"1"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString PromptUsername = @"User ({00}):"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString SelectMySqlKey = @"2"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString SelectContext = @"Which database would you like to migrate:"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString SelectPlayerDatabaseProvider = " [2] Player Database ({00})"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString SelectDatabase = @"[{00}] {01} (currently using {02}) {03}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString SelectPlayerDatabaseKey = @"2"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString SelectDatabaseType = @"[{00}] {01}"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString SelectSqliteKey = @"1"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString SelectProvider = @"Select which engine to migrate the {00} database to:"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString DatabaseFileAlreadyExists = @"{00} already exists, overwrite? (y/n) "; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString SqliteRecommended = @"SQLite is strongly recommended!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString StartingMigration = - @"Starting migration, please wait! (This could take several minutes depending on the size of your game)"; + public readonly LocalizedString StartingMigration = @"Starting migration, please wait! This could take several minutes depending on the size of your game."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString StoppingServer = - @"Please wait, stopping server, and saving current database..."; + public readonly LocalizedString StoppingServer = @"Please wait, stopping the server and saving the current database..."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString TryAgainCharacter = @"y"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString TryAgainCharacter = @"y"; } public sealed partial class NetDebugNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString hastebin = - @"Network Debug information uploaded to {00} (copied to clipboard) share this link with AGD when requesting for help getting your game online!"; + public readonly LocalizedString Hastebin = @"Network debug information uploaded to {00} (copied to clipboard). Share this link with AGD when requesting help to get your game online!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString pleasewait = @"Please wait while network diagnostics run...."; + public readonly LocalizedString PleaseWait = @"Please wait while network diagnostics run..."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString savedtofile = - @"Network Debug information saved to netdebug.txt! Upload that file and share it with AGD when requesting for help getting your game online!"; - + public readonly LocalizedString SavedToFile = @"Network debug information saved to netdebug.txt! Upload that file and share it with AGD when requesting help to get your game online!"; } public sealed partial class NetworkingNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString badpacket = - @"Error handling client packet. Disconnecting client. More info logged to errors.log"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString disconnected = @"Client disconnected."; - - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString ServerFull = @"The server is currently full, please try again later."; - + public readonly LocalizedString ServerFull = @"The server is currently full. Please try again later."; } public sealed partial class NotificationsNamespace : LocaleNamespace { + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Copyright = @"Copyright (C) 2020-2024 Ascension Game Dev, All Rights Reserved"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString copyright = "Copyright (C) 2020 Ascension Game Dev, All Rights Reserved"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString product = @"Intersect Game Engine"; - + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Product = @"Intersect Game Engine"; } public sealed partial class PartiesNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString alreadydenied = @"Your party invitation has already been rejected!"; + public readonly LocalizedString AlreadyDenied = @"Your party invitation has already been rejected!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString busy = @"{00} is busy. Please try again later!"; + public readonly LocalizedString Busy = @"{00} is busy. Please try again later!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString declined = @"{00} has declined your party invitation!"; + public readonly LocalizedString CannotCreateInstance = @"Only the party leader can create a shared instance."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString disbanded = @"The party has been disbanded."; + public readonly LocalizedString Declined = @"{00} has declined your party invitation!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InInstance = @"You cannot invite someone to a party while in an instance!"; + public readonly LocalizedString Disbanded = @"The party has been disbanded."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString inparty = @"{00} is already in a party!"; + public readonly LocalizedString InInstance = @"You cannot invite someone to a party while in an instance!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString joined = @"{00} has joined the party!"; + public readonly LocalizedString InstanceFailed = @"Your party has failed the instance..."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString kicked = @"You have been kicked from the party!"; + public readonly LocalizedString InstanceInProgress = @"The party has not yet completed their instance."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString - leaderinvonly = @"Only the party leader can send invitations to your party."; + public readonly LocalizedString InstanceInUse = @"Cannot create a new instance - party members are still in the old one."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString left = @"You have left the party."; + public readonly LocalizedString InstanceLivesRemaining = @"Your party has {00} lives remaining in this instance!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString limitreached = - @"You have reached the maximum limit of party members. Kick another member before adding more."; + public readonly LocalizedString InParty = @"{00} is already in a party!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString memberkicked = @"{00} has been kicked from the party!"; + public readonly LocalizedString Joined = @"{00} has joined the party!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString memberleft = @"{00} has left the party!"; + public readonly LocalizedString Kicked = @"You have been kicked from the party!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notinparty = @"You are not in a party."; + public readonly LocalizedString LeaderInviteOnly = @"Only the party leader can send invitations to your party."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString outofrange = @"Target is out of range or offline."; + public readonly LocalizedString Left = @"You have left the party."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InstanceInUse = @"Can not create new instance - party members are still in the old one."; + public readonly LocalizedString LimitReached = @"You have reached the maximum limit of party members. Kick another member before adding more."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString CannotCreateInstance = @"Only the party leader can create a shared instance."; + public readonly LocalizedString MemberKicked = @"{00} has been kicked from the party!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InstanceInProgress = @"The party has not yet completed their instance."; + public readonly LocalizedString MemberLeft = @"{00} has left the party!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString WrongInstance = @"Your party is currently doing a different instance."; + public readonly LocalizedString NoMoreLivesRemaining = @"Your party has no more lives remaining! You will respawn outside the instance on your next death."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InstanceLivesRemaining = @"Your party has {00} lives remaining on this instance!"; + public readonly LocalizedString NotInParty = @"You are not in a party."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString NoMoreLivesRemaining = @"Your party has no more lives remaining! You will respawn out of the instance on your next death."; + public readonly LocalizedString OutOfRange = @"Target is out of range or offline."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString InstanceFailed = @"Your party has failed the instance..."; - + public readonly LocalizedString WrongInstance = @"Your party is currently doing a different instance."; } public sealed partial class PasswordResetNotificationNamespace : LocaleNamespace { - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString subject = @"Intersect Game Engine - Password Reset Code"; - + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Subject = @"Intersect Game Engine - Password Reset Code"; } public sealed partial class PlayerNamespace : LocaleNamespace { - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString admin = @"{00} has been given administrative powers!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString adminjoined = - @"You are an administrator! Press Insert at any time to access the administration menu or F2 for debug information."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString adminsetpower = @"Only admins can set power!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString InstanceUpdate = @"Your instance ID has changed from {00} to {01}"; + public readonly LocalizedString Admin = @"{00} has been given administrative powers!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString OverworldReturnAdmin = @"You have returned {00} to the overworld."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString AdminJoined = @"You are an administrator! Press Insert at any time to access the administration menu or F2 for debug information."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString OverworldReturned = @"You have been returned to the overworld."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString AdminSetPower = @"Only administrators can set power!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString beenwarpedto = @"You have been warped to {00}."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString BeenWarpedTo = @"You have been warped to {00}."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString changeownpower = @"You cannot alter your own power!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString CannotAlterOwnPower = @"You cannot alter your own power!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString deadmin = @"{00} has had their administrative powers revoked!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString CannotWarpToYourself = @"You cannot warp to yourself."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString demod = @"{00} has had their moderation powers revoked!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Deadmin = @"{00} has had their administrative powers revoked!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString haswarpedto = @"{00} has been warped to you."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString HasWarpedTo = @"{00} has been warped to you."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString joined = @"{00} has joined {01}."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString InstanceUpdate = @"Your instance ID has changed from {00} to {01}."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString kicked = @"{00} has been kicked by {01}!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Kicked = @"{00} has been kicked by {01}!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString killed = @"{00} has been killed by {01}!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Killed = @"{00} has been killed by {01}!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString left = @"{00} has left {01}."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Left = @"{00} has left {01}."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString levelup = @"You have leveled up! You are now level {00}!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString LevelUp = @"You have leveled up! You are now level {00}!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString mod = @"{00} has been given moderation powers!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Moderator = @"{00} has been given moderation powers!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString modjoined = - @"You are a moderator! Press Insert at any time to access the administration menu or F2 for debug information."; + public readonly LocalizedString ModeratorJoined = @"You are a moderator! Press Insert at any time to access the administration menu or F2 for debug information."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString notarget = @"You need to select a valid target."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Offline = @"User not online!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString CannotWarpToYourself = - @"You cannot warp to yourself."; + public readonly LocalizedString OverworldReturnAdmin = @"You have returned {00} to the overworld."; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString offline = @"User not online!"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString OverworldReturned = @"You have been returned to the overworld."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString PlayerNotFound = @"The player '{00}' was not found!"; - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString powerchanged = @"Your power has been modified!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString serverkicked = @"{00} has been kicked by the server!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString serverkilled = @"{00} has been killed by the server!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString spelltaughtlevelup = @"You've learned the {00} spell!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString statpoints = @"You have {00} stat points available to be spent!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString targetoutsiderange = @"Target not in range."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString warpedto = @"Warped to {00}."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString warpedtoyou = @"{00} warped to you."; - - } + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString PowerChanged = @"Your power has been modified!"; - public sealed partial class PortcheckingNamespace : LocaleNamespace - { + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString ServerKicked = @"{00} has been kicked by the server!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString accessible = @"Your game is accesible to the public!"; + public readonly LocalizedString ServerKilled = @"{00} has been killed by the server!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString checkantivirus = - @" 2. Antivirus programs might also be blocking connections and you may need to add Intersect Server.exe to your antivirus exclusions."; + public readonly LocalizedString SpellTaughtLevelUp = @"You've learned the {00} spell!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString checkfirewalls = - @" 1. Firewalls might be blocking connections to your server. Check firewalls on your system. (i.e. iptables, FirewallD, Windows Firewall)"; + public readonly LocalizedString StatPoints = @"You have {00} stat points available to be spent!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString checkrouterupnp = - @"It appears that UPnP Failed. Your might need to enable UPnP on your router or manually port forward to allow connections to your server."; + public readonly LocalizedString WarpedTo = @"Warped to {00}."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString connectioninfo = @"Connection Information:"; + public readonly LocalizedString WarpedToYou = @"{00} warped to you."; + } + public sealed partial class PortcheckingNamespace : LocaleNamespace + { [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString debuggingsteps = @"Debugging Steps (To allow public access):"; + public readonly LocalizedString AntivirusCheck = @"2. Antivirus programs might also be blocking connections. You may need to add Intersect Server.exe to your antivirus exclusions."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString letothersjoin = - @"Enter your public ip and port into the client/editor config for others to join!"; + public readonly LocalizedString CheckFirewalls = @"1. Firewalls might be blocking connections to your server. Check firewalls on your system (e.g., iptables, FirewallD, Windows Firewall)."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notaccessible = - @"It does not appear that your game is accessible to the outside world."; + public readonly LocalizedString CheckRouterUpnp = @"It appears that UPnP failed. You might need to enable UPnP on your router or manually port forward to allow connections to your server."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString notconnected = - @" Could not retreive connection information from AGD servers. Do you have an internet connection?"; + public readonly LocalizedString ConnectionInfo = @"Connection Information:"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString publicip = @" Public IP: {00}"; + public readonly LocalizedString DebuggingSteps = @"Debugging Steps (To allow public access):"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString publicport = @" Public Port: {00}"; + public readonly LocalizedString DocumentationUrl = @"https://docs.freemmorpgmaker.com/en-US/deploy/forwarding/"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString screwed = - @" 3. If on a college campus, or within a business network you likely do not have permission to open ports or host games in which case you should explore external hosting options!"; + public readonly LocalizedString PortCheckerAndUpnpDisabled = @"The port checker service and UPnP have both been disabled. Please verify the server status manually with a client."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocaleDictionary PortCheckerResults = new LocaleDictionary( new Dictionary { - { PortCheckResult.Unknown, "This server is possibly inaccessible from the outside world, try to connect with the client to verify." }, - { PortCheckResult.Open, "This server is accessible from the outside world, properly configured clients can connect." }, - { PortCheckResult.PossiblyOpen, "This server is possible accessible from the outside world, but the AscensionGameDev port checker server gave an inconclusive response." }, - { PortCheckResult.IntersectResponseNoPlayerCount, "This server is not reporting a player count and may not be accessible, please see the Port Forwarding documentation for more information: {0}" }, - { PortCheckResult.IntersectResponseInvalidPlayerCount, "This server reporting an invalid player count and may not be accessible, please see the Port Forwarding documentation for more information: {0}" }, - { PortCheckResult.InvalidPortCheckerRequest, "The AscensionGameDev port checker server is down and this server may or may not be accessible from the outside world, try to connect with the client to verify" }, - { PortCheckResult.PortCheckerServerError, "The AscensionGameDev port checker server encountered an error and this server may or may not be accessible from the outside world, try to connect with the client to verify." }, - { PortCheckResult.PortCheckerServerDown, "The AscensionGameDev port checker server is down and this server may or may not be accessible from the outside world, try to connect with the client to verify" }, - { PortCheckResult.PortCheckerServerUnexpectedResponse, "The AscensionGameDev port checker server is down and this server may or may not be accessible from the outside world, try to connect with the client to verify" }, - { PortCheckResult.Inaccessible, "This server is not accessible from the outside world, please see the Port Forwarding documentation for more information: {0}" }, + { PortCheckResult.Unknown, "This server is possibly inaccessible from the outside world. Try to connect with the client to verify." }, + { PortCheckResult.Open, "This server is accessible from the outside world. Properly configured clients can connect." }, + { PortCheckResult.PossiblyOpen, "This server is possibly accessible from the outside world, but the AscensionGameDev port checker server gave an inconclusive response." }, + { PortCheckResult.IntersectResponseNoPlayerCount, "This server is not reporting a player count and may not be accessible. Please see the Port Forwarding documentation for more information: {0}" }, + { PortCheckResult.IntersectResponseInvalidPlayerCount, "This server is reporting an invalid player count and may not be accessible. Please see the Port Forwarding documentation for more information: {0}" }, + { PortCheckResult.InvalidPortCheckerRequest, "The AscensionGameDev port checker server is down and this server may or may not be accessible from the outside world. Try to connect with the client to verify." }, + { PortCheckResult.PortCheckerServerError, "The AscensionGameDev port checker server encountered an error and this server may or may not be accessible from the outside world. Try to connect with the client to verify." }, + { PortCheckResult.PortCheckerServerDown, "The AscensionGameDev port checker server is down and this server may or may not be accessible from the outside world. Try to connect with the client to verify." }, + { PortCheckResult.PortCheckerServerUnexpectedResponse, "The AscensionGameDev port checker server is down and this server may or may not be accessible from the outside world. Try to connect with the client to verify." }, + { PortCheckResult.Inaccessible, "This server is not accessible from the outside world. Please see the Port Forwarding documentation for more information: {0}" }, } ); [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString DocumentationUrl = - @"https://docs.freemmorpgmaker.com/en-US/deploy/forwarding/"; + public readonly LocalizedString PortNotOpenTryingUpnp = @"Port {0} is not open, trying UPnP..."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString PortNotOpenTryingUPnP = @"Port {0} is not open, trying UPnP..."; + public readonly LocalizedString PortNotOpenUpnpDisabled = + @"Port {0} is not open, but UPnP is disabled. Check your router port forwarding and computer firewall configurations."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString PortNotOpenUPnPDisabled = @"Port {0} is not open, but UPnP is disabled. Check your router port forwarding and computer firewall configurations."; - + public readonly LocalizedString ProbablyFirewall = + @"UPnP supposedly succeeded but the server is not accessible on port {0}. Check the firewall of the machine this server is running on."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString PortCheckerAndUPnPDisabled = - @"The port checker service and UPnP have both been disabled, please verify the server status manually with a client."; - + public readonly LocalizedString PublicIp = @"Public IP: {00}"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UPnPSucceededPortCheckerDisabled = - @"UPnP succeeded but the port checker is disabled. Please verify the server status manually using a client."; - + public readonly LocalizedString PublicPort = @"Public Port: {00}"; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString UPnPFailed = - @"UPnP failed, please verify the server status manually using a client."; + public readonly LocalizedString RouterUpnpFailed = + @"UPnP failed. Please verify the server status manually using a client."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString TryingUPnP = - @"Trying to open the port using UPnP..."; + public readonly LocalizedString TryingUpnp = @"Trying to open the port using UPnP..."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString ProbablyFirewall = - @"UPnP supposedly succeeded but the server is not accessible on port {0}, check the firewall of the machine this server is running on."; + public readonly LocalizedString UpnpSucceededPortCheckerDisabled = + @"UPnP succeeded but the port checker is disabled. Please verify the server status manually using a client."; + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString WithinRestrictedNetwork = + @"3. If you are on a college campus or within a business network, you likely do not have permission to open ports or host games. In this case, you should explore external hosting options!"; } public sealed partial class QuestsNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString abandoned = @"Quest Abandoned: {00}!"; + public readonly LocalizedString Abandoned = @"Quest Abandoned: {00}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString completed = @"Quest: {00} completed!"; + public readonly LocalizedString Completed = @"Quest: {00} completed!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString declined = @"Quest Declined: {00}!"; + public readonly LocalizedString Declined = @"Quest Declined: {00}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString itemtask = @"{00} updated! {01}/{02} {03}(s) gathered!"; + public readonly LocalizedString ItemTask = @"{00} updated! {01}/{02} {03}(s) gathered!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString npctask = @"{00} updated! {01}/{02} {03}(s) slain!"; + public readonly LocalizedString NpcTask = @"{00} updated! {01}/{02} {03}(s) slain!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString started = @"Quest Started: {00}!"; + public readonly LocalizedString Started = @"Quest Started: {00}!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString taskcompleted = @"Task Completed!"; + public readonly LocalizedString TaskCompleted = @"Task Completed!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString updated = @"Quest: {00} updated!"; - + public readonly LocalizedString Updated = @"Quest: {00} updated!"; } public sealed partial class RegexNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString email = - @"^(([\w-]+\.)+[\w-]+|([a-zA-Z]{1}|[\w-]{2,}))@((([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])){1}|([a-zA-Z]+[\w-]+\.)+[a-zA-Z]{2,4})$"; + public readonly LocalizedString Email = @"^(([\w-]+\.)+[\w-]+|([a-zA-Z]{1}|[\w-]{2,}))@((([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\.([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])){1}|([a-zA-Z]+[\w-]+\.)+[a-zA-Z]{2,4})$"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString - password = @"^[-_=\+`~!@#\$%\^&\*()\[\]{}\\|;\:'"",<\.>/\?a-zA-Z0-9]{4,64}$"; + public readonly LocalizedString GuildName = @"^[a-zA-Z0-9 ]{3,20}$"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString username = @"^[a-zA-Z0-9]{2,20}$"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString guildname = @"^[a-zA-Z0-9 ]{3,20}$"; - + public readonly LocalizedString Username = @"^[a-zA-Z0-9]{2,20}$"; } public sealed partial class ShopsNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString bound = @"This item is bound to you and cannot be sold!"; + public readonly LocalizedString Bound = @"This item is bound to you and cannot be sold!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString TransactionFailed = @"Transaction failed!"; + public readonly LocalizedString CannotAfford = @"Transaction failed due to insufficient funds."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString cantafford = @"Transaction failed due to insufficent funds."; + public readonly LocalizedString DoesNotAccept = @"This shop does not accept that item!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString doesnotaccept = @"This shop does not accept that item!"; + public readonly LocalizedString FailedToRemoveItem = @"Failed to remove items from slot {00} for player {01}. Quantity to remove: {02} at {03}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString inventoryfull = @"You do not have space to purchase that item!"; + public readonly LocalizedString InventoryFull = @"You do not have enough space to purchase that item!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString SuccessfullyRemovedItem = @"Successfully took {00} items from slot {01} for player {02} at {03}"; + public readonly LocalizedString SuccessfullyRemovedItem = @"Successfully removed {00} items from slot {01} for player {02} at {03}"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString FailedRemovedItem = @"Failed to take items from slot {00} for player {01}. Quantity to remove: {02} at {03}"; - + public readonly LocalizedString TransactionFailed = @"Transaction failed!"; } public sealed partial class TradingNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString accepted = @"The trade was successful!"; + public readonly LocalizedString Accepted = @"The trade was successful!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString alreadydenied = @"Your trade request has already been denied!"; + public readonly LocalizedString AlreadyDenied = @"Your trade request has already been denied!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString bound = @"This item is bound to you and cannot be traded!"; + public readonly LocalizedString Bound = @"This item is bound to you and cannot be traded!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString busy = @"{00} is busy. Please try again later!"; + public readonly LocalizedString Busy = @"{00} is busy. Please try again later!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString declined = @"The trade was declined!"; + public readonly LocalizedString Declined = @"The trade was declined!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString inventorynospace = - @"There is no space left in your inventory for that item!"; + public readonly LocalizedString InvalidOffer = @"Invalid item selected to offer!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString itemsdropped = - @"Out of inventory space. Some of your items have been dropped on the ground!"; + public readonly LocalizedString InvalidRevoke = @"Invalid item selected to revoke!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString OfferAccepted = @"{00} has accepted your offer. Please confirm the trade."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString offerinvalid = @"Invalid item selected to offer!"; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString RevokeNotAllowed = @"You can't revoke this item, {00} already accepted the trade!"; + public readonly LocalizedString ItemsDropped = @"Out of inventory space. Some of your items have been dropped on the ground!"; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString outofrange = @"Trade target is out of range or offline."; + public readonly LocalizedString OfferAccepted = @"{00} has accepted your offer. Please confirm the trade."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString revokeinvalid = @"Invalid item selected to revoke!"; + public readonly LocalizedString OutOfRange = @"Trade target is out of range or offline."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString tradenospace = @"There is no space left in the trade window for that item!"; - + public readonly LocalizedString RevokeNotAllowed = @"You can't revoke this item, {00} has already accepted the trade!"; } public sealed partial class UpnpNamespace : LocaleNamespace { - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString failedforwardingtcp = - @"Failed to automatically port forward tcp port {00} using UPnP. (UPnP possibly disabled in your router settings, or this port might already be forwarded!)"; + public readonly LocalizedString FailedForwardingTcp = @"Failed to automatically port forward TCP port {00} using UPnP. UPnP might be disabled in your router settings, or this port might already be forwarded."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString failedforwardingudp = - @"Failed to automatically port forward udp port {00} using UPnP. (UPnP possibly disabled in your router settings, or this port might already be forwarded!)"; + public readonly LocalizedString FailedForwardingUdp = @"Failed to automatically port forward UDP port {00} using UPnP. UPnP might be disabled in your router settings, or this port might already be forwarded."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString - forwardedtcp = @"Successfully auto port forwarded tcp port {00} using UPnP."; + public readonly LocalizedString ForwardedTcp = @"Successfully auto port forwarded TCP port {00} using UPnP."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString - forwardedudp = @"Successfully auto port forwarded udp port {00} using UPnP."; + public readonly LocalizedString ForwardedUdp = @"Successfully auto port forwarded UDP port {00} using UPnP."; [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public readonly LocalizedString initializationfailed = - @"UPnP Service Initialization Failed. You might not have a router, or UPnP on your router might be disabled."; - - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public readonly LocalizedString initialized = @"UPnP Service Initialization Succeeded"; + public readonly LocalizedString InitializationFailed = @"UPnP Service Initialization Failed. You might not have a router, or UPnP on your router might be disabled."; + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public readonly LocalizedString Initialized = @"UPnP Service Initialization Succeeded."; } #region Serialization @@ -1600,19 +1370,19 @@ private sealed partial class RootNamespace : LocaleNamespace public readonly AccountNamespace Account = new AccountNamespace(); - public readonly BagsNamespace Bags = new BagsNamespace(); + public readonly BagNamespace Bags = new BagNamespace(); - public readonly BanksNamespace Banks = new BanksNamespace(); + public readonly BankNamespace Banks = new BankNamespace(); public readonly ChatNamespace Chat = new ChatNamespace(); - public readonly ClassesNamespace Classes = new ClassesNamespace(); + public readonly ClassNamespace Classes = new ClassNamespace(); - public readonly ColorsNamespace Colors = new ColorsNamespace(); + public readonly ColorNamespace Colors = new ColorNamespace(); public readonly CombatNamespace Combat = new CombatNamespace(); - public readonly CommandoutputNamespace Commandoutput = new CommandoutputNamespace(); + public readonly CommandOutputNamespace Commandoutput = new CommandOutputNamespace(); public readonly CommandsNamespace Commands = new CommandsNamespace(); @@ -1675,19 +1445,19 @@ private sealed partial class RootNamespace : LocaleNamespace public static AccountNamespace Account => Root.Account; - public static BagsNamespace Bags => Root.Bags; + public static BagNamespace Bags => Root.Bags; - public static BanksNamespace Banks => Root.Banks; + public static BankNamespace Banks => Root.Banks; public static ChatNamespace Chat => Root.Chat; - public static ClassesNamespace Classes => Root.Classes; + public static ClassNamespace Classes => Root.Classes; - public static ColorsNamespace Colors => Root.Colors; + public static ColorNamespace Colors => Root.Colors; public static CombatNamespace Combat => Root.Combat; - public static CommandoutputNamespace Commandoutput => Root.Commandoutput; + public static CommandOutputNamespace Commandoutput => Root.Commandoutput; public static CommandsNamespace Commands => Root.Commands; diff --git a/Intersect.Server.Core/Networking/PacketHandler.cs b/Intersect.Server.Core/Networking/PacketHandler.cs index 98d23b3929..45d1b59df9 100644 --- a/Intersect.Server.Core/Networking/PacketHandler.cs +++ b/Intersect.Server.Core/Networking/PacketHandler.cs @@ -113,7 +113,7 @@ public bool ShouldAcceptPacket(IConnection connection, long pSize) if (pSize > thresholds.MaxPacketSize) { Log.Error( - Strings.Errors.floodsize.ToString( + Strings.Errors.ErrorFloodSize.ToString( pSize, client?.User?.Name ?? "", client?.Entity?.Name ?? "", client.Ip ) ); @@ -130,7 +130,7 @@ public bool ShouldAcceptPacket(IConnection connection, long pSize) if (client.PacketCount > thresholds.MaxPacketPerSec) { Log.Error( - Strings.Errors.floodburst.ToString( + Strings.Errors.ErrorFloodBurst.ToString( client.PacketCount, client?.User?.Name ?? "", client?.Entity?.Name ?? "", client.Ip ) ); @@ -504,7 +504,7 @@ public void HandlePacket(Client client, LoginPacket packet) { if (client.AccountAttempts > 3 && client.TimeoutMs > Timing.Global.Milliseconds) { - PacketSender.SendError(client, Strings.Errors.errortimeout); + PacketSender.SendError(client, Strings.Errors.ErrorTimeout, Strings.General.NoticeError); client.ResetTimeout(); return; @@ -516,7 +516,7 @@ public void HandlePacket(Client client, LoginPacket packet) // Are we at capacity yet, or can this user still log in? if (Globals.OnlineList.Count >= Options.MaxLoggedinUsers) { - PacketSender.SendError(client, Strings.Networking.ServerFull); + PacketSender.SendError(client, Strings.Networking.ServerFull, Strings.General.NoticeError); return; } @@ -527,7 +527,7 @@ public void HandlePacket(Client client, LoginPacket packet) UserActivityHistory.LogActivity(Guid.Empty, Guid.Empty, client?.Ip, UserActivityHistory.PeerType.Client, UserActivityHistory.UserAction.FailedLogin, packet.Username); client.FailedAttempt(); - PacketSender.SendError(client, Strings.Account.badlogin); + PacketSender.SendError(client, Strings.Account.BadLogin, Strings.General.NoticeError); return; } @@ -574,7 +574,7 @@ public void HandlePacket(Client client, LoginPacket packet) { client.SetUser(null); client.Banned = true; - PacketSender.SendError(client, isBanned); + PacketSender.SendError(client, isBanned, Strings.General.NoticeError); return; } @@ -584,7 +584,7 @@ public void HandlePacket(Client client, LoginPacket packet) { if (client.Power == UserRights.None) { - PacketSender.SendError(client, Strings.Account.adminonly); + PacketSender.SendError(client, Strings.Account.AdminOnly, Strings.General.NoticeError); return; } @@ -800,7 +800,7 @@ public void HandlePacket(Client client, ChatMsgPacket packet) if (player.LastChatTime > Timing.Global.MillisecondsUtc) { - PacketSender.SendChatMsg(player, Strings.Chat.toofast, ChatMessageType.Notice); + PacketSender.SendChatMsg(player, Strings.Chat.TooFast, ChatMessageType.Notice); player.LastChatTime = Timing.Global.MillisecondsUtc + Options.MinChatInterval; return; @@ -818,26 +818,26 @@ public void HandlePacket(Client client, ChatMsgPacket packet) switch (channel) { case 0: //local - cmd = Strings.Chat.localcmd; + cmd = Strings.Chat.LocalCommand; break; case 1: //global - cmd = Strings.Chat.allcmd; + cmd = Strings.Chat.AllCommand; break; case 2: //party - cmd = Strings.Chat.partycmd; + cmd = Strings.Chat.PartyCommand; break; case 3: - cmd = Strings.Guilds.guildcmd; + cmd = Strings.Guilds.GuildCommand; break; case 4: //admin - cmd = Strings.Chat.admincmd; + cmd = Strings.Chat.AdminCommand; break; @@ -855,7 +855,7 @@ public void HandlePacket(Client client, ChatMsgPacket packet) var msgSplit = msg.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); - if (cmd == Strings.Chat.localcmd) + if (cmd == Strings.Chat.LocalCommand) { if (msg.Trim().Length == 0) { @@ -874,13 +874,13 @@ public void HandlePacket(Client client, ChatMsgPacket packet) } PacketSender.SendProximityMsgToLayer( - Strings.Chat.local.ToString(player.Name, msg), ChatMessageType.Local, player.MapId, player.MapInstanceId, chatColor, + Strings.Chat.Local.ToString(player.Name, msg), ChatMessageType.Local, player.MapId, player.MapInstanceId, chatColor, player.Name ); PacketSender.SendChatBubble(player.Id, player.MapInstanceId, (int)EntityType.GlobalEntity, msg, player.MapId); ChatHistory.LogMessage(player, msg.Trim(), ChatMessageType.Local, Guid.Empty); } - else if (cmd == Strings.Chat.allcmd || cmd == Strings.Chat.globalcmd) + else if (cmd == Strings.Chat.AllCommand || cmd == Strings.Chat.GlobalCommand) { if (msg.Trim().Length == 0) { @@ -900,7 +900,7 @@ public void HandlePacket(Client client, ChatMsgPacket packet) PacketSender.SendGlobalMsg(Strings.Chat.Global.ToString(player.Name, msg), chatColor, player.Name); ChatHistory.LogMessage(player, msg.Trim(), ChatMessageType.Global, Guid.Empty); } - else if (cmd == Strings.Chat.partycmd) + else if (cmd == Strings.Chat.PartyCommand) { if (msg.Trim().Length == 0) { @@ -910,16 +910,16 @@ public void HandlePacket(Client client, ChatMsgPacket packet) if (player.InParty(player)) { PacketSender.SendPartyMsg( - player, Strings.Chat.party.ToString(player.Name, msg), CustomColors.Chat.PartyChat, player.Name + player, Strings.Chat.Party.ToString(player.Name, msg), CustomColors.Chat.PartyChat, player.Name ); ChatHistory.LogMessage(player, msg.Trim(), ChatMessageType.Party, Guid.Empty); } else { - PacketSender.SendChatMsg(player, Strings.Parties.notinparty, ChatMessageType.Party, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(player, Strings.Parties.NotInParty, ChatMessageType.Party, CustomColors.Alerts.Error); } } - else if (cmd == Strings.Chat.admincmd) + else if (cmd == Strings.Chat.AdminCommand) { if (msg.Trim().Length == 0) { @@ -929,12 +929,12 @@ public void HandlePacket(Client client, ChatMsgPacket packet) if (client?.Power.IsModerator ?? false) { PacketSender.SendAdminMsg( - Strings.Chat.admin.ToString(player.Name, msg), CustomColors.Chat.AdminChat, player.Name + Strings.Chat.Admin.ToString(player.Name, msg), CustomColors.Chat.AdminChat, player.Name ); ChatHistory.LogMessage(player, msg.Trim(), ChatMessageType.Admin, Guid.Empty); } } - else if (cmd == Strings.Guilds.guildcmd) + else if (cmd == Strings.Guilds.GuildCommand) { if (player.Guild == null) { @@ -949,11 +949,11 @@ public void HandlePacket(Client client, ChatMsgPacket packet) //Normalize Rank var rank = Options.Instance.Guild.Ranks[Math.Max(0, Math.Min(player.GuildRank, Options.Instance.Guild.Ranks.Length - 1))].Title; - PacketSender.SendGuildMsg(player, Strings.Guilds.guildchat.ToString(rank, player.Name, msg), CustomColors.Chat.GuildChat); + PacketSender.SendGuildMsg(player, Strings.Guilds.GuildChat.ToString(rank, player.Name, msg), CustomColors.Chat.GuildChat); ChatHistory.LogMessage(player, msg.Trim(), ChatMessageType.Guild, player.Guild.Id); } - else if (cmd == Strings.Chat.announcementcmd) + else if (cmd == Strings.Chat.AnnouncementCommand) { if (msg.Trim().Length == 0) { @@ -963,7 +963,7 @@ public void HandlePacket(Client client, ChatMsgPacket packet) if (client?.Power.IsModerator ?? false) { PacketSender.SendGlobalMsg( - Strings.Chat.announcement.ToString(player.Name, msg), CustomColors.Chat.AnnouncementChat, + Strings.Chat.Announcement.ToString(player.Name, msg), CustomColors.Chat.AnnouncementChat, player.Name ); @@ -977,7 +977,7 @@ public void HandlePacket(Client client, ChatMsgPacket packet) ChatHistory.LogMessage(player, msg.Trim(), ChatMessageType.Notice, Guid.Empty); } } - else if (cmd == Strings.Chat.pmcmd || cmd == Strings.Chat.messagecmd) + else if (cmd == Strings.Chat.PrivateMessageCommand || cmd == Strings.Chat.MessageCommand) { if (msgSplit.Length < 2) { @@ -1016,10 +1016,10 @@ public void HandlePacket(Client client, ChatMsgPacket packet) } else { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.PM, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.PM, CustomColors.Alerts.Error); } } - else if (cmd == Strings.Chat.replycmd || cmd == Strings.Chat.rcmd) + else if (cmd == Strings.Chat.ReplyCommand || cmd == Strings.Chat.ReplyShortcutCommand) { if (msg.Trim().Length == 0) { @@ -1043,7 +1043,7 @@ public void HandlePacket(Client client, ChatMsgPacket packet) } else { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.PM, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.PM, CustomColors.Alerts.Error); } } else @@ -1083,14 +1083,14 @@ public void HandlePacket(Client client, BlockPacket packet) { if (status.Type == SpellEffect.Stun) { - PacketSender.SendChatMsg(player, Strings.Combat.stunblocking, ChatMessageType.Combat); + PacketSender.SendChatMsg(player, Strings.Combat.StunBlocking, ChatMessageType.Combat); return; } if (status.Type == SpellEffect.Sleep) { - PacketSender.SendChatMsg(player, Strings.Combat.sleepblocking, ChatMessageType.Combat); + PacketSender.SendChatMsg(player, Strings.Combat.SleepBlocking, ChatMessageType.Combat); return; } @@ -1139,7 +1139,7 @@ public void HandlePacket(Client client, AttackPacket packet) { if (Options.Combat.EnableCombatChatMessages) { - PacketSender.SendChatMsg(player, Strings.Combat.channelingnoattack, ChatMessageType.Combat); + PacketSender.SendChatMsg(player, Strings.Combat.ChannelingNoAttack, ChatMessageType.Combat); } return; @@ -1155,7 +1155,7 @@ public void HandlePacket(Client client, AttackPacket packet) { if (Options.Combat.EnableCombatChatMessages) { - PacketSender.SendChatMsg(player, Strings.Combat.stunattacking, ChatMessageType.Combat); + PacketSender.SendChatMsg(player, Strings.Combat.StunAttacking, ChatMessageType.Combat); } return; @@ -1165,7 +1165,7 @@ public void HandlePacket(Client client, AttackPacket packet) { if (Options.Combat.EnableCombatChatMessages) { - PacketSender.SendChatMsg(player, Strings.Combat.sleepattacking, ChatMessageType.Combat); + PacketSender.SendChatMsg(player, Strings.Combat.SleepAttacking, ChatMessageType.Combat); } return; @@ -1173,7 +1173,7 @@ public void HandlePacket(Client client, AttackPacket packet) if (status.Type == SpellEffect.Blind) { - PacketSender.SendActionMsg(player, Strings.Combat.miss, CustomColors.Combat.Missed); + PacketSender.SendActionMsg(player, Strings.Combat.Miss, CustomColors.Combat.Missed); return; } @@ -1256,7 +1256,7 @@ public void HandlePacket(Client client, AttackPacket packet) { PacketSender.SendChatMsg( player, - Strings.Items.notenough.ToString(ItemBase.GetName(projectileBase.AmmoItemId)), + Strings.Items.NotEnough.ToString(ItemBase.GetName(projectileBase.AmmoItemId)), ChatMessageType.Inventory, CustomColors.Combat.NoAmmo ); @@ -1402,7 +1402,7 @@ public void HandlePacket(Client client, CreateAccountPacket packet) { if (client.TimeoutMs > Timing.Global.Milliseconds) { - PacketSender.SendError(client, Strings.Errors.errortimeout); + PacketSender.SendError(client, Strings.Errors.ErrorTimeout, Strings.General.NoticeError); client.ResetTimeout(); return; @@ -1412,21 +1412,21 @@ public void HandlePacket(Client client, CreateAccountPacket packet) if (Options.BlockClientRegistrations) { - PacketSender.SendError(client, Strings.Account.registrationsblocked); + PacketSender.SendError(client, Strings.Account.RegistrationsBlocked, Strings.General.NoticeError); return; } - if (!FieldChecking.IsValidUsername(packet.Username, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(packet.Username, Strings.Regex.Username)) { - PacketSender.SendError(client, Strings.Account.invalidname); + PacketSender.SendError(client, Strings.Account.InvalidName, Strings.General.NoticeError); return; } - if (!FieldChecking.IsWellformedEmailAddress(packet.Email, Strings.Regex.email)) + if (!FieldChecking.IsWellformedEmailAddress(packet.Email, Strings.Regex.Email)) { - PacketSender.SendError(client, Strings.Account.invalidemail); + PacketSender.SendError(client, Strings.Account.InvalidEmail, Strings.General.NoticeError); return; } @@ -1435,20 +1435,20 @@ public void HandlePacket(Client client, CreateAccountPacket packet) var isBanned = Ban.CheckBan(client.Ip); if (isBanned != null) { - PacketSender.SendError(client, isBanned); + PacketSender.SendError(client, isBanned, Strings.General.NoticeError); return; } if (User.UserExists(packet.Username)) { - PacketSender.SendError(client, Strings.Account.exists); + PacketSender.SendError(client, Strings.Account.AccountAlreadyExists, Strings.General.NoticeError); } else { if (User.UserExists(packet.Email)) { - PacketSender.SendError(client, Strings.Account.emailexists); + PacketSender.SendError(client, Strings.Account.EmailExists, Strings.General.NoticeError); } else { @@ -1475,7 +1475,7 @@ public void HandlePacket(Client client, CreateAccountPacket packet) { if (client.Power == UserRights.None) { - PacketSender.SendError(client, Strings.Account.adminonly); + PacketSender.SendError(client, Strings.Account.AdminOnly, Strings.General.NoticeError); return; } @@ -1496,9 +1496,9 @@ public void HandlePacket(Client client, CreateCharacterPacket packet) return; } - if (!FieldChecking.IsValidUsername(packet.Name, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(packet.Name, Strings.Regex.Username)) { - PacketSender.SendError(client, Strings.Account.invalidname); + PacketSender.SendError(client, Strings.Account.InvalidName, Strings.General.NoticeError); return; } @@ -1507,14 +1507,14 @@ public void HandlePacket(Client client, CreateCharacterPacket packet) var classBase = ClassBase.Get(packet.ClassId); if (classBase == null || classBase.Locked) { - PacketSender.SendError(client, Strings.Account.invalidclass); + PacketSender.SendError(client, Strings.Account.InvalidClass, Strings.General.NoticeError); return; } if (Player.PlayerExists(packet.Name)) { - PacketSender.SendError(client, Strings.Account.characterexists); + PacketSender.SendError(client, Strings.Account.CharacterExists, Strings.General.NoticeError); return; } @@ -1668,7 +1668,7 @@ public void HandlePacket(Client client, PickupItemPacket packet) // We couldn't give the player their item, notify them. PacketSender.SendChatMsg( player, - Strings.Items.InventoryNoSpace, + Strings.Items.NoSpaceForItem, ChatMessageType.Inventory, CustomColors.Alerts.Error ); @@ -1999,7 +1999,7 @@ public void HandlePacket(Client client, PartyInvitePacket packet) return; } - PacketSender.SendChatMsg(player, Strings.Parties.outofrange, ChatMessageType.Combat, CustomColors.Combat.NoTarget); + PacketSender.SendChatMsg(player, Strings.Parties.OutOfRange, ChatMessageType.Combat, CustomColors.Combat.NoTarget); } //PartyInviteResponsePacket @@ -2024,7 +2024,7 @@ public void HandlePacket(Client client, PartyInviteResponsePacket packet) else { PacketSender.SendChatMsg( - player.PartyRequester, Strings.Parties.declined.ToString(client.Entity.Name), + player.PartyRequester, Strings.Parties.Declined.ToString(client.Entity.Name), ChatMessageType.Party, CustomColors.Alerts.Declined ); @@ -2123,7 +2123,7 @@ public void HandlePacket(Client client, TradeRequestPacket packet) } //Player Out of Range Or Offline - PacketSender.SendChatMsg(player, Strings.Trading.outofrange.ToString(), ChatMessageType.Trading, CustomColors.Combat.NoTarget); + PacketSender.SendChatMsg(player, Strings.Trading.OutOfRange.ToString(), ChatMessageType.Trading, CustomColors.Combat.NoTarget); } //TradeRequestResponsePacket @@ -2153,21 +2153,21 @@ public void HandlePacket(Client client, TradeRequestResponsePacket packet) else { PacketSender.SendChatMsg( - player, Strings.Trading.outofrange.ToString(), ChatMessageType.Trading, CustomColors.Combat.NoTarget + player, Strings.Trading.OutOfRange.ToString(), ChatMessageType.Trading, CustomColors.Combat.NoTarget ); } } else { PacketSender.SendChatMsg( - player, Strings.Trading.busy.ToString(player.Trading.Requester.Name), ChatMessageType.Trading, Color.Red + player, Strings.Trading.Busy.ToString(player.Trading.Requester.Name), ChatMessageType.Trading, Color.Red ); } } else { PacketSender.SendChatMsg( - player.Trading.Requester, Strings.Trading.declined.ToString(player.Name), + player.Trading.Requester, Strings.Trading.Declined.ToString(player.Name), ChatMessageType.Trading, CustomColors.Alerts.Declined ); @@ -2252,9 +2252,9 @@ public void HandlePacket(Client client, AcceptTradePacket packet) player.Trading.Counterparty.ReturnTradeItems(); player.ReturnTradeItems(); - PacketSender.SendChatMsg(player, Strings.Trading.accepted, ChatMessageType.Trading, CustomColors.Alerts.Accepted); + PacketSender.SendChatMsg(player, Strings.Trading.Accepted, ChatMessageType.Trading, CustomColors.Alerts.Accepted); PacketSender.SendChatMsg( - player.Trading.Counterparty, Strings.Trading.accepted, ChatMessageType.Trading, CustomColors.Alerts.Accepted + player.Trading.Counterparty, Strings.Trading.Accepted, ChatMessageType.Trading, CustomColors.Alerts.Accepted ); PacketSender.SendTradeClose(player.Trading.Counterparty); @@ -2370,18 +2370,18 @@ public void HandlePacket(Client client, UpdateFriendsPacket packet) } else { - PacketSender.SendChatMsg(player, Strings.Friends.busy.ToString(target.Name), ChatMessageType.Friend); + PacketSender.SendChatMsg(player, Strings.Friends.Busy.ToString(target.Name), ChatMessageType.Friend); } } else { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Friend, CustomColors.Alerts.Error); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Friend, CustomColors.Alerts.Error); } } else { PacketSender.SendChatMsg( - player, Strings.Friends.alreadyfriends.ToString(packet.Name), ChatMessageType.Friend, CustomColors.Alerts.Info + player, Strings.Friends.AlreadyFriends.ToString(packet.Name), ChatMessageType.Friend, CustomColors.Alerts.Info ); } } @@ -2394,7 +2394,7 @@ public void HandlePacket(Client client, UpdateFriendsPacket packet) var otherPlayer = Player.FindOnline(friendId); player.CachedFriends.Remove(friendId); PacketSender.SendFriends(player); - PacketSender.SendChatMsg(player, Strings.Friends.remove, ChatMessageType.Friend, CustomColors.Alerts.Declined); + PacketSender.SendChatMsg(player, Strings.Friends.FriendRemoved, ChatMessageType.Friend, CustomColors.Alerts.Declined); if (otherPlayer?.CachedFriends.ContainsKey(player.Id) ?? false) { @@ -2437,7 +2437,7 @@ public void HandlePacket(Client client, FriendRequestResponsePacket packet) } PacketSender.SendChatMsg( - player, Strings.Friends.notification.ToString(target.Name), ChatMessageType.Friend, CustomColors.Alerts.Accepted + player, Strings.Friends.FriendNotification.ToString(target.Name), ChatMessageType.Friend, CustomColors.Alerts.Accepted ); PacketSender.SendFriends(player); @@ -2451,7 +2451,7 @@ public void HandlePacket(Client client, FriendRequestResponsePacket packet) } PacketSender.SendChatMsg( - target, Strings.Friends.accept.ToString(player.Name), ChatMessageType.Friend, CustomColors.Alerts.Accepted + target, Strings.Friends.Accept.ToString(player.Name), ChatMessageType.Friend, CustomColors.Alerts.Accepted ); PacketSender.SendFriends(target); @@ -2507,7 +2507,7 @@ public void HandlePacket(Client client, SelectCharacterPacket packet) catch (Exception exception) { Log.Warn(exception); - PacketSender.SendError(client, Strings.Account.loadfail); + PacketSender.SendError(client, Strings.Account.LoadFail, Strings.General.NoticeError); client.Logout(); } } @@ -2522,7 +2522,7 @@ public void HandlePacket(Client client, DeleteCharacterPacket packet) if (Player.FindOnline(packet.CharacterId) != null) { - PacketSender.SendError(client, Strings.Account.deletecharerror, Strings.Account.deletederror); + PacketSender.SendError(client, Strings.Account.DeleteCharacterError, Strings.General.NoticeError); PacketSender.SendPlayerCharacters(client); return; } @@ -2533,7 +2533,7 @@ public void HandlePacket(Client client, DeleteCharacterPacket packet) character.LoadGuild(); if (character.Guild != null && character.GuildRank == 0) { - PacketSender.SendError(client, Strings.Guilds.deleteguildleader, Strings.Account.deleted); + PacketSender.SendError(client, Strings.Guilds.DeleteGuildLeader, Strings.General.NoticeError); return; } @@ -2551,7 +2551,7 @@ public void HandlePacket(Client client, DeleteCharacterPacket packet) } } - PacketSender.SendError(client, Strings.Account.deletechar, Strings.Account.deleted); + PacketSender.SendError(client, Strings.Account.CharacterDeleted, Strings.General.Notice); PacketSender.SendPlayerCharacters(client); } @@ -2565,7 +2565,7 @@ public void HandlePacket(Client client, NewCharacterPacket packet) } else { - PacketSender.SendError(client, Strings.Account.maxchars); + PacketSender.SendError(client, Strings.Account.MaxCharacters, Strings.General.NoticeError); } } @@ -2576,7 +2576,7 @@ public void HandlePacket(Client client, ResetPasswordPacket packet) if (client.TimeoutMs > Timing.Global.Milliseconds) { - PacketSender.SendError(client, Strings.Errors.errortimeout); + PacketSender.SendError(client, Strings.Errors.ErrorTimeout, Strings.General.NoticeError); client.ResetTimeout(); return; diff --git a/Intersect.Server.Core/Networking/PacketSender.cs b/Intersect.Server.Core/Networking/PacketSender.cs index c9d7f5d18b..a8f11990aa 100644 --- a/Intersect.Server.Core/Networking/PacketSender.cs +++ b/Intersect.Server.Core/Networking/PacketSender.cs @@ -89,11 +89,11 @@ public static void SendJoinGame(Client client) if (client.Power.Editor) { - SendChatMsg(player, Strings.Player.adminjoined, ChatMessageType.Notice, CustomColors.Alerts.AdminJoined); + SendChatMsg(player, Strings.Player.AdminJoined, ChatMessageType.Notice, CustomColors.Alerts.AdminJoined); } else if (client.Power.IsModerator) { - SendChatMsg(player, Strings.Player.modjoined, ChatMessageType.Notice, CustomColors.Alerts.ModJoined); + SendChatMsg(player, Strings.Player.ModeratorJoined, ChatMessageType.Notice, CustomColors.Alerts.ModJoined); } player.LoginWarp(); diff --git a/Intersect.Server/Admin/Actions/ActionProcessing.cs b/Intersect.Server/Admin/Actions/ActionProcessing.cs index a8a3a65a1f..e2be6b5458 100644 --- a/Intersect.Server/Admin/Actions/ActionProcessing.cs +++ b/Intersect.Server/Admin/Actions/ActionProcessing.cs @@ -49,7 +49,7 @@ public static void ProcessAction(Player player, BanAction action) else if (Ban.Find(targetUsername) != null) // If the target is already banned. { PacketSender.SendChatMsg( - player, Strings.Account.alreadybanned.ToString(target.Name), ChatMessageType.Admin, Color.Red + player, Strings.Account.AlreadyBanned.ToString(target.Name), ChatMessageType.Admin, Color.Red ); } @@ -73,7 +73,7 @@ public static void ProcessAction(Player player, BanAction action) target.Client?.Disconnect(); // Sends a global chat message to every user online about the banned player. - PacketSender.SendGlobalMsg(Strings.Account.banned.ToString(target.Name)); + PacketSender.SendGlobalMsg(Strings.Account.Banned.ToString(target.Name)); } } @@ -90,7 +90,7 @@ public static void ProcessAction(Player player, KickAction action) if (target == null) // If the target is offline. { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Admin, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Admin, Color.Red); } else if (player.Power.CompareTo(target.Power) < 1) // Authority Comparison. { @@ -115,7 +115,7 @@ public static void ProcessAction(Player player, KickAction action) $"{target.User?.Name},{target.Name}"); // Sends a global chat message to every user online about the kicked player. - PacketSender.SendGlobalMsg(Strings.Player.kicked.ToString(target.Name, player.Name)); + PacketSender.SendGlobalMsg(Strings.Player.Kicked.ToString(target.Name, player.Name)); // Kick the target. target.Client?.Disconnect(); @@ -135,7 +135,7 @@ public static void ProcessAction(Player player, KillAction action) if (target == null) // If the target is offline. { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Admin, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Admin, Color.Red); } else if (player.Power.CompareTo(target.Power) < 1) // Authority Comparison. { @@ -160,7 +160,7 @@ public static void ProcessAction(Player player, KillAction action) $"{target.User?.Name},{target.Name}"); // Sends a global chat message to every user online about the killed player. - PacketSender.SendGlobalMsg(Strings.Player.killed.ToString(target.Name, player.Name)); + PacketSender.SendGlobalMsg(Strings.Player.Killed.ToString(target.Name, player.Name)); lock (target.EntityLock) { @@ -208,7 +208,7 @@ public static void ProcessAction(Player player, MuteAction action) else if (Mute.Find(targetUsername) != null) // If the target is already muted. { PacketSender.SendChatMsg( - player, Strings.Account.alreadymuted.ToString(target.Name), ChatMessageType.Admin, Color.Red + player, Strings.Account.AlreadyMuted.ToString(target.Name), ChatMessageType.Admin, Color.Red ); } @@ -229,7 +229,7 @@ public static void ProcessAction(Player player, MuteAction action) ); // Sends a global chat message to every user online about the muted player. - PacketSender.SendGlobalMsg(Strings.Account.muted.ToString(target.Name)); + PacketSender.SendGlobalMsg(Strings.Account.Muted.ToString(target.Name)); } } @@ -239,7 +239,7 @@ public static void ProcessAction(Player player, SetAccessAction action) var target = Player.FindOnline(action.Name); if (target == null || target.Client == null) { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Admin, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Admin, Color.Red); return; } @@ -262,25 +262,25 @@ public static void ProcessAction(Player player, SetAccessAction action) targetClient.Power = power; if (targetClient.Power.IsAdmin) { - PacketSender.SendGlobalMsg(Strings.Player.admin.ToString(target.Name)); + PacketSender.SendGlobalMsg(Strings.Player.Admin.ToString(target.Name)); } else if (targetClient.Power.IsModerator) { - PacketSender.SendGlobalMsg(Strings.Player.mod.ToString(target.Name)); + PacketSender.SendGlobalMsg(Strings.Player.Moderator.ToString(target.Name)); } else { - PacketSender.SendGlobalMsg(Strings.Player.deadmin.ToString(target.Name)); + PacketSender.SendGlobalMsg(Strings.Player.Deadmin.ToString(target.Name)); } } else { - PacketSender.SendChatMsg(player, Strings.Player.adminsetpower, ChatMessageType.Admin); + PacketSender.SendChatMsg(player, Strings.Player.AdminSetPower, ChatMessageType.Admin); } } else { - PacketSender.SendChatMsg(player, Strings.Player.changeownpower, ChatMessageType.Admin); + PacketSender.SendChatMsg(player, Strings.Player.CannotAlterOwnPower, ChatMessageType.Admin); } } @@ -295,7 +295,7 @@ public static void ProcessAction(Player player, SetFaceAction action) } else { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Admin, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Admin, Color.Red); } } @@ -310,7 +310,7 @@ public static void ProcessAction(Player player, SetSpriteAction action) } else { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Admin, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Admin, Color.Red); } } @@ -401,14 +401,14 @@ public static void ProcessAction(Player player, WarpMeToAction action) { var forceInstanceChange = target.InstanceType != player.InstanceType; player.AdminWarp(target.MapId, (byte)target.X, (byte)target.Y, target.MapInstanceId, target.InstanceType, forceInstanceChange); - PacketSender.SendChatMsg(player, Strings.Player.warpedto.ToString(target.Name), ChatMessageType.Admin); + PacketSender.SendChatMsg(player, Strings.Player.WarpedTo.ToString(target.Name), ChatMessageType.Admin); PacketSender.SendChatMsg( - target, Strings.Player.warpedtoyou.ToString(player.Name), ChatMessageType.Notice + target, Strings.Player.WarpedToYou.ToString(player.Name), ChatMessageType.Notice ); } else { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Admin, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Admin, Color.Red); } } @@ -430,7 +430,7 @@ public static void ProcessAction(Player player, WarpToMeAction action) var target = Player.FindOnline(action.Name); if (target == null) { - PacketSender.SendChatMsg(player, Strings.Player.offline, ChatMessageType.Admin, Color.Red); + PacketSender.SendChatMsg(player, Strings.Player.Offline, ChatMessageType.Admin, Color.Red); return; } @@ -456,11 +456,11 @@ public static void ProcessAction(Player player, WarpToMeAction action) target.AdminWarp(player.MapId, (byte)player.X, (byte)player.Y, player.MapInstanceId, player.InstanceType, forceInstanceChange); PacketSender.SendChatMsg( - player, Strings.Player.haswarpedto.ToString(target.Name), ChatMessageType.Admin, player.Name + player, Strings.Player.HasWarpedTo.ToString(target.Name), ChatMessageType.Admin, player.Name ); PacketSender.SendChatMsg( - target, Strings.Player.beenwarpedto.ToString(player.Name), ChatMessageType.Notice, player.Name + target, Strings.Player.BeenWarpedTo.ToString(player.Name), ChatMessageType.Notice, player.Name ); } } @@ -471,7 +471,7 @@ public static void ProcessAction(Player player, ReturnToOverworldAction action) var target = Player.FindOnline(action.PlayerName); if (target == null) { - PacketSender.SendChatMsg(player, Strings.Player.offline, Enums.ChatMessageType.Admin); + PacketSender.SendChatMsg(player, Strings.Player.Offline, Enums.ChatMessageType.Admin); return; } diff --git a/Intersect.Server/Core/Commands/ApiCommand.cs b/Intersect.Server/Core/Commands/ApiCommand.cs index b344a32799..d76638436b 100644 --- a/Intersect.Server/Core/Commands/ApiCommand.cs +++ b/Intersect.Server/Core/Commands/ApiCommand.cs @@ -25,7 +25,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target == null) { - Console.WriteLine($@" {Strings.Account.notfound}"); + Console.WriteLine($@" {Strings.Account.NotFound}"); return; } @@ -46,8 +46,8 @@ protected override void HandleTarget(ServerContext context, ParserResult result, Console.WriteLine( access - ? $@" {Strings.Commandoutput.apigranted.ToString(target.Name)}" - : $@" {Strings.Commandoutput.apirevoked.ToString(target.Name)}" + ? $@" {Strings.Commandoutput.ApiAccessGranted.ToString(target.Name)}" + : $@" {Strings.Commandoutput.ApiAccessRevoked.ToString(target.Name)}" ); } diff --git a/Intersect.Server/Core/Commands/ApiGrantCommand.cs b/Intersect.Server/Core/Commands/ApiGrantCommand.cs index cad89102ce..94e9cea62f 100644 --- a/Intersect.Server/Core/Commands/ApiGrantCommand.cs +++ b/Intersect.Server/Core/Commands/ApiGrantCommand.cs @@ -25,7 +25,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target == null) { - Console.WriteLine($@" {Strings.Account.notfound}"); + Console.WriteLine($@" {Strings.Account.NotFound}"); return; } @@ -39,7 +39,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, if (!target.Power.Api) { - Console.WriteLine(Strings.Commandoutput.apirolenotgranted.ToString(role, target.Name)); + Console.WriteLine(Strings.Commandoutput.ApiRoleNotGranted.ToString(role, target.Name)); return; } @@ -56,7 +56,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, } else { - Console.WriteLine(Strings.Commandoutput.apiroleprereq.ToString(role, "users.query")); + Console.WriteLine(Strings.Commandoutput.ApiRolePrerequisite.ToString(role, "users.query")); return; } @@ -64,14 +64,14 @@ protected override void HandleTarget(ServerContext context, ParserResult result, else { //Role Not Found - Console.WriteLine(Strings.Commandoutput.apirolenotfound.ToString(role)); + Console.WriteLine(Strings.Commandoutput.ApiRoleNotFound.ToString(role)); return; } target.Save(); - Console.WriteLine(Strings.Commandoutput.apirolegranted.ToString(target.Name, role)); + Console.WriteLine(Strings.Commandoutput.ApiRoleGranted.ToString(target.Name, role)); } } diff --git a/Intersect.Server/Core/Commands/ApiRevokeCommand.cs b/Intersect.Server/Core/Commands/ApiRevokeCommand.cs index 34ca57e36a..c3cc6814bb 100644 --- a/Intersect.Server/Core/Commands/ApiRevokeCommand.cs +++ b/Intersect.Server/Core/Commands/ApiRevokeCommand.cs @@ -25,7 +25,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target == null) { - Console.WriteLine($@" {Strings.Account.notfound}"); + Console.WriteLine($@" {Strings.Account.NotFound}"); return; } @@ -49,14 +49,14 @@ protected override void HandleTarget(ServerContext context, ParserResult result, else { //Role Not Found - Console.WriteLine(Strings.Commandoutput.apirolenotfound.ToString(role)); + Console.WriteLine(Strings.Commandoutput.ApiRoleNotFound.ToString(role)); return; } target.Save(); - Console.WriteLine(Strings.Commandoutput.apirolerevoked.ToString(target.Name, role)); + Console.WriteLine(Strings.Commandoutput.ApiRoleRevoked.ToString(target.Name, role)); } } diff --git a/Intersect.Server/Core/Commands/ApiRolesCommand.cs b/Intersect.Server/Core/Commands/ApiRolesCommand.cs index 1e653b592e..e1baf6abd1 100644 --- a/Intersect.Server/Core/Commands/ApiRolesCommand.cs +++ b/Intersect.Server/Core/Commands/ApiRolesCommand.cs @@ -18,7 +18,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target == null) { - Console.WriteLine($@" {Strings.Account.notfound}"); + Console.WriteLine($@" {Strings.Account.NotFound}"); return; } @@ -28,7 +28,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, throw new ArgumentNullException(nameof(target.Power)); } - Console.WriteLine(Strings.Commandoutput.apiroles.ToString(target.Name)); + Console.WriteLine(Strings.Commandoutput.ApiRoles.ToString(target.Name)); Console.WriteLine("users.query: " + target.Power.ApiRoles.UserQuery); Console.WriteLine("users.manage: " + target.Power.ApiRoles.UserManage); } diff --git a/Intersect.Server/Core/Commands/BanCommand.cs b/Intersect.Server/Core/Commands/BanCommand.cs index 52d3b193cc..76dfd37ba9 100644 --- a/Intersect.Server/Core/Commands/BanCommand.cs +++ b/Intersect.Server/Core/Commands/BanCommand.cs @@ -19,7 +19,7 @@ protected override void HandleClient(ServerContext context, Client target, int d { if (target.Entity == null) { - Console.WriteLine($@" {Strings.Player.offline}"); + Console.WriteLine($@" {Strings.Player.Offline}"); return; } @@ -30,12 +30,12 @@ protected override void HandleClient(ServerContext context, Client target, int d { Ban.Add(target, duration, reason, Strings.Commands.banuser, ip ? target.Ip : ""); target.Disconnect(); - PacketSender.SendGlobalMsg(Strings.Account.banned.ToString(name)); - Console.WriteLine($@" {Strings.Account.banned.ToString(name)}"); + PacketSender.SendGlobalMsg(Strings.Account.Banned.ToString(name)); + Console.WriteLine($@" {Strings.Account.Banned.ToString(name)}"); } else { - Console.WriteLine($@" {Strings.Account.alreadybanned.ToString(name)}"); + Console.WriteLine($@" {Strings.Account.AlreadyBanned.ToString(name)}"); } } diff --git a/Intersect.Server/Core/Commands/CpsCommand.cs b/Intersect.Server/Core/Commands/CpsCommand.cs index 30bd3b29cf..2f0608643a 100644 --- a/Intersect.Server/Core/Commands/CpsCommand.cs +++ b/Intersect.Server/Core/Commands/CpsCommand.cs @@ -43,7 +43,7 @@ protected override void HandleValue(ServerContext context, ParserResult result) // : Strings.Commandoutput.cpsunlocked); //} // TODO: Rethink what messages we want to display here. Confirmation of the change is ideal. To reuse code we effectively don't need to really handle status. - Console.WriteLine(Options.Instance.Processing.CpsLock ? (Strings.Commandoutput.cpslocked.ToString() + " (" + Globals.Cps + ")") : Strings.Commandoutput.cpsunlocked.ToString() + " (" + Globals.Cps + ")"); + Console.WriteLine(Options.Instance.Processing.CpsLock ? (Strings.Commandoutput.CpsLocked.ToString() + " (" + Globals.Cps + ")") : Strings.Commandoutput.CpsUnlocked.ToString() + " (" + Globals.Cps + ")"); } } diff --git a/Intersect.Server/Core/Commands/HelpCommand.cs b/Intersect.Server/Core/Commands/HelpCommand.cs index 4a057154b0..88a224f338 100644 --- a/Intersect.Server/Core/Commands/HelpCommand.cs +++ b/Intersect.Server/Core/Commands/HelpCommand.cs @@ -16,7 +16,7 @@ public HelpCommand(ParserSettings parserSettings) : base(Strings.Commands.Help) protected override void HandleValue(ServerContext context, ParserResult result) { - Console.WriteLine(@" " + Strings.Commandoutput.helpheader); + Console.WriteLine(@" " + Strings.Commandoutput.HelpHeader); Strings.Commands.CommandList.ForEach( command => { Console.WriteLine($@" {command?.Name,-20} - {command?.Help}"); } @@ -26,7 +26,7 @@ protected override void HandleValue(ServerContext context, ParserResult result) ? ParserSettings.PrefixShort + Help.ShortName.ToString() : ParserSettings.PrefixLong + Help.Name; - Console.WriteLine($@" {Strings.Commandoutput.helpfooter.ToString(helpArgument)}"); + Console.WriteLine($@" {Strings.Commandoutput.HelpFooter.ToString(helpArgument)}"); } } diff --git a/Intersect.Server/Core/Commands/KickCommand.cs b/Intersect.Server/Core/Commands/KickCommand.cs index 2a1d845087..2c1a44131b 100644 --- a/Intersect.Server/Core/Commands/KickCommand.cs +++ b/Intersect.Server/Core/Commands/KickCommand.cs @@ -16,15 +16,15 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target?.Entity == null) { - Console.WriteLine($@" {Strings.Player.offline}"); + Console.WriteLine($@" {Strings.Player.Offline}"); return; } var name = target.Entity.Name; target.Disconnect(); - PacketSender.SendGlobalMsg(Strings.Player.serverkicked.ToString(name)); - Console.WriteLine($@" {Strings.Player.serverkicked.ToString(name)}"); + PacketSender.SendGlobalMsg(Strings.Player.ServerKicked.ToString(name)); + Console.WriteLine($@" {Strings.Player.ServerKicked.ToString(name)}"); } } diff --git a/Intersect.Server/Core/Commands/KillCommand.cs b/Intersect.Server/Core/Commands/KillCommand.cs index 6e7c22476c..110bdcf890 100644 --- a/Intersect.Server/Core/Commands/KillCommand.cs +++ b/Intersect.Server/Core/Commands/KillCommand.cs @@ -16,7 +16,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target?.Entity == null) { - Console.WriteLine($@" {Strings.Player.offline}"); + Console.WriteLine($@" {Strings.Player.Offline}"); return; } @@ -26,8 +26,8 @@ protected override void HandleTarget(ServerContext context, ParserResult result, target.Entity.Die(); } - PacketSender.SendGlobalMsg($@" {Strings.Player.serverkilled.ToString(target.Entity.Name)}"); - Console.WriteLine($@" {Strings.Commandoutput.killsuccess.ToString(target.Entity.Name)}"); + PacketSender.SendGlobalMsg($@" {Strings.Player.ServerKilled.ToString(target.Entity.Name)}"); + Console.WriteLine($@" {Strings.Commandoutput.KillSuccess.ToString(target.Entity.Name)}"); } } diff --git a/Intersect.Server/Core/Commands/MetricsCommand.cs b/Intersect.Server/Core/Commands/MetricsCommand.cs index 9dcd84a7a5..2fb0fa7dbd 100644 --- a/Intersect.Server/Core/Commands/MetricsCommand.cs +++ b/Intersect.Server/Core/Commands/MetricsCommand.cs @@ -37,7 +37,7 @@ protected override void HandleValue(ServerContext context, ParserResult result) Options.Instance.Metrics.Enable = true; Options.SaveToDisk(); } - Console.WriteLine(Options.Instance.Metrics.Enable ? Strings.Commandoutput.metricsenabled.ToString() : Strings.Commandoutput.metricsdisabled.ToString()); + Console.WriteLine(Options.Instance.Metrics.Enable ? Strings.Commandoutput.MetricsEnabled.ToString() : Strings.Commandoutput.MetricsDisabled.ToString()); } } } \ No newline at end of file diff --git a/Intersect.Server/Core/Commands/ModeratorActionCommand.cs b/Intersect.Server/Core/Commands/ModeratorActionCommand.cs index 0ae6072de4..395124852b 100644 --- a/Intersect.Server/Core/Commands/ModeratorActionCommand.cs +++ b/Intersect.Server/Core/Commands/ModeratorActionCommand.cs @@ -34,7 +34,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target == null) { - Console.WriteLine($@" {Strings.Player.offline}"); + Console.WriteLine($@" {Strings.Player.Offline}"); return; } diff --git a/Intersect.Server/Core/Commands/MuteCommand.cs b/Intersect.Server/Core/Commands/MuteCommand.cs index d86de4070d..c8ff982944 100644 --- a/Intersect.Server/Core/Commands/MuteCommand.cs +++ b/Intersect.Server/Core/Commands/MuteCommand.cs @@ -19,7 +19,7 @@ protected override void HandleClient(ServerContext context, Client target, int d { if (target.Entity == null) { - Console.WriteLine($@" {Strings.Player.offline}"); + Console.WriteLine($@" {Strings.Player.Offline}"); return; } @@ -29,12 +29,12 @@ protected override void HandleClient(ServerContext context, Client target, int d if (string.IsNullOrEmpty(Mute.FindMuteReason(target.User.Id, ""))) { Mute.Add(target, duration, reason, Strings.Commands.muteuser, ip ? target.Ip : ""); - PacketSender.SendGlobalMsg(Strings.Account.muted.ToString(name)); - Console.WriteLine($@" {Strings.Account.muted.ToString(name)}"); + PacketSender.SendGlobalMsg(Strings.Account.Muted.ToString(name)); + Console.WriteLine($@" {Strings.Account.Muted.ToString(name)}"); } else { - Console.WriteLine($@" {Strings.Account.alreadymuted.ToString(name)}"); + Console.WriteLine($@" {Strings.Account.AlreadyMuted.ToString(name)}"); } } diff --git a/Intersect.Server/Core/Commands/OnlineListCommand.cs b/Intersect.Server/Core/Commands/OnlineListCommand.cs index 785357e198..d9b4a8bc68 100644 --- a/Intersect.Server/Core/Commands/OnlineListCommand.cs +++ b/Intersect.Server/Core/Commands/OnlineListCommand.cs @@ -21,8 +21,8 @@ protected override void HandleValue(ServerContext context, ParserResult result) var columnWidths = new[] { 37, - -Strings.Commandoutput.listaccount.ToString().Length, - -Strings.Commandoutput.listcharacter.ToString().Length, + -Strings.Commandoutput.ListAccount.ToString().Length, + -Strings.Commandoutput.ListCharacter.ToString().Length, 37, }; var resizableColumns = columnWidths.Count(columnWidth => columnWidth < 1); @@ -64,14 +64,14 @@ protected override void HandleValue(ServerContext context, ParserResult result) if (clients.Length > 0) { Console.WriteLine( - Strings.Commandoutput.OnlineListActiveConnectionsN.ToString(context.Network.ConnectionCount) + Strings.Commandoutput.ActiveConnections.ToString(context.Network.ConnectionCount) ); Console.WriteLine( formatLine, - Strings.Commandoutput.listid, - Strings.Commandoutput.listaccount, - Strings.Commandoutput.listcharacter, + Strings.Commandoutput.ListId, + Strings.Commandoutput.ListAccount, + Strings.Commandoutput.ListCharacter, "Connection ID" ); @@ -92,7 +92,7 @@ protected override void HandleValue(ServerContext context, ParserResult result) } else { - Console.WriteLine(Strings.Commandoutput.OnlineListNoClientsConnected); + Console.WriteLine(Strings.Commandoutput.NoClientsConnected); } var strayConnections = @@ -101,7 +101,7 @@ protected override void HandleValue(ServerContext context, ParserResult result) // ReSharper disable once InvertIf if (strayConnections.Length > 0) { - Console.WriteLine(Strings.Commandoutput.OnlineListStrayConnectionsN.ToString(strayConnections.Length)); + Console.WriteLine(Strings.Commandoutput.StrayConnections.ToString(strayConnections.Length)); foreach (var connection in strayConnections) { diff --git a/Intersect.Server/Core/Commands/PowerAccountCommand.cs b/Intersect.Server/Core/Commands/PowerAccountCommand.cs index 7b043690b7..1df737282a 100644 --- a/Intersect.Server/Core/Commands/PowerAccountCommand.cs +++ b/Intersect.Server/Core/Commands/PowerAccountCommand.cs @@ -26,7 +26,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, var power = result.Find(Power); if (DbInterface.SetPlayerPower(target, power.AsUserRights())) { - Console.WriteLine($@" {Strings.Commandoutput.powerchanged.ToString(target?.Name)}"); + Console.WriteLine($@" {Strings.Commandoutput.PowerChanged.ToString(target?.Name)}"); } } diff --git a/Intersect.Server/Core/Commands/PowerCommand.cs b/Intersect.Server/Core/Commands/PowerCommand.cs index 4631906bdc..cba61e2bb2 100644 --- a/Intersect.Server/Core/Commands/PowerCommand.cs +++ b/Intersect.Server/Core/Commands/PowerCommand.cs @@ -25,14 +25,14 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target?.Entity == null) { - Console.WriteLine($@" {Strings.Player.offline}"); + Console.WriteLine($@" {Strings.Player.Offline}"); return; } if (target.Name == null) { - Console.WriteLine($@" {Strings.Account.notfound}"); + Console.WriteLine($@" {Strings.Account.NotFound}"); return; } @@ -42,11 +42,11 @@ protected override void HandleTarget(ServerContext context, ParserResult result, PacketSender.SendEntityDataToProximity(target.Entity); PacketSender.SendGlobalMsg( power != Access.None - ? Strings.Player.admin.ToString(target.Entity.Name) - : Strings.Player.deadmin.ToString(target.Entity.Name) + ? Strings.Player.Admin.ToString(target.Entity.Name) + : Strings.Player.Deadmin.ToString(target.Entity.Name) ); - Console.WriteLine($@" {Strings.Commandoutput.powerchanged.ToString(target.Entity.Name)}"); + Console.WriteLine($@" {Strings.Commandoutput.PowerChanged.ToString(target.Entity.Name)}"); } } diff --git a/Intersect.Server/Core/Commands/UnbanCommand.cs b/Intersect.Server/Core/Commands/UnbanCommand.cs index 3fa0e9731f..bf5e000304 100644 --- a/Intersect.Server/Core/Commands/UnbanCommand.cs +++ b/Intersect.Server/Core/Commands/UnbanCommand.cs @@ -16,7 +16,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target == null) { - Console.WriteLine($@" {Strings.Account.notfound.ToString(result.Find(Target))}"); + Console.WriteLine($@" {Strings.Account.NotFound.ToString(result.Find(Target))}"); return; } diff --git a/Intersect.Server/Core/Commands/UnmuteCommand.cs b/Intersect.Server/Core/Commands/UnmuteCommand.cs index 290eb801f4..e632df91a2 100644 --- a/Intersect.Server/Core/Commands/UnmuteCommand.cs +++ b/Intersect.Server/Core/Commands/UnmuteCommand.cs @@ -16,7 +16,7 @@ protected override void HandleTarget(ServerContext context, ParserResult result, { if (target == null) { - Console.WriteLine($@" {Strings.Account.notfound.ToString(result.Find(Target))}"); + Console.WriteLine($@" {Strings.Account.NotFound.ToString(result.Find(Target))}"); return; } diff --git a/Intersect.Server/Core/ConsoleService.ConsoleThread.cs b/Intersect.Server/Core/ConsoleService.ConsoleThread.cs index aa0e4745f9..09c43d34ba 100644 --- a/Intersect.Server/Core/ConsoleService.ConsoleThread.cs +++ b/Intersect.Server/Core/ConsoleService.ConsoleThread.cs @@ -75,7 +75,7 @@ protected override void ThreadStart(ServerContext serverContext) throw new ArgumentNullException(nameof(serverContext)); } - Console.WriteLine(Strings.Intro.consoleactive); + Console.WriteLine(Strings.Intro.ConsoleActive); try { while (serverContext.IsRunning && !mDoNotContinue) diff --git a/Intersect.Server/Core/FullServerContext.cs b/Intersect.Server/Core/FullServerContext.cs index 4328b269fe..c19c236e30 100644 --- a/Intersect.Server/Core/FullServerContext.cs +++ b/Intersect.Server/Core/FullServerContext.cs @@ -124,7 +124,7 @@ internal void CheckNetwork() if (Options.UPnP && !StartupOptions.NoNatPunchthrough) { - Log.Pretty.Info(Strings.Portchecking.PortNotOpenTryingUPnP.ToString(Options.ServerPort)); + Log.Pretty.Info(Strings.Portchecking.PortNotOpenTryingUpnp.ToString(Options.ServerPort)); Console.WriteLine(); if (TryUPnP()) @@ -138,31 +138,31 @@ internal void CheckNetwork() } else { - Log.Pretty.Warn(Strings.Portchecking.UPnPFailed); + Log.Pretty.Warn(Strings.Portchecking.RouterUpnpFailed); } } else { - Log.Pretty.Warn(Strings.Portchecking.PortNotOpenUPnPDisabled.ToString(Options.ServerPort)); + Log.Pretty.Warn(Strings.Portchecking.PortNotOpenUpnpDisabled.ToString(Options.ServerPort)); } } else if (Options.UPnP) { - Log.Pretty.Info(Strings.Portchecking.TryingUPnP); + Log.Pretty.Info(Strings.Portchecking.TryingUpnp); Console.WriteLine(); if (TryUPnP()) { - Log.Pretty.Info(Strings.Portchecking.UPnPSucceededPortCheckerDisabled); + Log.Pretty.Info(Strings.Portchecking.UpnpSucceededPortCheckerDisabled); } else { - Log.Pretty.Warn(Strings.Portchecking.UPnPFailed); + Log.Pretty.Warn(Strings.Portchecking.RouterUpnpFailed); } } else { - Log.Pretty.Warn(Strings.Portchecking.PortCheckerAndUPnPDisabled); + Log.Pretty.Warn(Strings.Portchecking.PortCheckerAndUpnpDisabled); } } @@ -179,7 +179,7 @@ private bool TryUPnP() return true; } - Console.WriteLine(Strings.Portchecking.checkrouterupnp); + Console.WriteLine(Strings.Portchecking.CheckRouterUpnp); return false; } @@ -201,19 +201,19 @@ private bool CheckPort() if (!string.IsNullOrEmpty(externalIp)) { - Console.WriteLine(Strings.Portchecking.connectioninfo); - Console.WriteLine(Strings.Portchecking.publicip, externalIp); - Console.WriteLine(Strings.Portchecking.publicport, Options.ServerPort); + Console.WriteLine(Strings.Portchecking.ConnectionInfo); + Console.WriteLine(Strings.Portchecking.PublicIp, externalIp); + Console.WriteLine(Strings.Portchecking.PublicPort, Options.ServerPort); } if (portCheckResult == PortCheckResult.Inaccessible) { Console.WriteLine(); - Console.WriteLine(Strings.Portchecking.debuggingsteps); - Console.WriteLine(Strings.Portchecking.checkfirewalls); - Console.WriteLine(Strings.Portchecking.checkantivirus); - Console.WriteLine(Strings.Portchecking.screwed); + Console.WriteLine(Strings.Portchecking.DebuggingSteps); + Console.WriteLine(Strings.Portchecking.CheckFirewalls); + Console.WriteLine(Strings.Portchecking.AntivirusCheck); + Console.WriteLine(Strings.Portchecking.WithinRestrictedNetwork); } Console.WriteLine(); diff --git a/Intersect.Server/Networking/Helpers/NetDebug.cs b/Intersect.Server/Networking/Helpers/NetDebug.cs index 1565234302..b0d1f0091e 100644 --- a/Intersect.Server/Networking/Helpers/NetDebug.cs +++ b/Intersect.Server/Networking/Helpers/NetDebug.cs @@ -25,7 +25,7 @@ public static partial class NetDebug public static void GenerateDebugFile() { - Console.WriteLine(Strings.NetDebug.pleasewait); + Console.WriteLine(Strings.NetDebug.PleaseWait); var hasteClient = new HasteBinClient("https://hastebin.com"); var sb = new StringBuilder(); sb.AppendLine("Intersect Network Diagnostics"); @@ -119,12 +119,12 @@ public static void GenerateDebugFile() { Bootstrapper.MainThread.NextAction = () => { - Console.WriteLine(Strings.NetDebug.hastebin.ToString(result.Result.FullUrl)); + Console.WriteLine(Strings.NetDebug.Hastebin.ToString(result.Result.FullUrl)); }; } else { - Console.WriteLine(Strings.NetDebug.savedtofile); + Console.WriteLine(Strings.NetDebug.SavedToFile); File.WriteAllText("netdebug.txt", sb.ToString()); } } diff --git a/Intersect.Server/Networking/Helpers/UPnP.cs b/Intersect.Server/Networking/Helpers/UPnP.cs index d368a39a87..574b8dfb37 100644 --- a/Intersect.Server/Networking/Helpers/UPnP.cs +++ b/Intersect.Server/Networking/Helpers/UPnP.cs @@ -30,13 +30,13 @@ public static async Task ConnectNatDevice() var cts = new CancellationTokenSource(5000); sDevice = await nat.DiscoverDeviceAsync(PortMapper.Upnp, cts); sExternalIp = (await sDevice.GetExternalIPAsync()).ToString(); - Log.Pretty.Info(Strings.Upnp.initialized); + Log.Pretty.Info(Strings.Upnp.Initialized); sLog.AppendLine("Connected to UPnP device: " + sDevice.ToString()); } catch (Exception exception) { - Log.Pretty.Error(exception, Strings.Upnp.initializationfailed); - sLog.AppendLine(Strings.Upnp.initializationfailed); + Log.Pretty.Error(exception, Strings.Upnp.InitializationFailed); + sLog.AppendLine(Strings.Upnp.InitializationFailed); sLog.AppendLine("UPnP Initialization Error: " + exception.ToString()); } @@ -62,14 +62,14 @@ public static async Task OpenServerPort(int port, Protocol protocol) switch (protocol) { case Protocol.Tcp: - Log.Pretty.Info(Strings.Upnp.forwardedtcp.ToString(port)); - sLog.AppendLine(Strings.Upnp.forwardedtcp.ToString(port)); + Log.Pretty.Info(Strings.Upnp.ForwardedTcp.ToString(port)); + sLog.AppendLine(Strings.Upnp.ForwardedTcp.ToString(port)); break; case Protocol.Udp: - Log.Pretty.Info(Strings.Upnp.forwardedudp.ToString(port)); - sLog.AppendLine(Strings.Upnp.forwardedudp.ToString(port)); + Log.Pretty.Info(Strings.Upnp.ForwardedUdp.ToString(port)); + sLog.AppendLine(Strings.Upnp.ForwardedUdp.ToString(port)); sPortForwarded = true; break; @@ -83,14 +83,14 @@ public static async Task OpenServerPort(int port, Protocol protocol) switch (protocol) { case Protocol.Tcp: - Log.Pretty.Warn(Strings.Upnp.failedforwardingtcp.ToString(port)); + Log.Pretty.Warn(Strings.Upnp.FailedForwardingTcp.ToString(port)); Log.Warn("UPnP Could Not Open TCP Port " + port + Environment.NewLine + ex.ToString()); sLog.AppendLine("UPnP Could Not Open TCP Port " + port + Environment.NewLine + ex.ToString()); break; case Protocol.Udp: - Log.Pretty.Warn(Strings.Upnp.failedforwardingudp.ToString(port)); + Log.Pretty.Warn(Strings.Upnp.FailedForwardingUdp.ToString(port)); Log.Warn("UPnP Could Not Open UDP Port " + port + Environment.NewLine + ex.ToString()); sLog.AppendLine("UPnP Could Not Open UDP Port " + port + Environment.NewLine + ex.ToString()); diff --git a/Intersect.Server/Networking/NetworkedPacketHandler.cs b/Intersect.Server/Networking/NetworkedPacketHandler.cs index 7c0b7eccb7..69406b5eba 100644 --- a/Intersect.Server/Networking/NetworkedPacketHandler.cs +++ b/Intersect.Server/Networking/NetworkedPacketHandler.cs @@ -51,7 +51,7 @@ public void HandlePacket(Client client, RequestPasswordResetPacket packet) { if (client.TimeoutMs > Timing.Global.Milliseconds) { - PacketSender.SendError(client, Strings.Errors.errortimeout); + PacketSender.SendError(client, Strings.Errors.ErrorTimeout, Strings.General.NoticeError); client.ResetTimeout(); return; @@ -66,7 +66,7 @@ public void HandlePacket(Client client, RequestPasswordResetPacket packet) var email = new PasswordResetEmail(user); if (!email.Send()) { - PacketSender.SendError(client, Strings.Account.emailfail); + PacketSender.SendError(client, Strings.Account.EmailFail, Strings.General.NoticeError); } } else @@ -92,7 +92,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.LoginPacket packe { if (client.AccountAttempts > 3 && client.TimeoutMs > Timing.Global.Milliseconds) { - PacketSender.SendError(client, Strings.Errors.errortimeout); + PacketSender.SendError(client, Strings.Errors.ErrorTimeout, Strings.General.NoticeError); client.ResetTimeout(); return; @@ -106,7 +106,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.LoginPacket packe UserActivityHistory.LogActivity(Guid.Empty, Guid.Empty, client?.Ip, UserActivityHistory.PeerType.Editor, UserActivityHistory.UserAction.FailedLogin, packet.Username); client.FailedAttempt(); - PacketSender.SendError(client, Strings.Account.badlogin); + PacketSender.SendError(client, Strings.Account.BadLogin, Strings.General.NoticeError); return; } @@ -114,7 +114,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.LoginPacket packe if (!user.Power.Editor) { client.FailedAttempt(); - PacketSender.SendError(client, Strings.Account.badaccess); + PacketSender.SendError(client, Strings.Account.BadAccess, Strings.General.NoticeError); return; } @@ -456,7 +456,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.MapListUpdatePack if (packet.ParentId == Guid.Empty) { parent = default; - MapList.List.AddFolder(Strings.Mapping.newfolder); + MapList.List.AddFolder(Strings.Mapping.NewFolder); break; } @@ -471,7 +471,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.MapListUpdatePack } currentList = parent?.Children ?? MapList.List; - currentList.AddFolder(Strings.Mapping.newfolder); + currentList.AddFolder(Strings.Mapping.NewFolder); break; case MapListUpdate.Rename: @@ -527,7 +527,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.MapListUpdatePack if (MapController.Lookup.Count < 2) { - PacketSender.SendError(client, Strings.Mapping.lastmaperror, Strings.Mapping.lastmap); + PacketSender.SendError(client, Strings.Mapping.LastMapError, Strings.Mapping.LastMap); return; } @@ -694,11 +694,11 @@ public void HandlePacket(Client client, Network.Packets.Editor.LinkMapPacket pac //Incompatible Link! PacketSender.SendError( client, - Strings.Mapping.linkfailerror.ToString( + Strings.Mapping.LinkFailureError.ToString( MapBase.GetName(linkMapId), MapBase.GetName(adjacentMapId), MapBase.GetName(adjacentGrid.MapIdGrid[x, y]), MapBase.GetName(linkGrid.MapIdGrid[x + xOffset, y + yOffset]) - ), Strings.Mapping.linkfail + ), Strings.Mapping.LinkFailure ); return; @@ -857,7 +857,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.DeleteGameObjectP case GameObjectType.Class: if (ClassBase.Lookup.Count == 1) { - PacketSender.SendError(client, Strings.Classes.lastclasserror, Strings.Classes.lastclass); + PacketSender.SendError(client, Strings.Classes.LastClassError, Strings.Classes.LastClass); return; } diff --git a/Intersect.Server/Notifications/Notification.cs b/Intersect.Server/Notifications/Notification.cs index 592a039e2c..79cd6409dc 100644 --- a/Intersect.Server/Notifications/Notification.cs +++ b/Intersect.Server/Notifications/Notification.cs @@ -117,8 +117,8 @@ protected bool LoadFromTemplate(string templatename, string username) { IsHtml = true; Body = File.ReadAllText(filepath); - Body = Body.Replace("{{product}}", Strings.Notifications.product); - Body = Body.Replace("{{copyright}}", Strings.Notifications.copyright); + Body = Body.Replace("{{product}}", Strings.Notifications.Product); + Body = Body.Replace("{{copyright}}", Strings.Notifications.Copyright); Body = Body.Replace("{{name}}", username); return true; diff --git a/Intersect.Server/Notifications/ResetPassword.cs b/Intersect.Server/Notifications/ResetPassword.cs index ff89e309db..3705b1dab7 100644 --- a/Intersect.Server/Notifications/ResetPassword.cs +++ b/Intersect.Server/Notifications/ResetPassword.cs @@ -14,7 +14,7 @@ public partial class PasswordResetEmail : Notification public PasswordResetEmail(User user) : base(user.Email) { LoadFromTemplate("PasswordReset", user.Name); - Subject = Strings.PasswordResetNotification.subject; + Subject = Strings.PasswordResetNotification.Subject; var resetCode = GenerateResetCode(6); Body = Body.Replace("{{code}}", resetCode); Body = Body.Replace("{{expiration}}", Options.PasswordResetExpirationMinutes.ToString()); diff --git a/Intersect.Server/Web/RestApi/Routes/V1/GuildController.cs b/Intersect.Server/Web/RestApi/Routes/V1/GuildController.cs index 30bf958814..ed203cd355 100644 --- a/Intersect.Server/Web/RestApi/Routes/V1/GuildController.cs +++ b/Intersect.Server/Web/RestApi/Routes/V1/GuildController.cs @@ -78,7 +78,7 @@ public object GuildGet(Guid guildId) [HttpPost("{guildId:guid}/name")] public object ChangeName(Guid guildId, [FromBody] NameChange change) { - if (!FieldChecking.IsValidGuildName(change.Name, Strings.Regex.guildname)) + if (!FieldChecking.IsValidGuildName(change.Name, Strings.Regex.GuildName)) { return BadRequest($@"Invalid guild name."); } diff --git a/Intersect.Server/Web/RestApi/Routes/V1/PlayerController.cs b/Intersect.Server/Web/RestApi/Routes/V1/PlayerController.cs index 9981220dc8..e7a9230793 100644 --- a/Intersect.Server/Web/RestApi/Routes/V1/PlayerController.cs +++ b/Intersect.Server/Web/RestApi/Routes/V1/PlayerController.cs @@ -265,7 +265,7 @@ public object ChangeName(LookupKey lookupKey, [FromBody] NameChange change) return BadRequest(lookupKey.IsIdInvalid ? @"Invalid player id." : @"Invalid player name."); } - if (!FieldChecking.IsValidUsername(change.Name, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(change.Name, Strings.Regex.Username)) { return BadRequest($@"Invalid name."); } @@ -817,7 +817,7 @@ AdminActionParameters actionParameters } else if (Ban.Find(userId) != null) // If the target is already banned. { - return BadRequest(Strings.Account.alreadybanned.ToString(player.Name)); + return BadRequest(Strings.Account.AlreadyBanned.ToString(player.Name)); } // If target is online, not yet banned and the banner has the authority to ban. @@ -833,10 +833,10 @@ AdminActionParameters actionParameters client?.Disconnect(); // Sends a global chat message to every user online about the banned player. - PacketSender.SendGlobalMsg(Strings.Account.banned.ToString(player.Name)); + PacketSender.SendGlobalMsg(Strings.Account.Banned.ToString(player.Name)); // Inform to the API about the successful ban. - return Ok(Strings.Account.banned.ToString(player.Name)); + return Ok(Strings.Account.Banned.ToString(player.Name)); } case AdminAction.UnBan: @@ -854,7 +854,7 @@ AdminActionParameters actionParameters } else if (Mute.Find(userId) != null) // If the target is already muted. { - return BadRequest(Strings.Account.alreadymuted.ToString(player.Name)); + return BadRequest(Strings.Account.AlreadyMuted.ToString(player.Name)); } // If target is online, not yet muted and the action performer has the authority to mute. @@ -875,9 +875,9 @@ AdminActionParameters actionParameters ); } - PacketSender.SendGlobalMsg(Strings.Account.muted.ToString(player.Name)); + PacketSender.SendGlobalMsg(Strings.Account.Muted.ToString(player.Name)); - return Ok(Strings.Account.muted.ToString(player.Name)); + return Ok(Strings.Account.Muted.ToString(player.Name)); } case AdminAction.UnMute: @@ -928,9 +928,9 @@ AdminActionParameters actionParameters else { client.Disconnect(actionParameters.Reason); - PacketSender.SendGlobalMsg(Strings.Player.serverkicked.ToString(player.Name)); + PacketSender.SendGlobalMsg(Strings.Player.ServerKicked.ToString(player.Name)); - return Ok(Strings.Player.serverkicked.ToString(player.Name)); + return Ok(Strings.Player.ServerKicked.ToString(player.Name)); } } @@ -952,9 +952,9 @@ AdminActionParameters actionParameters client.Entity.Die(); } - PacketSender.SendGlobalMsg(Strings.Player.serverkilled.ToString(player.Name)); + PacketSender.SendGlobalMsg(Strings.Player.ServerKilled.ToString(player.Name)); - return Ok(Strings.Commandoutput.killsuccess.ToString(player.Name)); + return Ok(Strings.Commandoutput.KillSuccess.ToString(player.Name)); } } @@ -971,7 +971,7 @@ AdminActionParameters actionParameters return NotImplemented(adminAction.ToString()); } - return NotFound(Strings.Player.offline); + return NotFound(Strings.Player.Offline); } } } diff --git a/Intersect.Server/Web/RestApi/Routes/V1/UserController.cs b/Intersect.Server/Web/RestApi/Routes/V1/UserController.cs index f2c1e1da44..e64f0449f6 100644 --- a/Intersect.Server/Web/RestApi/Routes/V1/UserController.cs +++ b/Intersect.Server/Web/RestApi/Routes/V1/UserController.cs @@ -118,12 +118,12 @@ public object RegisterUser([FromBody] UserInfo user) return BadRequest("Username, Email, and Password all must be provided, and not null/empty."); } - if (!FieldChecking.IsWellformedEmailAddress(user.Email, Strings.Regex.email)) + if (!FieldChecking.IsWellformedEmailAddress(user.Email, Strings.Regex.Email)) { return BadRequest($@"Malformed email address '{user.Email}'."); } - if (!FieldChecking.IsValidUsername(user.Username, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(user.Username, Strings.Regex.Username)) { return BadRequest($@"Invalid username '{user.Username}'."); } @@ -223,7 +223,7 @@ public object ChangeNameByUsername(string userName, [FromBody] NameChange change return BadRequest("Invalid user name."); } - if (!FieldChecking.IsValidUsername(change.Name, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(change.Name, Strings.Regex.Username)) { return BadRequest($@"Invalid name."); } @@ -254,7 +254,7 @@ public object ChangeNameById(Guid userId, [FromBody] NameChange change) return BadRequest($@"Invalid user id '{userId}'."); } - if (!FieldChecking.IsValidUsername(change.Name, Strings.Regex.username)) + if (!FieldChecking.IsValidUsername(change.Name, Strings.Regex.Username)) { return BadRequest($@"Invalid name."); } @@ -451,7 +451,7 @@ public object UserChangeEmailByName(string userName, [FromBody] AdminChange auth return BadRequest($@"Malformed email address '{email}'."); } - if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.email)) + if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.Email)) { return BadRequest($@"Malformed email address '{email}'."); } @@ -490,7 +490,7 @@ public object UserChangeEmailById(Guid userId, [FromBody] AdminChange authorized return BadRequest($@"Malformed email address '{email}'."); } - if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.email)) + if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.Email)) { return BadRequest($@"Malformed email address '{email}'."); } @@ -528,7 +528,7 @@ public object UserChangeEmailByName(string userName, [FromBody] AuthorizedChange return BadRequest($@"Malformed email address '{email}'."); } - if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.email)) + if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.Email)) { return BadRequest($@"Malformed email address '{email}'."); } @@ -571,7 +571,7 @@ public object UserChangeEmailById(Guid userId, [FromBody] AuthorizedChange autho return BadRequest($@"Malformed email address '{email}'."); } - if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.email)) + if (!FieldChecking.IsWellformedEmailAddress(email, Strings.Regex.Email)) { return BadRequest($@"Malformed email address '{email}'."); } @@ -951,7 +951,7 @@ AdminActionParameters actionParameters } else if (Ban.Find(user.Id) != null) // If the target is already banned. { - return BadRequest(Strings.Account.alreadybanned.ToString(user.Name)); + return BadRequest(Strings.Account.AlreadyBanned.ToString(user.Name)); } // If target is online, not yet banned and the banner has the authority to ban. @@ -967,10 +967,10 @@ AdminActionParameters actionParameters client?.Disconnect(); // Sends a global chat message to every user online about the banned player. - PacketSender.SendGlobalMsg(Strings.Account.banned.ToString(user.Name)); + PacketSender.SendGlobalMsg(Strings.Account.Banned.ToString(user.Name)); // Inform to the API about the successful ban. - return Ok(Strings.Account.banned.ToString(user.Name)); + return Ok(Strings.Account.Banned.ToString(user.Name)); } case AdminAction.UnBan: @@ -988,7 +988,7 @@ AdminActionParameters actionParameters } else if (Mute.Find(user) != null) // If the target is already muted. { - return BadRequest(Strings.Account.alreadymuted.ToString(user.Name)); + return BadRequest(Strings.Account.AlreadyMuted.ToString(user.Name)); } // If target is online, not yet muted and the action performer has the authority to mute. @@ -999,9 +999,9 @@ AdminActionParameters actionParameters actionPerformer.Name, actionParameters.Ip ? targetIp : string.Empty ); - PacketSender.SendGlobalMsg(Strings.Account.muted.ToString(user.Name)); + PacketSender.SendGlobalMsg(Strings.Account.Muted.ToString(user.Name)); - return Ok(Strings.Account.muted.ToString(user.Name)); + return Ok(Strings.Account.Muted.ToString(user.Name)); } case AdminAction.UnMute: @@ -1049,9 +1049,9 @@ AdminActionParameters actionParameters else { client.Disconnect(actionParameters.Reason); - PacketSender.SendGlobalMsg(Strings.Player.serverkicked.ToString(player?.Name)); + PacketSender.SendGlobalMsg(Strings.Player.ServerKicked.ToString(player?.Name)); - return Ok(Strings.Player.serverkicked.ToString(player?.Name)); + return Ok(Strings.Player.ServerKicked.ToString(player?.Name)); } } @@ -1073,9 +1073,9 @@ AdminActionParameters actionParameters client.Entity.Die(); } - PacketSender.SendGlobalMsg(Strings.Player.serverkilled.ToString(player?.Name)); + PacketSender.SendGlobalMsg(Strings.Player.ServerKilled.ToString(player?.Name)); - return Ok(Strings.Commandoutput.killsuccess.ToString(player?.Name)); + return Ok(Strings.Commandoutput.KillSuccess.ToString(player?.Name)); } } @@ -1092,7 +1092,7 @@ AdminActionParameters actionParameters return NotImplemented(adminAction.ToString()); } - return NotFound(Strings.Player.offline); + return NotFound(Strings.Player.Offline); } #endregion