提交: 8fd88dcb4ab0a1fe38b74b43b44c7c57d2795260 - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• 修訂: 8fd88dcb4ab0a1fe38b74b43b44c7c57d2795260 (tree)
• 時間: 2019-08-31 05:45:50
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Enabled multi-lingual Rules text support,
Game time elapsed message for players joining,
Version bump & V1.10 API update (lang code)

Change Summary

• modified: AdminToolkit/AdminToolkitMod.cs
• modified: AdminToolkit/Commands/RulesCommand.cs
• modified: AdminToolkit/MechTurk.cs
• modified: AdminToolkit/modinfo.json

差異

--- a/AdminToolkit/AdminToolkitMod.cs
+++ b/AdminToolkit/AdminToolkitMod.cs
@@ -22,6 +22,7 @@ namespace AdminToolkit
 		 * Server RULES Printout {richtext / multi-linugual }
 		 * Optional: ACCEPTANCE / REJECT of server rules {changes players role}
 		 * List all Admins (online or offline) & track last logoff date
+		 * Keeps track of Elapsed game calendar days for players
 		 * { Alter ADMIN text to look 'different' }
 		 * Cyclic automatic Backups
 		 */
@@ -51,6 +52,7 @@ namespace AdminToolkit
 			};
 
 		internal const string _lastLoginKey = @"LastLogin";
+		internal const string _lastGameDayCountKey = @"LastDayCount";
 		internal const string _configFilename = @"admintoolkit.json";
 
 		internal static List<string> AdminRoles;	
@@ -97,7 +99,7 @@ namespace AdminToolkit
 			if (CachedConfiguration.BoomingVoice) {
 				this.ServerAPI.Event.PlayerChat += BoomingVoiceOfAuthority;
 			}
-
+			//TODO: Server MOTD / Name, DYNAMIC status info [season, moon-phase, events... ect]
 
 			this.ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, SaveConfigSettings);
 		}

--- a/AdminToolkit/Commands/RulesCommand.cs
+++ b/AdminToolkit/Commands/RulesCommand.cs
@@ -42,10 +42,10 @@ namespace AdminToolkit
 			Rules = new Dictionary<string, List<string>>( );
 			RulesPath = ServerAPI.GetOrCreateDataPath(_rulesPathKey);
 
-			string[] lang_codes = { "en", /*"fr", "es", "de", "ru", "kr" */};//FIXME: this should not be hardcoded
+			string[] lang_codes = { "en", "de", "it", "fr",  "pt-br", "ru" };//FIXME: this should extracted from language codes
 
 			foreach (var languageCode in lang_codes) {
-				//For each locale that is configured... get/create rules.txt
+				//For each locale that is configured... get rules_?.txt
 				string rulesFilePath = Path.Combine(RulesPath, $"rules_{languageCode}.txt");
 				if (File.Exists(rulesFilePath)) {
 					using (var ruleFileStream = File.OpenRead(rulesFilePath)) {
@@ -68,7 +68,7 @@ namespace AdminToolkit
 						ruleReader.Close( );
 					}
 				} else {
-					Logger.Error("Non existant '{0}' file for Rules-text!!!", $"rules_{languageCode}.txt");
+					Logger.Warning("Non existant '{0}' file for Rules-text", $"rules_{languageCode}.txt");
 				}
 			}
 		}
@@ -114,23 +114,6 @@ namespace AdminToolkit
 			if (args.Length == 1) {
 				string word = args.PopWord( );
 
-				/*
-				#if DEBUG
-				if (string.Compare("demote", word, StringComparison.InvariantCultureIgnoreCase) == 0) 
-				{ 
-					IPlayerRole restrainRole = ServerAPI.Server.Config.Roles.Single(rl => string.Compare(rl.Code, this.CachedConfiguration.PlayerRoleRestrain, StringComparison.InvariantCultureIgnoreCase) == 0);
-					player.SendMessage(groupId, $"{player.PlayerName} was demoted", EnumChatType.CommandSuccess);
-					ServerAPI.Permissions.SetRole(player, restrainRole.Code);
-				}
-
-				if (string.Compare("promote", word, StringComparison.InvariantCultureIgnoreCase) == 0) {
-					IPlayerRole normalRole = ServerAPI.Server.Config.Roles.Single(rl => string.Compare(rl.Code, this.CachedConfiguration.PlayerRoleNormal, StringComparison.InvariantCultureIgnoreCase) == 0);
-					player.SendMessage(groupId, $"{player.PlayerName} was promoted", EnumChatType.CommandSuccess);
-					ServerAPI.Permissions.SetRole(player, normalRole.Code);
-				}
-				#endif
-				*/
-
 				if (string.Compare(_acceptKeyword, word, StringComparison.InvariantCultureIgnoreCase) == 0) {
 
 					if (CheckRuleAccepted(player) == false) {
@@ -144,7 +127,7 @@ namespace AdminToolkit
 				}
 
 			} else {
-				var targetLocale = "en";//TODO: actually get locale!
+				var targetLocale = player.LanguageCode;
 
 				if (Rules.ContainsKey(targetLocale)) {
 
@@ -153,15 +136,16 @@ namespace AdminToolkit
 						player.SendMessage(groupId, line, EnumChatType.OthersMessage);
 					}
 				} else {
-					player.SendMessage(groupId, "* MISSING RULES FILE ! *", EnumChatType.CommandError);
+					//Subsitute rules?
+					player.SendMessage(groupId, $"* MISSING RULES FILE ({targetLocale})! *", EnumChatType.CommandError);
 				}
 			}
 		}
 
-			/// <summary>
-			/// Send Rule info text or Admin welcome
-			/// </summary>
-			/// <param name="byPlayer">By player.</param>
+		/// <summary>
+		/// Send Rule info text or Admin welcome, plus other info
+		/// </summary>
+		/// <param name="byPlayer">By player.</param>
 		private void UponJoin(IServerPlayer byPlayer)
 		{
 			if (AdminToolkit.AdminRoles.Contains(byPlayer.Role.Code)) {
@@ -174,11 +158,10 @@ namespace AdminToolkit
 				ServerAPI.SendMessageToGroup(GlobalConstants.AllChatGroups, adminMessage.ToString( ), EnumChatType.AllGroups);
 
 				byPlayer.ServerData.CustomPlayerData[AdminToolkit._lastLoginKey] = DateTimeOffset.UtcNow.ToString("u");
-
 			} else {
 				//For regular players
 				if (RulesCommand.CheckRuleAccepted(byPlayer) == false) {
-					//TODO: localize somehow?
+					//TODO: localize 
 					byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, "type ' /rules ' command for reading server rules.", EnumChatType.Notification);
 
 					if (this.CachedConfiguration.RuleRoleChangerEnabled) {
@@ -186,6 +169,22 @@ namespace AdminToolkit
 					}
 				}
 			}
+
+			double elapsedDays = 0D;
+			string elapsedDayStr;
+
+			if (byPlayer.ServerData.CustomPlayerData.TryGetValue(AdminToolkit._lastGameDayCountKey, out elapsedDayStr)
+				&&
+				double.TryParse(elapsedDayStr, out elapsedDays)) 
+			{
+				elapsedDays = ServerAPI.World.Calendar.TotalDays - elapsedDays;
+				byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, $"Meantime... {elapsedDays.ToString("F1")} days have passed. ", EnumChatType.OthersMessage);
+			} else 
+			{
+				byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, $"In the year; {ServerAPI.World.Calendar.PrettyDate( )}", EnumChatType.OthersMessage);
+			}
+
+			byPlayer.ServerData.CustomPlayerData[AdminToolkit._lastGameDayCountKey] = ServerAPI.World.Calendar.TotalDays.ToString("R");
 		}
 
 		private void PlayerAcceptsRulesAction(IServerPlayer byPlayer )

--- a/AdminToolkit/MechTurk.cs
+++ b/AdminToolkit/MechTurk.cs
@@ -81,6 +81,12 @@ namespace AdminToolkit
 			}
 		}
 
+		public string LanguageCode {
+			get {
+				return @"en";//ISO639-2 ?
+			}
+		}
+
 		public float Ping {
 			get {
 				return 0.0f;

--- a/AdminToolkit/modinfo.json
+++ b/AdminToolkit/modinfo.json
@@ -1,9 +1,9 @@
 {
   "type": "code",
   "name": "Administrator's Toolkit mod",
-  "description" : "Provides misc. Admin functions;\n list admins, print & accept rules , auto-backup...",
+  "description" : "Provides misc. Admin functions;\n list admins, print & accept rules (multi-lingual) , auto-backup...",
   "authors": ["Melchior", ],
-  "version": "0.3.1",
+  "version": "0.3.2",
   "dependencies": { 
 	"game": "1.10.0"	
   },