Updated to 2.0. i forgo

NotIntense · NotIntense · commit 157b7fc7a9a8 · 2023-06-14T08:23:41.000-04:00
diff --git a/TestingDummies/Commands/DummyLookAt.cs b/TestingDummies/Commands/DummyLookAt.cs
@@ -0,0 +1,59 @@
+﻿using CommandSystem;
+using Exiled.API.Features;
+using Mirror;
+using PlayerRoles.FirstPersonControl;
+using System;
+using UnityEngine;
+
+namespace TestingDummies.Commands
+{
+    [CommandHandler(typeof(RemoteAdminCommandHandler))]
+    public class DummyLookAt : ICommand
+    {
+        public string Command => "DummyLookAt";
+
+        public string[] Aliases => new string[] { "devdummylook", "dummylookat", "dummylook" };
+
+        public string Description => "Makes the specified dummy look at the target player";
+
+        public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
+        {
+            if (arguments.Count != 2)
+            {
+                response = "Incorrect arguments. Usage: DummyLookAt [dummyID] [TargetID]";
+                return false;
+            }
+            Player dummy = Player.Get(arguments.At(0));
+            Player target = Player.Get(arguments.At(1));
+
+            if (dummy == null)
+            {
+                response = $"The player with the specified ID, '{arguments.At(0)}', dosent exist!";
+                return false;
+            }
+            if (target == null)
+            {
+                response = $"The player with the specified ID, '{arguments.At(1)}', dosent exist!";
+                return false;
+            }
+            if (Plugin.Instance.DumRef.Contains(dummy.ReferenceHub))
+            {
+                Quaternion quat = Quaternion.LookRotation(target.Position - dummy.Position, Vector3.up);
+                var mouseLook = ((IFpcRole)dummy.ReferenceHub.roleManager.CurrentRole).FpcModule.MouseLook;
+                mouseLook.CurrentHorizontal = quat.eulerAngles.y;
+                mouseLook.CurrentVertical = 0f;
+
+                response = $"Rotated {dummy.Nickname} to the target {target.Nickname}";
+                return true;
+            }
+            else
+            {
+
+                response = $"ID : '{dummy.Id}', Nickname : '{dummy.Nickname}' is not a dummy or you entered a incorrect ID!";
+                return false;
+            }
+        }
+
+    }
+}
+
diff --git a/TestingDummies/Commands/DummyStats.cs b/TestingDummies/Commands/DummyStats.cs
@@ -16,30 +16,27 @@ public class DummyStats : ICommand
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            if (arguments.Count > 1 || arguments.Count < 1)
+            if (arguments.Count != 1)
             {
-                response = "Insufficient arguments. Usage: dummystats [dummyID]";
+                response = "Incorrect arguments. Usage: dummystats [dummyID]";
                 return false;
             }
-            string dummyID = arguments.At(0);
+            Player Dummy = Player.Get(arguments.At(0));
 
-            if (Player.Get(dummyID) == null)
+            if (Dummy == null)
             {
-                response = $"The player, '{dummyID}', dosent exist!";
+                response = $"The player with the specified ID, '{arguments.At(0)}', dosent exist!";
                 return false;
             }
-            if (Plugin.Instance.DumRef.Contains(Player.Get(dummyID).ReferenceHub))
+            if (Plugin.Instance.DumRef.Contains(Dummy.ReferenceHub))
             {
-                Player dummy = Player.Get(dummyID);
-
-                response = $"Stats: Player ID : {dummy.Id}, Name : {dummy.Nickname}, Health : {dummy.Health}, Role : {dummy.Role.Name}";
+                response = $"Stats: Player ID : {Dummy.Id}, Name : {Dummy.Nickname}, Health : {Dummy.Health}, Role : {Dummy.Role.Name}";
                 return true;
             }
             else
             {
-                Player InvalidDummy = Player.Get(dummyID);
 
-                response = $"ID : '{InvalidDummy.Id}', Nickname : '{InvalidDummy.Nickname}' is not a dummy or you entered a incorrect ID!";
+                response = $"ID : '{Dummy.Id}', Nickname : '{Dummy.Nickname}' is not a dummy or you entered a incorrect ID!";
                 return false;
             }
         }
diff --git a/TestingDummies/Commands/RemoveDummy.cs b/TestingDummies/Commands/RemoveDummy.cs
@@ -16,35 +16,31 @@ public class RemoveDummy : ICommand
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            if (arguments.Count > 1 || arguments.Count < 1)
+            if (arguments.Count != 1)
             {
                 response = "Insufficient arguments. Usage: removedummy [dummyID]";
                 return false;
             }
-            string dummyID = arguments.At(0);
+            Player Dummy = Player.Get(arguments.At(0));
 
-            if(Player.Get(dummyID) == null)
+            if(Dummy == null)
             {
-                response = $"The player ID, '{dummyID}', dosent exist!";
+                response = $"The player with the specified ID, '{arguments.At(0)}', dosent exist!";
                 return false;
             }
-            if(Plugin.Instance.DumRef.Contains(Player.Get(dummyID).ReferenceHub))
+            if(Plugin.Instance.DumRef.Contains(Dummy.ReferenceHub))
             {
-                Player dummy = Player.Get(dummyID);
-
-                Player.Dictionary.Remove(Plugin.Instance.spawning.PlayerPrefabs[dummy]);
-                Plugin.Instance.DumRef.Remove(dummy.ReferenceHub);
-                dummy.Disconnect();
-                NetworkServer.DestroyPlayerForConnection(Plugin.Instance.spawning.PlayerConnIDs[dummy]);
-                NetworkServer.Destroy(dummy.GameObject);
-                response = $"Removed {dummy.Nickname}!";
+                Player.Dictionary.Remove(Plugin.Instance.spawning.PlayerPrefabs[Dummy]);
+                Plugin.Instance.DumRef.Remove(Dummy.ReferenceHub);
+                Dummy.Disconnect();
+                NetworkServer.DestroyPlayerForConnection(Plugin.Instance.spawning.PlayerConnIDs[Dummy]);
+                NetworkServer.Destroy(Dummy.GameObject);
+                response = $"Removed {Dummy.Nickname}!";
                 return true;
             }
             else
             {
-                Player InvalidDummy = Player.Get(dummyID);
-
-                response = $"ID : '{InvalidDummy.Id}', Nickname : '{InvalidDummy.Nickname}' is not a dummy or you entered a incorrect ID!";
+                response = $"ID : '{Dummy.Id}', Nickname : '{Dummy.Nickname}' is not a dummy or you entered a incorrect ID!";
                 return false;
             }
         }
diff --git a/TestingDummies/Commands/SpawnDummy.cs b/TestingDummies/Commands/SpawnDummy.cs
@@ -3,6 +3,7 @@
 using Exiled.Permissions.Extensions;
 using PlayerRoles;
 using System;
+using MEC;
 
 
 namespace TestingDummies.Commands
@@ -18,26 +19,26 @@ public class SpawnDummy : ICommand
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {           
-            if (arguments.Count < 3)
+            if (arguments.Count != 3)
             {
-                response = "Insufficient arguments. Usage: spawndummy [name] [role] [playerID]";
+                response = "Incorrect arguments. Usage: spawndummy [name] [role] [playerID] OR [playerNickname]";
                 return false;
             }
             string name = arguments.At(0);
             string roleString = arguments.At(1);
-            string playerID = arguments.At(2);
+            Player playerID = Player.Get(arguments.At(2));
             if (!Enum.TryParse(roleString, out RoleTypeId role))
             {
                 response = $"Invalid role: {roleString}";
                 return false;
             }
-            if (Player.Get(playerID) == null)
+            if (playerID == null)
             {
-                response = $"Invalid player: {playerID}";
+                response = $"Invalid player with the specified ID OR Nickname: {arguments.At(2)}";
                 return false;
             }
-            MEC.MECExtensionMethods1.RunCoroutine(Plugin.Instance.spawning.SpawnDum(name, role, Player.Get(playerID)));
-            response = $"Spawned dummy with name '{name}', role '{role}', for player '{Player.Get(playerID).Nickname}'";
+            MECExtensionMethods1.RunCoroutine(Plugin.Instance.spawning.SpawnDum(name, role, playerID));
+            response = $"Spawned dummy with name '{name}', role '{role}', for player '{playerID.Nickname}'";
             return true;
         }
 
diff --git a/TestingDummies/Patches/RotationPatch.cs b/TestingDummies/Patches/RotationPatch.cs
@@ -8,7 +8,7 @@ namespace TestingDummies.Patches
 {
     //Thank you to the SCP-575 Plugin that I st- borrowed this code from :3
     [HarmonyPatch(typeof(FpcMouseLook), nameof(FpcMouseLook.UpdateRotation))]
-    public class AIRotation
+    public class RotationPatch
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
diff --git a/TestingDummies/Plugin.cs b/TestingDummies/Plugin.cs
@@ -3,30 +3,42 @@
 using System;
 using System.Collections.Generic;
 using TestingDummies.SpawningHandler;
+using HarmonyLib;
 
 namespace TestingDummies
 {
     public class Plugin : Plugin<Config>
     {
         public static Plugin Instance;
-        public List<ReferenceHub> DumRef = new List<ReferenceHub>();
+        public List<ReferenceHub> DumRef = new();
         public Spawn spawning;
+
+        private Harmony _harmony;
+
         public override string Name => "Dev Dummies";
         public override string Prefix => "Dev Dum";
         public override string Author => "NotIntense";
         public override PluginPriority Priority => PluginPriority.Medium;
-        public override Version Version => new(2, 0, 3);
+        public override Version Version => new(2, 0, 4);
         public override Version RequiredExiledVersion => new(7, 0, 0);
 
         public override void OnEnabled()
-        {
+        {           
+
             Instance = this;
             spawning = new Spawn();
+
+            _harmony = new("DevDummies-Rotation-Patch");
+            _harmony.PatchAll();
+
             base.OnEnabled();
         }
 
         public override void OnDisabled()
         {
+            _harmony.UnpatchAll();
+            _harmony = null;
+
             Instance = null;
             spawning = null;
             base.OnDisabled();
diff --git a/TestingDummies/SpawningHandler/Spawn.cs b/TestingDummies/SpawningHandler/Spawn.cs
@@ -5,8 +5,6 @@
 using System.Collections.Generic;
 using UnityEngine;
 using MEC;
-using PlayerRoles.FirstPersonControl;
-using System.IO.Pipes;
 
 namespace TestingDummies.SpawningHandler
 {
@@ -47,10 +45,6 @@ public IEnumerator<float> SpawnDum(string Name, RoleTypeId Role, Player targert)
             NewPlayer.Role.Set(Role, Exiled.API.Enums.SpawnReason.ForceClass);
             NewPlayer.Position = targert.Position;
             NewPlayer.SessionVariables.Add("npc", true);
-            Quaternion quat = Quaternion.LookRotation(targert.Rotation, Vector3.up);
-            var mouseLookInsameroom = ((IFpcRole)NewPlayer.ReferenceHub.roleManager.CurrentRole).FpcModule.MouseLook;
-            mouseLookInsameroom.CurrentHorizontal = Quaternion.Slerp(Quaternion.Euler(0f, mouseLookInsameroom.CurrentHorizontal, 0f), quat, Time.deltaTime).eulerAngles.y;
-            mouseLookInsameroom.CurrentVertical = 0;
             yield break;
         }
     }
diff --git a/TestingDummies/TestingDummies.csproj b/TestingDummies/TestingDummies.csproj
@@ -63,6 +63,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Commands\DummyLookAt.cs" />
     <Compile Include="Commands\DummyStats.cs" />
     <Compile Include="Commands\RemoveDummy.cs" />
     <Compile Include="Commands\SpawnDummy.cs" />

Original file line number	Diff line number	Diff line change
`@@ -16,30 +16,27 @@ public class DummyStats : ICommand`
`16`	`16`
`17`	`17`	`public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)`
`18`	`18`	`{`
`19`		`- if (arguments.Count > 1 \|\| arguments.Count < 1)`
	`19`	`+ if (arguments.Count != 1)`
`20`	`20`	`{`
`21`		`- response = "Insufficient arguments. Usage: dummystats [dummyID]";`
	`21`	`+ response = "Incorrect arguments. Usage: dummystats [dummyID]";`
`22`	`22`	`return false;`
`23`	`23`	`}`
`24`		`- string dummyID = arguments.At(0);`
	`24`	`+ Player Dummy = Player.Get(arguments.At(0));`
`25`	`25`
`26`		`- if (Player.Get(dummyID) == null)`
	`26`	`+ if (Dummy == null)`
`27`	`27`	`{`
`28`		`- response = $"The player, '{dummyID}', dosent exist!";`
	`28`	`+ response = $"The player with the specified ID, '{arguments.At(0)}', dosent exist!";`
`29`	`29`	`return false;`
`30`	`30`	`}`
`31`		`- if (Plugin.Instance.DumRef.Contains(Player.Get(dummyID).ReferenceHub))`
	`31`	`+ if (Plugin.Instance.DumRef.Contains(Dummy.ReferenceHub))`
`32`	`32`	`{`
`33`		`- Player dummy = Player.Get(dummyID);`
`34`		`-`
`35`		`- response = $"Stats: Player ID : {dummy.Id}, Name : {dummy.Nickname}, Health : {dummy.Health}, Role : {dummy.Role.Name}";`
	`33`	`+ response = $"Stats: Player ID : {Dummy.Id}, Name : {Dummy.Nickname}, Health : {Dummy.Health}, Role : {Dummy.Role.Name}";`
`36`	`34`	`return true;`
`37`	`35`	`}`
`38`	`36`	`else`
`39`	`37`	`{`
`40`		`- Player InvalidDummy = Player.Get(dummyID);`
`41`	`38`
`42`		`- response = $"ID : '{InvalidDummy.Id}', Nickname : '{InvalidDummy.Nickname}' is not a dummy or you entered a incorrect ID!";`
	`39`	`+ response = $"ID : '{Dummy.Id}', Nickname : '{Dummy.Nickname}' is not a dummy or you entered a incorrect ID!";`
`43`	`40`	`return false;`
`44`	`41`	`}`
`45`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,35 +16,31 @@ public class RemoveDummy : ICommand`
`16`	`16`
`17`	`17`	`public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)`
`18`	`18`	`{`
`19`		`- if (arguments.Count > 1 \|\| arguments.Count < 1)`
	`19`	`+ if (arguments.Count != 1)`
`20`	`20`	`{`
`21`	`21`	`response = "Insufficient arguments. Usage: removedummy [dummyID]";`
`22`	`22`	`return false;`
`23`	`23`	`}`
`24`		`- string dummyID = arguments.At(0);`
	`24`	`+ Player Dummy = Player.Get(arguments.At(0));`
`25`	`25`
`26`		`- if(Player.Get(dummyID) == null)`
	`26`	`+ if(Dummy == null)`
`27`	`27`	`{`
`28`		`- response = $"The player ID, '{dummyID}', dosent exist!";`
	`28`	`+ response = $"The player with the specified ID, '{arguments.At(0)}', dosent exist!";`
`29`	`29`	`return false;`
`30`	`30`	`}`
`31`		`- if(Plugin.Instance.DumRef.Contains(Player.Get(dummyID).ReferenceHub))`
	`31`	`+ if(Plugin.Instance.DumRef.Contains(Dummy.ReferenceHub))`
`32`	`32`	`{`
`33`		`- Player dummy = Player.Get(dummyID);`
`34`		`-`
`35`		`- Player.Dictionary.Remove(Plugin.Instance.spawning.PlayerPrefabs[dummy]);`
`36`		`- Plugin.Instance.DumRef.Remove(dummy.ReferenceHub);`
`37`		`- dummy.Disconnect();`
`38`		`- NetworkServer.DestroyPlayerForConnection(Plugin.Instance.spawning.PlayerConnIDs[dummy]);`
`39`		`- NetworkServer.Destroy(dummy.GameObject);`
`40`		`- response = $"Removed {dummy.Nickname}!";`
	`33`	`+ Player.Dictionary.Remove(Plugin.Instance.spawning.PlayerPrefabs[Dummy]);`
	`34`	`+ Plugin.Instance.DumRef.Remove(Dummy.ReferenceHub);`
	`35`	`+ Dummy.Disconnect();`
	`36`	`+ NetworkServer.DestroyPlayerForConnection(Plugin.Instance.spawning.PlayerConnIDs[Dummy]);`
	`37`	`+ NetworkServer.Destroy(Dummy.GameObject);`
	`38`	`+ response = $"Removed {Dummy.Nickname}!";`
`41`	`39`	`return true;`
`42`	`40`	`}`
`43`	`41`	`else`
`44`	`42`	`{`
`45`		`- Player InvalidDummy = Player.Get(dummyID);`
`46`		`-`
`47`		`- response = $"ID : '{InvalidDummy.Id}', Nickname : '{InvalidDummy.Nickname}' is not a dummy or you entered a incorrect ID!";`
	`43`	`+ response = $"ID : '{Dummy.Id}', Nickname : '{Dummy.Nickname}' is not a dummy or you entered a incorrect ID!";`
`48`	`44`	`return false;`
`49`	`45`	`}`
`50`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using Exiled.Permissions.Extensions;`
`4`	`4`	`using PlayerRoles;`
`5`	`5`	`using System;`
	`6`	`+using MEC;`
`6`	`7`
`7`	`8`
`8`	`9`	`namespace TestingDummies.Commands`
`@@ -18,26 +19,26 @@ public class SpawnDummy : ICommand`
`18`	`19`
`19`	`20`	`public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)`
`20`	`21`	`{`
`21`		`- if (arguments.Count < 3)`
	`22`	`+ if (arguments.Count != 3)`
`22`	`23`	`{`
`23`		`- response = "Insufficient arguments. Usage: spawndummy [name] [role] [playerID]";`
	`24`	`+ response = "Incorrect arguments. Usage: spawndummy [name] [role] [playerID] OR [playerNickname]";`
`24`	`25`	`return false;`
`25`	`26`	`}`
`26`	`27`	`string name = arguments.At(0);`
`27`	`28`	`string roleString = arguments.At(1);`
`28`		`- string playerID = arguments.At(2);`
	`29`	`+ Player playerID = Player.Get(arguments.At(2));`
`29`	`30`	`if (!Enum.TryParse(roleString, out RoleTypeId role))`
`30`	`31`	`{`
`31`	`32`	`response = $"Invalid role: {roleString}";`
`32`	`33`	`return false;`
`33`	`34`	`}`
`34`		`- if (Player.Get(playerID) == null)`
	`35`	`+ if (playerID == null)`
`35`	`36`	`{`
`36`		`- response = $"Invalid player: {playerID}";`
	`37`	`+ response = $"Invalid player with the specified ID OR Nickname: {arguments.At(2)}";`
`37`	`38`	`return false;`
`38`	`39`	`}`
`39`		`- MEC.MECExtensionMethods1.RunCoroutine(Plugin.Instance.spawning.SpawnDum(name, role, Player.Get(playerID)));`
`40`		`- response = $"Spawned dummy with name '{name}', role '{role}', for player '{Player.Get(playerID).Nickname}'";`
	`40`	`+ MECExtensionMethods1.RunCoroutine(Plugin.Instance.spawning.SpawnDum(name, role, playerID));`
	`41`	`+ response = $"Spawned dummy with name '{name}', role '{role}', for player '{playerID.Nickname}'";`
`41`	`42`	`return true;`
`42`	`43`	`}`
`43`	`44`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace TestingDummies.Patches`
`8`	`8`	`{`
`9`	`9`	`//Thank you to the SCP-575 Plugin that I st- borrowed this code from :3`
`10`	`10`	`[HarmonyPatch(typeof(FpcMouseLook), nameof(FpcMouseLook.UpdateRotation))]`
`11`		`- public class AIRotation`
	`11`	`+ public class RotationPatch`
`12`	`12`	`{`
`13`	`13`	`private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using UnityEngine;`
`7`	`7`	`using MEC;`
`8`		`-using PlayerRoles.FirstPersonControl;`
`9`		`-using System.IO.Pipes;`
`10`	`8`
`11`	`9`	`namespace TestingDummies.SpawningHandler`
`12`	`10`	`{`
`@@ -47,10 +45,6 @@ public IEnumerator<float> SpawnDum(string Name, RoleTypeId Role, Player targert)`
`47`	`45`	`NewPlayer.Role.Set(Role, Exiled.API.Enums.SpawnReason.ForceClass);`
`48`	`46`	`NewPlayer.Position = targert.Position;`
`49`	`47`	`NewPlayer.SessionVariables.Add("npc", true);`
`50`		`- Quaternion quat = Quaternion.LookRotation(targert.Rotation, Vector3.up);`
`51`		`- var mouseLookInsameroom = ((IFpcRole)NewPlayer.ReferenceHub.roleManager.CurrentRole).FpcModule.MouseLook;`
`52`		`- mouseLookInsameroom.CurrentHorizontal = Quaternion.Slerp(Quaternion.Euler(0f, mouseLookInsameroom.CurrentHorizontal, 0f), quat, Time.deltaTime).eulerAngles.y;`
`53`		`- mouseLookInsameroom.CurrentVertical = 0;`
`54`	`48`	`yield break;`
`55`	`49`	`}`
`56`	`50`	`}`