Reworked the InfectPlayer method to work with Spawn035 API

Author: Cyanox62

scp035/API/Scp035Data.cs

@@ -7,9 +7,9 @@ public static ReferenceHub GetScp035()
 			return EventHandlers.scpPlayer;
 		}
 
-		public static void Make035(ReferenceHub player)
+		public static void Spawn035(ReferenceHub player)
 		{
-			EventHandlers.InfectPlayer(player);
+			EventHandlers.Spawn035(player, null, false);
 		}
 	}
 }

scp035/Logic.cs

@@ -59,36 +59,44 @@ private static void KillScp035(bool setRank = true)
 			RefreshItems();
 		}
 
-		public static void InfectPlayer(ReferenceHub player, Pickup pItem = null)
+		public static void Spawn035(ReferenceHub p035, ReferenceHub player = null, bool full = true)
 		{
-			scpPlayer = null;
-			List<ReferenceHub> pList = Player.GetHubs().Where(x => x.characterClassManager.CurClass == RoleType.Spectator && !x.serverRoles.OverwatchEnabled && x.characterClassManager.UserId != null && x.characterClassManager.UserId != string.Empty).ToList();
-			if (pList.Count > 0)
+			Log.Info(p035.nicknameSync.Network_myNickSync);
+			Log.Info(p035.characterClassManager.UserId);
+			Log.Info(p035.characterClassManager.CurClass.ToString());
+			if (full)
 			{
-				if (pItem != null)
+				if (player != null)
 				{
-					pItem.Delete();
-				}
-
-				ReferenceHub p035 = pList[rand.Next(pList.Count)];
-				Log.Info(p035.nicknameSync.Network_myNickSync);
-				Log.Info(p035.characterClassManager.UserId);
-				Log.Info(p035.characterClassManager.CurClass.ToString());
-				Vector3 pos = player.transform.position;
-				p035.ChangeRole(player.characterClassManager.CurClass);
-				Timing.CallDelayed(0.2f, () => p035.plyMovementSync.OverridePosition(pos, 0));
+					Vector3 pos = player.transform.position;
+					p035.ChangeRole(player.characterClassManager.CurClass);
+					Timing.CallDelayed(0.2f, () => p035.plyMovementSync.OverridePosition(pos, 0));
 
-				foreach (Inventory.SyncItemInfo item in player.inventory.items) p035.inventory.AddNewItem(item.id);
+					foreach (Inventory.SyncItemInfo item in player.inventory.items) p035.inventory.AddNewItem(item.id);
+				}
 				p035.playerStats.health = Configs.health;
 				p035.ammoBox.Networkamount = "250:250:250";
+			}
+
+			hasTag = !string.IsNullOrEmpty(p035.serverRoles.NetworkMyText);
+			isHidden = !string.IsNullOrEmpty(p035.serverRoles.HiddenBadge);
+			if (isHidden) p035.RefreshTag();
+			p035.SetRank("SCP-035", "red");
+
+			p035.Broadcast($"<size=60>You are <color=\"red\"><b>SCP-035</b></color></size>{(full ? "\nYou have infected a body and have gained control over it, use it to help the other SCPs!" : string.Empty)}", 10);
+
+			scpPlayer = p035;
+		}
+
+		public static void InfectPlayer(ReferenceHub player, Pickup pItem)
+		{
+			List<ReferenceHub> pList = Player.GetHubs().Where(x => x.characterClassManager.CurClass == RoleType.Spectator && !x.serverRoles.OverwatchEnabled && x.characterClassManager.UserId != null && x.characterClassManager.UserId != string.Empty).ToList();
+			if (pList.Count > 0 && scpPlayer == null)
+			{
+				pItem.Delete();
 
-				hasTag = !string.IsNullOrEmpty(p035.serverRoles.NetworkMyText);
-				isHidden = !string.IsNullOrEmpty(p035.serverRoles.HiddenBadge);
-				if (isHidden) p035.RefreshTag();
-				p035.SetRank("SCP-035", "red");
+				Spawn035(pList[rand.Next(pList.Count)], player);
 
-				p035.Broadcast("<size=60>You are <color=\"red\"><b>SCP-035</b></color></size>\nYou have infected a body and have gained control over it, use it to help the other SCPs!", 10);
-				scpPlayer = p035;
 				isRotating = false;
 
 				player.ChangeRole(RoleType.Spectator);