Updated ClassId and Race to match newer branches.

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java

@@ -16,9 +16,9 @@
  */
 package quests.Q002_WhatWomenWant;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -99,7 +99,7 @@ public class Q002_WhatWomenWant extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getRace() != Race.elf) && (player.getRace() != Race.human))
+				if ((player.getRace() != Race.ELF) && (player.getRace() != Race.HUMAN))
 				{
 					htmltext = "30223-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java

@@ -16,9 +16,9 @@
  */
 package quests.Q003_WillTheSealBeBroken;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -78,7 +78,7 @@ public class Q003_WillTheSealBeBroken extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30141-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java

@@ -19,9 +19,9 @@ package quests.Q004_LongliveThePaagrioLord;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -82,7 +82,7 @@ public class Q004_LongliveThePaagrioLord extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30578-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java

@@ -16,9 +16,9 @@
  */
 package quests.Q006_StepIntoTheFuture;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -106,7 +106,7 @@ public class Q006_StepIntoTheFuture extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getRace() != Race.human) || (player.getLevel() < 3))
+				if ((player.getRace() != Race.HUMAN) || (player.getLevel() < 3))
 				{
 					htmltext = "30006-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java

@@ -16,9 +16,9 @@
  */
 package quests.Q007_ATripBegins;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -99,7 +99,7 @@ public class Q007_ATripBegins extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30146-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java

@@ -16,9 +16,9 @@
  */
 package quests.Q008_AnAdventureBegins;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -99,7 +99,7 @@ public class Q008_AnAdventureBegins extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getLevel() >= 3) && (player.getRace() == Race.darkelf))
+				if ((player.getLevel() >= 3) && (player.getRace() == Race.DARK_ELF))
 				{
 					htmltext = "30134-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java

@@ -16,9 +16,9 @@
  */
 package quests.Q009_IntoTheCityOfHumans;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -87,7 +87,7 @@ public class Q009_IntoTheCityOfHumans extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getLevel() >= 3) && (player.getRace() == Race.orc))
+				if ((player.getLevel() >= 3) && (player.getRace() == Race.ORC))
 				{
 					htmltext = "30583-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java

@@ -16,9 +16,9 @@
  */
 package quests.Q010_IntoTheWorld;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -104,7 +104,7 @@ public class Q010_IntoTheWorld extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getLevel() >= 3) && (player.getRace() == Race.dwarf))
+				if ((player.getLevel() >= 3) && (player.getRace() == Race.DWARF))
 				{
 					htmltext = "30533-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java

@@ -12,9 +12,9 @@
  */
 package quests.Q045_ToTalkingIsland;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -124,7 +124,7 @@ public class Q045_ToTalkingIsland extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getRace() == Race.human) && (player.getLevel() >= 3))
+				if ((player.getRace() == Race.HUMAN) && (player.getLevel() >= 3))
 				{
 					if (st.hasQuestItems(MARK_OF_TRAVELER))
 					{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java

@@ -16,9 +16,9 @@
  */
 package quests.Q046_OnceMoreInTheArmsOfTheMotherTree;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -128,7 +128,7 @@ public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getRace() == Race.elf) && (player.getLevel() >= 3))
+				if ((player.getRace() == Race.ELF) && (player.getLevel() >= 3))
 				{
 					if (st.hasQuestItems(MARK_OF_TRAVELER))
 					{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java

@@ -16,9 +16,9 @@
  */
 package quests.Q047_IntoTheDarkForest;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -128,7 +128,7 @@ public class Q047_IntoTheDarkForest extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getRace() == Race.darkelf) && (player.getLevel() >= 3))
+				if ((player.getRace() == Race.DARK_ELF) && (player.getLevel() >= 3))
 				{
 					if (st.hasQuestItems(MARK_OF_TRAVELER))
 					{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java

@@ -16,9 +16,9 @@
  */
 package quests.Q048_ToTheImmortalPlateau;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -128,7 +128,7 @@ public class Q048_ToTheImmortalPlateau extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getRace() == Race.orc) && (player.getLevel() >= 3))
+				if ((player.getRace() == Race.ORC) && (player.getLevel() >= 3))
 				{
 					if (st.hasQuestItems(MARK_OF_TRAVELER))
 					{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java

@@ -16,9 +16,9 @@
  */
 package quests.Q049_TheRoadHome;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -128,7 +128,7 @@ public class Q049_TheRoadHome extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getRace() == Race.dwarf) && (player.getLevel() >= 3))
+				if ((player.getRace() == Race.DWARF) && (player.getLevel() >= 3))
 				{
 					if (st.hasQuestItems(MARK_OF_TRAVELER))
 					{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java

@@ -16,9 +16,9 @@
  */
 package quests.Q101_SwordOfSolidarity;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -131,7 +131,7 @@ public class Q101_SwordOfSolidarity extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.human)
+				if (player.getRace() != Race.HUMAN)
 				{
 					htmltext = "30008-01a.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java

@@ -16,9 +16,9 @@
  */
 package quests.Q102_SeaOfSporesFever;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -103,7 +103,7 @@ public class Q102_SeaOfSporesFever extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30284-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java

@@ -16,9 +16,9 @@
  */
 package quests.Q103_SpiritOfCraftsman;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -100,7 +100,7 @@ public class Q103_SpiritOfCraftsman extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30307-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java

@@ -16,10 +16,10 @@
  */
 package quests.Q104_SpiritOfMirrors;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -100,7 +100,7 @@ public class Q104_SpiritOfMirrors extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.human)
+				if (player.getRace() != Race.HUMAN)
 				{
 					htmltext = "30017-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java

@@ -17,9 +17,9 @@
 package quests.Q105_SkirmishWithTheOrcs;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -105,7 +105,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30218-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java

@@ -16,9 +16,9 @@
  */
 package quests.Q106_ForgottenTruth;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -95,7 +95,7 @@ public class Q106_ForgottenTruth extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30358-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java

@@ -16,9 +16,9 @@
  */
 package quests.Q107_MercilessPunishment;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -114,7 +114,7 @@ public class Q107_MercilessPunishment extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30568-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java

@@ -17,9 +17,9 @@
 package quests.Q108_JumbleTumbleDiamondFuss;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -159,7 +159,7 @@ public class Q108_JumbleTumbleDiamondFuss extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.dwarf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30523-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java

@@ -16,9 +16,9 @@
  */
 package quests.Q116_BeyondTheHillsOfWinter;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -103,7 +103,7 @@ public class Q116_BeyondTheHillsOfWinter extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				htmltext = ((player.getLevel() < 30) || (player.getRace() != Race.dwarf)) ? "30535-00.htm" : "30535-01.htm";
+				htmltext = ((player.getLevel() < 30) || (player.getRace() != Race.DWARF)) ? "30535-00.htm" : "30535-01.htm";
 				break;
 			
 			case State.STARTED:

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java

@@ -16,9 +16,9 @@
  */
 package quests.Q159_ProtectTheWaterSource;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -76,7 +76,7 @@ public class Q159_ProtectTheWaterSource extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30154-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java

@@ -16,9 +16,9 @@
  */
 package quests.Q160_NerupasRequest;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -84,7 +84,7 @@ public class Q160_NerupasRequest extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30370-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java

@@ -16,9 +16,9 @@
  */
 package quests.Q161_FruitOfTheMotherTree;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -77,7 +77,7 @@ public class Q161_FruitOfTheMotherTree extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30362-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java

@@ -19,9 +19,9 @@ package quests.Q162_CurseOfTheUndergroundFortress;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -100,7 +100,7 @@ public class Q162_CurseOfTheUndergroundFortress extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() == Race.darkelf)
+				if (player.getRace() == Race.DARK_ELF)
 				{
 					htmltext = "30147-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java

@@ -16,9 +16,9 @@
  */
 package quests.Q163_LegacyOfThePoet;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -111,7 +111,7 @@ public class Q163_LegacyOfThePoet extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() == Race.darkelf)
+				if (player.getRace() == Race.DARK_ELF)
 				{
 					htmltext = "30220-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java

@@ -16,9 +16,9 @@
  */
 package quests.Q164_BloodFiend;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -73,7 +73,7 @@ public class Q164_BloodFiend extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() == Race.darkelf)
+				if (player.getRace() == Race.DARK_ELF)
 				{
 					htmltext = "30149-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java

@@ -19,9 +19,9 @@ package quests.Q165_ShilensHunt;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -93,7 +93,7 @@ public class Q165_ShilensHunt extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30348-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java

@@ -16,9 +16,9 @@
  */
 package quests.Q166_MassOfDarkness;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -81,7 +81,7 @@ public class Q166_MassOfDarkness extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30130-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java

@@ -16,9 +16,9 @@
  */
 package quests.Q168_DeliverSupplies;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -82,7 +82,7 @@ public class Q168_DeliverSupplies extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30349-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java

@@ -16,9 +16,9 @@
  */
 package quests.Q169_OffspringOfNightmares;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -85,7 +85,7 @@ public class Q169_OffspringOfNightmares extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30145-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java

@@ -16,9 +16,9 @@
  */
 package quests.Q170_DangerousSeduction;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -73,7 +73,7 @@ public class Q170_DangerousSeduction extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30305-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java

@@ -168,7 +168,7 @@ public class Q211_TrialOfTheChallenger extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.warrior) && (player.getClassId() != ClassId.elvenKnight) && (player.getClassId() != ClassId.palusKnight) && (player.getClassId() != ClassId.orcRaider) && (player.getClassId() != ClassId.orcMonk))
+				if ((player.getClassId() != ClassId.WARRIOR) && (player.getClassId() != ClassId.ELVEN_KNIGHT) && (player.getClassId() != ClassId.PALUS_KNIGHT) && (player.getClassId() != ClassId.ORC_RAIDER) && (player.getClassId() != ClassId.ORC_MONK))
 				{
 					htmltext = "30644-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java

@@ -115,7 +115,7 @@ public class Q212_TrialOfDuty extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.knight) && (player.getClassId() != ClassId.elvenKnight) && (player.getClassId() != ClassId.palusKnight))
+				if ((player.getClassId() != ClassId.KNIGHT) && (player.getClassId() != ClassId.ELVEN_KNIGHT) && (player.getClassId() != ClassId.PALUS_KNIGHT))
 				{
 					htmltext = "30109-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java

@@ -219,7 +219,7 @@ public class Q213_TrialOfTheSeeker extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() == ClassId.rogue) || (player.getClassId() == ClassId.elvenScout) || (player.getClassId() == ClassId.assassin))
+				if ((player.getClassId() == ClassId.ROGUE) || (player.getClassId() == ClassId.ELVEN_SCOUT) || (player.getClassId() == ClassId.ASSASSIN))
 				{
 					htmltext = (player.getLevel() < 35) ? "30106-02.htm" : "30106-03.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java

@@ -332,7 +332,7 @@ public class Q214_TrialOfTheScholar extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.wizard) && (player.getClassId() != ClassId.elvenWizard) && (player.getClassId() != ClassId.darkWizard))
+				if ((player.getClassId() != ClassId.WIZARD) && (player.getClassId() != ClassId.ELVEN_WIZARD) && (player.getClassId() != ClassId.DARK_WIZARD))
 				{
 					htmltext = "30461-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java

@@ -155,7 +155,7 @@ public class Q215_TrialOfThePilgrim extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.cleric) && (player.getClassId() != ClassId.oracle) && (player.getClassId() != ClassId.shillienOracle) && (player.getClassId() != ClassId.orcShaman))
+				if ((player.getClassId() != ClassId.CLERIC) && (player.getClassId() != ClassId.ORACLE) && (player.getClassId() != ClassId.SHILLIEN_ORACLE) && (player.getClassId() != ClassId.ORC_SHAMAN))
 				{
 					htmltext = "30648-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java

@@ -170,7 +170,7 @@ public class Q216_TrialOfTheGuildsman extends Quest
 			st.giveItems(PINTER_INSTRUCTIONS, 1);
 			
 			// Artisan receives a recipe to craft Amber Beads, while spoiler case is handled in onKill section.
-			if (player.getClassId() == ClassId.artisan)
+			if (player.getClassId() == ClassId.ARTISAN)
 			{
 				htmltext = "30298-05.htm";
 				st.giveItems(RECIPE_AMBER_BEAD, 1);
@@ -199,7 +199,7 @@ public class Q216_TrialOfTheGuildsman extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.scavenger) && (player.getClassId() != ClassId.artisan))
+				if ((player.getClassId() != ClassId.SCAVENGER) && (player.getClassId() != ClassId.ARTISAN))
 				{
 					htmltext = "30103-01.htm";
 				}
@@ -446,9 +446,9 @@ public class Q216_TrialOfTheGuildsman extends Quest
 				if (st.hasQuestItems(PINTER_INSTRUCTIONS))
 				{
 					// Different cases if player is a wannabe BH or WS.
-					if (st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.scavenger) && (npc.getIsSpoiledBy() == player.getObjectId())) ? 10 : 5, 70))
+					if (st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.SCAVENGER) && (npc.getIsSpoiledBy() == player.getObjectId())) ? 10 : 5, 70))
 					{
-						if ((player.getClassId() == ClassId.artisan) && Rnd.nextBoolean())
+						if ((player.getClassId() == ClassId.ARTISAN) && Rnd.nextBoolean())
 						{
 							st.giveItems(AMBER_LUMP, 1);
 						}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java

@@ -17,9 +17,9 @@
 package quests.Q217_TestimonyOfTrust;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -212,7 +212,7 @@ public class Q217_TestimonyOfTrust extends Quest
 				{
 					htmltext = "30191-01a.htm";
 				}
-				else if (player.getRace() != Race.human)
+				else if (player.getRace() != Race.HUMAN)
 				{
 					htmltext = "30191-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java

@@ -17,10 +17,10 @@
 package quests.Q218_TestimonyOfLife;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -203,7 +203,7 @@ public class Q218_TestimonyOfLife extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30460-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java

@@ -19,9 +19,9 @@ package quests.Q219_TestimonyOfFate;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -212,7 +212,7 @@ public class Q219_TestimonyOfFate extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30476-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java

@@ -16,9 +16,9 @@
  */
 package quests.Q220_TestimonyOfGlory;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -365,7 +365,7 @@ public class Q220_TestimonyOfGlory extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30514-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java

@@ -16,9 +16,9 @@
  */
 package quests.Q221_TestimonyOfProsperity;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -302,7 +302,7 @@ public class Q221_TestimonyOfProsperity extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.dwarf)
+				if (player.getRace() != Race.DWARF)
 				{
 					htmltext = "30104-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java

@@ -16,9 +16,9 @@
  */
 package quests.Q222_TestOfTheDuelist;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -97,7 +97,7 @@ public class Q222_TestOfTheDuelist extends Quest
 		
 		if (event.equals("30623-04.htm"))
 		{
-			if (player.getRace() == Race.orc)
+			if (player.getRace() == Race.ORC)
 			{
 				htmltext = "30623-05.htm";
 			}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java

@@ -171,7 +171,7 @@ public class Q223_TestOfTheChampion extends Quest
 		{
 			case State.CREATED:
 				final ClassId classId = player.getClassId();
-				if ((classId != ClassId.warrior) && (classId != ClassId.orcRaider))
+				if ((classId != ClassId.WARRIOR) && (classId != ClassId.ORC_RAIDER))
 				{
 					htmltext = "30624-01.htm";
 				}
@@ -181,7 +181,7 @@ public class Q223_TestOfTheChampion extends Quest
 				}
 				else
 				{
-					htmltext = (classId == ClassId.warrior) ? "30624-03.htm" : "30624-04.htm";
+					htmltext = (classId == ClassId.WARRIOR) ? "30624-03.htm" : "30624-04.htm";
 				}
 				break;
 			

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java

@@ -165,7 +165,7 @@ public class Q224_TestOfSagittarius extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.rogue) && (player.getClassId() != ClassId.elvenScout) && (player.getClassId() != ClassId.assassin))
+				if ((player.getClassId() != ClassId.ROGUE) && (player.getClassId() != ClassId.ELVEN_SCOUT) && (player.getClassId() != ClassId.ASSASSIN))
 				{
 					htmltext = "30702-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java

@@ -201,7 +201,7 @@ public class Q225_TestOfTheSearcher extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.rogue) && (player.getClassId() != ClassId.elvenScout) && (player.getClassId() != ClassId.assassin) && (player.getClassId() != ClassId.scavenger))
+				if ((player.getClassId() != ClassId.ROGUE) && (player.getClassId() != ClassId.ELVEN_SCOUT) && (player.getClassId() != ClassId.ASSASSIN) && (player.getClassId() != ClassId.SCAVENGER))
 				{
 					htmltext = "30690-01.htm";
 				}
@@ -211,7 +211,7 @@ public class Q225_TestOfTheSearcher extends Quest
 				}
 				else
 				{
-					htmltext = (player.getClassId() == ClassId.scavenger) ? "30690-04.htm" : "30690-03.htm";
+					htmltext = (player.getClassId() == ClassId.SCAVENGER) ? "30690-04.htm" : "30690-03.htm";
 				}
 				break;
 			

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java

@@ -213,7 +213,7 @@ public class Q226_TestOfTheHealer extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.knight) && (player.getClassId() != ClassId.elvenKnight) && (player.getClassId() != ClassId.cleric) && (player.getClassId() != ClassId.oracle))
+				if ((player.getClassId() != ClassId.KNIGHT) && (player.getClassId() != ClassId.ELVEN_KNIGHT) && (player.getClassId() != ClassId.CLERIC) && (player.getClassId() != ClassId.ORACLE))
 				{
 					htmltext = "30473-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java

@@ -249,7 +249,7 @@ public class Q227_TestOfTheReformer extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() == ClassId.cleric) || (player.getClassId() == ClassId.shillienOracle))
+				if ((player.getClassId() == ClassId.CLERIC) || (player.getClassId() == ClassId.SHILLIEN_ORACLE))
 				{
 					htmltext = (player.getLevel() < 39) ? "30118-01.htm" : "30118-03.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java

@@ -173,7 +173,7 @@ public class Q228_TestOfMagus extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.wizard) && (player.getClassId() != ClassId.elvenWizard) && (player.getClassId() != ClassId.darkWizard))
+				if ((player.getClassId() != ClassId.WIZARD) && (player.getClassId() != ClassId.ELVEN_WIZARD) && (player.getClassId() != ClassId.DARK_WIZARD))
 				{
 					htmltext = "30629-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java

@@ -289,7 +289,7 @@ public class Q229_TestOfWitchcraft extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.knight) && (player.getClassId() != ClassId.wizard) && (player.getClassId() != ClassId.palusKnight))
+				if ((player.getClassId() != ClassId.KNIGHT) && (player.getClassId() != ClassId.WIZARD) && (player.getClassId() != ClassId.PALUS_KNIGHT))
 				{
 					htmltext = "30630-01.htm";
 				}
@@ -299,7 +299,7 @@ public class Q229_TestOfWitchcraft extends Quest
 				}
 				else
 				{
-					htmltext = (player.getClassId() == ClassId.wizard) ? "30630-03.htm" : "30630-05.htm";
+					htmltext = (player.getClassId() == ClassId.WIZARD) ? "30630-03.htm" : "30630-05.htm";
 				}
 				break;
 			

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java

@@ -369,7 +369,7 @@ public class Q230_TestOfTheSummoner extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClassId() != ClassId.wizard) && (player.getClassId() != ClassId.elvenWizard) && (player.getClassId() != ClassId.darkWizard))
+				if ((player.getClassId() != ClassId.WIZARD) && (player.getClassId() != ClassId.ELVEN_WIZARD) && (player.getClassId() != ClassId.DARK_WIZARD))
 				{
 					htmltext = "30634-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java

@@ -167,7 +167,7 @@ public class Q231_TestOfTheMaestro extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getClassId() != ClassId.artisan)
+				if (player.getClassId() != ClassId.ARTISAN)
 				{
 					htmltext = "30531-01.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java

@@ -16,10 +16,10 @@
  */
 package quests.Q232_TestOfTheLord;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -200,11 +200,11 @@ public class Q232_TestOfTheLord extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30565-01.htm";
 				}
-				else if (player.getClassId() != ClassId.orcShaman)
+				else if (player.getClassId() != ClassId.ORC_SHAMAN)
 				{
 					htmltext = "30565-02.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java

@@ -17,10 +17,10 @@
 package quests.Q233_TestOfTheWarSpirit;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -189,13 +189,13 @@ public class Q233_TestOfTheWarSpirit extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getClassId() == ClassId.orcShaman)
+				if (player.getClassId() == ClassId.ORC_SHAMAN)
 				{
 					htmltext = (player.getLevel() < 39) ? "30510-03.htm" : "30510-04.htm";
 				}
 				else
 				{
-					htmltext = (player.getRace() == Race.orc) ? "30510-02.htm" : "30510-01.htm";
+					htmltext = (player.getRace() == Race.ORC) ? "30510-02.htm" : "30510-01.htm";
 				}
 				break;
 			

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java

@@ -16,9 +16,9 @@
  */
 package quests.Q260_HuntTheOrcs;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -90,7 +90,7 @@ public class Q260_HuntTheOrcs extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30221-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java

@@ -16,9 +16,9 @@
  */
 package quests.Q263_OrcSubjugation;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -79,7 +79,7 @@ public class Q263_OrcSubjugation extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30346-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java

@@ -16,9 +16,9 @@
  */
 package quests.Q265_ChainsOfSlavery;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -82,7 +82,7 @@ public class Q265_ChainsOfSlavery extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30357-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java

@@ -17,9 +17,9 @@
 package quests.Q266_PleasOfPixies;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -80,7 +80,7 @@ public class Q266_PleasOfPixies extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "31852-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java

@@ -16,9 +16,9 @@
  */
 package quests.Q267_WrathOfVerdure;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -81,7 +81,7 @@ public class Q267_WrathOfVerdure extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "31853-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java

@@ -17,9 +17,9 @@
 package quests.Q271_ProofOfValor;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -83,7 +83,7 @@ public class Q271_ProofOfValor extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30577-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java

@@ -16,9 +16,9 @@
  */
 package quests.Q272_WrathOfAncestors;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -73,7 +73,7 @@ public class Q272_WrathOfAncestors extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30572-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java

@@ -17,9 +17,9 @@
 package quests.Q273_InvadersOfTheHolyLand;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -83,7 +83,7 @@ public class Q273_InvadersOfTheHolyLand extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30566-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java

@@ -17,9 +17,9 @@
 package quests.Q274_SkirmishWithTheWerewolves;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -79,7 +79,7 @@ public class Q274_SkirmishWithTheWerewolves extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30569-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java

@@ -17,9 +17,9 @@
 package quests.Q275_DarkWingedSpies;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -79,7 +79,7 @@ public class Q275_DarkWingedSpies extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30567-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java

@@ -17,9 +17,9 @@
 package quests.Q276_TotemOfTheHestui;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -79,7 +79,7 @@ public class Q276_TotemOfTheHestui extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.orc)
+				if (player.getRace() != Race.ORC)
 				{
 					htmltext = "30571-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java

@@ -17,9 +17,9 @@
 package quests.Q292_BrigandsSweep;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -94,7 +94,7 @@ public class Q292_BrigandsSweep extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.dwarf)
+				if (player.getRace() != Race.DWARF)
 				{
 					htmltext = "30532-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java

@@ -17,9 +17,9 @@
 package quests.Q293_TheHiddenVeins;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -103,7 +103,7 @@ public class Q293_TheHiddenVeins extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.dwarf)
+				if (player.getRace() != Race.DWARF)
 				{
 					htmltext = "30535-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java

@@ -17,9 +17,9 @@
 package quests.Q294_CovertBusiness;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -77,7 +77,7 @@ public class Q294_CovertBusiness extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.dwarf)
+				if (player.getRace() != Race.DWARF)
 				{
 					htmltext = "30534-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java

@@ -16,9 +16,9 @@
  */
 package quests.Q316_DestroyPlagueCarriers;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -84,7 +84,7 @@ public class Q316_DestroyPlagueCarriers extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.elf)
+				if (player.getRace() != Race.ELF)
 				{
 					htmltext = "30155-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java

@@ -16,9 +16,9 @@
  */
 package quests.Q320_BonesTellTheFuture;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
@@ -73,7 +73,7 @@ public class Q320_BonesTellTheFuture extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getRace() != Race.darkelf)
+				if (player.getRace() != Race.DARK_ELF)
 				{
 					htmltext = "30359-00.htm";
 				}

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java

@@ -65,9 +65,9 @@ public class Q401_PathToAWarrior extends Quest
 		
 		if (event.equals("30010-05.htm"))
 		{
-			if (player.getClassId() != ClassId.fighter)
+			if (player.getClassId() != ClassId.FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.warrior) ? "30010-03.htm" : "30010-02b.htm";
+				htmltext = (player.getClassId() == ClassId.WARRIOR) ? "30010-03.htm" : "30010-02b.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java

@@ -83,9 +83,9 @@ public class Q402_PathToAHumanKnight extends Quest
 		
 		if (event.equals("30417-05.htm"))
 		{
-			if (player.getClassId() != ClassId.fighter)
+			if (player.getClassId() != ClassId.FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.knight) ? "30417-02a.htm" : "30417-03.htm";
+				htmltext = (player.getClassId() == ClassId.KNIGHT) ? "30417-02a.htm" : "30417-03.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java

@@ -69,9 +69,9 @@ public class Q403_PathToARogue extends Quest
 		
 		if (event.equals("30379-05.htm"))
 		{
-			if (player.getClassId() != ClassId.fighter)
+			if (player.getClassId() != ClassId.FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.rogue) ? "30379-02a.htm" : "30379-02.htm";
+				htmltext = (player.getClassId() == ClassId.ROGUE) ? "30379-02a.htm" : "30379-02.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java

@@ -102,9 +102,9 @@ public class Q404_PathToAHumanWizard extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getClassId() != ClassId.mage)
+				if (player.getClassId() != ClassId.MAGE)
 				{
-					htmltext = (player.getClassId() == ClassId.wizard) ? "30391-02a.htm" : "30391-01.htm";
+					htmltext = (player.getClassId() == ClassId.WIZARD) ? "30391-02a.htm" : "30391-01.htm";
 				}
 				else if (player.getLevel() < 19)
 				{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java

@@ -95,9 +95,9 @@ public class Q405_PathToACleric extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getClassId() != ClassId.mage)
+				if (player.getClassId() != ClassId.MAGE)
 				{
-					htmltext = (player.getClassId() == ClassId.cleric) ? "30022-02a.htm" : "30022-02.htm";
+					htmltext = (player.getClassId() == ClassId.CLERIC) ? "30022-02a.htm" : "30022-02.htm";
 				}
 				else if (player.getLevel() < 19)
 				{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java

@@ -62,9 +62,9 @@ public class Q406_PathToAnElvenKnight extends Quest
 		
 		if (event.equals("30327-05.htm"))
 		{
-			if (player.getClassId() != ClassId.elvenFighter)
+			if (player.getClassId() != ClassId.ELVEN_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.elvenKnight) ? "30327-02a.htm" : "30327-02.htm";
+				htmltext = (player.getClassId() == ClassId.ELVEN_KNIGHT) ? "30327-02a.htm" : "30327-02.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java

@@ -69,9 +69,9 @@ public class Q407_PathToAnElvenScout extends Quest
 		
 		if (event.equals("30328-05.htm"))
 		{
-			if (player.getClassId() != ClassId.elvenFighter)
+			if (player.getClassId() != ClassId.ELVEN_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.elvenScout) ? "30328-02a.htm" : "30328-02.htm";
+				htmltext = (player.getClassId() == ClassId.ELVEN_SCOUT) ? "30328-02a.htm" : "30328-02.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java

@@ -72,9 +72,9 @@ public class Q408_PathToAnElvenWizard extends Quest
 		
 		if (event.equals("30414-06.htm"))
 		{
-			if (player.getClassId() != ClassId.elvenMage)
+			if (player.getClassId() != ClassId.ELVEN_MAGE)
 			{
-				htmltext = (player.getClassId() == ClassId.elvenWizard) ? "30414-02a.htm" : "30414-03.htm";
+				htmltext = (player.getClassId() == ClassId.ELVEN_WIZARD) ? "30414-02a.htm" : "30414-03.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java

@@ -99,9 +99,9 @@ public class Q409_PathToAnElvenOracle extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if (player.getClassId() != ClassId.elvenMage)
+				if (player.getClassId() != ClassId.ELVEN_MAGE)
 				{
-					htmltext = (player.getClassId() == ClassId.oracle) ? "30293-02a.htm" : "30293-02.htm";
+					htmltext = (player.getClassId() == ClassId.ORACLE) ? "30293-02a.htm" : "30293-02.htm";
 				}
 				else if (player.getLevel() < 19)
 				{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java

@@ -69,9 +69,9 @@ public class Q410_PathToAPalusKnight extends Quest
 		
 		if (event.equals("30329-05.htm"))
 		{
-			if (player.getClassId() != ClassId.darkFighter)
+			if (player.getClassId() != ClassId.DARK_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.palusKnight) ? "30329-02a.htm" : "30329-03.htm";
+				htmltext = (player.getClassId() == ClassId.PALUS_KNIGHT) ? "30329-02a.htm" : "30329-03.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java

@@ -64,9 +64,9 @@ public class Q411_PathToAnAssassin extends Quest
 		
 		if (event.equals("30416-05.htm"))
 		{
-			if (player.getClassId() != ClassId.darkFighter)
+			if (player.getClassId() != ClassId.DARK_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.assassin) ? "30416-02a.htm" : "30416-02.htm";
+				htmltext = (player.getClassId() == ClassId.ASSASSIN) ? "30416-02a.htm" : "30416-02.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java

@@ -70,9 +70,9 @@ public class Q412_PathToADarkWizard extends Quest
 		
 		if (event.equals("30421-05.htm"))
 		{
-			if (player.getClassId() != ClassId.darkMage)
+			if (player.getClassId() != ClassId.DARK_MAGE)
 			{
-				htmltext = (player.getClassId() == ClassId.darkWizard) ? "30421-02a.htm" : "30421-03.htm";
+				htmltext = (player.getClassId() == ClassId.DARK_WIZARD) ? "30421-02a.htm" : "30421-03.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java

@@ -66,9 +66,9 @@ public class Q413_PathToAShillienOracle extends Quest
 		
 		if (event.equals("30330-05.htm"))
 		{
-			if (player.getClassId() != ClassId.darkMage)
+			if (player.getClassId() != ClassId.DARK_MAGE)
 			{
-				htmltext = (player.getClassId() == ClassId.shillienOracle) ? "30330-02a.htm" : "30330-03.htm";
+				htmltext = (player.getClassId() == ClassId.SHILLIEN_ORACLE) ? "30330-02a.htm" : "30330-03.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java

@@ -73,9 +73,9 @@ public class Q414_PathToAnOrcRaider extends Quest
 		// KARUKIA
 		if (event.equals("30570-05.htm"))
 		{
-			if (player.getClassId() != ClassId.orcFighter)
+			if (player.getClassId() != ClassId.ORC_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.orcRaider) ? "30570-02a.htm" : "30570-03.htm";
+				htmltext = (player.getClassId() == ClassId.ORC_RAIDER) ? "30570-02a.htm" : "30570-03.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java

@@ -87,9 +87,9 @@ public class Q415_PathToAMonk extends Quest
 		
 		if (event.equals("30587-05.htm"))
 		{
-			if (player.getClassId() != ClassId.orcFighter)
+			if (player.getClassId() != ClassId.ORC_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.orcMonk) ? "30587-02a.htm" : "30587-02.htm";
+				htmltext = (player.getClassId() == ClassId.ORC_MONK) ? "30587-02a.htm" : "30587-02.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java

@@ -89,9 +89,9 @@ public class Q416_PathToAnOrcShaman extends Quest
 		// TATARU ZU HESTUI
 		if (event.equals("30585-05.htm"))
 		{
-			if (player.getClassId() != ClassId.orcMage)
+			if (player.getClassId() != ClassId.ORC_MAGE)
 			{
-				htmltext = (player.getClassId() == ClassId.orcShaman) ? "30585-02a.htm" : "30585-02.htm";
+				htmltext = (player.getClassId() == ClassId.ORC_SHAMAN) ? "30585-02a.htm" : "30585-02.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java

@@ -88,9 +88,9 @@ public class Q417_PathToBecomeAScavenger extends Quest
 		// PIPPI
 		if (event.equals("30524-05.htm"))
 		{
-			if (player.getClassId() != ClassId.dwarvenFighter)
+			if (player.getClassId() != ClassId.DWARVEN_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.scavenger) ? "30524-02a.htm" : "30524-08.htm";
+				htmltext = (player.getClassId() == ClassId.SCAVENGER) ? "30524-02a.htm" : "30524-08.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java

@@ -71,9 +71,9 @@ public class Q418_PathToAnArtisan extends Quest
 		
 		if (event.equals("30527-05.htm"))
 		{
-			if (player.getClassId() != ClassId.dwarvenFighter)
+			if (player.getClassId() != ClassId.DWARVEN_FIGHTER)
 			{
-				htmltext = (player.getClassId() == ClassId.artisan) ? "30527-02a.htm" : "30527-02.htm";
+				htmltext = (player.getClassId() == ClassId.ARTISAN) ? "30527-02a.htm" : "30527-02.htm";
 			}
 			else if (player.getLevel() < 19)
 			{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java

@@ -19,9 +19,9 @@ package village_master.FirstClassChange;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
@@ -193,7 +193,7 @@ public class FirstClassChange extends Quest
 			case 30290: // Dark Elf
 			case 30297:
 			case 30462:
-				if (player.getRace() == Race.darkelf)
+				if (player.getRace() == Race.DARK_ELF)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -222,7 +222,7 @@ public class FirstClassChange extends Quest
 				break;
 			
 			case 30358: // Thifiell (dark elf)
-				if (player.getRace() == Race.darkelf)
+				if (player.getRace() == Race.DARK_ELF)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -254,7 +254,7 @@ public class FirstClassChange extends Quest
 			case 30505:
 			case 30508:
 			case 32097:
-				if (player.getRace() == Race.orc)
+				if (player.getRace() == Race.ORC)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -283,7 +283,7 @@ public class FirstClassChange extends Quest
 				break;
 			
 			case 30565: // Kakai (Orcs)
-				if (player.getRace() == Race.orc)
+				if (player.getRace() == Race.ORC)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -319,7 +319,7 @@ public class FirstClassChange extends Quest
 			case 30504:
 			case 30595:
 			case 30499:
-				if (player.getRace() == Race.dwarf)
+				if (player.getRace() == Race.DWARF)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -345,7 +345,7 @@ public class FirstClassChange extends Quest
 			
 			case 30525: // Bronk and Reed(dwarf)
 			case 30520:
-				if (player.getRace() == Race.dwarf)
+				if (player.getRace() == Race.DWARF)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -373,7 +373,7 @@ public class FirstClassChange extends Quest
 			case 30037:
 			case 30289:
 			case 32098:
-				if (player.getRace() == Race.elf)
+				if (player.getRace() == Race.ELF)
 				{
 					if (player.isMageClass())
 					{
@@ -398,7 +398,7 @@ public class FirstClassChange extends Quest
 						htmltext = npcId + "-33.htm";
 					}
 				}
-				else if (player.getRace() == Race.human)
+				else if (player.getRace() == Race.HUMAN)
 				{
 					if (player.isMageClass())
 					{
@@ -430,7 +430,7 @@ public class FirstClassChange extends Quest
 				break;
 			
 			case 30154: // Asterios (Elf fighters and mages)
-				if (player.getRace() == Race.elf)
+				if (player.getRace() == Race.ELF)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -459,7 +459,7 @@ public class FirstClassChange extends Quest
 				break;
 			
 			case 30031: // Biotin (Human mages)
-				if (player.getRace() == Race.human)
+				if (player.getRace() == Race.HUMAN)
 				{
 					if (player.isMageClass())
 					{
@@ -493,7 +493,7 @@ public class FirstClassChange extends Quest
 			case 30373: // Human and Elfs fighters
 			case 30288:
 			case 30066:
-				if (player.getRace() == Race.human)
+				if (player.getRace() == Race.HUMAN)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -515,7 +515,7 @@ public class FirstClassChange extends Quest
 						htmltext = npcId + "-39.htm";
 					}
 				}
-				else if (player.getRace() == Race.elf)
+				else if (player.getRace() == Race.ELF)
 				{
 					if (player.getClassId().level() == 0)
 					{
@@ -544,7 +544,7 @@ public class FirstClassChange extends Quest
 				break;
 			
 			case 30026: // Bitz (Human fighters)
-				if (player.getRace() == Race.human)
+				if (player.getRace() == Race.HUMAN)
 				{
 					if (player.getClassId().level() == 0)
 					{

L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java

@@ -19,10 +19,10 @@ package village_master.SecondClassChange;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
@@ -208,23 +208,23 @@ public class SecondClassChange extends Quest
 			case 31334:
 			case 31974:
 			case 32096:
-				if (player.getRace() == Race.darkelf)
+				if (player.getRace() == Race.DARK_ELF)
 				{
 					if (player.getClassId().level() == 1)
 					{
-						if (player.getClassId() == ClassId.palusKnight)
+						if (player.getClassId() == ClassId.PALUS_KNIGHT)
 						{
 							htmltext = "master_de-01.htm";
 						}
-						else if (player.getClassId() == ClassId.shillienOracle)
+						else if (player.getClassId() == ClassId.SHILLIEN_ORACLE)
 						{
 							htmltext = "master_de-08.htm";
 						}
-						else if (player.getClassId() == ClassId.assassin)
+						else if (player.getClassId() == ClassId.ASSASSIN)
 						{
 							htmltext = "master_de-12.htm";
 						}
-						else if (player.getClassId() == ClassId.darkWizard)
+						else if (player.getClassId() == ClassId.DARK_WIZARD)
 						{
 							htmltext = "master_de-19.htm";
 						}
@@ -248,19 +248,19 @@ public class SecondClassChange extends Quest
 			case 31288:
 			case 31326:
 			case 31977:
-				if (player.getRace() == Race.orc)
+				if (player.getRace() == Race.ORC)
 				{
 					if (player.getClassId().level() == 1)
 					{
-						if (player.getClassId() == ClassId.orcMonk)
+						if (player.getClassId() == ClassId.ORC_MONK)
 						{
 							htmltext = "master_orc-01.htm";
 						}
-						else if (player.getClassId() == ClassId.orcRaider)
+						else if (player.getClassId() == ClassId.ORC_RAIDER)
 						{
 							htmltext = "master_orc-05.htm";
 						}
-						else if (player.getClassId() == ClassId.orcShaman)
+						else if (player.getClassId() == ClassId.ORC_SHAMAN)
 						{
 							htmltext = "master_orc-09.htm";
 						}
@@ -284,15 +284,15 @@ public class SecondClassChange extends Quest
 			case 31269:
 			case 31314:
 			case 31958:
-				if (player.getRace() == Race.dwarf)
+				if (player.getRace() == Race.DWARF)
 				{
 					if (player.getClassId().level() == 1)
 					{
-						if (player.getClassId() == ClassId.scavenger)
+						if (player.getClassId() == ClassId.SCAVENGER)
 						{
 							htmltext = "master_dwarf-01.htm";
 						}
-						else if (player.getClassId() == ClassId.artisan)
+						else if (player.getClassId() == ClassId.ARTISAN)
 						{
 							htmltext = "master_dwarf-15.htm";
 						}
@@ -316,15 +316,15 @@ public class SecondClassChange extends Quest
 			case 31272:
 			case 31317:
 			case 31961:
-				if (player.getRace() == Race.dwarf)
+				if (player.getRace() == Race.DWARF)
 				{
 					if (player.getClassId().level() == 1)
 					{
-						if (player.getClassId() == ClassId.scavenger)
+						if (player.getClassId() == ClassId.SCAVENGER)
 						{
 							htmltext = "master_dwarf-22.htm";
 						}
-						else if (player.getClassId() == ClassId.artisan)
+						else if (player.getClassId() == ClassId.ARTISAN)
 						{
 							htmltext = "master_dwarf-05.htm";
 						}
@@ -347,27 +347,27 @@ public class SecondClassChange extends Quest
 			case 30900:
 			case 31965:
 			case 32094:
-				if ((player.getRace() == Race.human) || (player.getRace() == Race.elf))
+				if ((player.getRace() == Race.HUMAN) || (player.getRace() == Race.ELF))
 				{
 					if (player.getClassId().level() == 1)
 					{
-						if (player.getClassId() == ClassId.elvenKnight)
+						if (player.getClassId() == ClassId.ELVEN_KNIGHT)
 						{
 							htmltext = "master_human_elf_fighter-01.htm";
 						}
-						else if (player.getClassId() == ClassId.knight)
+						else if (player.getClassId() == ClassId.KNIGHT)
 						{
 							htmltext = "master_human_elf_fighter-08.htm";
 						}
-						else if (player.getClassId() == ClassId.rogue)
+						else if (player.getClassId() == ClassId.ROGUE)
 						{
 							htmltext = "master_human_elf_fighter-15.htm";
 						}
-						else if (player.getClassId() == ClassId.elvenScout)
+						else if (player.getClassId() == ClassId.ELVEN_SCOUT)
 						{
 							htmltext = "master_human_elf_fighter-22.htm";
 						}
-						else if (player.getClassId() == ClassId.warrior)
+						else if (player.getClassId() == ClassId.WARRIOR)
 						{
 							htmltext = "master_human_elf_fighter-29.htm";
 						}
@@ -393,15 +393,15 @@ public class SecondClassChange extends Quest
 			case 30694:
 			case 30854:
 			case 31996:
-				if ((player.getRace() == Race.elf) || (player.getRace() == Race.human))
+				if ((player.getRace() == Race.ELF) || (player.getRace() == Race.HUMAN))
 				{
 					if (player.getClassId().level() == 1)
 					{
-						if (player.getClassId() == ClassId.elvenWizard)
+						if (player.getClassId() == ClassId.ELVEN_WIZARD)
 						{
 							htmltext = "master_human_elf_mystic-01.htm";
 						}
-						else if (player.getClassId() == ClassId.wizard)
+						else if (player.getClassId() == ClassId.WIZARD)
 						{
 							htmltext = "master_human_elf_mystic-08.htm";
 						}
@@ -432,15 +432,15 @@ public class SecondClassChange extends Quest
 			case 31968:
 			case 32095:
 			case 31336:
-				if ((player.getRace() == Race.human) || (player.getRace() == Race.elf))
+				if ((player.getRace() == Race.HUMAN) || (player.getRace() == Race.ELF))
 				{
 					if (player.getClassId().level() == 1)
 					{
-						if (player.getClassId() == ClassId.oracle)
+						if (player.getClassId() == ClassId.ORACLE)
 						{
 							htmltext = "master_human_elf_buffer-01.htm";
 						}
-						else if (player.getClassId() == ClassId.cleric)
+						else if (player.getClassId() == ClassId.CLERIC)
 						{
 							htmltext = "master_human_elf_buffer-05.htm";
 						}
@@ -475,23 +475,23 @@ public class SecondClassChange extends Quest
 		
 		switch (player.getRace())
 		{
-			case darkelf:
+			case DARK_ELF:
 				change = "master_de";
 				break;
 			
-			case dwarf:
+			case DWARF:
 				change = "master_dwarf";
 				break;
 			
-			case orc:
+			case ORC:
 				change = "master_orc";
 				break;
 			
-			case human:
+			case HUMAN:
-			case elf:
+			case ELF:
 				if (player.isMageClass())
 				{
-					change = ((player.getClassId() == ClassId.wizard) || (player.getClassId() == ClassId.elvenWizard)) ? "master_human_elf_mystic" : "master_human_elf_buffer";
+					change = ((player.getClassId() == ClassId.WIZARD) || (player.getClassId() == ClassId.ELVEN_WIZARD)) ? "master_human_elf_mystic" : "master_human_elf_buffer";
 				}
 				else
 				{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java

@@ -244,9 +244,7 @@ public class CharTemplateTable
 	
 	public PlayerTemplate getTemplate(int classId)
 	{
-		final int key = classId;
+		return _templates.get(classId);
-		
-		return _templates.get(key);
 	}
 	
 	public static final String getClassNameById(int classId)

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java

@@ -270,7 +270,7 @@ public class SkillTreeTable
 		}
 		
 		// since expertise comes at same level for all classes we use paladin for now
-		final Map<Integer, SkillLearn> learnMap = getSkillTrees().get(ClassId.paladin);
+		final Map<Integer, SkillLearn> learnMap = getSkillTrees().get(ClassId.PALADIN);
 		
 		final int skillHashCode = SkillTable.getSkillHashCode(239, grade);
 		

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java

@@ -32,11 +32,11 @@ import org.w3c.dom.Node;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.datatables.SkillTable;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.type.ArmorType;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/enums/Race.java

@@ -1,26 +1,30 @@
-/*
+/*
- * This file is part of the L2J Mobius project.
+ * This file is part of the L2J Mobius project.
- * 
+ * 
- * This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (at your option) any later version.
- * 
+ * 
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * General Public License for more details.
- * 
+ * 
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+ */
-package org.l2jmobius.gameserver.model.base;
+package org.l2jmobius.gameserver.enums;
-
+
-public enum Race
+/**
-{
+ * Creature races enumerated.
-	human,
+ * @author Zealar
-	elf,
+ */
-	darkelf,
+public enum Race
-	orc,
+{
-	dwarf
+	HUMAN,
-}
+	ELF,
+	DARK_ELF,
+	ORC,
+	DWARF;
+}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java

@@ -498,7 +498,7 @@ public class AdminEditChar implements IAdminCommandHandler
 				if (valid && (player.getClassId().getId() != classidval))
 				{
 					player.setClassId(classidval);
-					final ClassId classId = ClassId.getClassIdByOrdinal(classidval);
+					final ClassId classId = ClassId.getClassId(classidval);
 					if (!player.isSubClassActive())
 					{
 						player.setBaseClass(classId);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java

@@ -87,17 +87,17 @@ public class ClassMasterInstance extends FolkInstance
 			ClassLevel lvl = PlayerClass.values()[classId.getId()].getLevel();
 			switch (lvl)
 			{
-				case First:
+				case FIRST:
 				{
 					jobLevel = 1;
 					break;
 				}
-				case Second:
+				case SECOND:
 				{
 					jobLevel = 2;
 					break;
 				}
-				case Third:
+				case THIRD:
 				{
 					jobLevel = 3;
 					break;
@@ -272,17 +272,17 @@ public class ClassMasterInstance extends FolkInstance
 			}
 			switch (lvlnow)
 			{
-				case First:
+				case FIRST:
 				{
 					jobLevel = 1;
 					break;
 				}
-				case Second:
+				case SECOND:
 				{
 					jobLevel = 2;
 					break;
 				}
-				case Third:
+				case THIRD:
 				{
 					jobLevel = 3;
 					break;
@@ -301,17 +301,17 @@ public class ClassMasterInstance extends FolkInstance
 			ClassLevel lvlnext = PlayerClass.values()[val].getLevel();
 			switch (lvlnext)
 			{
-				case First:
+				case FIRST:
 				{
 					newJobLevel = 1;
 					break;
 				}
-				case Second:
+				case SECOND:
 				{
 					newJobLevel = 2;
 					break;
 				}
-				case Third:
+				case THIRD:
 				{
 					newJobLevel = 3;
 					break;
@@ -689,7 +689,7 @@ public class ClassMasterInstance extends FolkInstance
 		}
 		else
 		{
-			ClassId classId = ClassId.getClassIdByOrdinal(player.getActiveClass());
+			ClassId classId = ClassId.getClassId(player.getActiveClass());
 			
 			if (classId.getParent() != null)
 			{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.model.actor.instance;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.instancemanager.CustomNpcInstanceManager;
 import org.l2jmobius.gameserver.model.base.ClassId;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;
 
 /**
@@ -372,7 +372,7 @@ public class CustomNpcInstance
 				{
 					continue;
 				}
-				else if (_classId.getRace() == Race.human)
+				else if (_classId.getRace() == Race.HUMAN)
 				{
 				}
 				break;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -65,6 +65,7 @@ import org.l2jmobius.gameserver.datatables.sql.SkillTreeTable;
 import org.l2jmobius.gameserver.datatables.xml.AdminData;
 import org.l2jmobius.gameserver.datatables.xml.ExperienceData;
 import org.l2jmobius.gameserver.datatables.xml.ItemTable;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.handler.ItemHandler;
@@ -127,7 +128,6 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
 import org.l2jmobius.gameserver.model.base.ClassId;
 import org.l2jmobius.gameserver.model.base.ClassLevel;
 import org.l2jmobius.gameserver.model.base.PlayerClass;
-import org.l2jmobius.gameserver.model.base.Race;
 import org.l2jmobius.gameserver.model.base.SubClass;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.ClanMember;
@@ -2972,7 +2972,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setClassId(int Id)
 	{
-		if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.Third))
+		if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.THIRD))
 		{
 			if (getLvlJoinedAcademy() <= 16)
 			{
@@ -3170,7 +3170,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Active skill dwarven craft
-		if ((getSkillLevel(1321) < 1) && (getRace() == Race.dwarf))
+		if ((getSkillLevel(1321) < 1) && (getRace() == Race.DWARF))
 		{
 			Skill skill = SkillTable.getInstance().getInfo(1321, 1);
 			addSkill(skill, !restore);
@@ -3313,9 +3313,7 @@ public class PlayerInstance extends Playable
 		{
 			return getTemplate().race;
 		}
-		
+		return CharTemplateTable.getInstance().getTemplate(_baseClass).race;
-		final PlayerTemplate charTemp = CharTemplateTable.getInstance().getTemplate(_baseClass);
-		return charTemp.race;
 	}
 	
 	/**
@@ -15811,7 +15809,7 @@ public class PlayerInstance extends Playable
 		{
 			ivlim = Config.INVENTORY_MAXIMUM_GM;
 		}
-		else if (getRace() == Race.dwarf)
+		else if (getRace() == Race.DWARF)
 		{
 			ivlim = Config.INVENTORY_MAXIMUM_DWARF;
 		}
@@ -15831,7 +15829,7 @@ public class PlayerInstance extends Playable
 	public int GetWareHouseLimit()
 	{
 		int whlim;
-		if (getRace() == Race.dwarf)
+		if (getRace() == Race.DWARF)
 		{
 			whlim = Config.WAREHOUSE_SLOTS_DWARF;
 		}
@@ -15851,7 +15849,7 @@ public class PlayerInstance extends Playable
 	public int GetPrivateSellStoreLimit()
 	{
 		int pslim;
-		if (getRace() == Race.dwarf)
+		if (getRace() == Race.DWARF)
 		{
 			pslim = Config.MAX_PVTSTORE_SLOTS_DWARF;
 		}
@@ -15872,7 +15870,7 @@ public class PlayerInstance extends Playable
 	public int GetPrivateBuyStoreLimit()
 	{
 		int pblim;
-		if (getRace() == Race.dwarf)
+		if (getRace() == Race.DWARF)
 		{
 			pblim = Config.MAX_PVTSTORE_SLOTS_DWARF;
 		}