BETA: Datapack part for [L6578].

Patch from: Zealar
Reviewed by: UnAfraid, Zoey76, Sdw

L2J_DataPack_BETA/dist/game/data/html/admin/npcinfo.htm

@@ -19,6 +19,7 @@
 <tr><td colspan="4"><table width=270 border=0><tr><td width=270><font color="LEVEL">Npc Info</font> : %name% (<font color="LEVEL">%id%</font>) [<font color=00FF00>%lvl%</font> lvl]</td></tr></table></td></tr>
 <tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">ObjectId</font></td><td align=right width=170>%objid%</td></tr></table></td></tr>
 <tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Type:</font></td><td align=right width=170><font color=999999>%class%</font></td></tr></table></td></tr>
+<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Race</font></td><td align=right width=170>%race%</td></tr></table></td></tr>
 <tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Territory:</font></td><td align=right width=170>%territory%</td></tr></table></td></tr>
 <tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Spawn type:</font></td><td align=right width=170>%spawntype%</td></tr></table></td></tr>
 <tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Spawn loc:</font></td><td align=right width=170>%spawn%</td></tr></table></td></tr>

L2J_DataPack_BETA/dist/game/data/html/admin/petinfo.htm

@@ -23,7 +23,7 @@
 <tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Load:</font></td><td align=right width=170>%load%</td></tr></table></td></tr>
 <tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Karma:</font></td><td align=right width=170>%karma%</td></tr></table></td></tr>
 <tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Inventory:</font></td><td align=right width=170>%inv%</td></tr></table></td></tr>
-<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Undead:</font></td><td align=right width=170>%undead%</td></tr></table></td></tr>
+<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Race:</font></td><td align=right width=170>%race%</td></tr></table></td></tr>
 </table>
 <br><img src="L2UI.SquareWhite" width=260 height=1><br>
 <table width=240>

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java

@@ -21,7 +21,7 @@ package ai.npc.TerritoryManagers;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.MultisellData;
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
@@ -160,7 +160,7 @@ public final class TerritoryManagers extends AbstractNpcAI
 					// Complete the sub-class related quest.
 					// Complete quest Seeds of Chaos (236) for Kamael characters.
 					// Complete quest Mimir's Elixir (235) for other races characters.
-					final Quest q = QuestManager.getInstance().getQuest((player.getRace() == PcRace.KAMAEL) ? 236 : 235);
+					final Quest q = QuestManager.getInstance().getQuest((player.getRace() == Race.KAMAEL) ? 236 : 235);
 					if (q != null)
 					{
 						QuestState qs = player.getQuestState(q.getName());

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2VillageMasterFighterInstance;
@@ -36,25 +36,25 @@ import com.l2jserver.gameserver.model.actor.instance.L2VillageMasterPriestInstan
  */
 public final class FirstClassTransferTalk extends AbstractNpcAI
 {
-	private static final Map<Integer, PcRace> MASTERS = new HashMap<>();
+	private static final Map<Integer, Race> MASTERS = new HashMap<>();
 	static
 	{
-		MASTERS.put(30026, PcRace.HUMAN); // Blitz, TI Fighter Guild Head Master
-		MASTERS.put(30031, PcRace.HUMAN); // Biotin, TI Einhasad Temple High Priest
-		MASTERS.put(30154, PcRace.ELF); // Asterios, Elven Village Tetrarch
-		MASTERS.put(30358, PcRace.DARK_ELF); // Thifiell, Dark Elf Village Tetrarch
-		MASTERS.put(30565, PcRace.ORC); // Kakai, Orc Village Flame Lord
-		MASTERS.put(30520, PcRace.DWARF); // Reed, Dwarven Village Warehouse Chief
-		MASTERS.put(30525, PcRace.DWARF); // Bronk, Dwarven Village Head Blacksmith
+		MASTERS.put(30026, Race.HUMAN); // Blitz, TI Fighter Guild Head Master
+		MASTERS.put(30031, Race.HUMAN); // Biotin, TI Einhasad Temple High Priest
+		MASTERS.put(30154, Race.ELF); // Asterios, Elven Village Tetrarch
+		MASTERS.put(30358, Race.DARK_ELF); // Thifiell, Dark Elf Village Tetrarch
+		MASTERS.put(30565, Race.ORC); // Kakai, Orc Village Flame Lord
+		MASTERS.put(30520, Race.DWARF); // Reed, Dwarven Village Warehouse Chief
+		MASTERS.put(30525, Race.DWARF); // Bronk, Dwarven Village Head Blacksmith
 		// Kamael Village NPCs
-		MASTERS.put(32171, PcRace.DWARF); // Hoffa, Warehouse Chief
-		MASTERS.put(32158, PcRace.DWARF); // Fisler, Dwarf Guild Warehouse Chief
-		MASTERS.put(32157, PcRace.DWARF); // Moka, Dwarf Guild Head Blacksmith
-		MASTERS.put(32160, PcRace.DARK_ELF); // Devon, Dark Elf Guild Grand Magister
-		MASTERS.put(32147, PcRace.ELF); // Rivian, Elf Guild Grand Master
-		MASTERS.put(32150, PcRace.ORC); // Took, Orc Guild High Prefect
-		MASTERS.put(32153, PcRace.HUMAN); // Prana, Human Guild High Priest
-		MASTERS.put(32154, PcRace.HUMAN); // Aldenia, Human Guild Grand Master
+		MASTERS.put(32171, Race.DWARF); // Hoffa, Warehouse Chief
+		MASTERS.put(32158, Race.DWARF); // Fisler, Dwarf Guild Warehouse Chief
+		MASTERS.put(32157, Race.DWARF); // Moka, Dwarf Guild Head Blacksmith
+		MASTERS.put(32160, Race.DARK_ELF); // Devon, Dark Elf Guild Grand Magister
+		MASTERS.put(32147, Race.ELF); // Rivian, Elf Guild Grand Master
+		MASTERS.put(32150, Race.ORC); // Took, Orc Guild High Prefect
+		MASTERS.put(32153, Race.HUMAN); // Prana, Human Guild High Priest
+		MASTERS.put(32154, Race.HUMAN); // Aldenia, Human Guild Grand Master
 	}
 	
 	private FirstClassTransferTalk()

L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java

@@ -67,6 +67,7 @@ public class L2NpcActionShift implements IActionHandler
 			
 			html.replace("%objid%", String.valueOf(target.getObjectId()));
 			html.replace("%class%", target.getClass().getSimpleName());
+			html.replace("%race%", ((L2Npc) target).getTemplate().getRace().toString());
 			html.replace("%id%", String.valueOf(((L2Npc) target).getTemplate().getId()));
 			html.replace("%lvl%", String.valueOf(((L2Npc) target).getTemplate().getLevel()));
 			html.replace("%name%", String.valueOf(((L2Npc) target).getTemplate().getName()));

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java

@@ -1474,7 +1474,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		html.replace("%hp%", (int) target.getStatus().getCurrentHp() + "/" + target.getStat().getMaxHp());
 		html.replace("%mp%", (int) target.getStatus().getCurrentMp() + "/" + target.getStat().getMaxMp());
 		html.replace("%karma%", Integer.toString(target.getKarma()));
-		html.replace("%undead%", target.isUndead() ? "yes" : "no");
+		html.replace("%race%", target.getTemplate().getRace().toString());
 		if (target instanceof L2PetInstance)
 		{
 			int objId = target.getActingPlayer().getObjectId();

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java

@@ -20,7 +20,7 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.enums.NpcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -76,7 +76,7 @@ public final class Summon extends AbstractEffect
 		final L2PcInstance player = info.getEffected().getActingPlayer();
 		final L2NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
 		final L2ServitorInstance summon = new L2ServitorInstance(IdFactory.getInstance().getNextId(), template, player);
-		final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != NpcRace.SIEGE_WEAPON ? 240 : 60)) * 1000;
+		final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
 		
 		summon.setName(template.getName());
 		summon.setTitle(info.getEffected().getName());

L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java

@@ -18,7 +18,7 @@
  */
 package handlers.usercommandhandlers;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.handler.IUserCommandHandler;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -44,7 +44,7 @@ public class Loc implements IUserCommandHandler
 		L2RespawnZone zone = ZoneManager.getInstance().getZone(activeChar, L2RespawnZone.class);
 		if (zone != null)
 		{
-			region = MapRegionManager.getInstance().getRestartRegion(activeChar, zone.getAllRespawnPoints().get(PcRace.HUMAN)).getLocId();
+			region = MapRegionManager.getInstance().getRestartRegion(activeChar, zone.getAllRespawnPoints().get(Race.HUMAN)).getLocId();
 		}
 		else
 		{

L2J_DataPack_BETA/dist/game/data/scripts/quests/236_SeedsOfChaos/__init__.py

@@ -5,7 +5,7 @@ import sys
 from com.l2jserver.gameserver.model.quest import State
 from com.l2jserver.gameserver.model.quest import QuestState
 from com.l2jserver.gameserver.model.quest import Quest as JQuest
-from com.l2jserver.gameserver.enums import PcRace
+from com.l2jserver.gameserver.enums import Race
 
 qn = "236_SeedsOfChaos"
 
@@ -151,7 +151,7 @@ class Quest (JQuest) :
     if npcId == KEKROPUS :
         if id == State.CREATED :
             st.set("cond","0")
-            if player.getRace() != PcRace.Kamael :
+            if player.getRace() != Race.Kamael :
                 st.exitQuest(1)
                 htmltext = "<html><body>I'm sorry, but I can only give this quest to Kamael. Talk to Magister Ladd.</body></html>"
             elif player.getLevel() < 75 :

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00002_WhatWomenWant;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -109,7 +109,7 @@ public class Q00002_WhatWomenWant extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = ((player.getRace() != PcRace.ELF) && (player.getRace() != PcRace.HUMAN)) ? "30223-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30223-02.htm" : "30223-01.html";
+						htmltext = ((player.getRace() != Race.ELF) && (player.getRace() != Race.HUMAN)) ? "30223-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30223-02.htm" : "30223-01.html";
 						break;
 					case State.STARTED:
 						switch (st.getCond())

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00003_WillTheSealBeBroken;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -122,7 +122,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				htmltext = (player.getRace() != PcRace.DARK_ELF) ? "30141-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30141-02.htm" : "30141-01.html";
+				htmltext = (player.getRace() != Race.DARK_ELF) ? "30141-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30141-02.htm" : "30141-01.html";
 				break;
 			case State.STARTED:
 				if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00004_LongLiveThePaagrioLord;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -100,7 +100,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = (player.getRace() != PcRace.ORC) ? "30578-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30578-02.htm" : "30578-01.htm";
+						htmltext = (player.getRace() != Race.ORC) ? "30578-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30578-02.htm" : "30578-01.htm";
 						break;
 					case State.STARTED:
 						if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00006_StepIntoTheFuture;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -105,7 +105,7 @@ public class Q00006_StepIntoTheFuture extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = ((player.getRace() == PcRace.HUMAN) && (player.getLevel() >= MIN_LEVEL)) ? "30006-02.htm" : "30006-01.html";
+						htmltext = ((player.getRace() == Race.HUMAN) && (player.getLevel() >= MIN_LEVEL)) ? "30006-02.htm" : "30006-01.html";
 						break;
 					case State.STARTED:
 						if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00007_ATripBegins;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -105,7 +105,7 @@ public class Q00007_ATripBegins extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = ((player.getRace() == PcRace.ELF) && (player.getLevel() >= MIN_LEVEL)) ? "30146-01.htm" : "30146-02.html";
+						htmltext = ((player.getRace() == Race.ELF) && (player.getLevel() >= MIN_LEVEL)) ? "30146-01.htm" : "30146-02.html";
 						break;
 					case State.STARTED:
 						if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00008_AnAdventureBegins;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -105,7 +105,7 @@ public class Q00008_AnAdventureBegins extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = ((player.getRace() == PcRace.DARK_ELF) && (player.getLevel() >= MIN_LEVEL)) ? "30134-02.htm" : "30134-01.html";
+						htmltext = ((player.getRace() == Race.DARK_ELF) && (player.getLevel() >= MIN_LEVEL)) ? "30134-02.htm" : "30134-01.html";
 						break;
 					case State.STARTED:
 						if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00009_IntoTheCityOfHumans;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -94,7 +94,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = (player.getLevel() >= MIN_LEVEL) ? (player.getRace() == PcRace.ORC) ? "30583-01.htm" : "30583-02.html" : "30583-03.html";
+						htmltext = (player.getLevel() >= MIN_LEVEL) ? (player.getRace() == Race.ORC) ? "30583-01.htm" : "30583-02.html" : "30583-03.html";
 						break;
 					case State.STARTED:
 						if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00010_IntoTheWorld;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -108,7 +108,7 @@ public class Q00010_IntoTheWorld extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = ((player.getLevel() >= MIN_LEVEL) && (player.getRace() == PcRace.DWARF)) ? "30533-01.htm" : "30533-02.html";
+						htmltext = ((player.getLevel() >= MIN_LEVEL) && (player.getRace() == Race.DWARF)) ? "30533-01.htm" : "30533-02.html";
 						break;
 					case State.STARTED:
 						if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java

@@ -20,7 +20,7 @@ package quests.Q00101_SwordOfSolidarity;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -177,7 +177,7 @@ public class Q00101_SwordOfSolidarity extends Quest
 					{
 						case State.CREATED:
 						{
-							htmltext = (player.getRace() == PcRace.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm";
+							htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm";
 							break;
 						}
 						case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java

@@ -21,7 +21,7 @@ package quests.Q00102_SeaOfSporesFever;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -133,7 +133,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 					{
 						case State.CREATED:
 						{
-							htmltext = player.getRace() == PcRace.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm";
+							htmltext = player.getRace() == Race.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm";
 							break;
 						}
 						case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java

@@ -20,7 +20,7 @@ package quests.Q00103_SpiritOfCraftsman;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -117,7 +117,7 @@ public final class Q00103_SpiritOfCraftsman extends Quest
 			{
 				if (qs.isCreated())
 				{
-					if (talker.getRace() != PcRace.DARK_ELF)
+					if (talker.getRace() != Race.DARK_ELF)
 					{
 						htmltext = "30307-01.htm";
 					}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -128,7 +128,7 @@ public final class Q00104_SpiritOfMirrors extends Quest
 					{
 						case State.CREATED:
 						{
-							htmltext = (player.getRace() == PcRace.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm";
+							htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm";
 							break;
 						}
 						case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -167,7 +167,7 @@ public final class Q00105_SkirmishWithOrcs extends Quest
 		{
 			case State.CREATED:
 			{
-				if (talker.getRace() == PcRace.ELF)
+				if (talker.getRace() == Race.ELF)
 				{
 					htmltext = (talker.getLevel() >= MIN_LVL) ? "30218-03.htm" : "30218-02.htm";
 				}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java

@@ -20,7 +20,7 @@ package quests.Q00106_ForgottenTruth;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -130,7 +130,7 @@ public final class Q00106_ForgottenTruth extends Quest
 				{
 					case State.CREATED:
 					{
-						if (talker.getRace() == PcRace.DARK_ELF)
+						if (talker.getRace() == Race.DARK_ELF)
 						{
 							htmltext = talker.getLevel() >= MIN_LVL ? "30358-03.htm" : "30358-02.htm";
 						}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java

@@ -20,7 +20,7 @@ package quests.Q00107_MercilessPunishment;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -140,7 +140,7 @@ public final class Q00107_MercilessPunishment extends Quest
 				{
 					case State.CREATED:
 					{
-						if (talker.getRace() != PcRace.ORC)
+						if (talker.getRace() != Race.ORC)
 						{
 							htmltext = "30568-01.htm";
 						}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -160,7 +160,7 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest
 				{
 					case State.CREATED:
 					{
-						if (talker.getRace() != PcRace.DWARF)
+						if (talker.getRace() != Race.DWARF)
 						{
 							htmltext = "30523-01.htm";
 						}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00159_ProtectTheWaterSource;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -115,7 +115,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() == PcRace.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm";
+					htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00160_NerupasRequest;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -82,7 +82,7 @@ public final class Q00160_NerupasRequest extends Quest
 			{
 				if (npc.getId() == NERUPA)
 				{
-					if (player.getRace() != PcRace.ELF)
+					if (player.getRace() != Race.ELF)
 					{
 						htmltext = "30370-01.htm";
 					}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00161_FruitOfTheMotherTree;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -90,7 +90,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = (player.getRace() == PcRace.ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30362-03.htm" : "30362-02.htm" : "30362-01.htm";
+						htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30362-03.htm" : "30362-02.htm" : "30362-01.htm";
 						break;
 					case State.STARTED:
 						if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java

@@ -21,7 +21,7 @@ package quests.Q00162_CurseOfTheUndergroundFortress;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -151,7 +151,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() != PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm";
+					htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00163_LegacyOfThePoet;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -152,7 +152,7 @@ public class Q00163_LegacyOfThePoet extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() != PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm";
+					htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00164_BloodFiend;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -88,7 +88,7 @@ public class Q00164_BloodFiend extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() != PcRace.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm";
+					htmltext = (player.getRace() != Race.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java

@@ -21,7 +21,7 @@ package quests.Q00165_ShilensHunt;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -104,7 +104,7 @@ public class Q00165_ShilensHunt extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm";
+					htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java

@@ -21,7 +21,7 @@ package quests.Q00166_MassOfDarkness;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -91,7 +91,7 @@ public class Q00166_MassOfDarkness extends Quest
 					{
 						case State.CREATED:
 						{
-							htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm";
+							htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm";
 							break;
 						}
 						case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java

@@ -21,7 +21,7 @@ package quests.Q00168_DeliverSupplies;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -90,7 +90,7 @@ public class Q00168_DeliverSupplies extends Quest
 					{
 						case State.CREATED:
 						{
-							htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm";
+							htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm";
 							break;
 						}
 						case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00169_OffspringOfNightmares;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -118,7 +118,7 @@ public class Q00169_OffspringOfNightmares extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm";
+					htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00170_DangerousSeduction;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -99,7 +99,7 @@ public class Q00170_DangerousSeduction extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30305-01.htm" : "30305-02.htm" : "30305-03.htm";
+				htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30305-01.htm" : "30305-02.htm" : "30305-03.htm";
 				break;
 			case State.STARTED:
 				if (st.isCond(1))

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00172_NewHorizons;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -92,7 +92,7 @@ public class Q00172_NewHorizons extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						htmltext = (player.getRace() == PcRace.KAMAEL) ? (player.getLevel() >= MIN_LEVEL) ? "32140-01.htm" : "32140-02.htm" : "32140-03.htm";
+						htmltext = (player.getRace() == Race.KAMAEL) ? (player.getLevel() >= MIN_LEVEL) ? "32140-01.htm" : "32140-02.htm" : "32140-03.htm";
 						break;
 					case State.STARTED:
 						htmltext = "32140-05.html";

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java

@@ -20,7 +20,7 @@ package quests.Q00173_ToTheIsleOfSouls;
 
 import quests.Q00172_NewHorizons.Q00172_NewHorizons;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -102,7 +102,7 @@ public class Q00173_ToTheIsleOfSouls extends Quest
 				{
 					case State.CREATED:
 						final QuestState qs = player.getQuestState(Q00172_NewHorizons.class.getSimpleName());
-						htmltext = ((qs != null) && qs.isCompleted() && (player.getRace() == PcRace.KAMAEL) && st.hasQuestItems(MARK_OF_TRAVELER)) ? "30097-01.htm" : "30097-02.htm";
+						htmltext = ((qs != null) && qs.isCompleted() && (player.getRace() == Race.KAMAEL) && st.hasQuestItems(MARK_OF_TRAVELER)) ? "30097-01.htm" : "30097-02.htm";
 						break;
 					case State.STARTED:
 						htmltext = (st.isCond(1)) ? "30097-04.html" : "30097-05.html";

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00175_TheWayOfTheWarrior;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -181,7 +181,7 @@ public final class Q00175_TheWayOfTheWarrior extends Quest
 			{
 				if (qs.isCreated())
 				{
-					if (player.getRace() != PcRace.KAMAEL)
+					if (player.getRace() != Race.KAMAEL)
 					{
 						htmltext = "32138-04.htm";
 					}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00179_IntoTheLargeCavern;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -94,7 +94,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
 			switch (st.getState())
 			{
 				case State.CREATED:
-					if (player.getRace() != PcRace.KAMAEL)
+					if (player.getRace() != Race.KAMAEL)
 					{
 						htmltext = "32138-00b.html";
 					}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00182_NewRecruits;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -93,7 +93,7 @@ public class Q00182_NewRecruits extends Quest
 			{
 				case State.CREATED:
 					final int level = player.getLevel();
-					if (player.getRace() == PcRace.KAMAEL)
+					if (player.getRace() == Race.KAMAEL)
 					{
 						htmltext = "32138-00.html";
 					}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java

@@ -21,7 +21,7 @@ package quests.Q00235_MimirsElixir;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.QuestItemHolder;
@@ -259,7 +259,7 @@ public final class Q00235_MimirsElixir extends Quest
 		{
 			if (npc.getId() == LADD)
 			{
-				if (player.getRace() == PcRace.KAMAEL)
+				if (player.getRace() == Race.KAMAEL)
 				{
 					htmltext = "30721-09.html";
 				}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -124,7 +124,7 @@ public final class Q00260_OrcHunting extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.getRace() == PcRace.ELF) ? (player.getLevel() >= MIN_LVL) ? "30221-03.htm" : "30221-02.html" : "30221-01.html";
+				htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "30221-03.htm" : "30221-02.html" : "30221-01.html";
 				break;
 			}
 			case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java

@@ -21,7 +21,7 @@ package quests.Q00263_OrcSubjugation;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -120,7 +120,7 @@ public final class Q00263_OrcSubjugation extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30346-03.htm" : "30346-02.htm" : "30346-01.htm";
+				htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30346-03.htm" : "30346-02.htm" : "30346-01.htm";
 				break;
 			}
 			case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -119,7 +119,7 @@ public final class Q00265_BondsOfSlavery extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30357-03.htm" : "30357-02.html" : "30357-01.html";
+				htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30357-03.htm" : "30357-02.html" : "30357-01.html";
 				break;
 			}
 			case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -119,7 +119,7 @@ public final class Q00266_PleasOfPixies extends Quest
 		{
 			case State.CREATED:
 			{
-				if (player.getRace() != PcRace.ELF)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "31852-01.htm";
 				}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00267_WrathOfVerdure;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -106,7 +106,7 @@ public final class Q00267_WrathOfVerdure extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() == PcRace.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm";
+					htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00271_ProofOfValor;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -98,7 +98,7 @@ public final class Q00271_ProofOfValor extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() == PcRace.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm";
+					htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00272_WrathOfAncestors;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -96,7 +96,7 @@ public final class Q00272_WrathOfAncestors extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() == PcRace.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm";
+					htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -123,7 +123,7 @@ public final class Q00273_InvadersOfTheHolyLand extends Quest
 			{
 				case State.CREATED:
 				{
-					htmltext = (player.getRace() == PcRace.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm";
+					htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm";
 					break;
 				}
 				case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00274_SkirmishWithTheWerewolves;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -108,7 +108,7 @@ public final class Q00274_SkirmishWithTheWerewolves extends Quest
 			{
 				if (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE))
 				{
-					htmltext = (player.getRace() == PcRace.ORC) ? (player.getLevel() >= MIN_LVL) ? "30569-03.htm" : "30569-02.html" : "30569-01.html";
+					htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30569-03.htm" : "30569-02.html" : "30569-01.html";
 				}
 				else
 				{

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java

@@ -19,7 +19,7 @@
 package quests.Q00275_DarkWingedSpies;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -138,7 +138,7 @@ public final class Q00275_DarkWingedSpies extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (talker.getRace() == PcRace.ORC) ? (talker.getLevel() >= MIN_LVL) ? "30567-02.htm" : "30567-01.htm" : "30567-00.htm";
+				htmltext = (talker.getRace() == Race.ORC) ? (talker.getLevel() >= MIN_LVL) ? "30567-02.htm" : "30567-01.htm" : "30567-00.htm";
 				break;
 			}
 			case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 import quests.Q00261_CollectorsDream.Q00261_CollectorsDream;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -142,7 +142,7 @@ public final class Q00276_TotemOfTheHestui extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.getRace() == PcRace.ORC) ? (player.getLevel() >= MIN_LVL) ? "30571-02.htm" : "30571-01.htm" : "30571-00.htm";
+				htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30571-02.htm" : "30571-01.htm" : "30571-00.htm";
 				break;
 			}
 			case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java

@@ -21,7 +21,7 @@ package quests.Q00292_BrigandsSweep;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -155,7 +155,7 @@ public final class Q00292_BrigandsSweep extends Quest
 				{
 					case State.CREATED:
 					{
-						html = (talker.getRace() == PcRace.DWARF) ? (talker.getLevel() >= MIN_LVL) ? "30532-02.htm" : "30532-01.htm" : "30532-00.htm";
+						html = (talker.getRace() == Race.DWARF) ? (talker.getLevel() >= MIN_LVL) ? "30532-02.htm" : "30532-01.htm" : "30532-00.htm";
 						break;
 					}
 					case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java

@@ -20,7 +20,7 @@ package quests.Q00293_TheHiddenVeins;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -146,7 +146,7 @@ public final class Q00293_TheHiddenVeins extends Quest
 				{
 					case State.CREATED:
 					{
-						htmltext = (player.getRace() == PcRace.DWARF) ? (player.getLevel() >= MIN_LVL) ? "30535-03.htm" : "30535-02.htm" : "30535-01.htm";
+						htmltext = (player.getRace() == Race.DWARF) ? (player.getLevel() >= MIN_LVL) ? "30535-03.htm" : "30535-02.htm" : "30535-01.htm";
 						break;
 					}
 					case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -104,7 +104,7 @@ public final class Q00294_CovertBusiness extends Quest
 		String html = getNoQuestMsg(talker);
 		if (qs.isCreated())
 		{
-			html = (talker.getRace() == PcRace.DWARF) ? (talker.getLevel() >= MIN_LVL) ? "30534-02.htm" : "30534-01.htm" : "30534-00.htm";
+			html = (talker.getRace() == Race.DWARF) ? (talker.getLevel() >= MIN_LVL) ? "30534-02.htm" : "30534-01.htm" : "30534-00.htm";
 		}
 		else if (qs.isStarted())
 		{

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java

@@ -21,7 +21,7 @@ package quests.Q00316_DestroyPlagueCarriers;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -142,7 +142,7 @@ public final class Q00316_DestroyPlagueCarriers extends Quest
 		
 		if (qs.isCreated())
 		{
-			if (player.getRace() != PcRace.ELF)
+			if (player.getRace() != Race.ELF)
 			{
 				htmltext = "30155-00.htm";
 			}

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java

@@ -18,7 +18,7 @@
  */
 package quests.Q00320_BonesTellTheFuture;
 
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -92,7 +92,7 @@ public final class Q00320_BonesTellTheFuture extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.getRace() == PcRace.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30359-03.htm" : "30359-02.htm" : "30359-00.htm";
+				htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30359-03.htm" : "30359-02.htm" : "30359-00.htm";
 				break;
 			}
 			case State.STARTED:

L2J_DataPack_BETA/dist/game/data/scripts/village_master/DarkElvenChange1/DarkElvenChange1.java

@@ -18,8 +18,8 @@
  */
 package village_master.DarkElvenChange1;
 
-import com.l2jserver.gameserver.enums.PcRace;
 import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -78,7 +78,7 @@ public final class DarkElvenChange1 extends Quest
 		{
 			int i = Integer.valueOf(event);
 			final ClassId cid = player.getClassId();
-			if ((cid.getRace() == PcRace.DARK_ELF) && (cid.getId() == CLASSES[i][1]))
+			if ((cid.getRace() == Race.DARK_ELF) && (cid.getId() == CLASSES[i][1]))
 			{
 				int suffix;
 				final boolean item = st.hasQuestItems(CLASSES[i][6]);
@@ -125,7 +125,7 @@ public final class DarkElvenChange1 extends Quest
 		}
 		
 		final ClassId cid = player.getClassId();
-		if (cid.getRace() == PcRace.DARK_ELF)
+		if (cid.getRace() == Race.DARK_ELF)
 		{
 			switch (cid)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/village_master/DarkElvenChange2/DarkElvenChange2.java

@@ -18,8 +18,8 @@
  */
 package village_master.DarkElvenChange2;
 
-import com.l2jserver.gameserver.enums.PcRace;
 import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -96,7 +96,7 @@ public final class DarkElvenChange2 extends Quest
 		{
 			int i = Integer.valueOf(event);
 			final ClassId cid = player.getClassId();
-			if ((cid.getRace() == PcRace.DARK_ELF) && (cid.getId() == CLASSES[i][1]))
+			if ((cid.getRace() == Race.DARK_ELF) && (cid.getId() == CLASSES[i][1]))
 			{
 				int suffix;
 				final boolean item1 = st.hasQuestItems(CLASSES[i][6]);
@@ -146,7 +146,7 @@ public final class DarkElvenChange2 extends Quest
 		}
 		
 		final ClassId cid = player.getClassId();
-		if (cid.getRace() == PcRace.DARK_ELF)
+		if (cid.getRace() == Race.DARK_ELF)
 		{
 			switch (cid)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java

@@ -22,7 +22,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.CategoryData;
 import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -167,7 +167,7 @@ public final class KamaelChange1 extends AbstractNpcAI
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = null;
-		if (player.getRace() != PcRace.KAMAEL)
+		if (player.getRace() != Race.KAMAEL)
 		{
 			htmltext = "32191-01.htm"; // master_all_kamael002a
 		}

L2J_DataPack_BETA/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java

@@ -22,7 +22,7 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.CategoryData;
 import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -290,7 +290,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = null;
-		if (player.getRace() != PcRace.KAMAEL)
+		if (player.getRace() != Race.KAMAEL)
 		{
 			htmltext = "32145-01.htm"; // master_all_kamael002a
 		}

L2J_DataPack_BETA/dist/game/data/stats/npcs/13100-13200.xml

@@ -2724,7 +2724,7 @@
 	</npc>
 	<npc id="13171" level="55" type="L2Npc" name="Dark Elf Female Mercenary">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="25">
 			<vitals hp="1673.05473" hpRegen="6.5" mp="889.8" mpRegen="2.4" />
@@ -3051,7 +3051,7 @@
 	</npc>
 	<npc id="13180" level="55" type="L2Npc" name="Commander Elite Mercenary">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="25">
 			<vitals hp="1673.05473" hpRegen="6.5" mp="889.8" mpRegen="2.4" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30100-30200.xml

@@ -1024,7 +1024,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1064,7 +1064,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="124" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1104,7 +1104,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1144,7 +1144,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="124" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1184,7 +1184,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1225,7 +1225,7 @@
 			<param name="MoveAroundSocial1" value="120" />
 			<param name="IsGateKeeperForCoreTime" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1265,7 +1265,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1305,7 +1305,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1345,7 +1345,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1385,7 +1385,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1425,7 +1425,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1465,7 +1465,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1505,7 +1505,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1545,7 +1545,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1587,7 +1587,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1629,7 +1629,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2554,7 +2554,7 @@
 			<param name="MoveAroundSocial1" value="110" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3240,7 +3240,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3282,7 +3282,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3323,7 +3323,7 @@
 			<param name="MoveAroundSocial1" value="103" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30200-30300.xml

@@ -574,7 +574,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="79" /> <!-- rhand: Sword of Damascus -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1140,7 +1140,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1303,7 +1303,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30300-30400.xml

@@ -87,7 +87,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -127,7 +127,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -729,7 +729,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -771,7 +771,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1264,7 +1264,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="277" /> <!-- rhand: Dark Elven Bow -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1305,7 +1305,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="132" /> <!-- rhand: Sword of Limit -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1346,7 +1346,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="132" /> <!-- rhand: Sword of Limit -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1387,7 +1387,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="277" /> <!-- rhand: Dark Elven Bow -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1468,7 +1468,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1508,7 +1508,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1548,7 +1548,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1588,7 +1588,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1628,7 +1628,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="277" /> <!-- rhand: Dark Elven Bow -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1669,7 +1669,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="277" /> <!-- rhand: Dark Elven Bow -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1710,7 +1710,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="132" /> <!-- rhand: Sword of Limit -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1751,7 +1751,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1791,7 +1791,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1831,7 +1831,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2316,7 +2316,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2356,7 +2356,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30400-30500.xml

@@ -166,7 +166,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="124" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -611,7 +611,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -651,7 +651,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -731,7 +731,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -771,7 +771,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -811,7 +811,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -851,7 +851,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -891,7 +891,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1298,7 +1298,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="132" /> <!-- rhand: Sword of Limit -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1339,7 +1339,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="132" /> <!-- rhand: Sword of Limit -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1742,7 +1742,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1782,7 +1782,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1824,7 +1824,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2110,7 +2110,7 @@
 			<param name="MoveAroundSocial1" value="103" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2150,7 +2150,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2192,7 +2192,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30600-30700.xml

@@ -6,7 +6,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1304,7 +1304,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="156" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1424,7 +1424,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="110" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1907,7 +1907,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1987,7 +1987,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="74" /> <!-- rhand: Katana -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2269,7 +2269,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="135" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2551,7 +2551,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3803,7 +3803,7 @@
 			<param name="MoveAroundSocial1" value="103" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30700-30800.xml

@@ -6,7 +6,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -48,7 +48,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -817,7 +817,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="110" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -857,7 +857,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="156" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -897,7 +897,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1903,7 +1903,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2835,7 +2835,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30800-30900.xml

@@ -529,7 +529,7 @@
 			<param name="MoveAroundSocial1" value="120" />
 			<param name="IsGateKeeperForCoreTime" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1585,7 +1585,7 @@
 			<param name="MoveAroundSocial1" value="103" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1625,7 +1625,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1667,7 +1667,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/30900-31000.xml

@@ -413,7 +413,7 @@
 			<param name="MoveAroundSocial1" value="103" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -453,7 +453,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -495,7 +495,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2281,7 +2281,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="325" /> <!-- rhand: Horn of Glory -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3305,7 +3305,7 @@
 			<param name="cost_penaltyoff0" value="3600" />
 			<skill name="s_penaltyoff" id="5077" level="1" /> <!-- NPC Remove Death Penalty -->
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3753,7 +3753,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/31000-31100.xml

@@ -1261,7 +1261,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="277" /> <!-- rhand: Dark Elven Bow -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2394,7 +2394,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2436,7 +2436,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2478,7 +2478,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2520,7 +2520,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2562,7 +2562,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2604,7 +2604,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2647,7 +2647,7 @@
 			<param name="ssq_priest_type" value="1" />
 			<param name="ssq_event_listener" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31100-31200.xml

@@ -1536,7 +1536,7 @@
 			<param name="battle_bomb_man_name" value="18317" /> <!-- Flame of Forbidden Path -->
 			<param name="battle_bomb_man_ai" value="dawn_5_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1651,7 +1651,7 @@
 			<param name="battle_bomb_man_name" value="18315" /> <!-- Flame of Dark Omen -->
 			<param name="battle_bomb_man_ai" value="dawn_4_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1766,7 +1766,7 @@
 			<param name="battle_bomb_man_name" value="18313" /> <!-- Flame of the Witch -->
 			<param name="battle_bomb_man_ai" value="dawn_3_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1881,7 +1881,7 @@
 			<param name="battle_bomb_man_name" value="18311" /> <!-- Flame of Apostates -->
 			<param name="battle_bomb_man_ai" value="dawn_2_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1996,7 +1996,7 @@
 			<param name="battle_bomb_man_name" value="18309" /> <!-- Flame of the Branded -->
 			<param name="battle_bomb_man_ai" value="dawn_1_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2045,7 +2045,7 @@
 			<param name="SibylPosZ" value="-5151" />
 			<param name="part_type" value="TWILIGHT" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2094,7 +2094,7 @@
 			<param name="SibylPosZ" value="-5151" />
 			<param name="part_type" value="TWILIGHT" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2143,7 +2143,7 @@
 			<param name="SibylPosZ" value="-5151" />
 			<param name="part_type" value="TWILIGHT" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2193,7 +2193,7 @@
 			<param name="SibylPosZ" value="-5151" />
 			<param name="part_type" value="TWILIGHT" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2243,7 +2243,7 @@
 			<param name="SibylPosZ" value="-5151" />
 			<param name="part_type" value="TWILIGHT" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2359,7 +2359,7 @@
 			<param name="battle_bomb_man_name" value="18307" /> <!-- Flame of Forbidden Path -->
 			<param name="battle_bomb_man_ai" value="dusk_5_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2474,7 +2474,7 @@
 			<param name="battle_bomb_man_name" value="18305" /> <!-- Flame of Dark Omen -->
 			<param name="battle_bomb_man_ai" value="dusk_4_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2589,7 +2589,7 @@
 			<param name="battle_bomb_man_name" value="18303" /> <!-- Flame of the Witch -->
 			<param name="battle_bomb_man_ai" value="dusk_3_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2704,7 +2704,7 @@
 			<param name="battle_bomb_man_name" value="18301" /> <!-- Flame of Apostates -->
 			<param name="battle_bomb_man_ai" value="dusk_2_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2819,7 +2819,7 @@
 			<param name="battle_bomb_man_name" value="18299" /> <!-- Flame of the Branded -->
 			<param name="battle_bomb_man_ai" value="dusk_1_5_mid_bomb" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3024,7 +3024,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31200-31300.xml

@@ -3443,7 +3443,7 @@
 			<param name="MoveAroundSocial1" value="180" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3483,7 +3483,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="143" /> <!-- rhand: Sword of Mystic -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3526,7 +3526,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="204" /> <!-- rhand: Deadman's Staff -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31300-31400.xml

@@ -1004,7 +1004,7 @@
 			<param name="MoveAroundSocial1" value="135" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="316" /> <!-- rhand: Sage's Blood -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1045,7 +1045,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="227" lhand="627" /> <!-- rhand: Stiletto lhand: Aspis -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1416,7 +1416,7 @@
 			<param name="MoveAroundSocial1" value="120" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -1458,7 +1458,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="317" /> <!-- rhand: Tome of Blood -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2316,7 +2316,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="135" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="315" /> <!-- rhand: Divine Tome -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2357,7 +2357,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31400-31500.xml

@@ -520,7 +520,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="156" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/31500-31600.xml

@@ -3320,7 +3320,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="132" lhand="110" /> <!-- rhand: Sword of Limit lhand: Doom Shield -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3363,7 +3363,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="202" /> <!-- rhand: Mace of Underworld -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -4055,7 +4055,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="206" /> <!-- rhand: Demon's Staff -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31600-31700.xml

@@ -6,7 +6,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="135" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -47,7 +47,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -88,7 +88,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="232" /> <!-- rhand: Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -129,7 +129,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="227" /> <!-- rhand: Stiletto -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -410,7 +410,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="80" lhand="633" /> <!-- rhand: Tallum Blade lhand: Zubei's Shield -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -451,7 +451,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="81" /> <!-- rhand: Dragon Slayer -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -533,7 +533,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="204" /> <!-- rhand: Deadman's Staff -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -697,7 +697,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="236" /> <!-- rhand: Soul Separator -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -861,7 +861,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="206" /> <!-- rhand: Demon's Staff -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3819,7 +3819,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3903,7 +3903,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31700-31800.xml

@@ -1225,7 +1225,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1428,7 +1428,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2982,7 +2982,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3023,7 +3023,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3064,7 +3064,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3553,7 +3553,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3635,7 +3635,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31800-31900.xml

@@ -169,7 +169,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -414,7 +414,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -496,7 +496,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -658,7 +658,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -862,7 +862,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1025,7 +1025,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1189,7 +1189,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="139" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="151" /> <!-- rhand: Sword of Miracles -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1230,7 +1230,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -1515,7 +1515,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="21731" /> <!-- rhand: Maingauche - Event -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -2327,7 +2327,7 @@
 	</npc>
 	<npc id="31856" level="70" type="L2Npc" name="Event Manager">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<acquire expRate="0.1" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/31900-32000.xml

@@ -3456,7 +3456,7 @@
 			<param name="MoveAroundSocial1" value="103" />
 			<param name="chk_my_cat" value="SUB_GROUP_DE" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="143" /> <!-- rhand: Sword of Mystic -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3497,7 +3497,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="143" /> <!-- rhand: Sword of Mystic -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3540,7 +3540,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="204" /> <!-- rhand: Deadman's Staff -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -4443,7 +4443,7 @@
 			<param name="MoveAroundSocial1" value="80" />
 			<param name="ssq_priest_type" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5801" /> <!-- rhand: For NPC (Dusk) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/32000-32100.xml

@@ -3893,7 +3893,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="143" /> <!-- rhand: Sword of Mystic -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">

L2J_DataPack_BETA/dist/game/data/stats/npcs/32100-32200.xml

@@ -2379,7 +2379,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="156" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2419,7 +2419,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -2461,7 +2461,7 @@
 			<param name="skill_sharing_item" value="15309" /> <!-- Holy Pomander - Shillien Saint -->
 			<param name="token_num" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/32300-32400.xml

@@ -3150,7 +3150,7 @@
 	</npc>
 	<npc id="32386" level="70" type="L2Npc">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3186,7 +3186,7 @@
 	</npc>
 	<npc id="32387" level="70" type="L2Npc">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3222,7 +3222,7 @@
 	</npc>
 	<npc id="32388" level="70" type="L2Npc">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3258,7 +3258,7 @@
 	</npc>
 	<npc id="32389" level="70" type="L2Npc">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3294,7 +3294,7 @@
 	</npc>
 	<npc id="32390" level="70" type="L2Npc">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/32400-32500.xml

@@ -3002,7 +3002,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3042,7 +3042,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/32500-32600.xml

@@ -3665,7 +3665,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="103" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -3705,7 +3705,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/32600-32700.xml

@@ -644,7 +644,7 @@
 	</npc>
 	<npc id="32616" level="70" type="L2Npc" name="Mine" title="Fortune Teller">
 		<!-- Confirmed CT2.5 -->
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
@@ -911,7 +911,7 @@
 		<parameters>
 			<param name="NoFnHi" value="1" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/35200-35300.xml

@@ -1444,7 +1444,7 @@
 			<param name="MoveAroundSocial1" value="120" />
 			<param name="manor_id" value="4" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml

@@ -3153,7 +3153,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml

@@ -111,7 +111,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -2180,7 +2180,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -3950,7 +3950,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml

@@ -390,7 +390,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -2119,7 +2119,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -3878,7 +3878,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml

@@ -379,7 +379,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -2138,7 +2138,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -4237,7 +4237,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml

@@ -722,7 +722,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -2477,7 +2477,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -4572,7 +4572,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml

@@ -1164,7 +1164,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -2878,7 +2878,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -4633,7 +4633,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml

@@ -1205,7 +1205,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -3300,7 +3300,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -5354,7 +5354,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml

@@ -1636,7 +1636,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -3731,7 +3731,7 @@
 			<param name="Skill02_FString" value="1300019" />
 			<param name="Skill02_FStringRate" value="5000" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>MALE</sex>
 		<equipment rhand="2500" lhand="6377" /> <!-- rhand: Dark Legion's Edge lhand: Imperial Crusader Shield -->
 		<acquire expRate="0.5" />
@@ -5407,7 +5407,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />

L2J_DataPack_BETA/dist/game/data/stats/npcs/36400-36500.xml

@@ -1695,7 +1695,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />
@@ -1855,7 +1855,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />
@@ -1895,7 +1895,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />
@@ -2015,7 +2015,7 @@
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
 		</parameters>
-		<race>DARKELF</race>
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml

@@ -1463,8 +1463,8 @@
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<enchant3 name="elementPower" val="#enchElementPower" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
-		<cond msgId="144">
-			<target npcRace="UNDEAD" />
+		<cond msgId="113" addName="1">
+			<target race="UNDEAD" />
 		</cond>
 		<for>
 			<effect name="MagicalAttack" />
@@ -2574,7 +2574,7 @@
 		<enchant3 name="power" val="#ench3Attack" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<cond msgId="144">
-			<target npcRace="UNDEAD" />
+			<target race="UNDEAD" />
 		</cond>
 		<for>
 			<effect name="Debuff">

L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml

@@ -328,7 +328,7 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<cond msgId="144">
-			<target npcRace="UNDEAD" />
+			<target race="UNDEAD" />
 		</cond>
 		<for>
 			<effect name="Root" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml

@@ -335,8 +335,8 @@
 		<enchant4 name="element" val="4" /> <!-- Holy -->
 		<enchant4 name="elementPower" val="#ench4HolyAttack" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
-		<cond msgId="144">
-			<target npcRace="UNDEAD" />
+		<cond msgId="113" addName="1">
+			<target race="UNDEAD" />
 		</cond>
 		<for>
 			<effect name="Fear" abnormalTime="20" />
@@ -1809,8 +1809,8 @@
 		<enchant4 name="element" val="5" /> <!-- Dark -->
 		<enchant4 name="elementPower" val="#ench4DarkAttack" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
-		<cond msgId="144">
-			<target npcRace="DIVINE" />
+		<cond msgId="113" addName="1">
+			<target race="DIVINE" />
 		</cond>
 		<for>
 			<effect name="Fear" abnormalTime="20" />