Admin command changes, as required by [DP3775]

L2_GameServer_T1/java/config/command-privileges.properties

@@ -150,6 +150,10 @@ admin_polymorph = 75
 admin_unpolymorph = 75
 admin_polyself = 75
 admin_unpolyself = 75
+admin_transform = 75
+admin_transform_menu = 75
+admin_untransform = 75
+admin_untransform_menu = 75
 admin_clearteams = 100
 admin_setteam_close = 100
 admin_setteam = 100

L2_GameServer_T1/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPolymorph.java

@@ -46,6 +46,8 @@ public class AdminPolymorph implements IAdminCommandHandler
 	    "admin_unpolymorph_menu",
         "admin_transform",
         "admin_untransform",
+        "admin_transform_menu",
+        "admin_untransform_menu",
 	};
 
 	private static final int REQUIRED_LEVEL = Config.GM_NPC_EDIT;
@@ -55,7 +57,7 @@ public class AdminPolymorph implements IAdminCommandHandler
 		if (!Config.ALT_PRIVILEGES_ADMIN)
 			if (!(checkLevel(activeChar.getAccessLevel()) && activeChar.isGM()))
 				return false;
-        if (command.equals("admin_untransform"))
+        if (command.startsWith("admin_untransform"))
         {
             L2Object obj = activeChar.getTarget();
             if (obj != null && obj instanceof L2PcInstance)
@@ -65,7 +67,7 @@ public class AdminPolymorph implements IAdminCommandHandler
             }
             else
             {
-                activeChar.sendMessage("Must target an Player for transformation");
+                activeChar.sendPacket(new SystemMessage(SystemMessageId.INCORRECT_TARGET));
             }
         }
         else if (command.startsWith("admin_transform"))
@@ -96,6 +98,8 @@ public class AdminPolymorph implements IAdminCommandHandler
                         activeChar.sendMessage("Usage: //transform <id> [duration (secs)]");
                     }
                 }
+                else if (parts.length == 1)
+                    cha.untransform();
                 else
                 {
                     activeChar.sendMessage("Usage: //transform <id>");
@@ -103,7 +107,7 @@ public class AdminPolymorph implements IAdminCommandHandler
             }
             else
             {
-                activeChar.sendMessage("Must target an Player for transformation");
+                activeChar.sendPacket(new SystemMessage(SystemMessageId.INCORRECT_TARGET));
             }
         }
 		if (command.startsWith("admin_polymorph"))
@@ -131,9 +135,9 @@ public class AdminPolymorph implements IAdminCommandHandler
 		{
 			doUnpoly(activeChar,activeChar.getTarget());
 		}
-		if (command.contains("polymorph_menu"))
+		if (command.contains("_menu"))
         {
-			showMainPage(activeChar);
+			showMainPage(activeChar,command);
         }
         
         
@@ -196,8 +200,13 @@ public class AdminPolymorph implements IAdminCommandHandler
 			activeChar.sendPacket(new SystemMessage(SystemMessageId.INCORRECT_TARGET));
 	}
 
-	private void showMainPage(L2PcInstance activeChar)
+	private void showMainPage(L2PcInstance activeChar,String command)
 	{
-		AdminHelpPage.showHelpPage(activeChar, "effects_menu.htm");
+        if (command.contains("transform"))
+            AdminHelpPage.showHelpPage(activeChar, "transform.htm");
+        else if (command.contains("abnormal"))
+            AdminHelpPage.showHelpPage(activeChar, "abnormal.htm");
+        else
+            AdminHelpPage.showHelpPage(activeChar, "effects_menu.htm");
 	}
 }