From acf6b0e42a8ca8c1239a50e225be36288c91d1fb Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 24 Aug 2019 11:19:01 +0000 Subject: [PATCH] Updated ClassId and Race to match newer branches. --- .../Q002_WhatWomenWant.java | 4 +- .../Q003_WillTheSealBeBroken.java | 4 +- .../Q004_LongliveThePaagrioLord.java | 4 +- .../Q006_StepIntoTheFuture.java | 4 +- .../Q007_ATripBegins/Q007_ATripBegins.java | 4 +- .../Q008_AnAdventureBegins.java | 4 +- .../Q009_IntoTheCityOfHumans.java | 4 +- .../Q010_IntoTheWorld/Q010_IntoTheWorld.java | 4 +- .../Q045_ToTalkingIsland.java | 4 +- ...Q046_OnceMoreInTheArmsOfTheMotherTree.java | 4 +- .../Q047_IntoTheDarkForest.java | 4 +- .../Q048_ToTheImmortalPlateau.java | 4 +- .../Q049_TheRoadHome/Q049_TheRoadHome.java | 4 +- .../Q101_SwordOfSolidarity.java | 4 +- .../Q102_SeaOfSporesFever.java | 4 +- .../Q103_SpiritOfCraftsman.java | 4 +- .../Q104_SpiritOfMirrors.java | 4 +- .../Q105_SkirmishWithTheOrcs.java | 4 +- .../Q106_ForgottenTruth.java | 4 +- .../Q107_MercilessPunishment.java | 4 +- .../Q108_JumbleTumbleDiamondFuss.java | 4 +- .../Q116_BeyondTheHillsOfWinter.java | 4 +- .../Q159_ProtectTheWaterSource.java | 4 +- .../Q160_NerupasRequest.java | 4 +- .../Q161_FruitOfTheMotherTree.java | 4 +- .../Q162_CurseOfTheUndergroundFortress.java | 4 +- .../Q163_LegacyOfThePoet.java | 4 +- .../Q164_BloodFiend/Q164_BloodFiend.java | 4 +- .../Q165_ShilensHunt/Q165_ShilensHunt.java | 4 +- .../Q166_MassOfDarkness.java | 4 +- .../Q168_DeliverSupplies.java | 4 +- .../Q169_OffspringOfNightmares.java | 4 +- .../Q170_DangerousSeduction.java | 4 +- .../Q211_TrialOfTheChallenger.java | 2 +- .../Q212_TrialOfDuty/Q212_TrialOfDuty.java | 2 +- .../Q213_TrialOfTheSeeker.java | 2 +- .../Q214_TrialOfTheScholar.java | 2 +- .../Q215_TrialOfThePilgrim.java | 2 +- .../Q216_TrialOfTheGuildsman.java | 8 +- .../Q217_TestimonyOfTrust.java | 4 +- .../Q218_TestimonyOfLife.java | 4 +- .../Q219_TestimonyOfFate.java | 4 +- .../Q220_TestimonyOfGlory.java | 4 +- .../Q221_TestimonyOfProsperity.java | 4 +- .../Q222_TestOfTheDuelist.java | 4 +- .../Q223_TestOfTheChampion.java | 4 +- .../Q224_TestOfSagittarius.java | 2 +- .../Q225_TestOfTheSearcher.java | 4 +- .../Q226_TestOfTheHealer.java | 2 +- .../Q227_TestOfTheReformer.java | 2 +- .../Q228_TestOfMagus/Q228_TestOfMagus.java | 2 +- .../Q229_TestOfWitchcraft.java | 4 +- .../Q230_TestOfTheSummoner.java | 2 +- .../Q231_TestOfTheMaestro.java | 2 +- .../Q232_TestOfTheLord.java | 6 +- .../Q233_TestOfTheWarSpirit.java | 6 +- .../Q260_HuntTheOrcs/Q260_HuntTheOrcs.java | 4 +- .../Q263_OrcSubjugation.java | 4 +- .../Q265_ChainsOfSlavery.java | 4 +- .../Q266_PleasOfPixies.java | 4 +- .../Q267_WrathOfVerdure.java | 4 +- .../Q271_ProofOfValor/Q271_ProofOfValor.java | 4 +- .../Q272_WrathOfAncestors.java | 4 +- .../Q273_InvadersOfTheHolyLand.java | 4 +- .../Q274_SkirmishWithTheWerewolves.java | 4 +- .../Q275_DarkWingedSpies.java | 4 +- .../Q276_TotemOfTheHestui.java | 4 +- .../Q292_BrigandsSweep.java | 4 +- .../Q293_TheHiddenVeins.java | 4 +- .../Q294_CovertBusiness.java | 4 +- .../Q316_DestroyPlagueCarriers.java | 4 +- .../Q320_BonesTellTheFuture.java | 4 +- .../Q401_PathToAWarrior.java | 4 +- .../Q402_PathToAHumanKnight.java | 4 +- .../Q403_PathToARogue/Q403_PathToARogue.java | 4 +- .../Q404_PathToAHumanWizard.java | 4 +- .../Q405_PathToACleric.java | 4 +- .../Q406_PathToAnElvenKnight.java | 4 +- .../Q407_PathToAnElvenScout.java | 4 +- .../Q408_PathToAnElvenWizard.java | 4 +- .../Q409_PathToAnElvenOracle.java | 4 +- .../Q410_PathToAPalusKnight.java | 4 +- .../Q411_PathToAnAssassin.java | 4 +- .../Q412_PathToADarkWizard.java | 4 +- .../Q413_PathToAShillienOracle.java | 4 +- .../Q414_PathToAnOrcRaider.java | 4 +- .../Q415_PathToAMonk/Q415_PathToAMonk.java | 4 +- .../Q416_PathToAnOrcShaman.java | 4 +- .../Q417_PathToBecomeAScavenger.java | 4 +- .../Q418_PathToAnArtisan.java | 4 +- .../FirstClassChange/FirstClassChange.java | 28 +- .../SecondClassChange/SecondClassChange.java | 68 +-- .../datatables/sql/CharTemplateTable.java | 4 +- .../datatables/sql/SkillTreeTable.java | 2 +- .../gameserver/engines/DocumentBase.java | 2 +- .../{model/base => enums}/Race.java | 56 +-- .../admincommandhandlers/AdminEditChar.java | 2 +- .../actor/instance/ClassMasterInstance.java | 20 +- .../actor/instance/CustomNpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 18 +- .../actor/instance/VillageMasterInstance.java | 22 +- .../model/actor/stat/PlayerStat.java | 12 +- .../model/actor/templates/PlayerTemplate.java | 10 +- .../gameserver/model/base/ClassId.java | 404 +++++++++++------- .../gameserver/model/base/ClassLevel.java | 11 +- .../gameserver/model/base/PlayerClass.java | 224 +++++----- .../gameserver/model/base/PlayerRace.java | 26 -- .../gameserver/model/entity/event/DM.java | 2 +- .../gameserver/model/entity/event/VIP.java | 12 +- .../conditions/ConditionPlayerRace.java | 2 +- .../model/zone/type/MotherTreeZone.java | 4 +- .../network/clientpackets/EnterWorld.java | 6 +- .../network/clientpackets/NewCharacter.java | 18 +- .../clientpackets/RequestEnchantItem.java | 4 +- 114 files changed, 679 insertions(+), 628 deletions(-) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/base => enums}/Race.java (81%) delete mode 100644 L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerRace.java diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java index 79bceb944f..abcd84e8f4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java index 0339d1deac..bece438aea 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java index 8e70e5940a..9143908d6c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java index 89452d3ba7..6629e0d2f5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java index f7d5528093..2c4accaaf7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java index 67ec258407..f424ff4a26 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java index 38d9d142cf..bfb6419984 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java index 178b6d0d12..2048fb9b04 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java index f61ed14091..bf0b0be2ee 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java +++ b/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)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java index 1e97eddfcc..766468d91b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java +++ b/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)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java index 3db7c070ad..5f765ec7d7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java +++ b/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)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java index f16fb439f1..0ec6c6d14a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java +++ b/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)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java index 30b60f5e04..0abc16b064 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java +++ b/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)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java index 62bfc5f6f5..a0759f03f0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java index d1c0f5756c..806ec0e272 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java index 5d5ddc0de7..75fc1d4db2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java index 57205db5f2..9a12dca757 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java index 7b7bca6da9..cf1a424509 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java index 466aad8710..aa3c01b2ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java index e2d301cc05..76d0f8c209 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java index 645049b3ee..4109f938b9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java index 32334b70f6..5e91315251 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java +++ b/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: diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java index 713104e6e4..ce35593305 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java index 7db1d28571..4ed4400a31 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java index f86b0308ab..1ddd2c971f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java index e46de6b86e..5d38a3a5b5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java index 2577301fbe..088334d41e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java index a0dfe4405c..ffc996ed7c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java index ec3337c37c..d7de612d34 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java index b9d76e256c..a4d09b5315 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java index d4e46cb0c6..e928a7b5ca 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java index 182864fd4c..5e745ab7e9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java index 60df30ff41..77aa0c50d0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java index 448fc7f544..ebf3a09988 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java index e82ae71114..3b6c132306 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java index d1826119a2..dcc42c3d20 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java index 5f9ff0433c..4a00d2a032 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java index 729a08acde..46c64790c2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java index 3cb636404d..ff5ce15f3f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java +++ b/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); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java index a8510100b5..514701fb53 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java index 1eb5309a67..779b00f127 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java index 721f2553bc..4fec6caa41 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java index d394fa394b..8df393a05c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java index a6ee2269a4..3349e2ae4e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java index 101646c604..55f9a34816 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java index 92d146a7e4..dc12805741 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java index 8b4f061d20..7470525543 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java index 9b9a36fd27..965ca58f47 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java index e4496f348e..f807d7b06c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java index 1dbbcbc680..1e926c3b83 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java index a2003f7476..a5c8aab68b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java index 01b1476311..dd78d3ee09 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java index 17567ad31c..4ef1baa27b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java index 01440faf8a..5753d5d422 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java index 3bce208e02..2c3eb51cad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java index a858161e23..463c97b0ea 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java index 92b52e34a0..ac6da5d960 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java index d1fbd5c807..f540777fab 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java index 58e004980b..9b35de9dc5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java index b32ab2deb7..3ea42504eb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java index e3d744f3d1..a24edcba29 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java index 6cb8ec5583..a5034894e8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java index c2c39d6bb6..53bf614ebb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java index d6631a3461..33e8e38d71 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java index 80bc6ba31d..12931f00df 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java index dcdacdd729..2e2a2800ed 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java index c4adde3742..032b6ae767 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java index 7d92bdd611..ab17830c7d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java index 0f4fe7c446..b1645aa768 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java index 9cd6505d0c..c2d14d01ae 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java index 52f98fbc97..ad7902e8b1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java index bd8dda42d5..d5ac9450ca 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java +++ b/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"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java index 4c4543675f..30f03e4ae7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java index 8586314e90..fa53ec78f6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java index 032037c1c8..9545e732d6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java index 493bd98ab3..1668a97631 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java index 44dcf41a8e..c08dc49ed9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java index 9f75581a23..aba6363747 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java index 21353ceb79..dff4b83792 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java index c5fa0c8f1e..2fc3615b62 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java index fb2ed11d56..e9a488cfaf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java index d905e4e71c..b9b03e4333 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java index 77799ecf43..438f410c13 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java index e0cd248736..2a4c4f8d67 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java index 76cdb35794..de2dc3ca17 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java index d520e28e88..049c6f9334 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java index e721c2cd12..96d8372429 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java index 4273f3fbf9..3a79c544bc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java index e734c0798b..dd65d6dffe 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java index a9850537fb..b45f3a1a6d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java index f843dea4fd..db84523a75 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java index e02a6d9824..bb9863ceb0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java +++ b/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 elf: + case HUMAN: + 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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java index 25fd77b5aa..e8a9c60c14 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java +++ b/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(key); + return _templates.get(classId); } public static final String getClassNameById(int classId) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java index bf822418e1..b405c977fe 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java +++ b/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 learnMap = getSkillTrees().get(ClassId.paladin); + final Map learnMap = getSkillTrees().get(ClassId.PALADIN); final int skillHashCode = SkillTable.getSkillHashCode(239, grade); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java index cbacb0e246..ae1e30d7b1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/Race.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/enums/Race.java similarity index 81% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/Race.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/enums/Race.java index 5cee8aaf0c..181ecf3626 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/Race.java +++ b/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 program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -public enum Race -{ - human, - elf, - darkelf, - orc, - dwarf -} +/* + * This file is part of the L2J Mobius project. + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.enums; + +/** + * Creature races enumerated. + * @author Zealar + */ +public enum Race +{ + HUMAN, + ELF, + DARK_ELF, + ORC, + DWARF; +} \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java index 114f1e581b..f84949ba0a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java +++ b/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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java index 1e733079df..49a7ebb68a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java +++ b/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) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java index 1b3843ce81..43dc805801 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CustomNpcInstance.java +++ b/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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 89cdffcd90..30492fcbf6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/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; } - - final PlayerTemplate charTemp = CharTemplateTable.getInstance().getTemplate(_baseClass); - return charTemp.race; + return CharTemplateTable.getInstance().getTemplate(_baseClass).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; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index ca34f089ab..043ac40ce7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -23,6 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.datatables.sql.CharTemplateTable; import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.datatables.sql.SkillTreeTable; +import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; @@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.base.ClassType; import org.l2jmobius.gameserver.model.base.PlayerClass; -import org.l2jmobius.gameserver.model.base.PlayerRace; import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; @@ -959,7 +959,7 @@ public class VillageMasterInstance extends FolkInstance charClassId = player.getClassId().getParent().ordinal(); } - final PlayerRace npcRace = getVillageMasterRace(); + final Race npcRace = getVillageMasterRace(); final ClassType npcTeachType = getVillageMasterTeachType(); PlayerClass currClass = PlayerClass.values()[charClassId]; @@ -998,19 +998,19 @@ public class VillageMasterInstance extends FolkInstance } } - if ((npcRace == PlayerRace.Human) || (npcRace == PlayerRace.LightElf)) + if ((npcRace == Race.HUMAN) || (npcRace == Race.ELF)) { // If the master is human or light elf, ensure that fighter-type masters only teach fighter classes, and priest-type masters only teach priest classes etc. if (!availSub.isOfType(npcTeachType)) { availSubs.remove(availSub); } - else if (!availSub.isOfRace(PlayerRace.Human) && !availSub.isOfRace(PlayerRace.LightElf)) + else if (!availSub.isOfRace(Race.HUMAN) && !availSub.isOfRace(Race.ELF)) { availSubs.remove(availSub); } } - else if ((npcRace != PlayerRace.Human) && (npcRace != PlayerRace.LightElf) && !availSub.isOfRace(npcRace)) // If the master is not human and not light elf, then remove any classes not of the same race as the master. + else if ((npcRace != Race.HUMAN) && (npcRace != Race.ELF) && !availSub.isOfRace(npcRace)) // If the master is not human and not light elf, then remove any classes not of the same race as the master. { availSubs.remove(availSub); } @@ -1095,31 +1095,31 @@ public class VillageMasterInstance extends FolkInstance * Gets the village master race. * @return the village master race */ - private final PlayerRace getVillageMasterRace() + private final Race getVillageMasterRace() { final String npcClass = getTemplate().getStatsSet().getString("jClass").toLowerCase(); if (npcClass.contains("human")) { - return PlayerRace.Human; + return Race.HUMAN; } if (npcClass.contains("darkelf")) { - return PlayerRace.DarkElf; + return Race.DARK_ELF; } if (npcClass.contains("elf")) { - return PlayerRace.LightElf; + return Race.ELF; } if (npcClass.contains("orc")) { - return PlayerRace.Orc; + return Race.ORC; } - return PlayerRace.Dwarf; + return Race.DWARF; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 06f93b8bb9..aedba9a232 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -177,21 +177,21 @@ public class PlayerStat extends PlayableStat if (Config.ALLOW_CLASS_MASTERS && Config.ALLOW_REMOTE_CLASS_MASTERS) { - final ClassMasterInstance master_instance = ClassMasterInstance.getInstance(); + final ClassMasterInstance masterInstance = ClassMasterInstance.getInstance(); - if (master_instance != null) + if (masterInstance != null) { - final ClassLevel lvlnow = PlayerClass.values()[getActiveChar().getClassId().getId()].getLevel(); - if ((getLevel() >= 20) && (lvlnow == ClassLevel.First)) + final ClassLevel curLevel = PlayerClass.values()[getActiveChar().getClassId().getId()].getLevel(); + if ((getLevel() >= 20) && (curLevel == ClassLevel.FIRST)) { ClassMasterInstance.getInstance().onAction(getActiveChar()); } - else if ((getLevel() >= 40) && (lvlnow == ClassLevel.Second)) + else if ((getLevel() >= 40) && (curLevel == ClassLevel.SECOND)) { ClassMasterInstance.getInstance().onAction(getActiveChar()); } - else if ((getLevel() >= 76) && (lvlnow == ClassLevel.Third)) + else if ((getLevel() >= 76) && (curLevel == ClassLevel.THIRD)) { ClassMasterInstance.getInstance().onAction(getActiveChar()); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index ce95f01e25..4482b6a9a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.Race; import org.l2jmobius.gameserver.model.items.Item; /** @@ -113,19 +113,19 @@ public class PlayerTemplate extends CreatureTemplate public int getBaseFallSafeHeight(boolean female) { - if ((classId.getRace() == Race.darkelf) || (classId.getRace() == Race.elf)) + if ((classId.getRace() == Race.DARK_ELF) || (classId.getRace() == Race.ELF)) { return classId.isMage() ? (female ? 330 : 300) : female ? 380 : 350; } - else if (classId.getRace() == Race.dwarf) + else if (classId.getRace() == Race.DWARF) { return female ? 200 : 180; } - else if (classId.getRace() == Race.human) + else if (classId.getRace() == Race.HUMAN) { return classId.isMage() ? (female ? 220 : 200) : female ? 270 : 250; } - else if (classId.getRace() == Race.orc) + else if (classId.getRace() == Race.ORC) { return classId.isMage() ? (female ? 280 : 250) : female ? 220 : 200; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassId.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassId.java index af9e628506..d53d67ffd8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassId.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassId.java @@ -16,165 +16,223 @@ */ package org.l2jmobius.gameserver.model.base; +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.gameserver.enums.Race; + /** - * This class defines all classes (ex : human fighter, darkFighter...) that a player can chose.
- *
- * Data :
- *
+ * This class defines all classes (ex : human fighter, darkFighter...) that a player can chose.
+ * Data: + *
    *
  • id : The Identifier of the class
    • *
  • isMage : True if the class is a mage class
    • *
  • race : The race of this class
    • - *
  • parent : The parent ClassId or null if this class is the root

    • - *
    + *
  • parent : The parent ClassId or null if this class is the root
    • + *
* @version $Revision: 1.4.4.4 $ $Date: 2005/03/27 15:29:33 $ */ public enum ClassId { - fighter(0x00, false, Race.human, null), - warrior(0x01, false, Race.human, fighter), - gladiator(0x02, false, Race.human, warrior), - warlord(0x03, false, Race.human, warrior), - knight(0x04, false, Race.human, fighter), - paladin(0x05, false, Race.human, knight), - darkAvenger(0x06, false, Race.human, knight), - rogue(0x07, false, Race.human, fighter), - treasureHunter(0x08, false, Race.human, rogue), - hawkeye(0x09, false, Race.human, rogue), - mage(0x0a, true, Race.human, null), - wizard(0x0b, true, Race.human, mage), - sorceror(0x0c, true, Race.human, wizard), - necromancer(0x0d, true, Race.human, wizard), - warlock(0x0e, true, Race.human, wizard), - cleric(0x0f, true, Race.human, mage), - bishop(0x10, true, Race.human, cleric), - prophet(0x11, true, Race.human, cleric), - elvenFighter(0x12, false, Race.elf, null), - elvenKnight(0x13, false, Race.elf, elvenFighter), - templeKnight(0x14, false, Race.elf, elvenKnight), - swordSinger(0x15, false, Race.elf, elvenKnight), - elvenScout(0x16, false, Race.elf, elvenFighter), - plainsWalker(0x17, false, Race.elf, elvenScout), - silverRanger(0x18, false, Race.elf, elvenScout), - elvenMage(0x19, true, Race.elf, null), - elvenWizard(0x1a, true, Race.elf, elvenMage), - spellsinger(0x1b, true, Race.elf, elvenWizard), - elementalSummoner(0x1c, true, Race.elf, elvenWizard), - oracle(0x1d, true, Race.elf, elvenMage), - elder(0x1e, true, Race.elf, oracle), - darkFighter(0x1f, false, Race.darkelf, null), - palusKnight(0x20, false, Race.darkelf, darkFighter), - shillienKnight(0x21, false, Race.darkelf, palusKnight), - bladedancer(0x22, false, Race.darkelf, palusKnight), - assassin(0x23, false, Race.darkelf, darkFighter), - abyssWalker(0x24, false, Race.darkelf, assassin), - phantomRanger(0x25, false, Race.darkelf, assassin), - darkMage(0x26, true, Race.darkelf, null), - darkWizard(0x27, true, Race.darkelf, darkMage), - spellhowler(0x28, true, Race.darkelf, darkWizard), - phantomSummoner(0x29, true, Race.darkelf, darkWizard), - shillienOracle(0x2a, true, Race.darkelf, darkMage), - shillenElder(0x2b, true, Race.darkelf, shillienOracle), - orcFighter(0x2c, false, Race.orc, null), - orcRaider(0x2d, false, Race.orc, orcFighter), - destroyer(0x2e, false, Race.orc, orcRaider), - orcMonk(0x2f, false, Race.orc, orcFighter), - tyrant(0x30, false, Race.orc, orcMonk), - orcMage(0x31, false, Race.orc, null), - orcShaman(0x32, true, Race.orc, orcMage), - overlord(0x33, true, Race.orc, orcShaman), - warcryer(0x34, true, Race.orc, orcShaman), - dwarvenFighter(0x35, false, Race.dwarf, null), - scavenger(0x36, false, Race.dwarf, dwarvenFighter), - bountyHunter(0x37, false, Race.dwarf, scavenger), - artisan(0x38, false, Race.dwarf, dwarvenFighter), - warsmith(0x39, false, Race.dwarf, artisan), - dummyEntry1(58, false, null, null), - dummyEntry2(59, false, null, null), - dummyEntry3(60, false, null, null), - dummyEntry4(61, false, null, null), - dummyEntry5(62, false, null, null), - dummyEntry6(63, false, null, null), - dummyEntry7(64, false, null, null), - dummyEntry8(65, false, null, null), - dummyEntry9(66, false, null, null), - dummyEntry10(67, false, null, null), - dummyEntry11(68, false, null, null), - dummyEntry12(69, false, null, null), - dummyEntry13(70, false, null, null), - dummyEntry14(71, false, null, null), - dummyEntry15(72, false, null, null), - dummyEntry16(73, false, null, null), - dummyEntry17(74, false, null, null), - dummyEntry18(75, false, null, null), - dummyEntry19(76, false, null, null), - dummyEntry20(77, false, null, null), - dummyEntry21(78, false, null, null), - dummyEntry22(79, false, null, null), - dummyEntry23(80, false, null, null), - dummyEntry24(81, false, null, null), - dummyEntry25(82, false, null, null), - dummyEntry26(83, false, null, null), - dummyEntry27(84, false, null, null), - dummyEntry28(85, false, null, null), - dummyEntry29(86, false, null, null), - dummyEntry30(87, false, null, null), - duelist(0x58, false, Race.human, gladiator), - dreadnought(0x59, false, Race.human, warlord), - phoenixKnight(0x5a, false, Race.human, paladin), - hellKnight(0x5b, false, Race.human, darkAvenger), - sagittarius(0x5c, false, Race.human, hawkeye), - adventurer(0x5d, false, Race.human, treasureHunter), - archmage(0x5e, true, Race.human, sorceror), - soultaker(0x5f, true, Race.human, necromancer), - arcanaLord(0x60, true, Race.human, warlock), - cardinal(0x61, true, Race.human, bishop), - hierophant(0x62, true, Race.human, prophet), - evaTemplar(0x63, false, Race.elf, templeKnight), - swordMuse(0x64, false, Race.elf, swordSinger), - windRider(0x65, false, Race.elf, plainsWalker), - moonlightSentinel(0x66, false, Race.elf, silverRanger), - mysticMuse(0x67, true, Race.elf, spellsinger), - elementalMaster(0x68, true, Race.elf, elementalSummoner), - evaSaint(0x69, true, Race.elf, elder), - shillienTemplar(0x6a, false, Race.darkelf, shillienKnight), - spectralDancer(0x6b, false, Race.darkelf, bladedancer), - ghostHunter(0x6c, false, Race.darkelf, abyssWalker), - ghostSentinel(0x6d, false, Race.darkelf, phantomRanger), - stormScreamer(0x6e, true, Race.darkelf, spellhowler), - spectralMaster(0x6f, true, Race.darkelf, phantomSummoner), - shillienSaint(0x70, true, Race.darkelf, shillenElder), - titan(0x71, false, Race.orc, destroyer), - grandKhauatari(0x72, false, Race.orc, tyrant), - dominator(0x73, true, Race.orc, overlord), - doomcryer(0x74, true, Race.orc, warcryer), - fortuneSeeker(0x75, false, Race.dwarf, bountyHunter), - maestro(0x76, false, Race.dwarf, warsmith); + FIGHTER(0, false, Race.HUMAN, null), + WARRIOR(1, false, Race.HUMAN, FIGHTER), + GLADIATOR(2, false, Race.HUMAN, WARRIOR), + WARLORD(3, false, Race.HUMAN, WARRIOR), + KNIGHT(4, false, Race.HUMAN, FIGHTER), + PALADIN(5, false, Race.HUMAN, KNIGHT), + DARK_AVENGER(6, false, Race.HUMAN, KNIGHT), + ROGUE(7, false, Race.HUMAN, FIGHTER), + TREASURE_HUNTER(8, false, Race.HUMAN, ROGUE), + HAWKEYE(9, false, Race.HUMAN, ROGUE), + + MAGE(10, true, Race.HUMAN, null), + WIZARD(11, true, Race.HUMAN, MAGE), + SORCERER(12, true, Race.HUMAN, WIZARD), + NECROMANCER(13, true, Race.HUMAN, WIZARD), + WARLOCK(14, true, true, Race.HUMAN, WIZARD), + CLERIC(15, true, Race.HUMAN, MAGE), + BISHOP(16, true, Race.HUMAN, CLERIC), + PROPHET(17, true, Race.HUMAN, CLERIC), + + ELVEN_FIGHTER(18, false, Race.ELF, null), + ELVEN_KNIGHT(19, false, Race.ELF, ELVEN_FIGHTER), + TEMPLE_KNIGHT(20, false, Race.ELF, ELVEN_KNIGHT), + SWORDSINGER(21, false, Race.ELF, ELVEN_KNIGHT), + ELVEN_SCOUT(22, false, Race.ELF, ELVEN_FIGHTER), + PLAINS_WALKER(23, false, Race.ELF, ELVEN_SCOUT), + SILVER_RANGER(24, false, Race.ELF, ELVEN_SCOUT), + + ELVEN_MAGE(25, true, Race.ELF, null), + ELVEN_WIZARD(26, true, Race.ELF, ELVEN_MAGE), + SPELLSINGER(27, true, Race.ELF, ELVEN_WIZARD), + ELEMENTAL_SUMMONER(28, true, true, Race.ELF, ELVEN_WIZARD), + ORACLE(29, true, Race.ELF, ELVEN_MAGE), + ELDER(30, true, Race.ELF, ORACLE), + + DARK_FIGHTER(31, false, Race.DARK_ELF, null), + PALUS_KNIGHT(32, false, Race.DARK_ELF, DARK_FIGHTER), + SHILLIEN_KNIGHT(33, false, Race.DARK_ELF, PALUS_KNIGHT), + BLADEDANCER(34, false, Race.DARK_ELF, PALUS_KNIGHT), + ASSASSIN(35, false, Race.DARK_ELF, DARK_FIGHTER), + ABYSS_WALKER(36, false, Race.DARK_ELF, ASSASSIN), + PHANTOM_RANGER(37, false, Race.DARK_ELF, ASSASSIN), + + DARK_MAGE(38, true, Race.DARK_ELF, null), + DARK_WIZARD(39, true, Race.DARK_ELF, DARK_MAGE), + SPELLHOWLER(40, true, Race.DARK_ELF, DARK_WIZARD), + PHANTOM_SUMMONER(41, true, true, Race.DARK_ELF, DARK_WIZARD), + SHILLIEN_ORACLE(42, true, Race.DARK_ELF, DARK_MAGE), + SHILLIEN_ELDER(43, true, Race.DARK_ELF, SHILLIEN_ORACLE), + + ORC_FIGHTER(44, false, Race.ORC, null), + ORC_RAIDER(45, false, Race.ORC, ORC_FIGHTER), + DESTROYER(46, false, Race.ORC, ORC_RAIDER), + ORC_MONK(47, false, Race.ORC, ORC_FIGHTER), + TYRANT(48, false, Race.ORC, ORC_MONK), + + ORC_MAGE(49, true, Race.ORC, null), + ORC_SHAMAN(50, true, Race.ORC, ORC_MAGE), + OVERLORD(51, true, Race.ORC, ORC_SHAMAN), + WARCRYER(52, true, Race.ORC, ORC_SHAMAN), + + DWARVEN_FIGHTER(53, false, Race.DWARF, null), + SCAVENGER(54, false, Race.DWARF, DWARVEN_FIGHTER), + BOUNTY_HUNTER(55, false, Race.DWARF, SCAVENGER), + ARTISAN(56, false, Race.DWARF, DWARVEN_FIGHTER), + WARSMITH(57, false, Race.DWARF, ARTISAN), + + DUMMY_ENTRY_1(58, false, null, null), + DUMMY_ENTRY_2(59, false, null, null), + DUMMY_ENTRY_3(60, false, null, null), + DUMMY_ENTRY_4(61, false, null, null), + DUMMY_ENTRY_5(62, false, null, null), + DUMMY_ENTRY_6(63, false, null, null), + DUMMY_ENTRY_7(64, false, null, null), + DUMMY_ENTRY_8(65, false, null, null), + DUMMY_ENTRY_9(66, false, null, null), + DUMMY_ENTRY_10(67, false, null, null), + DUMMY_ENTRY_11(68, false, null, null), + DUMMY_ENTRY_12(69, false, null, null), + DUMMY_ENTRY_13(70, false, null, null), + DUMMY_ENTRY_14(71, false, null, null), + DUMMY_ENTRY_15(72, false, null, null), + DUMMY_ENTRY_16(73, false, null, null), + DUMMY_ENTRY_17(74, false, null, null), + DUMMY_ENTRY_18(75, false, null, null), + DUMMY_ENTRY_19(76, false, null, null), + DUMMY_ENTRY_20(77, false, null, null), + DUMMY_ENTRY_21(78, false, null, null), + DUMMY_ENTRY_22(79, false, null, null), + DUMMY_ENTRY_23(80, false, null, null), + DUMMY_ENTRY_24(81, false, null, null), + DUMMY_ENTRY_25(82, false, null, null), + DUMMY_ENTRY_26(83, false, null, null), + DUMMY_ENTRY_27(84, false, null, null), + DUMMY_ENTRY_28(85, false, null, null), + DUMMY_ENTRY_29(86, false, null, null), + DUMMY_ENTRY_30(87, false, null, null), + + DUELIST(88, false, Race.HUMAN, GLADIATOR), + DREADNOUGHT(89, false, Race.HUMAN, WARLORD), + PHOENIX_KNIGHT(90, false, Race.HUMAN, PALADIN), + HELL_KNIGHT(91, false, Race.HUMAN, DARK_AVENGER), + SAGITTARIUS(92, false, Race.HUMAN, HAWKEYE), + ADVENTURER(93, false, Race.HUMAN, TREASURE_HUNTER), + ARCHMAGE(94, true, Race.HUMAN, SORCERER), + SOULTAKER(95, true, Race.HUMAN, NECROMANCER), + ARCANA_LORD(96, true, true, Race.HUMAN, WARLOCK), + CARDINAL(97, true, Race.HUMAN, BISHOP), + HIEROPHANT(98, true, Race.HUMAN, PROPHET), + + EVA_TEMPLAR(99, false, Race.ELF, TEMPLE_KNIGHT), + SWORD_MUSE(100, false, Race.ELF, SWORDSINGER), + WIND_RIDER(101, false, Race.ELF, PLAINS_WALKER), + MOONLIGHT_SENTINEL(102, false, Race.ELF, SILVER_RANGER), + MYSTIC_MUSE(103, true, Race.ELF, SPELLSINGER), + ELEMENTAL_MASTER(104, true, true, Race.ELF, ELEMENTAL_SUMMONER), + EVA_SAINT(105, true, Race.ELF, ELDER), + + SHILLIEN_TEMPLAR(106, false, Race.DARK_ELF, SHILLIEN_KNIGHT), + SPECTRAL_DANCER(107, false, Race.DARK_ELF, BLADEDANCER), + GHOST_HUNTER(108, false, Race.DARK_ELF, ABYSS_WALKER), + GHOST_SENTINEL(109, false, Race.DARK_ELF, PHANTOM_RANGER), + STORM_SCREAMER(110, true, Race.DARK_ELF, SPELLHOWLER), + SPECTRAL_MASTER(111, true, true, Race.DARK_ELF, PHANTOM_SUMMONER), + SHILLIEN_SAINT(112, true, Race.DARK_ELF, SHILLIEN_ELDER), + + TITAN(113, false, Race.ORC, DESTROYER), + GRAND_KHAVATARI(114, false, Race.ORC, TYRANT), + DOMINATOR(115, true, Race.ORC, OVERLORD), + DOOMCRYER(116, true, Race.ORC, WARCRYER), + + FORTUNE_SEEKER(117, false, Race.DWARF, BOUNTY_HUNTER), + MAESTRO(118, false, Race.DWARF, WARSMITH); + + /** The Identifier of the Class */ private final int _id; + + /** True if the class is a mage class */ private final boolean _isMage; + + /** True if the class is a summoner class */ + private final boolean _isSummoner; + + /** The Race object of the class */ private final Race _race; + + /** The parent ClassId or null if this class is a root */ private final ClassId _parent; + /** List of available Class for next transfer **/ + private final Set _nextClassIds = new HashSet<>(1); + /** - * Constructor of ClassId.
- *
- * @param pId the id - * @param pIsMage the is mage - * @param pRace the race - * @param pParent the parent + * Class constructor. + * @param pId the class Id. + * @param pIsMage {code true} if the class is mage class. + * @param race the race related to the class. + * @param pParent the parent class Id. */ - private ClassId(int pId, boolean pIsMage, Race pRace, ClassId pParent) + private ClassId(int pId, boolean pIsMage, Race race, ClassId pParent) { _id = pId; _isMage = pIsMage; - _race = pRace; + _isSummoner = false; + _race = race; _parent = pParent; + + if (_parent != null) + { + _parent.addNextClassId(this); + } } /** - * Return the Identifier of the Class.
- *
- * @return the id + * Class constructor. + * @param pId the class Id. + * @param pIsMage {code true} if the class is mage class. + * @param pIsSummoner {code true} if the class is summoner class. + * @param race the race related to the class. + * @param pParent the parent class Id. + */ + private ClassId(int pId, boolean pIsMage, boolean pIsSummoner, Race race, ClassId pParent) + { + _id = pId; + _isMage = pIsMage; + _isSummoner = pIsSummoner; + _race = race; + _parent = pParent; + + if (_parent != null) + { + _parent.addNextClassId(this); + } + } + + /** + * Gets the ID of the class. + * @return the ID of the class */ public int getId() { @@ -182,9 +240,7 @@ public enum ClassId } /** - * Return True if the class is a mage class.
- *
- * @return true, if is mage + * @return {code true} if the class is a mage class. */ public boolean isMage() { @@ -192,9 +248,15 @@ public enum ClassId } /** - * Return the Race object of the class.
- *
- * @return the race + * @return {code true} if the class is a summoner class. + */ + public boolean isSummoner() + { + return _isSummoner; + } + + /** + * @return the Race object of the class. */ public Race getRace() { @@ -202,10 +264,8 @@ public enum ClassId } /** - * Return True if this Class is a child of the selected ClassId.
- *
- * @param cid The parent ClassId to check - * @return true, if successful + * @param cid the parent ClassId to check. + * @return {code true} if this Class is a child of the selected ClassId. */ public boolean childOf(ClassId cid) { @@ -223,10 +283,8 @@ public enum ClassId } /** - * Return True if this Class is equal to the selected ClassId or a child of the selected ClassId.
- *
- * @param cid The parent ClassId to check - * @return true, if successful + * @param cid the parent ClassId to check. + * @return {code true} if this Class is equal to the selected ClassId or a child of the selected ClassId. */ public boolean equalsOrChildOf(ClassId cid) { @@ -234,9 +292,7 @@ public enum ClassId } /** - * Return the child level of this Class (0=root, 1=child leve 1...).
- *
- * @return the int + * @return the child level of this Class (0=root, 1=child leve 1...) */ public int level() { @@ -249,26 +305,44 @@ public enum ClassId } /** - * Return its parent ClassId
- *
- * . - * @return the parent + * @return its parent Class Id */ public ClassId getParent() { return _parent; } - public static ClassId getClassIdByOrdinal(int id) + public ClassId getRootClassId() { - for (ClassId current : values()) + if (_parent != null) { - if (current._id == id) - { - return current; - } + return _parent.getRootClassId(); } - - return null; + return this; + } + + /** + * @return list of possible class transfer for this class + */ + public Set getNextClassIds() + { + return _nextClassIds; + } + + public static ClassId getClassId(int cId) + { + try + { + return ClassId.values()[cId]; + } + catch (Exception e) + { + return null; + } + } + + private final void addNextClassId(ClassId cId) + { + _nextClassIds.add(cId); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassLevel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassLevel.java index 349b456aed..996f5eb627 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassLevel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/ClassLevel.java @@ -16,10 +16,13 @@ */ package org.l2jmobius.gameserver.model.base; +/** + * @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $ + */ public enum ClassLevel { - First, - Second, - Third, - Fourth + FIRST, + SECOND, + THIRD, + FOURTH } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 6a73c58e48..1400b6431f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -16,89 +16,88 @@ */ package org.l2jmobius.gameserver.model.base; -import static org.l2jmobius.gameserver.model.base.ClassLevel.First; -import static org.l2jmobius.gameserver.model.base.ClassLevel.Fourth; -import static org.l2jmobius.gameserver.model.base.ClassLevel.Second; -import static org.l2jmobius.gameserver.model.base.ClassLevel.Third; +import static org.l2jmobius.gameserver.model.base.ClassLevel.FIRST; +import static org.l2jmobius.gameserver.model.base.ClassLevel.FOURTH; +import static org.l2jmobius.gameserver.model.base.ClassLevel.SECOND; +import static org.l2jmobius.gameserver.model.base.ClassLevel.THIRD; import static org.l2jmobius.gameserver.model.base.ClassType.Fighter; import static org.l2jmobius.gameserver.model.base.ClassType.Mystic; import static org.l2jmobius.gameserver.model.base.ClassType.Priest; -import static org.l2jmobius.gameserver.model.base.PlayerRace.DarkElf; -import static org.l2jmobius.gameserver.model.base.PlayerRace.Dwarf; -import static org.l2jmobius.gameserver.model.base.PlayerRace.Human; -import static org.l2jmobius.gameserver.model.base.PlayerRace.LightElf; -import static org.l2jmobius.gameserver.model.base.PlayerRace.Orc; import java.util.EnumMap; import java.util.EnumSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +/** + * @author luisantonioa + */ public enum PlayerClass { - HumanFighter(Human, Fighter, First), - Warrior(Human, Fighter, Second), - Gladiator(Human, Fighter, Third), - Warlord(Human, Fighter, Third), - HumanKnight(Human, Fighter, Second), - Paladin(Human, Fighter, Third), - DarkAvenger(Human, Fighter, Third), - Rogue(Human, Fighter, Second), - TreasureHunter(Human, Fighter, Third), - Hawkeye(Human, Fighter, Third), - HumanMystic(Human, Mystic, First), - HumanWizard(Human, Mystic, Second), - Sorceror(Human, Mystic, Third), - Necromancer(Human, Mystic, Third), - Warlock(Human, Mystic, Third), - Cleric(Human, Priest, Second), - Bishop(Human, Priest, Third), - Prophet(Human, Priest, Third), + HumanFighter(Race.HUMAN, Fighter, FIRST), + Warrior(Race.HUMAN, Fighter, SECOND), + Gladiator(Race.HUMAN, Fighter, THIRD), + Warlord(Race.HUMAN, Fighter, THIRD), + HumanKnight(Race.HUMAN, Fighter, SECOND), + Paladin(Race.HUMAN, Fighter, THIRD), + DarkAvenger(Race.HUMAN, Fighter, THIRD), + Rogue(Race.HUMAN, Fighter, SECOND), + TreasureHunter(Race.HUMAN, Fighter, THIRD), + Hawkeye(Race.HUMAN, Fighter, THIRD), + HumanMystic(Race.HUMAN, Mystic, FIRST), + HumanWizard(Race.HUMAN, Mystic, SECOND), + Sorceror(Race.HUMAN, Mystic, THIRD), + Necromancer(Race.HUMAN, Mystic, THIRD), + Warlock(Race.HUMAN, Mystic, THIRD), + Cleric(Race.HUMAN, Priest, SECOND), + Bishop(Race.HUMAN, Priest, THIRD), + Prophet(Race.HUMAN, Priest, THIRD), - ElvenFighter(LightElf, Fighter, First), - ElvenKnight(LightElf, Fighter, Second), - TempleKnight(LightElf, Fighter, Third), - Swordsinger(LightElf, Fighter, Third), - ElvenScout(LightElf, Fighter, Second), - Plainswalker(LightElf, Fighter, Third), - SilverRanger(LightElf, Fighter, Third), - ElvenMystic(LightElf, Mystic, First), - ElvenWizard(LightElf, Mystic, Second), - Spellsinger(LightElf, Mystic, Third), - ElementalSummoner(LightElf, Mystic, Third), - ElvenOracle(LightElf, Priest, Second), - ElvenElder(LightElf, Priest, Third), + ElvenFighter(Race.ELF, Fighter, FIRST), + ElvenKnight(Race.ELF, Fighter, SECOND), + TempleKnight(Race.ELF, Fighter, THIRD), + Swordsinger(Race.ELF, Fighter, THIRD), + ElvenScout(Race.ELF, Fighter, SECOND), + Plainswalker(Race.ELF, Fighter, THIRD), + SilverRanger(Race.ELF, Fighter, THIRD), + ElvenMystic(Race.ELF, Mystic, FIRST), + ElvenWizard(Race.ELF, Mystic, SECOND), + Spellsinger(Race.ELF, Mystic, THIRD), + ElementalSummoner(Race.ELF, Mystic, THIRD), + ElvenOracle(Race.ELF, Priest, SECOND), + ElvenElder(Race.ELF, Priest, THIRD), - DarkElvenFighter(DarkElf, Fighter, First), - PalusKnight(DarkElf, Fighter, Second), - ShillienKnight(DarkElf, Fighter, Third), - Bladedancer(DarkElf, Fighter, Third), - Assassin(DarkElf, Fighter, Second), - AbyssWalker(DarkElf, Fighter, Third), - PhantomRanger(DarkElf, Fighter, Third), - DarkElvenMystic(DarkElf, Mystic, First), - DarkElvenWizard(DarkElf, Mystic, Second), - Spellhowler(DarkElf, Mystic, Third), - PhantomSummoner(DarkElf, Mystic, Third), - ShillienOracle(DarkElf, Priest, Second), - ShillienElder(DarkElf, Priest, Third), + DarkElvenFighter(Race.DARK_ELF, Fighter, FIRST), + PalusKnight(Race.DARK_ELF, Fighter, SECOND), + ShillienKnight(Race.DARK_ELF, Fighter, THIRD), + Bladedancer(Race.DARK_ELF, Fighter, THIRD), + Assassin(Race.DARK_ELF, Fighter, SECOND), + AbyssWalker(Race.DARK_ELF, Fighter, THIRD), + PhantomRanger(Race.DARK_ELF, Fighter, THIRD), + DarkElvenMystic(Race.DARK_ELF, Mystic, FIRST), + DarkElvenWizard(Race.DARK_ELF, Mystic, SECOND), + Spellhowler(Race.DARK_ELF, Mystic, THIRD), + PhantomSummoner(Race.DARK_ELF, Mystic, THIRD), + ShillienOracle(Race.DARK_ELF, Priest, SECOND), + ShillienElder(Race.DARK_ELF, Priest, THIRD), - OrcFighter(Orc, Fighter, First), - OrcRaider(Orc, Fighter, Second), - Destroyer(Orc, Fighter, Third), - OrcMonk(Orc, Fighter, Second), - Tyrant(Orc, Fighter, Third), - OrcMystic(Orc, Mystic, First), - OrcShaman(Orc, Mystic, Second), - Overlord(Orc, Mystic, Third), - Warcryer(Orc, Mystic, Third), + OrcFighter(Race.ORC, Fighter, FIRST), + OrcRaider(Race.ORC, Fighter, SECOND), + Destroyer(Race.ORC, Fighter, THIRD), + OrcMonk(Race.ORC, Fighter, SECOND), + Tyrant(Race.ORC, Fighter, THIRD), + OrcMystic(Race.ORC, Mystic, FIRST), + OrcShaman(Race.ORC, Mystic, SECOND), + Overlord(Race.ORC, Mystic, THIRD), + Warcryer(Race.ORC, Mystic, THIRD), - DwarvenFighter(Dwarf, Fighter, First), - DwarvenScavenger(Dwarf, Fighter, Second), - BountyHunter(Dwarf, Fighter, Third), - DwarvenArtisan(Dwarf, Fighter, Second), - Warsmith(Dwarf, Fighter, Third), + DwarvenFighter(Race.DWARF, Fighter, FIRST), + DwarvenScavenger(Race.DWARF, Fighter, SECOND), + BountyHunter(Race.DWARF, Fighter, THIRD), + DwarvenArtisan(Race.DWARF, Fighter, SECOND), + Warsmith(Race.DWARF, Fighter, THIRD), dummyEntry1(null, null, null), dummyEntry2(null, null, null), @@ -130,44 +129,46 @@ public enum PlayerClass dummyEntry28(null, null, null), dummyEntry29(null, null, null), dummyEntry30(null, null, null), + /* + * (3rd classes) + */ + duelist(Race.HUMAN, Fighter, FOURTH), + dreadnought(Race.HUMAN, Fighter, FOURTH), + phoenixKnight(Race.HUMAN, Fighter, FOURTH), + hellKnight(Race.HUMAN, Fighter, FOURTH), + sagittarius(Race.HUMAN, Fighter, FOURTH), + adventurer(Race.HUMAN, Fighter, FOURTH), + archmage(Race.HUMAN, Mystic, FOURTH), + soultaker(Race.HUMAN, Mystic, FOURTH), + arcanaLord(Race.HUMAN, Mystic, FOURTH), + cardinal(Race.HUMAN, Priest, FOURTH), + hierophant(Race.HUMAN, Priest, FOURTH), - duelist(Human, Fighter, Fourth), - dreadnought(Human, Fighter, Fourth), - phoenixKnight(Human, Fighter, Fourth), - hellKnight(Human, Fighter, Fourth), - sagittarius(Human, Fighter, Fourth), - adventurer(Human, Fighter, Fourth), - archmage(Human, Mystic, Fourth), - soultaker(Human, Mystic, Fourth), - arcanaLord(Human, Mystic, Fourth), - cardinal(Human, Mystic, Fourth), - hierophant(Human, Mystic, Fourth), + evaTemplar(Race.ELF, Fighter, FOURTH), + swordMuse(Race.ELF, Fighter, FOURTH), + windRider(Race.ELF, Fighter, FOURTH), + moonlightSentinel(Race.ELF, Fighter, FOURTH), + mysticMuse(Race.ELF, Mystic, FOURTH), + elementalMaster(Race.ELF, Mystic, FOURTH), + evaSaint(Race.ELF, Priest, FOURTH), - evaTemplar(LightElf, Fighter, Fourth), - swordMuse(LightElf, Fighter, Fourth), - windRider(LightElf, Fighter, Fourth), - moonlightSentinel(LightElf, Fighter, Fourth), - mysticMuse(LightElf, Mystic, Fourth), - elementalMaster(LightElf, Mystic, Fourth), - evaSaint(LightElf, Mystic, Fourth), + shillienTemplar(Race.DARK_ELF, Fighter, FOURTH), + spectralDancer(Race.DARK_ELF, Fighter, FOURTH), + ghostHunter(Race.DARK_ELF, Fighter, FOURTH), + ghostSentinel(Race.DARK_ELF, Fighter, FOURTH), + stormScreamer(Race.DARK_ELF, Mystic, FOURTH), + spectralMaster(Race.DARK_ELF, Mystic, FOURTH), + shillienSaint(Race.DARK_ELF, Priest, FOURTH), - shillienTemplar(DarkElf, Fighter, Fourth), - spectralDancer(DarkElf, Fighter, Fourth), - ghostHunter(DarkElf, Fighter, Fourth), - ghostSentinel(DarkElf, Fighter, Fourth), - stormScreamer(DarkElf, Mystic, Fourth), - spectralMaster(DarkElf, Mystic, Fourth), - shillienSaint(DarkElf, Mystic, Fourth), + titan(Race.ORC, Fighter, FOURTH), + grandKhavatari(Race.ORC, Fighter, FOURTH), + dominator(Race.ORC, Mystic, FOURTH), + doomcryer(Race.ORC, Mystic, FOURTH), - titan(Orc, Fighter, Fourth), - grandKhauatari(Orc, Fighter, Fourth), - dominator(Orc, Mystic, Fourth), - doomcryer(Orc, Mystic, Fourth), + fortuneSeeker(Race.DWARF, Fighter, FOURTH), + maestro(Race.DWARF, Fighter, FOURTH); - fortuneSeeker(Dwarf, Fighter, Fourth), - maestro(Dwarf, Fighter, Fourth); - - private PlayerRace _race; + private Race _race; private ClassLevel _level; private ClassType _type; @@ -184,7 +185,7 @@ public enum PlayerClass static { - Set subclasses = getSet(null, Third); + final Set subclasses = getSet(null, THIRD); subclasses.removeAll(neverSubclassed); mainSubclassSet = subclasses; @@ -211,9 +212,9 @@ public enum PlayerClass subclassSetMap.put(Spellhowler, subclasseSet5); } - PlayerClass(PlayerRace pRace, ClassType pType, ClassLevel pLevel) + PlayerClass(Race race, ClassType pType, ClassLevel pLevel) { - _race = pRace; + _race = race; _level = pLevel; _type = pType; } @@ -222,7 +223,7 @@ public enum PlayerClass { Set subclasses = null; - if (_level == Third) + if (_level == THIRD) { subclasses = EnumSet.copyOf(mainSubclassSet); @@ -231,19 +232,19 @@ public enum PlayerClass switch (player.getRace()) { - case elf: + case ELF: { - subclasses.removeAll(getSet(DarkElf, Third)); + subclasses.removeAll(getSet(Race.DARK_ELF, THIRD)); break; } - case darkelf: + case DARK_ELF: { - subclasses.removeAll(getSet(LightElf, Third)); + subclasses.removeAll(getSet(Race.ELF, THIRD)); break; } } - Set unavailableClasses = subclassSetMap.get(this); + final Set unavailableClasses = subclassSetMap.get(this); if (unavailableClasses != null) { @@ -254,7 +255,7 @@ public enum PlayerClass return subclasses; } - public static final EnumSet getSet(PlayerRace race, ClassLevel level) + public static EnumSet getSet(Race race, ClassLevel level) { final EnumSet allOf = EnumSet.noneOf(PlayerClass.class); @@ -268,11 +269,10 @@ public enum PlayerClass } } } - return allOf; } - public boolean isOfRace(PlayerRace pRace) + public boolean isOfRace(Race pRace) { return _race == pRace; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerRace.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerRace.java deleted file mode 100644 index 0208deebcb..0000000000 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerRace.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -public enum PlayerRace -{ - Human, - LightElf, - DarkElf, - Orc, - Dwarf -} diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java index 7a6fdfc48f..959d50c6f5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java @@ -1439,7 +1439,7 @@ public class DM implements EventTask } } - if (!Config.DM_ALLOW_HEALER_CLASSES && ((eventPlayer.getClassId() == ClassId.cardinal) || (eventPlayer.getClassId() == ClassId.evaSaint) || (eventPlayer.getClassId() == ClassId.shillienSaint))) + if (!Config.DM_ALLOW_HEALER_CLASSES && ((eventPlayer.getClassId() == ClassId.CARDINAL) || (eventPlayer.getClassId() == ClassId.EVA_SAINT) || (eventPlayer.getClassId() == ClassId.SHILLIEN_SAINT))) { eventPlayer.sendMessage("You cant join with Healer Class!"); return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java index 9edf5a2ae0..f31660ae95 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java @@ -29,10 +29,10 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.PlayerInventory; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.Race; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; @@ -830,7 +830,7 @@ public class VIP else { replyMSG.append("You want to participate in the event?

"); - if ((eventPlayer.getRace() == Race.human) && (_team == 1)) + if ((eventPlayer.getRace() == Race.HUMAN) && (_team == 1)) { replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided"); replyMSG.append("The VIP will be decided on when the event starts. It's completely random.
"); @@ -838,7 +838,7 @@ public class VIP replyMSG.append("