Updated category data XML file.

Adapted from: L2jUnity free files.
2017-11-20 23:01:06 +00:00
parent fa13672236
commit 5d75ddc762
280 changed files with 31341 additions and 13865 deletions
--- a/L2J_Mobius_2.5_Underground/dist/game/config/ClassMaster.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/config/ClassMaster.xml
@@ -17,7 +17,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>SIGEL_CANDIDATE</category>
+				<category>TANKER_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32264" count="1" /> <!-- Abelius' Power - Sigel Knight -->
@@ -26,7 +26,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>TYRR_CANDIDATE</category>
+				<category>WARRIOR_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32265" count="1" /> <!-- Sapyros' Power - Tyrr Warrior -->
@@ -35,7 +35,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>OTHELL_CANDIDATE</category>
+				<category>ROGUE_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32266" count="1" /> <!-- Ashagen's Power - Othell Rogue -->
@@ -44,7 +44,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>YUL_CANDIDATE</category>
+				<category>ARCHER_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32267" count="1" /> <!-- Cranigg's Power - Yul Archer -->
@@ -53,7 +53,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>FEOH_CANDIDATE</category>
+				<category>WIZARD_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32268" count="1" /> <!-- Soltkreig's Power - Feoh Wizard -->
@@ -62,7 +62,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>WYNN_CANDIDATE</category>
+				<category>SUMMONER_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32269" count="1" /> <!-- Naviarope's Power - Wynn Summoner -->
@@ -71,7 +71,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>ISS_CANDIDATE</category>
+				<category>ENCHANTER_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32270" count="1" /> <!-- Leister's Power - Iss Enchanter -->
@@ -80,7 +80,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>AEORE_CANDIDATE</category>
+				<category>HEALER_CATEGORY</category>
 			</appliesTo>
 			<rewards>
 				<item id="32271" count="1" /> <!-- Lakcis' Power - Aeore Healer -->
@@ -89,7 +89,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>EVISCERATOR_CANDIDATE</category>
+				<category>ERTHEIA_THIRD_FIGHTER_GROUP</category>
 			</appliesTo>
 			<rewards>
 				<item id="40268" count="1" /> <!-- Sayha's Box - Eviscerator -->
@@ -98,7 +98,7 @@
 		</classChangeOption>
 		<classChangeOption name="Free">
 			<appliesTo>
-				<category>SAYHA_SEER_CANDIDATE</category>
+				<category>ERTHEIA_THIRD_WIZARD_GROUP</category>
 			</appliesTo>
 			<rewards>
 				<item id="40269" count="1" /> <!-- Sayha's Box - Sayha's Seer -->
--- a/L2J_Mobius_2.5_Underground/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/CategoryData.xml
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -68,17 +68,16 @@ public final class AwakeningMaster extends AbstractNpcAI
 	private static final int CHAOS_POMANDER = 37374;
 	private static final int CHAOS_POMANDER_DUAL_CLASS = 37375;
 	private static final Map<CategoryType, Integer> AWAKE_POWER = new HashMap<>();
-	
 	static
 	{
-		AWAKE_POWER.put(CategoryType.SIGEL_GROUP, 32264);
-		AWAKE_POWER.put(CategoryType.TYRR_GROUP, 32265);
-		AWAKE_POWER.put(CategoryType.OTHELL_GROUP, 32266);
-		AWAKE_POWER.put(CategoryType.YUL_GROUP, 32267);
-		AWAKE_POWER.put(CategoryType.FEOH_GROUP, 32268);
-		AWAKE_POWER.put(CategoryType.ISS_GROUP, 32269);
-		AWAKE_POWER.put(CategoryType.WYNN_GROUP, 32270);
-		AWAKE_POWER.put(CategoryType.AEORE_GROUP, 32271);
+		AWAKE_POWER.put(CategoryType.SIXTH_SIGEL_GROUP, 32264);
+		AWAKE_POWER.put(CategoryType.SIXTH_TIR_GROUP, 32265);
+		AWAKE_POWER.put(CategoryType.SIXTH_OTHEL_GROUP, 32266);
+		AWAKE_POWER.put(CategoryType.SIXTH_YR_GROUP, 32267);
+		AWAKE_POWER.put(CategoryType.SIXTH_FEOH_GROUP, 32268);
+		AWAKE_POWER.put(CategoryType.SIXTH_WYNN_GROUP, 32269);
+		AWAKE_POWER.put(CategoryType.SIXTH_IS_GROUP, 32270);
+		AWAKE_POWER.put(CategoryType.SIXTH_EOLH_GROUP, 32271);
 	}
 	
 	// Skills
@@ -117,7 +116,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 					{
 						case SIGEL_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+							if (!player.isInCategory(CategoryType.TANKER_CATEGORY))
 							{
 								return SIGEL_MASTER + "-no_class.htm";
 							}
@@ -125,7 +124,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 						case TYRR_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.TYRR_CANDIDATE))
+							if (!player.isInCategory(CategoryType.WARRIOR_CATEGORY))
 							{
 								return TYRR_MASTER + "-no_class.htm";
 							}
@@ -133,7 +132,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 						case OTHELL_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+							if (!player.isInCategory(CategoryType.ROGUE_CATEGORY))
 							{
 								return OTHELL_MASTER + "-no_class.htm";
 							}
@@ -141,7 +140,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 						case YUL_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.YUL_CANDIDATE))
+							if (!player.isInCategory(CategoryType.ARCHER_CATEGORY))
 							{
 								return YUL_MASTER + "-no_class.htm";
 							}
@@ -149,7 +148,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 						case FEOH_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.FEOH_CANDIDATE))
+							if (!player.isInCategory(CategoryType.WIZARD_CATEGORY))
 							{
 								return FEOH_MASTER + "-no_class.htm";
 							}
@@ -157,7 +156,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 						case ISS_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.ISS_CANDIDATE))
+							if (!player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
 							{
 								return ISS_MASTER + "-no_class.htm";
 							}
@@ -165,7 +164,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 						case WYNN_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.WYNN_CANDIDATE))
+							if (!player.isInCategory(CategoryType.SUMMONER_CATEGORY))
 							{
 								return WYNN_MASTER + "-no_class.htm";
 							}
@@ -173,7 +172,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 						case AEORE_MASTER:
 						{
-							if (!player.isInCategory(CategoryType.AEORE_CANDIDATE))
+							if (!player.isInCategory(CategoryType.HEALER_CATEGORY))
 							{
 								return AEORE_MASTER + "-no_class.htm";
 							}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -62,7 +62,7 @@ public final class Hadel extends AbstractNpcAI
 			}
 			case "teleportToHarnak":
 			{
-				if ((!player.isInCategory(CategoryType.AWAKEN_GROUP)) || (player.getLevel() < 85))
+				if ((!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) || (player.getLevel() < 85))
 				{
 					htmltext = "33344-noClass.html";
 					break;
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -183,7 +183,7 @@ public final class Hardin extends AbstractNpcAI
 				return "33870-02.html";
 			}
 		}
-		if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+		if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			return "33870-no.html";
 		}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -78,7 +78,7 @@ public final class MonkOfChaos extends AbstractNpcAI
 			}
 			case "LearnRevelationSkills":
 			{
-				if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP))
+				if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					htmltext = "no-learn.html";
 					break;
@@ -139,7 +139,7 @@ public final class MonkOfChaos extends AbstractNpcAI
 					}
 				}
 				
-				if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || (count == 0))
+				if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || (count == 0))
 				{
 					htmltext = "no-cancel.html";
 					break;
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -111,14 +111,14 @@ public final class Raina extends AbstractNpcAI
 	
 	private static final Map<CategoryType, Integer> classCloak = new HashMap<>();
 	{
-		classCloak.put(CategoryType.SIGEL_GROUP, 30310); // Abelius Cloak
-		classCloak.put(CategoryType.TYRR_GROUP, 30311); // Sapyros Cloak Grade
-		classCloak.put(CategoryType.OTHELL_GROUP, 30312); // Ashagen Cloak Grade
-		classCloak.put(CategoryType.YUL_GROUP, 30313); // Cranigg Cloak Grade
-		classCloak.put(CategoryType.FEOH_GROUP, 30314); // Soltkreig Cloak Grade
-		classCloak.put(CategoryType.WYNN_GROUP, 30315); // Naviarope Cloak Grade
-		classCloak.put(CategoryType.ISS_GROUP, 30316); // Leister Cloak Grade
-		classCloak.put(CategoryType.AEORE_GROUP, 30317); // Laksis Cloak Grade
+		classCloak.put(CategoryType.SIXTH_SIGEL_GROUP, 30310); // Abelius Cloak
+		classCloak.put(CategoryType.SIXTH_TIR_GROUP, 30311); // Sapyros Cloak Grade
+		classCloak.put(CategoryType.SIXTH_OTHEL_GROUP, 30312); // Ashagen Cloak Grade
+		classCloak.put(CategoryType.SIXTH_YR_GROUP, 30313); // Cranigg Cloak Grade
+		classCloak.put(CategoryType.SIXTH_FEOH_GROUP, 30314); // Soltkreig Cloak Grade
+		classCloak.put(CategoryType.SIXTH_WYNN_GROUP, 30315); // Naviarope Cloak Grade
+		classCloak.put(CategoryType.SIXTH_IS_GROUP, 30316); // Leister Cloak Grade
+		classCloak.put(CategoryType.SIXTH_EOLH_GROUP, 30317); // Laksis Cloak Grade
 	}
 	
 	private static final List<PlayerClass> dualClassList = new ArrayList<>();
@@ -290,7 +290,7 @@ public final class Raina extends AbstractNpcAI
 			case "ertheiaDualClass":
 			{
 				// TODO: Maybe html is different when you have 85lvl but you haven't completed quest
-				if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+				if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
 				{
 					htmltext = "addDualClassErtheiaFailed.html";
 				}
@@ -309,7 +309,7 @@ public final class Raina extends AbstractNpcAI
 			case "addDualClass_WYNN_GROUP":
 			case "addDualClass_AEORE_GROUP":
 			{
-				if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
+				if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
 				{
 					htmltext = "addDualClassErtheiaFailed.html";
 					break;
@@ -659,31 +659,31 @@ public final class Raina extends AbstractNpcAI
 	private void addPowerItem(L2PcInstance player)
 	{
 		int itemId = ABELIUS_POWER; // Sigel
-		if (player.isInCategory(CategoryType.TYRR_GROUP))
+		if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
 		{
 			itemId = SAPYROS_POWER;
 		}
-		else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
 		{
 			itemId = ASHAGEN_POWER;
 		}
-		else if (player.isInCategory(CategoryType.YUL_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
 		{
 			itemId = CRANIGG_POWER;
 		}
-		else if (player.isInCategory(CategoryType.FEOH_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
 		{
 			itemId = SOLTKREIG_POWER;
 		}
-		else if (player.isInCategory(CategoryType.WYNN_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
 		{
 			itemId = NAVIAROPE_POWER;
 		}
-		else if (player.isInCategory(CategoryType.ISS_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
 		{
 			itemId = LEISTER_POWER;
 		}
-		else if (player.isInCategory(CategoryType.AEORE_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
 		{
 			itemId = LAKCIS_POWER;
 		}
@@ -905,37 +905,37 @@ public final class Raina extends AbstractNpcAI
 	{
 		CategoryType catType = null;
 		
-		if (player.isInCategory(CategoryType.SIGEL_GROUP))
+		if (player.isInCategory(CategoryType.SIXTH_SIGEL_GROUP))
 		{
-			catType = CategoryType.SIGEL_GROUP;
+			catType = CategoryType.SIXTH_SIGEL_GROUP;
 		}
-		else if (player.isInCategory(CategoryType.TYRR_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
 		{
-			catType = CategoryType.TYRR_GROUP;
+			catType = CategoryType.SIXTH_TIR_GROUP;
 		}
-		else if (player.isInCategory(CategoryType.OTHELL_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
 		{
-			catType = CategoryType.OTHELL_GROUP;
+			catType = CategoryType.SIXTH_OTHEL_GROUP;
 		}
-		else if (player.isInCategory(CategoryType.YUL_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
 		{
-			catType = CategoryType.YUL_GROUP;
+			catType = CategoryType.SIXTH_YR_GROUP;
 		}
-		else if (player.isInCategory(CategoryType.FEOH_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
 		{
-			catType = CategoryType.FEOH_GROUP;
+			catType = CategoryType.SIXTH_FEOH_GROUP;
 		}
-		else if (player.isInCategory(CategoryType.ISS_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
 		{
-			catType = CategoryType.ISS_GROUP;
+			catType = CategoryType.SIXTH_IS_GROUP;
 		}
-		else if (player.isInCategory(CategoryType.WYNN_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
 		{
-			catType = CategoryType.WYNN_GROUP;
+			catType = CategoryType.SIXTH_WYNN_GROUP;
 		}
-		else if (player.isInCategory(CategoryType.AEORE_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
 		{
-			catType = CategoryType.AEORE_GROUP;
+			catType = CategoryType.SIXTH_EOLH_GROUP;
 		}
 		return classCloak.get(catType);
 	}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -152,7 +152,7 @@ public final class KimerianCommon extends AbstractInstance
 					{
 						if (hasQuestItems(player, FLUTE))
 						{
-							if (player.isInCategory(CategoryType.AEORE_GROUP))
+							if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
 							{
 								addSpawn(FAIRY_REBEL, player.getX() + 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
 								addSpawn(FAIRY_REBEL, player.getX() - 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -53,6 +53,9 @@ public final class AdventurersGuide extends AbstractNpcAI
 		new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
 		new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
 	};
+	// Misc
+	private static int MAX_LEVEL_BUFFS = 90;
+	private static int MIN_LEVEL_PROTECTION = 40;
 	
 	private AdventurersGuide()
 	{
@@ -115,7 +118,7 @@ public final class AdventurersGuide extends AbstractNpcAI
 	
 	private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
 	{
-		if (player.getLevel() > 90)
+		if (player.getLevel() > MAX_LEVEL_BUFFS)
 		{
 			return "guide-noBuffs.html";
 		}
@@ -126,7 +129,7 @@ public final class AdventurersGuide extends AbstractNpcAI
 		}
 		SkillCaster.triggerCast(npc, player, skill);
 		
-		if ((player.getLevel() < 40) && (player.getClassId().level() <= 1))
+		if ((player.getLevel() < MIN_LEVEL_PROTECTION) && (player.getClassId().level() <= 1))
 		{
 			SkillCaster.triggerCast(npc, player, BLESS_PROTECTION.getSkill());
 		}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -121,14 +121,14 @@ public final class CastleCourtMagician extends AbstractNpcAI
 	// Misc
 	private static final CategoryType[] AWAKENED_CT =
 	{
-		CategoryType.SIGEL_GROUP,
-		CategoryType.TYRR_GROUP,
-		CategoryType.OTHELL_GROUP,
-		CategoryType.YUL_GROUP,
-		CategoryType.FEOH_GROUP,
-		CategoryType.ISS_GROUP,
-		CategoryType.WYNN_GROUP,
-		CategoryType.AEORE_GROUP,
+		CategoryType.SIXTH_SIGEL_GROUP,
+		CategoryType.SIXTH_TIR_GROUP,
+		CategoryType.SIXTH_OTHEL_GROUP,
+		CategoryType.SIXTH_YR_GROUP,
+		CategoryType.SIXTH_FEOH_GROUP,
+		CategoryType.SIXTH_IS_GROUP,
+		CategoryType.SIXTH_WYNN_GROUP,
+		CategoryType.SIXTH_EOLH_GROUP,
 	};
 	
 	private CastleCourtMagician()
@@ -266,7 +266,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
 			}
 			case "giveTalismanR":
 			{
-				htmltext = player.isInCategory(CategoryType.AWAKEN_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
+				htmltext = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
 				break;
 			}
 			case "giveTalismanR_classSpecific":
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -297,7 +297,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 				{
 					htmltext = "test_server_helper011.html";
 				}
-				else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+				else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					htmltext = "test_server_helper011a.html";
 				}
@@ -319,7 +319,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 						htmltext = "test_server_helper021.html";
 					}
 				}
-				else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+				else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					htmltext = "test_server_helper011a.html";
 				}
@@ -352,7 +352,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 				}
 				else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (player.getLevel() >= 85)) // 9
 				{
-					canChange = CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, classId); // 11
+					canChange = CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId); // 11
 				}
 				
 				if (canChange)
@@ -422,7 +422,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 					{
 						player.setBaseClass(player.getActiveClass());
 					}
-					if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+					if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 					{
 						SkillTreesData.getInstance().cleanSkillUponAwakening(player);
 						for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
@@ -450,7 +450,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 			case "learnskills":
 			{
 				// Retail class master only lets you learn all third class skills.
-				if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+				if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					htmltext = "test_server_helper001_failed.html";
 				}
@@ -578,7 +578,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 		{
 			htmltext = "test_server_helper011.html";
 		}
-		else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			htmltext = "test_server_helper011a.html";
 		}
@@ -762,7 +762,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 		{
 			htmltext = "test_server_helper011.html";
 		}
-		else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+		else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			htmltext = "test_server_helper011a.html";
 		}
@@ -853,7 +853,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 			{
 				player.setBaseClass(player.getActiveClass());
 			}
-			if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+			if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 			{
 				SkillTreesData.getInstance().cleanSkillUponAwakening(player);
 				for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -97,7 +97,7 @@ public final class HermuncusMinion extends AbstractNpcAI
 		
 		if (event.equals("teleportList"))
 		{
-			if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 			{
 				htmltext = "HermuncusMinion-no.html";
 			}
@@ -155,7 +155,7 @@ public final class HermuncusMinion extends AbstractNpcAI
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		return player.isInCategory(CategoryType.AWAKEN_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
+		return player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
 	}
 	
 	private String generateButton(Integer locationId)
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -369,7 +369,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
 		
 		handleMenteeSkills(player);
 		
-		if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+		if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			handleGraduateMentee(player);
 		}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -57,16 +57,15 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 	private static final int MANAGER = 31688;
 	// Misc
 	private static final Map<CategoryType, Integer> EQUIPMENT_MULTISELL = new HashMap<>();
-	
 	{
-		EQUIPMENT_MULTISELL.put(CategoryType.SIGEL_GROUP, 917);
-		EQUIPMENT_MULTISELL.put(CategoryType.TYRR_GROUP, 918);
-		EQUIPMENT_MULTISELL.put(CategoryType.OTHELL_GROUP, 919);
-		EQUIPMENT_MULTISELL.put(CategoryType.YUL_GROUP, 920);
-		EQUIPMENT_MULTISELL.put(CategoryType.FEOH_GROUP, 921);
-		EQUIPMENT_MULTISELL.put(CategoryType.ISS_GROUP, 923);
-		EQUIPMENT_MULTISELL.put(CategoryType.WYNN_GROUP, 922);
-		EQUIPMENT_MULTISELL.put(CategoryType.AEORE_GROUP, 924);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_SIGEL_GROUP, 917);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_TIR_GROUP, 918);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_OTHEL_GROUP, 919);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_YR_GROUP, 920);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_FEOH_GROUP, 921);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_IS_GROUP, 923);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_WYNN_GROUP, 922);
+		EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_EOLH_GROUP, 924);
 	}
 	
 	private static final String[] BYPASSES =
@@ -144,7 +143,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 				{
 					htmltext = "OlyManager-subclass.html";
 				}
-				else if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+				else if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					htmltext = "OlyManager-awaken.html";
 				}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -416,7 +416,7 @@ public class AdminEditChar implements IAdminCommandHandler
 					}
 					
 					final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
-					if (player.isInCategory(CategoryType.AWAKEN_GROUP))
+					if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 					{
 						SkillTreesData.getInstance().cleanSkillUponAwakening(player);
 						for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -114,7 +114,7 @@ public final class AirBind extends AbstractEffect
 		for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200))
 		{
 			if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) //
-				&& nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+				&& nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
 			{
 				final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId());
 				if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -173,7 +173,7 @@ public final class KnockBack extends AbstractEffect
 			{
 				continue;
 			}
-			if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
+			if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
 			{
 				final int chainSkill = _chainKnockSkills.get(nearbyPlayer.getClassId());
 				if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -79,17 +79,16 @@ public final class HarnakUndergroundRuins extends AbstractInstance
 	private static final int DOOR_ONE = 16240100;
 	private static final int DOOR_TWO = 16240102;
 	private static final Map<CategoryType, Integer> MOB_CATEGORY = new HashMap<>();
-	
 	static
 	{
-		MOB_CATEGORY.put(CategoryType.SIGEL_CANDIDATE, RAKZAN);
-		MOB_CATEGORY.put(CategoryType.TYRR_CANDIDATE, KRAKIA_BATHUS);
-		MOB_CATEGORY.put(CategoryType.OTHELL_CANDIDATE, BAMONTI);
-		MOB_CATEGORY.put(CategoryType.YUL_CANDIDATE, KRAKIA_CARCASS);
-		MOB_CATEGORY.put(CategoryType.FEOH_CANDIDATE, WEISS_KHAN);
-		MOB_CATEGORY.put(CategoryType.ISS_CANDIDATE, SEKNUS);
-		MOB_CATEGORY.put(CategoryType.WYNN_CANDIDATE, KRAKIA_LOTUS);
-		MOB_CATEGORY.put(CategoryType.AEORE_CANDIDATE, WEISS_ELE);
+		MOB_CATEGORY.put(CategoryType.SIXTH_SIGEL_GROUP, RAKZAN);
+		MOB_CATEGORY.put(CategoryType.SIXTH_TIR_GROUP, KRAKIA_BATHUS);
+		MOB_CATEGORY.put(CategoryType.SIXTH_OTHEL_GROUP, BAMONTI);
+		MOB_CATEGORY.put(CategoryType.SIXTH_YR_GROUP, KRAKIA_CARCASS);
+		MOB_CATEGORY.put(CategoryType.SIXTH_FEOH_GROUP, WEISS_KHAN);
+		MOB_CATEGORY.put(CategoryType.SIXTH_IS_GROUP, SEKNUS);
+		MOB_CATEGORY.put(CategoryType.SIXTH_WYNN_GROUP, KRAKIA_LOTUS);
+		MOB_CATEGORY.put(CategoryType.SIXTH_EOLH_GROUP, WEISS_ELE);
 	}
 	
 	public HarnakUndergroundRuins()
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -363,27 +363,27 @@ public final class Nursery extends AbstractInstance
 			{
 				int pointsCount = getRandom(6) + 3;
 				
-				if (killer.isInCategory(CategoryType.SIGEL_GROUP) || killer.isInCategory(CategoryType.AEORE_GROUP))
+				if (killer.isInCategory(CategoryType.SIXTH_SIGEL_GROUP) || killer.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
 				{
 					pointsCount += 6;
 				}
-				else if (killer.isInCategory(CategoryType.TYRR_GROUP))
+				else if (killer.isInCategory(CategoryType.SIXTH_TIR_GROUP))
 				{
 					pointsCount -= 1;
 				}
-				else if (killer.isInCategory(CategoryType.OTHELL_GROUP))
+				else if (killer.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
 				{
 					pointsCount += 2;
 				}
-				else if (killer.isInCategory(CategoryType.YUL_GROUP))
+				else if (killer.isInCategory(CategoryType.SIXTH_YR_GROUP))
 				{
 					pointsCount += 1;
 				}
-				else if (killer.isInCategory(CategoryType.FEOH_GROUP) || killer.isInCategory(CategoryType.ISS_GROUP))
+				else if (killer.isInCategory(CategoryType.SIXTH_FEOH_GROUP) || killer.isInCategory(CategoryType.SIXTH_IS_GROUP))
 				{
 					pointsCount += 0;
 				}
-				else if (killer.isInCategory(CategoryType.WYNN_GROUP))
+				else if (killer.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
 				{
 					pointsCount += 3;
 				}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -239,39 +239,39 @@ public final class Q00177_SplitDestiny extends Quest
 			{
 				htmltext = "33344-02.htm";
 			}
-			else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClass()))
+			else if (!CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, player.getBaseClass()))
 			{
 				htmltext = "33344-03.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TANKER_CATEGORY))
 			{
 				htmltext = "33344-sigel.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_TIR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WARRIOR_CATEGORY))
 			{
 				htmltext = "33344-tyrr.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ROGUE_CATEGORY))
 			{
 				htmltext = "33344-othell.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ARCHER_CATEGORY))
 			{
 				htmltext = "33344-yul.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WIZARD_CATEGORY))
 			{
 				htmltext = "33344-feoh.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
 			{
 				htmltext = "33344-iss.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SUMMONER_CATEGORY))
 			{
 				htmltext = "33344-wynn.htm";
 			}
-			else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
+			else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.HEALER_CATEGORY))
 			{
 				htmltext = "33344-aeore.htm";
 			}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -91,7 +91,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
 			}
 			case "33477-03.html":
 			{
-				if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+				if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					qs.setSimulated(false);
 					qs.setState(State.CREATED);
@@ -149,7 +149,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
 				{
 					htmltext = "33477-06.html";
 				}
-				else if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+				else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
 				{
 					htmltext = "33477-05.html";
 				}
@@ -167,7 +167,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
 			}
 			case HADEL:
 			{
-				if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
+				if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
 				{
 					htmltext = "33344-07.html";
 				}
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -62,7 +62,7 @@ public final class Q10339_FightingTheForgotten extends Quest
 		addTalkId(THEODORE, HADEL);
 		addKillId(MONSTERS);
 		addCondMinLevel(MIN_LV, "32975-06.html");
-		addCondInCategory(CategoryType.AWAKEN_GROUP, "32975-06.html");
+		addCondInCategory(CategoryType.SIXTH_CLASS_GROUP, "32975-06.html");
 	}
 	
 	@Override
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19100-19199.xml
@@ -2101,7 +2101,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25700-25799.xml
@@ -4618,7 +4618,7 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky_drop>
 		</drop_lists>
-		<status undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="81" />
@@ -4935,7 +4935,7 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky_drop>
 		</drop_lists>
-		<status undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<collision>
 			<radius normal="90" />
 			<height normal="190" />
@@ -5617,7 +5617,7 @@
 				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky_drop>
 		</drop_lists>
-		<status undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="55" />
@@ -5681,6 +5681,7 @@
 			<skill id="14621" level="1" /> <!-- Pulling Resistance -->
 		</skill_list>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="300" />
+		<status undying="false" isDeathPenalty="true" />
 		<drop_lists>
 			<drop>
 				<item id="57" min="7500000" max="13000000" chance="100" /> <!-- Adena -->
@@ -5773,7 +5774,6 @@
 				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky_drop>
 		</drop_lists>
-		<status undying="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29" />
@@ -5883,6 +5883,7 @@
 			<skill id="14621" level="1" /> <!-- Pulling Resistance -->
 		</skill_list>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="300" />
+		<status undying="false" isDeathPenalty="true" />
 		<drop_lists>
 			<drop>
 				<item id="57" min="7500000" max="13000000" chance="100" /> <!-- Adena -->
@@ -5975,7 +5976,6 @@
 				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky_drop>
 		</drop_lists>
-		<status undying="false" />
 		<collision>
 			<radius normal="15" />
 			<height normal="32" />
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
@@ -57,7 +57,7 @@
 			<skill id="14621" level="1" /> <!-- Pulling Resistance -->
 		</skill_list>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="300" />
-		<status undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="32" />
@@ -109,7 +109,7 @@
 			<skill id="14765" level="2" /> <!-- Blood Siphon Resistance -->
 		</skill_list>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<status targetable="false" showName="false" undying="false" />
+		<status targetable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<collision>
 			<radius normal="90" />
 			<height normal="190" />
@@ -1027,7 +1027,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5462" level="1" /> <!-- Fire Attack -->
 			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
@@ -1087,6 +1087,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5462" level="1" /> <!-- Fire Attack -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1616,6 +1617,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14729" level="1" /> <!-- Raid Boss (Lv. 92) -->
@@ -1697,6 +1699,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14733" level="1" /> <!-- Raid Boss (Lv. 93) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1770,6 +1773,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14734" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1846,6 +1850,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14730" level="1" /> <!-- Raid Boss (Lv. 94) -->
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -1923,6 +1928,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14731" level="1" /> <!-- Raid Boss (Lv. 95) -->
 			<skill id="4416" level="1" /> <!-- Undead -->
@@ -2005,7 +2011,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="3" /> <!-- Beast -->
@@ -2046,7 +2052,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14732" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -2100,7 +2106,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14732" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -2155,6 +2161,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14732" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
@@ -2239,6 +2246,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14735" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -2310,7 +2318,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -2366,7 +2374,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -2956,7 +2964,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
@@ -3012,7 +3020,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14722" level="1" /> <!-- Raid Boss (Lv. 98) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -3065,7 +3073,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14722" level="1" /> <!-- Raid Boss (Lv. 98) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -3394,7 +3402,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -3450,7 +3458,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -3637,7 +3645,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5463" level="1" /> <!-- Water Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
@@ -4708,7 +4716,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4414" level="3" /> <!-- Light Armor Type -->
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29000-29099.xml
@@ -1397,7 +1397,7 @@
 			</speed>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
@@ -3489,7 +3489,7 @@
 			</speed>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29100-29199.xml
@@ -3420,7 +3420,7 @@
 			</speed>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
@@ -3949,7 +3949,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14726" level="1" /> <!-- Octavis -->
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
@@ -3988,7 +3988,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="3" /> <!-- Beast -->
@@ -4028,7 +4028,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14726" level="1" /> <!-- Octavis -->
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
@@ -4070,7 +4070,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14726" level="1" /> <!-- Octavis -->
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
@@ -4211,7 +4211,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14708" level="1" /> <!-- Istina -->
 			<skill id="5463" level="1" /> <!-- Water Attack -->
@@ -4369,7 +4369,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5463" level="1" /> <!-- Water Attack -->
 			<skill id="14709" level="1" /> <!-- Istina -->
@@ -4524,7 +4524,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" showName="false" undying="false" />
+		<status attackable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -4672,7 +4672,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
@@ -4718,7 +4718,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/29200-29299.xml
@@ -25,7 +25,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" showName="false" undying="false" />
+		<status attackable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -71,7 +71,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
@@ -116,7 +116,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
@@ -160,7 +160,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
@@ -204,7 +204,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" showName="false" undying="false" />
+		<status attackable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
@@ -249,7 +249,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
@@ -293,7 +293,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="2" /> <!-- Magic Creatures -->
@@ -334,7 +334,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" showName="false" undying="false" />
+		<status attackable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -375,7 +375,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" showName="false" undying="false" />
+		<status attackable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -416,7 +416,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14726" level="1" /> <!-- Octavis -->
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
@@ -457,7 +457,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="4416" level="3" /> <!-- Beast -->
@@ -497,7 +497,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="14726" level="1" /> <!-- Octavis -->
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
@@ -540,7 +540,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14726" level="1" /> <!-- Octavis -->
@@ -693,7 +693,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
@@ -964,7 +964,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="14247" level="1" /> <!-- Black Vortex -->
@@ -1116,7 +1116,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" showName="false" undying="false" />
+		<status attackable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -1157,7 +1157,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" showName="false" undying="false" />
+		<status attackable="false" showName="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -1197,7 +1197,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -1248,7 +1248,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4122" level="1" /> <!-- Antharas -->
@@ -1472,7 +1472,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5462" level="1" /> <!-- Fire Attack -->
 			<skill id="4679" level="1" /> <!-- Valakas -->
@@ -1595,7 +1595,7 @@
 			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
@@ -1678,7 +1678,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="16101" level="1" /> <!-- Tauti -->
@@ -1726,7 +1726,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="16101" level="1" /> <!-- Tauti -->
@@ -1774,7 +1774,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="16101" level="1" /> <!-- Tauti -->
@@ -1814,7 +1814,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="16101" level="1" /> <!-- Tauti -->
@@ -1922,7 +1922,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="16101" level="1" /> <!-- Tauti -->
@@ -2030,7 +2030,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="false" undying="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="16101" level="1" /> <!-- Tauti -->
@@ -2069,7 +2069,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" targetable="false" />
+		<status attackable="false" targetable="false" isDeathPenalty="true" />
 		<skill_list>
 			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="16101" level="1" /> <!-- Tauti -->
--- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd
@@ -200,6 +200,7 @@
 									<xs:attribute name="passableDoor" type="xs:boolean" />
 									<xs:attribute name="hasSummoner" type="xs:boolean" />
 									<xs:attribute name="canBeSown" type="xs:boolean" />
+									<xs:attribute name="isDeathPenalty" type="xs:boolean" />
 								</xs:complexType>
 							</xs:element>
 							<xs:element name="skill_list" minOccurs="0" maxOccurs="1">
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -689,7 +689,7 @@ public final class SkillTreesData implements IGameXmlReader
 			return result;
 		}
 		
-		final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
+		final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && ((player.getRace() != Race.ERTHEIA) || player.isDualClassActive());
 		
 		for (Entry<Long, L2SkillLearn> entry : skills.entrySet())
 		{
@@ -803,7 +803,7 @@ public final class SkillTreesData implements IGameXmlReader
 		}
 		
 		final Race race = player.getRace();
-		final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP);
+		final boolean isAwaken = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP);
 		
 		// Race skills
 		if (isAwaken)
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/CategoryType.java
@@ -32,6 +32,17 @@ public enum CategoryType
 	SECOND_CLASS_GROUP,
 	THIRD_CLASS_GROUP,
 	FOURTH_CLASS_GROUP,
+	EQUIP_ENABLE_R,
+	FIFTH_CLASS_GROUP,
+	SIXTH_CLASS_GROUP,
+	SIXTH_SIGEL_GROUP,
+	SIXTH_TIR_GROUP,
+	SIXTH_OTHEL_GROUP,
+	SIXTH_YR_GROUP,
+	SIXTH_FEOH_GROUP,
+	SIXTH_IS_GROUP,
+	SIXTH_WYNN_GROUP,
+	SIXTH_EOLH_GROUP,
 	BOUNTY_HUNTER_GROUP,
 	WARSMITH_GROUP,
 	SUMMON_NPC_GROUP,
@@ -142,30 +153,158 @@ public enum CategoryType
 	RECOM_KAMAEL_GROUP,
 	RECOM_ORCF_GROUP,
 	RECOM_ORCM_GROUP,
+	RECOM_ERTHEIAF_GROUP,
+	RECOM_ERTHEIAM_GROUP,
 	DEINONYCHUS_PET_GROUP,
 	BEASTFARM_BEAST,
 	BEASTFARM_INVADER,
 	ICEQUEEN_NPC,
-	AWAKEN_GROUP,
-	SHILENS_FOLLOWERS,
-	SIGEL_CANDIDATE,
-	TYRR_CANDIDATE,
-	OTHELL_CANDIDATE,
-	YUL_CANDIDATE,
-	FEOH_CANDIDATE,
-	ISS_CANDIDATE,
-	WYNN_CANDIDATE,
-	AEORE_CANDIDATE,
-	EVISCERATOR_CANDIDATE,
-	SAYHA_SEER_CANDIDATE,
-	SIGEL_GROUP,
-	TYRR_GROUP,
-	OTHELL_GROUP,
-	YUL_GROUP,
-	FEOH_GROUP,
-	ISS_GROUP,
-	WYNN_GROUP,
-	AEORE_GROUP;
+	FAIRY_PC_SIDE,
+	FAIRY_WISP,
+	FAIRY_GLIMMER,
+	TANKER_CATEGORY,
+	WARRIOR_CATEGORY,
+	ROGUE_CATEGORY,
+	ARCHER_CATEGORY,
+	WIZARD_CATEGORY,
+	SUMMONER_CATEGORY,
+	HEALER_CATEGORY,
+	ENCHANTER_CATEGORY,
+	RUMBLE_MONSTERS,
+	RUMBLE_GUARDIANS,
+	TWO_POINT_MULTI_SUMMON,
+	APM_ZERO_WARRIOR_GROUP,
+	APM_ZERO_MAGE_GROUP,
+	APM_1ST_KNIGHT_GROUP,
+	APM_1ST_WARRIOR_GROUP,
+	APM_1ST_WIZARD_GROUP,
+	APM_1ST_HEALER_GROUP,
+	APM_2ND_KNIGHT_GROUP,
+	APM_2ND_WARRIOR_GROUP,
+	APM_2ND_ROGUE_GROUP,
+	APM_2ND_WIZARD_GROUP,
+	APM_2ND_ARCHER_GROUP,
+	APM_2ND_BUFFER_GROUP,
+	APM_2ND_SUMMONER_GROUP,
+	APM_2ND_ONLY_GROUP,
+	APM_3RD_KNIGHT_GROUP,
+	APM_3RD_WARRIOR_GROUP,
+	APM_3RD_ROGUE_GROUP,
+	APM_3RD_WIZARD_GROUP,
+	APM_3RD_ARCHER_GROUP,
+	APM_3RD_BUFFER_GROUP,
+	APM_3RD_SUMMONER_GROUP,
+	APM_3RD_ONLY_GROUP,
+	SUBCLASS_TANKER,
+	SUBCLASS_WARRIOR,
+	SUBCLASS_ROUGE,
+	SUBCLASS_ARCHER,
+	SUBCLASS_WIZARD,
+	SUBCLASS_SUMMON,
+	SUBCLASS_HEAL,
+	SUBCLASS_ENCHANTER,
+	SUBCLASS_SPEACIAL,
+	SUBCLASS_KAMAEL,
+	EXCEPT_KAMAEL_GROUP,
+	R_HUMANMAGE_GROUP,
+	R_HUMANFIGHTER_GROUP,
+	DIVISION_TANKER,
+	DIVISION_WARRIOR,
+	DIVISION_ROUGE,
+	DIVISION_ARCHER,
+	DIVISION_WIZARD,
+	DIVISION_SUMMON,
+	DIVISION_ENCHANTER,
+	DIVISION_HEAL,
+	HUMAN_FOURTH_CLASS_GROUP,
+	ELF_FOURTH_CLASS_GROUP,
+	DARKELF_FOURTH_CLASS_GROUP,
+	ORC_FOURTH_CLASS_GROUP,
+	DWARF_FOURTH_CLASS_GROUP,
+	FOURTH_LANCE_CLASS_GROUP,
+	FOURTH_BOW_CLASS_GROUP,
+	EQUIP_ENABLE_HEAVY_ATTACK,
+	EQUIP_ENABLE_HEAVY_DEFENSE,
+	EQUIP_ENABLE_LIGHT_HIT,
+	EQUIP_ENABLE_LIGHT_ENCHANT,
+	EQUIP_ENABLE_ROBE_MAGIC,
+	EQUIP_ENABLE_ROBE_RECOVERY,
+	DILLER_GROUP,
+	MAESTRO_GROUP,
+	MAESTRO_GROUP_CRAFT,
+	SUB_GROUP_WARRIOR2,
+	SUB_GROUP_ROGUE2,
+	SUB_GROUP_KNIGHT2,
+	SUB_GROUP_SUMMONER2,
+	SUB_GROUP_WIZARD2,
+	SUB_GROUP_HEALER2,
+	SUB_GROUP_ENCHANTER2,
+	G_CARTIA_PC_GROUP,
+	G_CARTIA_NPC_GROUP,
+	HEAVY_GROUP,
+	LIGHT_GROUP,
+	ROBE_GROUP,
+	M_WARRIOR_GROUP,
+	PHYSICS_CLASS_GROUP,
+	HEATSAND_SUMMON_CLASS_GROUP,
+	MAGIC_CLASS_GROUP,
+	LONG_DISTANCE_CLASS_GROUP,
+	CLOSE_DISTANCE_CLASS_GROUP,
+	HS_WIZARD_CLASS_GROUP,
+	HS_WARRIOR_CLASS_GROUP,
+	SUBCLASS_PALADIN,
+	SUBCLASS_DARKAVENGER,
+	SUBCLASS_TEMPLEKNIGHT,
+	SUBCLASS_SHILLIENKNIGHT,
+	SUBCLASS_GLADIATOR,
+	SUBCLASS_WARLORD,
+	SUBCLASS_DESTROYER,
+	SUBCLASS_TYRAN,
+	SUBCLASS_BERSERKER,
+	SUBCLASS_TREASUREHUNTER,
+	SUBCLASS_PLAINSWALKER,
+	SUBCLASS_ABYSSWALKER,
+	SUBCLASS_BOUNTYHUNTER,
+	SUBCLASS_HAWKEYE,
+	SUBCLASS_SILVERRANGER,
+	SUBCLASS_PHANTOMRANGER,
+	SUBCLASS_ARBALESTER,
+	SUBCLASS_SORCERER,
+	SUBCLASS_NECROMANCER,
+	SUBCLASS_SPELLSINGER,
+	SUBCLASS_SPELLHOWLER,
+	SUBCLASS_SOULBREAKER,
+	SUBCLASS_WARLOCK,
+	SUBCLASS_ELEMENTALSUMMONER,
+	SUBCLASS_PHANTOMSUMMONER,
+	SUBCLASS_BISHOP,
+	SUBCLASS_ELDER,
+	SUBCLASS_SHILLIENELDER,
+	SUBCLASS_PROPHET,
+	SUBCLASS_SWORDSINGER,
+	SUBCLASS_BLADEDANCER,
+	SUBCLASS_WARCRYER,
+	SUBCLASS_INSPECTOR,
+	WINDREFINE_ERTHEIA_GROUP,
+	WINDREFINE_ERTHEIA_GROUP1,
+	WINDREFINE_ERTHEIA_GROUP2,
+	ERTHEIA_ALL_CLASS,
+	ERTHEIA_FIRST_CLASS_GROUP,
+	ERTHEIA_SECOND_CLASS_GROUP,
+	ERTHEIA_THIRD_CLASS_GROUP,
+	ERTHEIA_FOURTH_CLASS_GROUP,
+	ERTHEIA_WIZARD_GROUP,
+	ERTHEIA_FIGHTER_GROUP,
+	ERTHEIA_THIRD_WIZARD_GROUP,
+	ERTHEIA_THIRD_FIGHTER_GROUP,
+	VANGUARD_OF_ADEN_FCC,
+	COMMON_MONSTER_FCC,
+	EQEIP_ENABLE_LHAND,
+	G_EV_MON_MINIGAME,
+	HEAVY_ARMOR_CLASS,
+	LIGHT_ARMOR_CLASS,
+	ROBE_CLASS,
+	EXCEPT_ERTHEIA_CLASS;
 	
 	/**
 	 * Finds category by it's name
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
@@ -288,7 +288,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
 			sm = SystemMessageId.YOU_CANNOT_PARTICIPATE_IN_THE_CEREMONY_OF_CHAOS_AS_A_FLYING_TRANSFORMED_OBJECT;
 			canRegister = false;
 		}
-		else if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+		else if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			sm = SystemMessageId.ONLY_CHARACTERS_WHO_HAVE_COMPLETED_THE_3RD_CLASS_TRANSFER_MAY_PARTICIPATE;
 			canRegister = false;
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -8084,7 +8084,7 @@ public final class L2PcInstance extends L2Playable
 	@Override
 	public boolean hasBasicPropertyResist()
 	{
-		return isInCategory(CategoryType.AWAKEN_GROUP);
+		return isInCategory(CategoryType.SIXTH_CLASS_GROUP);
 	}
 	
 	/**
@@ -11447,7 +11447,7 @@ public final class L2PcInstance extends L2Playable
 			percent *= getStat().getValue(Stats.REDUCE_DEATH_PENALTY_BY_PVP, 1);
 		}
 		
-		if (killer.isInCategory(CategoryType.SHILENS_FOLLOWERS) || (Rnd.get(1, 100) <= ((Config.DEATH_PENALTY_CHANCE) * percent)))
+		if ((killer.isNpc() && ((L2Npc) killer).getTemplate().isDeathPenalty()) || (Rnd.get(1, 100) <= ((Config.DEATH_PENALTY_CHANCE) * percent)))
 		{
 			if (!killer.isPlayable() || (getReputation() < 0))
 			{
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
@@ -84,6 +84,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 	private boolean _hasSummoner;
 	private boolean _canBeSown;
 	private boolean _canBeCrt;
+	private boolean _isDeathPenalty;
 	private int _corpseTime;
 	private AIType _aiType;
 	private int _aggroRange;
@@ -162,6 +163,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 		_hasSummoner = set.getBoolean("hasSummoner", false);
 		_canBeSown = set.getBoolean("canBeSown", false);
 		_canBeCrt = set.getBoolean("ex_crt_effect", true);
+		_isDeathPenalty = set.getBoolean("isDeathPenalty", false);
 		
 		_corpseTime = set.getInt("corpseTime", Config.DEFAULT_CORPSE_TIME);
 		
@@ -418,6 +420,11 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 		return _canBeCrt;
 	}
 	
+	public boolean isDeathPenalty()
+	{
+		return _isDeathPenalty;
+	}
+	
 	public int getCorpseTime()
 	{
 		return _corpseTime;
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -80,7 +80,7 @@ public class Olympiad extends ListenersContainer
 	private static final String OLYMPIAD_MONTH_CLEAR = "TRUNCATE olympiad_nobles_eom";
 	private static final String OLYMPIAD_MONTH_CREATE = "INSERT INTO olympiad_nobles_eom SELECT charId, class_id, olympiad_points, competitions_done, competitions_won, competitions_lost, competitions_drawn FROM olympiad_nobles";
 	
-	private static final Set<Integer> HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.AWAKEN_GROUP);
+	private static final Set<Integer> HERO_IDS = CategoryData.getInstance().getCategoryByType(CategoryType.SIXTH_CLASS_GROUP);
 	
 	private static final int COMP_START = Config.ALT_OLY_START_TIME; // 6PM
 	private static final int COMP_MIN = Config.ALT_OLY_MIN; // 00 mins
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2SayuneZone.java
@@ -56,7 +56,7 @@ public class L2SayuneZone extends L2ZoneType
 	@Override
 	protected void onEnter(L2Character character)
 	{
-		if (character.isPlayer() && (character.isInCategory(CategoryType.AWAKEN_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
+		if (character.isPlayer() && (character.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || Config.FREE_JUMPS_FOR_ALL) && !character.getActingPlayer().isMounted() && !character.isTransformed())
 		{
 			character.setInsideZone(ZoneId.SAYUNE, true);
 			ThreadPoolManager.execute(new FlyMoveStartTask(this, character.getActingPlayer()));
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -417,7 +417,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
 					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
 					return;
 				}
-				if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+				if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
 					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
@@ -460,7 +460,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
 					return;
 				}
 				
-				if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+				if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
 					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -150,7 +150,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
 			}
 			case REVELATION:
 			{
-				if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+				if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
 					return;
 				}
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -82,7 +82,7 @@ public final class RequestExEnchantSkill implements IClientIncomingPacket
 			return;
 		}
 		
-		if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
+		if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			return;
 		}
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -61,7 +61,7 @@ public final class RequestExEnchantSkillInfo implements IClientIncomingPacket
 			return;
 		}
 		
-		if (!activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+		if (!activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			return;
 		}
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -115,7 +115,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
 			mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
 			return false;
 		}
-		else if (!mentor.isInCategory(CategoryType.AWAKEN_GROUP))
+		else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR);
 			return false;
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -44,7 +44,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
 	public void run(L2GameClient client)
 	{
 		final L2PcInstance activeChar = client.getActiveChar();
-		if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.AWAKEN_GROUP))
+		if ((activeChar == null) || !activeChar.isInsideZone(ZoneId.SAYUNE) || activeChar.hasRequest(SayuneRequest.class) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 		{
 			return;
 		}
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -48,7 +48,7 @@ public class ExMentorList implements IClientOutgoingPacket
 			_type = 0x02;
 			_mentees = Arrays.asList(MentorManager.getInstance().getMentor(activeChar.getObjectId()));
 		}
-		else if (activeChar.isInCategory(CategoryType.AWAKEN_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
+		else if (activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) // Not a mentor, Not a mentee, so can be a mentor
 		{
 			_mentees = Collections.emptyList();
 			_type = 0x01;
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -40,7 +40,7 @@ public class ListMenteeWaiting implements IClientOutgoingPacket
 		_page = page;
 		for (L2PcInstance player : L2World.getInstance().getPlayers())
 		{
-			if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.AWAKEN_GROUP))
+			if ((player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && !player.isMentee() && !player.isMentor() && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 			{
 				_possibleCandiates.add(player);
 			}