Commit: 8ba00983036921e9c1b2e200b15862006546750a - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• Révision: 8ba00983036921e9c1b2e200b15862006546750a (tree)
• l'heure: 2020-09-14 05:08:34
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

W.I.P. Untested sp fix

Change Summary

• modified: AdminToolkit/Commands/VariableSpawnpoints.cs
• modified: AdminToolkit/readme.md

Modification

--- a/AdminToolkit/Commands/VariableSpawnpoints.cs
+++ b/AdminToolkit/Commands/VariableSpawnpoints.cs
@@ -16,7 +16,7 @@ using ProtoBuf;
 namespace AdminToolkit
 {
 	[ProtoContract]
-	public struct Spawnpoint
+	internal struct Spawnpoint
 	{
 		[ProtoMember(1)]
 		public PlayerSpawnPos Location;
@@ -49,52 +49,23 @@ namespace AdminToolkit
 		this.Command = "spawnpoints";
 		this.Description = "Control add/remove/adjust List of approved player spawn points";
 		this.RequiredPrivilege = Privilege.setspawn;
-		this.Syntax = @"Add {name} {123,456,-678}|here / Remove {name} / List / Enable / Disable";
+		this.Syntax = @"Add {name} {123 456 -678}|here / Remove {name} / List / Enable / Disable";
 		this.handler += HandleCommand;
 
 		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.RunGame, ReloadSpawnpoints);
-		ServerAPI.Event.PlayerCreate += NewPlayerCreation;
+		ServerAPI.Event.PlayerJoin += PlayerJoins;
 		ServerAPI.Event.PlayerDeath += PlayerDied;
 		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, PersistSpawnpoints);
 		}
 
-		private void ReloadSpawnpoints( )
-		{
-		var spawnsBytes = ServerAPI.WorldManager.SaveGame.GetData(_spawnsDataKey);
-
-		if (spawnsBytes != null) {
-		this.Spawnpoints = SerializerUtil.Deserialize<List<Spawnpoint>>(spawnsBytes);
-		Logger.Notification("Loaded Variable-Spawns # ({0})", Spawnpoints.Count);
-		}
-		else {
-		this.Spawnpoints = new List<Spawnpoint>( );
-
-		var emptySpawnsList = SerializerUtil.Serialize(this.Spawnpoints);
-
-		ServerAPI.WorldManager.SaveGame.StoreData(_spawnsDataKey, emptySpawnsList);
-						
-		Logger.Notification("Created (empty) Spawnpoints Data");
-		}
-
-		
-		}
-
-		private void PersistSpawnpoints( )
-		{			
-		if (this.Spawnpoints != null && this.Spawnpoints.Count > 0) {
-		var spawnDatas = SerializerUtil.Serialize(this.Spawnpoints);
-		ServerAPI.WorldManager.SaveGame.StoreData(_spawnsDataKey, spawnDatas);
-		Logger.Notification("Persisted Spawnpoints Data");
-		}
 
-		}
 
 		private void HandleCommand(IServerPlayer player, int groupId, CmdArgs args)
 		{
 		string name;
 		Vec3i position;
-		
-		
+
+		bool console = player is ServerConsolePlayer;
 
 		if (args.Length >= 1) {
 		string cmd = args.PopWord(string.Empty).ToLowerInvariant();
@@ -103,19 +74,26 @@ namespace AdminToolkit
 		case "add":
 			name = args.PopWord("?");
 
-			if (String.Equals(args.PeekWord(), "here", StringComparison.OrdinalIgnoreCase)) {
+			if (console == false && String.Equals(args.PeekWord( ), "here", StringComparison.OrdinalIgnoreCase)) {
 			position = player.Entity.Pos.XYZInt;
 			}
-			position = args.PopVec3i(player.Entity.Pos.XYZInt);			
+			else {
+			var pos = args.PopVec3i(ServerAPI.World.DefaultSpawnPosition.AsBlockPos.ToVec3i( ));
+			position = RelativeToAbsolute(pos);
+			}
+
 			if (AddSpawnpoint(name, position)) {
-			player.SendMessage(groupId, "Added Spawnpoint", EnumChatType.CommandSuccess);
+			player.SendMessage(groupId, "Added Spawnpoint.", EnumChatType.CommandSuccess);
+			}
+			else {
+			player.SendMessage(groupId, "Can't add Spawnpoint!", EnumChatType.CommandError);
 			}
 			break;
 
 		case "remove":
 			name = args.PopWord( );
 			if (RemoveSpawnpoint(name)) {
-			player.SendMessage(groupId, "Removed Spawnpoint", EnumChatType.CommandSuccess);
+			player.SendMessage(groupId, $"Removed Spawnpoint '{name}'", EnumChatType.CommandSuccess);
 			}
 			break;
 
@@ -131,6 +109,16 @@ namespace AdminToolkit
 			Toggle(false);
 			break;
 
+		case "reset":
+			if (console) {
+			name = args.PopWord("?");
+			#if DEBUG
+			ResetPlayer(name);
+			player.SendMessage(groupId, $"Reset Playerdata for '{name}'", EnumChatType.CommandSuccess);
+			#endif
+			}
+			break;
+
 		default:
 			player.SendMessage(groupId, "Unrecognised command ", EnumChatType.CommandError);
 			break;
@@ -161,7 +149,7 @@ namespace AdminToolkit
 		return true;
 		}
 		else {
-		Logger.VerboseDebug($"Apparently spawnpoint Unsafe! @ {position}");	
+		Logger.VerboseDebug($"Apparently '{name}' spawnpoint is Unsafe!  @ABS:{position}");	
 		}
 
 		return false;
@@ -182,7 +170,7 @@ namespace AdminToolkit
 		{
 		if (this.Spawnpoints.Count > 0) {
 		foreach (var sp in this.Spawnpoints) {
-		player.SendMessage(chatGroupId, $"Spawn: '{sp.Name}' @({sp.Location})", EnumChatType.CommandSuccess);
+		player.SendMessage(chatGroupId, $"Spawn: '{sp.Name}' ({PrettyFormat(sp.Location)}) ABS:({sp.Location})", EnumChatType.CommandSuccess);
 		}
 		}
 		}
@@ -192,18 +180,62 @@ namespace AdminToolkit
 		this.CachedConfiguration.VariableSpawnpoints = state;
 		}
 
-		private void NewPlayerCreation( IServerPlayer byPlayer)
+		private void ResetPlayer(string name)
+		{
+		var byPlayer = ServerAPI.Server.Players.SingleOrDefault(plr => plr.PlayerName == name);
+		if (byPlayer != null && this.Spawnpoints != null && this.Spawnpoints.Count > 0) 
+			{
+			byPlayer.ClearSpawnPosition( );
+			//var datas = ServerAPI.PlayerData.GetPlayerDataByUid(byPlayer.PlayerUID);
+			//datas.	                 
+			//ServerAPI.Server.Players.Remove(byPlayer); //List is a array copy
+			var servPlayer = byPlayer as ServerPlayer;
+
+			}
+		}
+
+		#region Events
+
+		private void ReloadSpawnpoints( )
+		{
+		var spawnsBytes = ServerAPI.WorldManager.SaveGame.GetData(_spawnsDataKey);
+
+		if (spawnsBytes != null) {
+		this.Spawnpoints = SerializerUtil.Deserialize<List<Spawnpoint>>(spawnsBytes);
+		Logger.Notification("Loaded Variable-Spawns # ({0}) STATE: {1}", Spawnpoints.Count, (this.CachedConfiguration.VariableSpawnpoints ? "Enabled" : "Disabled"));
+		}
+		else {
+		this.Spawnpoints = new List<Spawnpoint>( );
+
+		var emptySpawnsList = SerializerUtil.Serialize(this.Spawnpoints);
+
+		ServerAPI.WorldManager.SaveGame.StoreData(_spawnsDataKey, emptySpawnsList);
+
+		Logger.Notification("Created (empty) Spawnpoints Data");
+		}
+
+
+		}
+
+		private void PersistSpawnpoints( )
+		{
+		if (this.Spawnpoints != null && this.Spawnpoints.Count > 0) {
+		var spawnDatas = SerializerUtil.Serialize(this.Spawnpoints);
+		ServerAPI.WorldManager.SaveGame.StoreData(_spawnsDataKey, spawnDatas);
+		Logger.Notification("Persisted Spawnpoints Data");
+		}
+
+		}
+
+		private void PlayerJoins( IServerPlayer byPlayer)
 		{			
 		if (this.CachedConfiguration.VariableSpawnpoints && this.Spawnpoints.Count > 0) {
 				
 		var swpd = byPlayer.WorldData as ServerWorldPlayerData;
-		if (swpd.SpawnPosition == null) {
-		var newSP = RandomSpawnpoint( );
-		byPlayer.SetSpawnPosition(newSP.Location);
-		#if DEBUG
-		Logger.VerboseDebug($"New spawn Pos: '{newSP.Name}' @ {newSP.Location} ");
-		#endif
-		}
+		if (swpd.SpawnPosition == null || KnownSpawn(swpd.SpawnPosition)) 
+			{
+			RandomizeSpawnpoint(byPlayer);
+			}
 		}
 		}
 
@@ -212,19 +244,23 @@ namespace AdminToolkit
 		if (this.CachedConfiguration.VariableSpawnpoints && this.Spawnpoints.Count > 0) {
 
 		var swpd = byPlayer.WorldData as ServerWorldPlayerData;
-		if (swpd.SpawnPosition == null || KnownSpawn(swpd.SpawnPosition)) {
-		var newSP = RandomSpawnpoint( );
-		byPlayer.SetSpawnPosition(newSP.Location);
-		#if DEBUG
-		Logger.VerboseDebug( $"Changed spawn Pos: '{newSP.Name}' @ {newSP.Location} ");
-		#endif
-		}
+		if (swpd.SpawnPosition == null || KnownSpawn(swpd.SpawnPosition)) 
+			{
+			RandomizeSpawnpoint(byPlayer);
+			}
 		}
 		}
 
-		private Spawnpoint RandomSpawnpoint( )
+		#endregion
+
+
+		private void RandomizeSpawnpoint(IServerPlayer byPlayer)
 		{
-		return this.Spawnpoints[random.Next(0, Spawnpoints.Count - 1)];
+		var randSp = this.Spawnpoints[random.Next(0, Spawnpoints.Count - 1)];
+		byPlayer.SetSpawnPosition(randSp.Location);
+		#if DEBUG
+		Logger.VerboseDebug($"Changed spawn Pos: '{randSp.Name}' @ {randSp.Location} for {byPlayer.PlayerName}");
+		#endif
 		}
 
 		private bool KnownSpawn(PlayerSpawnPos aSpawn)
@@ -237,6 +273,32 @@ namespace AdminToolkit
 
 		return false;
 		}
+
+		private Vec3i RelativeToAbsolute(Vec3i location)
+		{
+		var start = ServerAPI.World.DefaultSpawnPosition.AsBlockPos;
+		return new Vec3i( location.X + start.X, location.Y, location.Z + start.Z);
+		}
+
+		private Vec3i AbsoluteToRelative(Vec3i location)
+		{
+		var start = ServerAPI.World.DefaultSpawnPosition.AsBlockPos;
+		return new Vec3i(start.X - location.X, location.Y, start.Z - location.Z);
+		}
+
+		private string PrettyFormat(PlayerSpawnPos spawnPos)
+		{
+		var start = ServerAPI.World.DefaultSpawnPosition.AsBlockPos;
+
+		return String.Format
+        (
+		@"{0:D}, {1:D}, {2:D}",
+    	spawnPos.x - start.X,
+        spawnPos.y - start.Y,
+        spawnPos.z - start.Z
+		);
+				
+		}
 	}
 }
 

--- a/AdminToolkit/readme.md
+++ b/AdminToolkit/readme.md
@@ -1,5 +1,5 @@
 
-Instructions for using the Administrator's Toolkit (V0.3.3);
+Instructions for using the Administrator's Toolkit (V0.3.6);
 ============================================================
 
 It provides the (server side only) commands:
@@ -7,6 +7,12 @@ It provides the (server side only) commands:
 *	/rules
 *	/admins
 *	/backups
+*	/pings
+*	/spawnpoints
+
+The configuration file: 'admintoolkit.json' ( %home%/.config/VintagestoryData/ModConfig ); 
+Note: by default most features are _DISABLED_ . 
+
 
 RULES
 -----
@@ -97,3 +103,30 @@ A special feature for admins; their text messages get underlined.
 edit file ('/ModConfig/admintoolkit.json' ) :
 
 >	"BoomingVoice": true
+
+
+
+VAIRABLE SPAWNS
+---------------
+
+Lets admins define and have players spawn from a list of pre-defined coordinates. 
+(chosen at random)
+
+Config file setting: "VariableSpawnpoints" : set value to 'true' or 'false' (no quotes)
+
+Use command:
+/spawnpoints
+
+/spawnpoints add {name} {5123 100 3992} | here
+
+(either 'here' where admin is standing OR manually entered RELATIVE (to-spawn) coordinates)
+
+/spawnpoints remove {name}
+
+(by name of spawnpoint)
+
+/spawnpoints list
+
+/spawnpoints enable
+
+/spawnpoints disable