lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated ClassId and ClassLevel emums to match newer branches.

Browse Source
This commit is contained in:
MobiusDev 2018-04-06 17:34:17 +00:00
parent 165840dd77
commit 6ca1e72d5d
69 changed files with 586 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java vendored
View File

@ -87,42 +87,42 @@ public final class DragonValley extends AbstractNpcAI
private static final int CLASS_LVL = 3;
private static final EnumMap<ClassId, Double> CLASS_POINTS = new EnumMap<>(ClassId.class);
{
CLASS_POINTS.put(ClassId.adventurer, 0.2);
CLASS_POINTS.put(ClassId.arcanaLord, 1.5);
CLASS_POINTS.put(ClassId.archmage, 0.3);
CLASS_POINTS.put(ClassId.cardinal, -0.6);
CLASS_POINTS.put(ClassId.dominator, 0.2);
CLASS_POINTS.put(ClassId.doombringer, 0.2);
CLASS_POINTS.put(ClassId.doomcryer, 0.1);
CLASS_POINTS.put(ClassId.dreadnought, 0.7);
CLASS_POINTS.put(ClassId.duelist, 0.2);
CLASS_POINTS.put(ClassId.elementalMaster, 1.4);
CLASS_POINTS.put(ClassId.evaSaint, -0.6);
CLASS_POINTS.put(ClassId.evaTemplar, 0.8);
CLASS_POINTS.put(ClassId.femaleSoulhound, 0.4);
CLASS_POINTS.put(ClassId.fortuneSeeker, 0.9);
CLASS_POINTS.put(ClassId.ghostHunter, 0.2);
CLASS_POINTS.put(ClassId.ghostSentinel, 0.2);
CLASS_POINTS.put(ClassId.grandKhavatari, 0.2);
CLASS_POINTS.put(ClassId.hellKnight, 0.6);
CLASS_POINTS.put(ClassId.hierophant, 0.0);
CLASS_POINTS.put(ClassId.judicator, 0.1);
CLASS_POINTS.put(ClassId.moonlightSentinel, 0.2);
CLASS_POINTS.put(ClassId.maestro, 0.7);
CLASS_POINTS.put(ClassId.maleSoulhound, 0.4);
CLASS_POINTS.put(ClassId.mysticMuse, 0.3);
CLASS_POINTS.put(ClassId.phoenixKnight, 0.6);
CLASS_POINTS.put(ClassId.sagittarius, 0.2);
CLASS_POINTS.put(ClassId.shillienSaint, -0.6);
CLASS_POINTS.put(ClassId.shillienTemplar, 0.8);
CLASS_POINTS.put(ClassId.soultaker, 0.3);
CLASS_POINTS.put(ClassId.spectralDancer, 0.4);
CLASS_POINTS.put(ClassId.spectralMaster, 1.4);
CLASS_POINTS.put(ClassId.stormScreamer, 0.3);
CLASS_POINTS.put(ClassId.swordMuse, 0.4);
CLASS_POINTS.put(ClassId.titan, 0.3);
CLASS_POINTS.put(ClassId.trickster, 0.5);
CLASS_POINTS.put(ClassId.windRider, 0.2);
CLASS_POINTS.put(ClassId.ADVENTURER, 0.2);
CLASS_POINTS.put(ClassId.ARCANA_LORD, 1.5);
CLASS_POINTS.put(ClassId.ARCHMAGE, 0.3);
CLASS_POINTS.put(ClassId.CARDINAL, -0.6);
CLASS_POINTS.put(ClassId.DOMINATOR, 0.2);
CLASS_POINTS.put(ClassId.DOOMBRINGER, 0.2);
CLASS_POINTS.put(ClassId.DOOMCRYER, 0.1);
CLASS_POINTS.put(ClassId.DREADNOUGHT, 0.7);
CLASS_POINTS.put(ClassId.DUELIST, 0.2);
CLASS_POINTS.put(ClassId.ELEMENTAL_MASTER, 1.4);
CLASS_POINTS.put(ClassId.EVA_SAINT, -0.6);
CLASS_POINTS.put(ClassId.EVA_TEMPLAR, 0.8);
CLASS_POINTS.put(ClassId.FEMALE_SOUL_HOUND, 0.4);
CLASS_POINTS.put(ClassId.FORTUNE_SEEKER, 0.9);
CLASS_POINTS.put(ClassId.GHOST_HUNTER, 0.2);
CLASS_POINTS.put(ClassId.GHOST_SENTINEL, 0.2);
CLASS_POINTS.put(ClassId.GRAND_KHAVATARI, 0.2);
CLASS_POINTS.put(ClassId.HELL_KNIGHT, 0.6);
CLASS_POINTS.put(ClassId.HIEROPHANT, 0.0);
CLASS_POINTS.put(ClassId.JUDICATOR, 0.1);
CLASS_POINTS.put(ClassId.MOONLIGHT_SENTINEL, 0.2);
CLASS_POINTS.put(ClassId.MAESTRO, 0.7);
CLASS_POINTS.put(ClassId.MALE_SOUL_HOUND, 0.4);
CLASS_POINTS.put(ClassId.MYSTIC_MUSE, 0.3);
CLASS_POINTS.put(ClassId.PHOENIX_KNIGHT, 0.6);
CLASS_POINTS.put(ClassId.SAGITTARIUS, 0.2);
CLASS_POINTS.put(ClassId.SHILLIEN_SAINT, -0.6);
CLASS_POINTS.put(ClassId.SHILLIEN_TEMPLAR, 0.8);
CLASS_POINTS.put(ClassId.SOULTAKER, 0.3);
CLASS_POINTS.put(ClassId.SPECTRAL_DANCER, 0.4);
CLASS_POINTS.put(ClassId.SPECTRAL_MASTER, 1.4);
CLASS_POINTS.put(ClassId.STORM_SCREAMER, 0.3);
CLASS_POINTS.put(ClassId.SWORD_MUSE, 0.4);
CLASS_POINTS.put(ClassId.TITAN, 0.3);
CLASS_POINTS.put(ClassId.TRICKSTER, 0.5);
CLASS_POINTS.put(ClassId.WIND_RIDER, 0.2);
}
private DragonValley()

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java vendored
View File

@ -178,17 +178,17 @@ public final class HealerTrainer extends AbstractNpcAI
int itemId;
switch (player.getClassId())
{
case cardinal:
case CARDINAL:
{
itemId = 15307;
break;
}
case evaSaint:
case EVA_SAINT:
{
itemId = 15308;
break;
}
case shillienSaint:
case SHILLIEN_SAINT:
{
itemId = 15309;
break;

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java vendored
View File

@ -147,15 +147,15 @@ public final class SkillTransfer extends AbstractNpcAI
{
switch (player.getClassId())
{
case cardinal:
case CARDINAL:
{
return 0;
}
case evaSaint:
case EVA_SAINT:
{
return 1;
}
case shillienSaint:
case SHILLIEN_SAINT:
{
return 2;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java vendored
View File

@ -55,7 +55,7 @@ public final class BaseTower extends AbstractNpcAI
public final String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final ClassId classId = player.getClassId();
if (classId.equalsOrChildOf(ClassId.hellKnight) || classId.equalsOrChildOf(ClassId.soultaker))
if (classId.equalsOrChildOf(ClassId.HELL_KNIGHT) || classId.equalsOrChildOf(ClassId.SOULTAKER))
{
return "32301-02.htm";
}

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java vendored
View File

@ -544,7 +544,7 @@ public final class TullyWorkshop extends AbstractNpcAI
if (TULLY_DOORLIST.containsKey(npcId))
{
if (classId.equalsOrChildOf(ClassId.maestro))
if (classId.equalsOrChildOf(ClassId.MAESTRO))
{
return "doorman-01c.htm";
}
@ -558,7 +558,7 @@ public final class TullyWorkshop extends AbstractNpcAI
}
else if (!brokenContraptions.contains(npc.getObjectId()))
{
if (classId.equalsOrChildOf(ClassId.maestro))
if (classId.equalsOrChildOf(ClassId.MAESTRO))
{
return "32371-01a.htm";
}
@ -875,12 +875,12 @@ public final class TullyWorkshop extends AbstractNpcAI
if (event.equalsIgnoreCase("touch_device"))
{
final int i0 = talkedContraptions.contains(npc.getObjectId()) ? 0 : 1;
final int i1 = player.getClassId().equalsOrChildOf(ClassId.maestro) ? 6 : 3;
final int i1 = player.getClassId().equalsOrChildOf(ClassId.MAESTRO) ? 6 : 3;
if (getRandom(1000) < ((i1 - i0) * 100))
{
talkedContraptions.add(npc.getObjectId());
htmltext = player.getClassId().equalsOrChildOf(ClassId.maestro) ? "32371-03a.htm" : "32371-03.htm";
htmltext = player.getClassId().equalsOrChildOf(ClassId.MAESTRO) ? "32371-03a.htm" : "32371-03.htm";
}
else
{

134
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java vendored
View File

@ -335,75 +335,75 @@ public final class Q00060_GoodWorksReward extends Quest
{
if (qs.isMemoState(10))
{
if ((player.getClassId() == ClassId.warrior))
if ((player.getClassId() == ClassId.WARRIOR))
{
htmltext = "31092-05.html";
}
else if ((player.getClassId() == ClassId.knight))
else if ((player.getClassId() == ClassId.KNIGHT))
{
htmltext = "31092-06.html";
}
else if ((player.getClassId() == ClassId.rogue))
else if ((player.getClassId() == ClassId.ROGUE))
{
htmltext = "31092-07.html";
}
else if ((player.getClassId() == ClassId.wizard))
else if ((player.getClassId() == ClassId.WIZARD))
{
htmltext = "31092-08.html";
}
else if ((player.getClassId() == ClassId.cleric))
else if ((player.getClassId() == ClassId.CLERIC))
{
htmltext = "31092-09.html";
}
else if ((player.getClassId() == ClassId.elvenKnight))
else if ((player.getClassId() == ClassId.ELVEN_KNIGHT))
{
htmltext = "31092-10.html";
}
else if ((player.getClassId() == ClassId.elvenScout))
else if ((player.getClassId() == ClassId.ELVEN_SCOUT))
{
htmltext = "31092-11.html";
}
else if ((player.getClassId() == ClassId.elvenWizard))
else if ((player.getClassId() == ClassId.ELVEN_WIZARD))
{
htmltext = "31092-12.html";
}
else if ((player.getClassId() == ClassId.oracle))
else if ((player.getClassId() == ClassId.ORACLE))
{
htmltext = "31092-13.html";
}
else if ((player.getClassId() == ClassId.palusKnight))
else if ((player.getClassId() == ClassId.PALUS_KNIGHT))
{
htmltext = "31092-14.html";
}
else if ((player.getClassId() == ClassId.assassin))
else if ((player.getClassId() == ClassId.ASSASSIN))
{
htmltext = "31092-15.html";
}
else if ((player.getClassId() == ClassId.darkWizard))
else if ((player.getClassId() == ClassId.DARK_WIZARD))
{
htmltext = "31092-16.html";
}
else if ((player.getClassId() == ClassId.shillienOracle))
else if ((player.getClassId() == ClassId.SHILLIEN_ORACLE))
{
htmltext = "31092-17.html";
}
else if ((player.getClassId() == ClassId.orcRaider))
else if ((player.getClassId() == ClassId.ORC_RAIDER))
{
htmltext = "31092-18.html";
}
else if ((player.getClassId() == ClassId.orcMonk))
else if ((player.getClassId() == ClassId.ORC_MONK))
{
htmltext = "31092-19.html";
}
else if ((player.getClassId() == ClassId.orcShaman))
else if ((player.getClassId() == ClassId.ORC_SHAMAN))
{
htmltext = "31092-20.html";
}
else if ((player.getClassId() == ClassId.scavenger))
else if ((player.getClassId() == ClassId.SCAVENGER))
{
htmltext = "31092-21.html";
}
else if ((player.getClassId() == ClassId.artisan))
else if ((player.getClassId() == ClassId.ARTISAN))
{
htmltext = "31092-22.html";
}
@ -414,75 +414,75 @@ public final class Q00060_GoodWorksReward extends Quest
{
if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
{
if ((player.getClassId() == ClassId.warrior))
if ((player.getClassId() == ClassId.WARRIOR))
{
htmltext = "31092-05a.html";
}
else if ((player.getClassId() == ClassId.knight))
else if ((player.getClassId() == ClassId.KNIGHT))
{
htmltext = "31092-06a.html";
}
else if ((player.getClassId() == ClassId.rogue))
else if ((player.getClassId() == ClassId.ROGUE))
{
htmltext = "31092-07a.html";
}
else if ((player.getClassId() == ClassId.wizard))
else if ((player.getClassId() == ClassId.WIZARD))
{
htmltext = "31092-08a.html";
}
else if ((player.getClassId() == ClassId.cleric))
else if ((player.getClassId() == ClassId.CLERIC))
{
htmltext = "31092-09a.html";
}
else if ((player.getClassId() == ClassId.elvenKnight))
else if ((player.getClassId() == ClassId.ELVEN_KNIGHT))
{
htmltext = "31092-10a.html";
}
else if ((player.getClassId() == ClassId.elvenScout))
else if ((player.getClassId() == ClassId.ELVEN_SCOUT))
{
htmltext = "31092-11a.html";
}
else if ((player.getClassId() == ClassId.elvenWizard))
else if ((player.getClassId() == ClassId.ELVEN_WIZARD))
{
htmltext = "31092-12a.html";
}
else if ((player.getClassId() == ClassId.oracle))
else if ((player.getClassId() == ClassId.ORACLE))
{
htmltext = "31092-13a.html";
}
else if ((player.getClassId() == ClassId.palusKnight))
else if ((player.getClassId() == ClassId.PALUS_KNIGHT))
{
htmltext = "31092-14a.html";
}
else if ((player.getClassId() == ClassId.assassin))
else if ((player.getClassId() == ClassId.ASSASSIN))
{
htmltext = "31092-15a.html";
}
else if ((player.getClassId() == ClassId.darkWizard))
else if ((player.getClassId() == ClassId.DARK_WIZARD))
{
htmltext = "31092-16a.html";
}
else if ((player.getClassId() == ClassId.shillienOracle))
else if ((player.getClassId() == ClassId.SHILLIEN_ORACLE))
{
htmltext = "31092-17a.html";
}
else if ((player.getClassId() == ClassId.orcRaider))
else if ((player.getClassId() == ClassId.ORC_RAIDER))
{
htmltext = "31092-18a.html";
}
else if ((player.getClassId() == ClassId.orcMonk))
else if ((player.getClassId() == ClassId.ORC_MONK))
{
htmltext = "31092-19a.html";
}
else if ((player.getClassId() == ClassId.orcShaman))
else if ((player.getClassId() == ClassId.ORC_SHAMAN))
{
htmltext = "31092-20a.html";
}
else if ((player.getClassId() == ClassId.scavenger))
else if ((player.getClassId() == ClassId.SCAVENGER))
{
htmltext = "31092-21a.html";
}
else if ((player.getClassId() == ClassId.artisan))
else if ((player.getClassId() == ClassId.ARTISAN))
{
htmltext = "31092-22a.html";
}
@ -490,7 +490,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_6":
{
if ((player.getClassId() == ClassId.warrior))
if ((player.getClassId() == ClassId.WARRIOR))
{
if (!hasQuestItems(player, MARK_OF_CHALLENGER))
{
@ -510,7 +510,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_7":
{
if ((player.getClassId() == ClassId.warrior))
if ((player.getClassId() == ClassId.WARRIOR))
{
if (!hasQuestItems(player, MARK_OF_CHALLENGER))
{
@ -530,7 +530,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_8":
{
if ((player.getClassId() == ClassId.knight))
if ((player.getClassId() == ClassId.KNIGHT))
{
if (!hasQuestItems(player, MARK_OF_DUTY))
{
@ -550,7 +550,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_9":
{
if ((player.getClassId() == ClassId.knight))
if ((player.getClassId() == ClassId.KNIGHT))
{
if (!hasQuestItems(player, MARK_OF_DUTY))
{
@ -570,7 +570,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_10":
{
if ((player.getClassId() == ClassId.rogue))
if ((player.getClassId() == ClassId.ROGUE))
{
if (!hasQuestItems(player, MARK_OF_SEEKER))
{
@ -590,7 +590,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_11":
{
if ((player.getClassId() == ClassId.rogue))
if ((player.getClassId() == ClassId.ROGUE))
{
if (!hasQuestItems(player, MARK_OF_SEEKER))
{
@ -610,7 +610,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_12":
{
if ((player.getClassId() == ClassId.wizard))
if ((player.getClassId() == ClassId.WIZARD))
{
if (!hasQuestItems(player, MARK_OF_SCHOLAR))
{
@ -630,7 +630,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_13":
{
if ((player.getClassId() == ClassId.wizard))
if ((player.getClassId() == ClassId.WIZARD))
{
if (!hasQuestItems(player, MARK_OF_SCHOLAR))
{
@ -650,7 +650,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_14":
{
if ((player.getClassId() == ClassId.wizard))
if ((player.getClassId() == ClassId.WIZARD))
{
if (!hasQuestItems(player, MARK_OF_SCHOLAR))
{
@ -670,7 +670,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_15":
{
if ((player.getClassId() == ClassId.cleric))
if ((player.getClassId() == ClassId.CLERIC))
{
if (!hasQuestItems(player, MARK_OF_PILGRIM))
{
@ -690,7 +690,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_16":
{
if ((player.getClassId() == ClassId.cleric))
if ((player.getClassId() == ClassId.CLERIC))
{
if (!hasQuestItems(player, MARK_OF_PILGRIM))
{
@ -710,7 +710,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_17":
{
if ((player.getClassId() == ClassId.elvenKnight))
if ((player.getClassId() == ClassId.ELVEN_KNIGHT))
{
if (!hasQuestItems(player, MARK_OF_DUTY))
{
@ -730,7 +730,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_18":
{
if ((player.getClassId() == ClassId.elvenKnight))
if ((player.getClassId() == ClassId.ELVEN_KNIGHT))
{
if (!hasQuestItems(player, MARK_OF_CHALLENGER))
{
@ -750,7 +750,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_19":
{
if ((player.getClassId() == ClassId.elvenScout))
if ((player.getClassId() == ClassId.ELVEN_SCOUT))
{
if (!hasQuestItems(player, MARK_OF_SEEKER))
{
@ -770,7 +770,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_20":
{
if ((player.getClassId() == ClassId.elvenScout))
if ((player.getClassId() == ClassId.ELVEN_SCOUT))
{
if (!hasQuestItems(player, MARK_OF_SEEKER))
{
@ -790,7 +790,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_21":
{
if ((player.getClassId() == ClassId.elvenWizard))
if ((player.getClassId() == ClassId.ELVEN_WIZARD))
{
if (!hasQuestItems(player, MARK_OF_SCHOLAR))
{
@ -810,7 +810,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_22":
{
if ((player.getClassId() == ClassId.elvenWizard))
if ((player.getClassId() == ClassId.ELVEN_WIZARD))
{
if (!hasQuestItems(player, MARK_OF_SCHOLAR))
{
@ -830,7 +830,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_23":
{
if ((player.getClassId() == ClassId.oracle))
if ((player.getClassId() == ClassId.ORACLE))
{
if (!hasQuestItems(player, MARK_OF_PILGRIM))
{
@ -850,7 +850,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_24":
{
if ((player.getClassId() == ClassId.palusKnight))
if ((player.getClassId() == ClassId.PALUS_KNIGHT))
{
if (!hasQuestItems(player, MARK_OF_DUTY))
{
@ -870,7 +870,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_25":
{
if ((player.getClassId() == ClassId.palusKnight))
if ((player.getClassId() == ClassId.PALUS_KNIGHT))
{
if (!hasQuestItems(player, MARK_OF_CHALLENGER))
{
@ -890,7 +890,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_26":
{
if ((player.getClassId() == ClassId.assassin))
if ((player.getClassId() == ClassId.ASSASSIN))
{
if (!hasQuestItems(player, MARK_OF_SEEKER))
{
@ -910,7 +910,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_27":
{
if ((player.getClassId() == ClassId.assassin))
if ((player.getClassId() == ClassId.ASSASSIN))
{
if (!hasQuestItems(player, MARK_OF_SEEKER))
{
@ -930,7 +930,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_28":
{
if ((player.getClassId() == ClassId.darkWizard))
if ((player.getClassId() == ClassId.DARK_WIZARD))
{
if (!hasQuestItems(player, MARK_OF_SCHOLAR))
{
@ -950,7 +950,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_29":
{
if ((player.getClassId() == ClassId.darkWizard))
if ((player.getClassId() == ClassId.DARK_WIZARD))
{
if (!hasQuestItems(player, MARK_OF_SCHOLAR))
{
@ -970,7 +970,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_30":
{
if ((player.getClassId() == ClassId.shillienOracle))
if ((player.getClassId() == ClassId.SHILLIEN_ORACLE))
{
if (!hasQuestItems(player, MARK_OF_PILGRIM))
{
@ -990,7 +990,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_31":
{
if ((player.getClassId() == ClassId.orcRaider))
if ((player.getClassId() == ClassId.ORC_RAIDER))
{
if (!hasQuestItems(player, MARK_OF_CHALLENGER))
{
@ -1010,7 +1010,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_32":
{
if ((player.getClassId() == ClassId.orcMonk))
if ((player.getClassId() == ClassId.ORC_MONK))
{
if (!hasQuestItems(player, MARK_OF_CHALLENGER))
{
@ -1030,7 +1030,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_33":
{
if ((player.getClassId() == ClassId.orcShaman))
if ((player.getClassId() == ClassId.ORC_SHAMAN))
{
if (!hasQuestItems(player, MARK_OF_PILGRIM))
{
@ -1050,7 +1050,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_34":
{
if ((player.getClassId() == ClassId.orcShaman))
if ((player.getClassId() == ClassId.ORC_SHAMAN))
{
if (!hasQuestItems(player, MARK_OF_PILGRIM))
{
@ -1070,7 +1070,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_35":
{
if ((player.getClassId() == ClassId.scavenger))
if ((player.getClassId() == ClassId.SCAVENGER))
{
if (!hasQuestItems(player, MARK_OF_GUILDSMAN))
{
@ -1090,7 +1090,7 @@ public final class Q00060_GoodWorksReward extends Quest
}
case "REPLY_36":
{
if ((player.getClassId() == ClassId.artisan))
if ((player.getClassId() == ClassId.ARTISAN))
{
if (!hasQuestItems(player, MARK_OF_GUILDSMAN))
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java vendored
View File

@ -166,7 +166,7 @@ public final class Q00061_LawEnforcement extends Quest
{
if (player.getLevel() >= MIN_LEVEL)
{
if (player.getClassId() == ClassId.inspector)
if (player.getClassId() == ClassId.INSPECTOR)
{
return getHtm(player.getHtmlPrefix(), "32222-01.htm").replace("%name%", player.getName());
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java vendored
View File

@ -160,7 +160,7 @@ public final class Q00062_PathOfTheTrooper extends Quest
{
if (player.getRace() == Race.KAMAEL)
{
if (player.getClassId() == ClassId.maleSoldier)
if (player.getClassId() == ClassId.MALE_SOLDIER)
{
if (player.getLevel() >= MIN_LEVEL)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java vendored
View File

@ -318,7 +318,7 @@ public final class Q00063_PathOfTheWarder extends Quest
{
if (npc.getId() == MASTER_SIONE)
{
if ((player.getClassId() == ClassId.femaleSoldier) && !hasQuestItems(player, STEELRAZOR_EVALUTION))
if ((player.getClassId() == ClassId.FEMALE_SOLDIER) && !hasQuestItems(player, STEELRAZOR_EVALUTION))
{
if (player.getLevel() >= MIN_LEVEL)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java vendored
View File

@ -303,7 +303,7 @@ public final class Q00064_CertifiedBerserker extends Quest
{
if (player.getRace() == Race.KAMAEL)
{
if (player.getClassId() == ClassId.trooper)
if (player.getClassId() == ClassId.TROOPER)
{
if (player.getLevel() >= MIN_LEVEL)
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java vendored
View File

@ -100,7 +100,7 @@ public final class Q00066_CertifiedArbalester extends Quest
{
case "ACCEPT":
{
if ((player.getLevel() >= MIN_LEVEL) && (player.getClassId() == ClassId.warder) && !hasQuestItems(player, KAMAEL_INQUISITOR_MARK))
if ((player.getLevel() >= MIN_LEVEL) && (player.getClassId() == ClassId.WARDER) && !hasQuestItems(player, KAMAEL_INQUISITOR_MARK))
{
qs.startQuest();
qs.setMemoState(1);
@ -733,7 +733,7 @@ public final class Q00066_CertifiedArbalester extends Quest
{
if (npc.getId() == MASTER_RINDY)
{
if ((player.getClassId() == ClassId.warder) && !hasQuestItems(player, KAMAEL_INQUISITOR_MARK))
if ((player.getClassId() == ClassId.WARDER) && !hasQuestItems(player, KAMAEL_INQUISITOR_MARK))
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -1045,7 +1045,7 @@ public final class Q00066_CertifiedArbalester extends Quest
{
if (npc.getId() == MASTER_RINDY)
{
if (player.getClassId() == ClassId.arbalester)
if (player.getClassId() == ClassId.ARBALESTER)
{
htmltext = "32201-05.html";
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java vendored
View File

@ -80,7 +80,7 @@ public final class Q00178_IconicTrinity extends Quest
}
case "32138-14.htm":
{
if ((qs.isMemoState(10) && (player.getLevel() <= TWENTY_LEVEL) && (player.getClassId() == ClassId.maleSoldier)) || (player.getClassId() == ClassId.femaleSoldier))
if ((qs.isMemoState(10) && (player.getLevel() <= TWENTY_LEVEL) && (player.getClassId() == ClassId.MALE_SOLDIER)) || (player.getClassId() == ClassId.FEMALE_SOLDIER))
{
giveItems(player, SCROLL_ENCHANT_ARMOR_D_GRADE, 1);
addExpAndSp(player, 20123, 976);
@ -91,7 +91,7 @@ public final class Q00178_IconicTrinity extends Quest
}
case "32138-17.html":
{
if ((qs.isMemoState(10) && (player.getLevel() > TWENTY_LEVEL) && (player.getClassId() != ClassId.maleSoldier)) || (player.getClassId() != ClassId.femaleSoldier))
if ((qs.isMemoState(10) && (player.getLevel() > TWENTY_LEVEL) && (player.getClassId() != ClassId.MALE_SOLDIER)) || (player.getClassId() != ClassId.FEMALE_SOLDIER))
{
giveItems(player, SCROLL_ENCHANT_ARMOR_D_GRADE, 1);
qs.exitQuest(false, true);
@ -436,7 +436,7 @@ public final class Q00178_IconicTrinity extends Quest
}
case 10:
{
if (((player.getLevel() <= TWENTY_LEVEL) && (player.getClassId() == ClassId.maleSoldier)) || (player.getClassId() == ClassId.femaleSoldier))
if (((player.getLevel() <= TWENTY_LEVEL) && (player.getClassId() == ClassId.MALE_SOLDIER)) || (player.getClassId() == ClassId.FEMALE_SOLDIER))
{
htmltext = "32138-12.html";
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java vendored
View File

@ -570,7 +570,7 @@ public final class Q00212_TrialOfDuty extends Quest
if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
{
if (player.getClassId() == ClassId.knight)
if (player.getClassId() == ClassId.KNIGHT)
{
rewardItems(player, DIMENSIONAL_DIAMOND, 45);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java vendored
View File

@ -398,7 +398,7 @@ public final class Q00213_TrialOfTheSeeker extends Quest
{
if (npc.getId() == MASTER_DUFNER)
{
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)))
{
if (player.getLevel() < MIN_LVL)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java vendored
View File

@ -565,7 +565,7 @@ public final class Q00214_TrialOfTheScholar extends Quest
{
if (npc.getId() == MAGISTER_MIRIEN)
{
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)))
{
if (player.getLevel() < MIN_LVL)
{

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java vendored
View File

@ -221,7 +221,7 @@ public final class Q00216_TrialOfTheGuildsman extends Quest
}
case "30298-04.html":
{
if (player.getClassId() == ClassId.scavenger)
if (player.getClassId() == ClassId.SCAVENGER)
{
if (hasQuestItems(player, ALLTRANS_2ND_RECOMMENDATION))
{
@ -266,12 +266,12 @@ public final class Q00216_TrialOfTheGuildsman extends Quest
if (qs != null)
{
int count = 0;
if ((qs.getPlayer().getClassId() == ClassId.scavenger) && npc.isSweepActive())
if ((qs.getPlayer().getClassId() == ClassId.SCAVENGER) && npc.isSweepActive())
{
count += 5;
}
if (getRandomBoolean() && (qs.getPlayer().getClassId() == ClassId.artisan))
if (getRandomBoolean() && (qs.getPlayer().getClassId() == ClassId.ARTISAN))
{
giveItems(qs.getPlayer(), AMBER_LUMP, 1);
playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
@ -410,7 +410,7 @@ public final class Q00216_TrialOfTheGuildsman extends Quest
{
if (npc.getId() == WAREHOUSE_KEEPER_VALKON)
{
if ((player.getClassId() == ClassId.artisan) || (player.getClassId() == ClassId.scavenger))
if ((player.getClassId() == ClassId.ARTISAN) || (player.getClassId() == ClassId.SCAVENGER))
{
if (player.getLevel() < MIN_LVL)
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java vendored
View File

@ -113,7 +113,7 @@ public final class Q00222_TestOfTheDuelist extends Quest
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
{
if (player.getClassId() == ClassId.palusKnight)
if (player.getClassId() == ClassId.PALUS_KNIGHT)
{
giveItems(player, DIMENSIONAL_DIAMOND, 104);
}
@ -463,7 +463,7 @@ public final class Q00222_TestOfTheDuelist extends Quest
String htmltext = getNoQuestMsg(player);
if (qs.isCreated())
{
if ((player.getClassId() == ClassId.warrior) || (player.getClassId() == ClassId.elvenKnight) || (player.getClassId() == ClassId.palusKnight) || (player.getClassId() == ClassId.orcMonk))
if ((player.getClassId() == ClassId.WARRIOR) || (player.getClassId() == ClassId.ELVEN_KNIGHT) || (player.getClassId() == ClassId.PALUS_KNIGHT) || (player.getClassId() == ClassId.ORC_MONK))
{
if (player.getLevel() >= MIN_LEVEL)
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java vendored
View File

@ -105,7 +105,7 @@ public final class Q00223_TestOfTheChampion extends Quest
giveItems(player, ASCALONS_1ST_LETTER, 1);
if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
{
if (player.getClassId() == ClassId.warrior)
if (player.getClassId() == ClassId.WARRIOR)
{
giveItems(player, DIMENSIONAL_DIAMOND, 72);
}
@ -448,11 +448,11 @@ public final class Q00223_TestOfTheChampion extends Quest
{
if (npc.getId() == VETERAN_ASCALON)
{
if ((player.getClassId() == ClassId.warrior) || (player.getClassId() == ClassId.orcRaider))
if ((player.getClassId() == ClassId.WARRIOR) || (player.getClassId() == ClassId.ORC_RAIDER))
{
if (player.getLevel() >= MIN_LEVEL)
{
if (player.getClassId() == ClassId.warrior)
if (player.getClassId() == ClassId.WARRIOR)
{
htmltext = "30624-03.htm";
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java vendored
View File

@ -366,7 +366,7 @@ public final class Q00224_TestOfSagittarius extends Quest
{
if (npc.getId() == GUILD_PRESIDENT_BERNARD)
{
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))
{
if (player.getLevel() >= MIN_LEVEL)
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java vendored
View File

@ -112,7 +112,7 @@ public final class Q00225_TestOfTheSearcher extends Quest
giveItems(player, LUTHERS_LETTER, 1);
if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
{
if (player.getClassId() == ClassId.scavenger)
if (player.getClassId() == ClassId.SCAVENGER)
{
giveItems(player, DIMENSIONAL_DIAMOND, 82);
}
@ -329,11 +329,11 @@ public final class Q00225_TestOfTheSearcher extends Quest
{
if (npc.getId() == MASTER_LUTHER)
{
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))
{
if (player.getLevel() >= MIN_LEVEL)
{
if (player.getClassId() == ClassId.scavenger)
if (player.getClassId() == ClassId.SCAVENGER)
{
htmltext = "30690-04.htm";
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java vendored
View File

@ -103,15 +103,15 @@ public final class Q00226_TestOfTheHealer extends Quest
giveItems(player, REPORT_OF_PERRIN, 1);
if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
{
if (player.getClassId() == ClassId.cleric)
if (player.getClassId() == ClassId.CLERIC)
{
giveItems(player, DIMENSIONAL_DIAMOND, 60);
}
else if (player.getClassId() == ClassId.knight)
else if (player.getClassId() == ClassId.KNIGHT)
{
giveItems(player, DIMENSIONAL_DIAMOND, 104);
}
else if (player.getClassId() == ClassId.oracle)
else if (player.getClassId() == ClassId.ORACLE)
{
giveItems(player, DIMENSIONAL_DIAMOND, 45);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java vendored
View File

@ -423,7 +423,7 @@ public final class Q00227_TestOfTheReformer extends Quest
{
if (npc.getId() == PRIESTESS_PUPINA)
{
if ((player.getClassId() == ClassId.cleric) || (player.getClassId() == ClassId.shillienOracle))
if ((player.getClassId() == ClassId.CLERIC) || (player.getClassId() == ClassId.SHILLIEN_ORACLE))
{
if (player.getLevel() >= MIN_LEVEL)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java vendored
View File

@ -390,7 +390,7 @@ public final class Q00228_TestOfMagus extends Quest
{
if (npc.getId() == BARD_RUKAL)
{
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)))
{
if (player.getLevel() < MIN_LVL)
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java vendored
View File

@ -135,7 +135,7 @@ public final class Q00229_TestOfWitchcraft extends Quest
giveItems(player, ORIMS_DIAGRAM, 1);
if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
{
if (player.getClassId() == ClassId.wizard)
if (player.getClassId() == ClassId.WIZARD)
{
giveItems(player, DIMENSIONAL_DIAMOND, 122);
}
@ -508,11 +508,11 @@ public final class Q00229_TestOfWitchcraft extends Quest
{
if (npc.getId() == SHADOW_ORIM)
{
if ((player.getClassId() == ClassId.wizard) || (player.getClassId() == ClassId.knight) || (player.getClassId() == ClassId.palusKnight))
if ((player.getClassId() == ClassId.WIZARD) || (player.getClassId() == ClassId.KNIGHT) || (player.getClassId() == ClassId.PALUS_KNIGHT))
{
if (player.getLevel() >= MIN_LEVEL)
{
if (player.getClassId() == ClassId.wizard)
if (player.getClassId() == ClassId.WIZARD)
{
htmltext = "30630-03.htm";
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java vendored
View File

@ -851,7 +851,7 @@ public final class Q00230_TestOfTheSummoner extends Quest
{
if (npc.getId() == HIGH_SUMMONER_GALATEA)
{
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))
{
if (player.getLevel() >= MIN_LEVEL)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java vendored
View File

@ -247,7 +247,7 @@ public final class Q00231_TestOfTheMaestro extends Quest
{
if (npc.getId() == IRON_GATES_LOCKIRIN)
{
if (player.getClassId() == ClassId.artisan)
if (player.getClassId() == ClassId.ARTISAN)
{
if (player.getLevel() >= MIN_LEVEL)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java vendored
View File

@ -364,7 +364,7 @@ public final class Q00232_TestOfTheLord extends Quest
{
htmltext = "30565-01.html";
}
else if (player.getClassId() != ClassId.orcShaman)
else if (player.getClassId() != ClassId.ORC_SHAMAN)
{
htmltext = "30565-02.html";
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java vendored
View File

@ -368,7 +368,7 @@ public final class Q00233_TestOfTheWarSpirit extends Quest
{
if (player.getRace() == Race.ORC)
{
if (player.getClassId() == ClassId.orcShaman)
if (player.getClassId() == ClassId.ORC_SHAMAN)
{
if (player.getLevel() < MIN_LEVEL)
{

24
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java vendored
View File

@ -1432,7 +1432,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
final ClassId playerClassId = player.getClassId();
final int playerLevel = player.getLevel();
if ((playerClassId == ClassId.treasureHunter) || (playerClassId == ClassId.plainsWalker) || (playerClassId == ClassId.abyssWalker) || (playerClassId == ClassId.adventurer) || (playerClassId == ClassId.windRider) || (playerClassId == ClassId.ghostHunter) || (playerClassId == ClassId.maleSoulbreaker) || (playerClassId == ClassId.femaleSoulbreaker) || (playerClassId == ClassId.maleSoulhound) || (playerClassId == ClassId.femaleSoulhound) || (playerClassId == ClassId.inspector) || (playerClassId == ClassId.judicator))
if ((playerClassId == ClassId.TREASURE_HUNTER) || (playerClassId == ClassId.PLAINS_WALKER) || (playerClassId == ClassId.ABYSS_WALKER) || (playerClassId == ClassId.ADVENTURER) || (playerClassId == ClassId.WIND_RIDER) || (playerClassId == ClassId.GHOST_HUNTER) || (playerClassId == ClassId.MALE_SOULBREAKER) || (playerClassId == ClassId.FEMALE_SOULBREAKER) || (playerClassId == ClassId.MALE_SOUL_HOUND) || (playerClassId == ClassId.FEMALE_SOUL_HOUND) || (playerClassId == ClassId.INSPECTOR) || (playerClassId == ClassId.JUDICATOR))
{
if (playerLevel < 69)
{
@ -1445,7 +1445,7 @@ public class Q00348_AnArrogantSearch extends Quest
giveItems(player, COKES, 2);
}
}
else if ((playerClassId == ClassId.tyrant) || (playerClassId == ClassId.grandKhavatari))
else if ((playerClassId == ClassId.TYRANT) || (playerClassId == ClassId.GRAND_KHAVATARI))
{
if (playerLevel < 69)
{
@ -1459,7 +1459,7 @@ public class Q00348_AnArrogantSearch extends Quest
giveItems(player, ORIHARUKON_ORE, 2);
}
}
else if ((playerClassId == ClassId.paladin) || (playerClassId == ClassId.darkAvenger) || (playerClassId == ClassId.prophet) || (playerClassId == ClassId.templeKnight) || (playerClassId == ClassId.swordSinger) || (playerClassId == ClassId.shillienKnight) || (playerClassId == ClassId.bladedancer) || (playerClassId == ClassId.shillenElder) || (playerClassId == ClassId.phoenixKnight) || (playerClassId == ClassId.hellKnight) || (playerClassId == ClassId.hierophant) || (playerClassId == ClassId.evaTemplar) || (playerClassId == ClassId.swordMuse) || (playerClassId == ClassId.shillienTemplar) || (playerClassId == ClassId.spectralDancer) || (playerClassId == ClassId.shillienSaint))
else if ((playerClassId == ClassId.PALADIN) || (playerClassId == ClassId.DARK_AVENGER) || (playerClassId == ClassId.PROPHET) || (playerClassId == ClassId.TEMPLE_KNIGHT) || (playerClassId == ClassId.SWORDSINGER) || (playerClassId == ClassId.SHILLIEN_KNIGHT) || (playerClassId == ClassId.BLADEDANCER) || (playerClassId == ClassId.SHILLIEN_ELDER) || (playerClassId == ClassId.PHOENIX_KNIGHT) || (playerClassId == ClassId.HELL_KNIGHT) || (playerClassId == ClassId.HIEROPHANT) || (playerClassId == ClassId.EVA_TEMPLAR) || (playerClassId == ClassId.SWORD_MUSE) || (playerClassId == ClassId.SHILLIEN_TEMPLAR) || (playerClassId == ClassId.SPECTRAL_DANCER) || (playerClassId == ClassId.SHILLIEN_SAINT))
{
if (playerLevel < 69)
{
@ -1472,7 +1472,7 @@ public class Q00348_AnArrogantSearch extends Quest
giveItems(player, ORIHARUKON_ORE, 2);
}
}
else if ((playerClassId == ClassId.hawkeye) || (playerClassId == ClassId.silverRanger) || (playerClassId == ClassId.phantomRanger) || (playerClassId == ClassId.sagittarius) || (playerClassId == ClassId.moonlightSentinel) || (playerClassId == ClassId.ghostSentinel) || (playerClassId == ClassId.arbalester) || (playerClassId == ClassId.trickster))
else if ((playerClassId == ClassId.HAWKEYE) || (playerClassId == ClassId.SILVER_RANGER) || (playerClassId == ClassId.PHANTOM_RANGER) || (playerClassId == ClassId.SAGITTARIUS) || (playerClassId == ClassId.MOONLIGHT_SENTINEL) || (playerClassId == ClassId.GHOST_SENTINEL) || (playerClassId == ClassId.ARBALESTER) || (playerClassId == ClassId.TRICKSTER))
{
if (playerLevel < 69)
{
@ -1485,7 +1485,7 @@ public class Q00348_AnArrogantSearch extends Quest
giveItems(player, COARSE_BONE_POWDER, 9);
}
}
else if ((playerClassId == ClassId.gladiator) || (playerClassId == ClassId.bishop) || (playerClassId == ClassId.elder) || (playerClassId == ClassId.duelist) || (playerClassId == ClassId.cardinal) || (playerClassId == ClassId.evaSaint))
else if ((playerClassId == ClassId.GLADIATOR) || (playerClassId == ClassId.BISHOP) || (playerClassId == ClassId.ELDER) || (playerClassId == ClassId.DUELIST) || (playerClassId == ClassId.CARDINAL) || (playerClassId == ClassId.EVA_SAINT))
{
if (playerLevel < 69)
{
@ -1499,7 +1499,7 @@ public class Q00348_AnArrogantSearch extends Quest
giveItems(player, ORIHARUKON_ORE, 2);
}
}
else if ((playerClassId == ClassId.warlord) || (playerClassId == ClassId.bountyHunter) || (playerClassId == ClassId.warsmith) || (playerClassId == ClassId.dreadnought) || (playerClassId == ClassId.fortuneSeeker) || (playerClassId == ClassId.maestro))
else if ((playerClassId == ClassId.WARLORD) || (playerClassId == ClassId.BOUNTY_HUNTER) || (playerClassId == ClassId.WARSMITH) || (playerClassId == ClassId.DREADNOUGHT) || (playerClassId == ClassId.FORTUNE_SEEKER) || (playerClassId == ClassId.MAESTRO))
{
if (playerLevel < 63)
{
@ -1513,7 +1513,7 @@ public class Q00348_AnArrogantSearch extends Quest
giveItems(player, ORIHARUKON_ORE, 2);
}
}
else if ((playerClassId == ClassId.sorceror) || (playerClassId == ClassId.spellsinger) || (playerClassId == ClassId.overlord) || (playerClassId == ClassId.archmage) || (playerClassId == ClassId.mysticMuse) || (playerClassId == ClassId.dominator))
else if ((playerClassId == ClassId.SORCERER) || (playerClassId == ClassId.SPELLSINGER) || (playerClassId == ClassId.OVERLORD) || (playerClassId == ClassId.ARCHMAGE) || (playerClassId == ClassId.MYSTIC_MUSE) || (playerClassId == ClassId.DOMINATOR))
{
if (playerLevel < 63)
{
@ -1527,30 +1527,30 @@ public class Q00348_AnArrogantSearch extends Quest
giveItems(player, ANIMAL_BONE, 5);
}
}
else if ((playerClassId == ClassId.necromancer) || (playerClassId == ClassId.spellhowler) || (playerClassId == ClassId.soultaker) || (playerClassId == ClassId.stormScreamer))
else if ((playerClassId == ClassId.NECROMANCER) || (playerClassId == ClassId.SPELLHOWLER) || (playerClassId == ClassId.SOULTAKER) || (playerClassId == ClassId.STORM_SCREAMER))
{
giveItems(player, HELL_KNIFE_EDGE, 1);
giveItems(player, SYNTHETIC_COKES, 2);
giveItems(player, ANIMAL_BONE, 2);
}
else if ((playerClassId == ClassId.destroyer) || (playerClassId == ClassId.titan) || (playerClassId == ClassId.berserker) || (playerClassId == ClassId.doombringer))
else if ((playerClassId == ClassId.DESTROYER) || (playerClassId == ClassId.TITAN) || (playerClassId == ClassId.BERSERKER) || (playerClassId == ClassId.DOOMBRINGER))
{
giveItems(player, GREAT_SWORD_BLADE, 1);
giveItems(player, VARNISH_OF_PURITY, 2);
giveItems(player, SYNTHETIC_COKES, 2);
}
else if ((playerClassId == ClassId.elementalSummoner) || (playerClassId == ClassId.phantomSummoner) || (playerClassId == ClassId.elementalMaster) || (playerClassId == ClassId.spectralMaster))
else if ((playerClassId == ClassId.ELEMENTAL_SUMMONER) || (playerClassId == ClassId.PHANTOM_SUMMONER) || (playerClassId == ClassId.ELEMENTAL_MASTER) || (playerClassId == ClassId.SPECTRAL_MASTER))
{
giveItems(player, SWORD_OF_DAMASCUS_BLADE, 1);
giveItems(player, ENRIA, 1);
}
else if ((playerClassId == ClassId.warcryer) || (playerClassId == ClassId.doomcryer))
else if ((playerClassId == ClassId.WARCRYER) || (playerClassId == ClassId.DOOMCRYER))
{
giveItems(player, SWORD_OF_VALHALLA_BLADE, 1);
giveItems(player, ORIHARUKON_ORE, 1);
giveItems(player, VARNISH_OF_PURITY, 1);
}
else if ((playerClassId == ClassId.warlock) || (playerClassId == ClassId.arcanaLord))
else if ((playerClassId == ClassId.WARLOCK) || (playerClassId == ClassId.ARCANA_LORD))
{
giveItems(player, ART_OF_BATTLE_AXE_BLADE, 1);
giveItems(player, ENRIA, 1);

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java vendored
View File

@ -78,7 +78,7 @@ public final class Q00401_PathOfTheWarrior extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.fighter)
if (player.getClassId() == ClassId.FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -96,7 +96,7 @@ public final class Q00401_PathOfTheWarrior extends Quest
htmltext = "30010-02.htm";
}
}
else if (player.getClassId() == ClassId.warrior)
else if (player.getClassId() == ClassId.WARRIOR)
{
htmltext = "30010-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java vendored
View File

@ -104,7 +104,7 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.fighter)
if (player.getClassId() == ClassId.FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -122,7 +122,7 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
htmltext = "30417-02.htm";
}
}
else if (player.getClassId() == ClassId.knight)
else if (player.getClassId() == ClassId.KNIGHT)
{
htmltext = "30417-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java vendored
View File

@ -105,7 +105,7 @@ public final class Q00403_PathOfTheRogue extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.fighter)
if (player.getClassId() == ClassId.FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -123,7 +123,7 @@ public final class Q00403_PathOfTheRogue extends Quest
htmltext = "30379-03.htm";
}
}
else if (player.getClassId() == ClassId.rogue)
else if (player.getClassId() == ClassId.ROGUE)
{
htmltext = "30379-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java vendored
View File

@ -84,7 +84,7 @@ public final class Q00404_PathOfTheHumanWizard extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.mage)
if (player.getClassId() == ClassId.MAGE)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -103,7 +103,7 @@ public final class Q00404_PathOfTheHumanWizard extends Quest
htmltext = "30391-02.htm";
}
}
else if (player.getClassId() == ClassId.wizard)
else if (player.getClassId() == ClassId.WIZARD)
{
htmltext = "30391-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java vendored
View File

@ -80,7 +80,7 @@ public final class Q00405_PathOfTheCleric extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.mage)
if (player.getClassId() == ClassId.MAGE)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -100,7 +100,7 @@ public final class Q00405_PathOfTheCleric extends Quest
htmltext = "30022-03.htm";
}
}
else if (player.getClassId() == ClassId.cleric)
else if (player.getClassId() == ClassId.CLERIC)
{
htmltext = "30022-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java vendored
View File

@ -85,9 +85,9 @@ public final class Q00406_PathOfTheElvenKnight extends Quest
{
case "ACCEPT":
{
if (player.getClassId() != ClassId.elvenFighter)
if (player.getClassId() != ClassId.ELVEN_FIGHTER)
{
if (player.getClassId() == ClassId.elvenKnight)
if (player.getClassId() == ClassId.ELVEN_KNIGHT)
{
htmltext = "30327-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java vendored
View File

@ -79,7 +79,7 @@ public final class Q00407_PathOfTheElvenScout extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.elvenFighter)
if (player.getClassId() == ClassId.ELVEN_FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -100,7 +100,7 @@ public final class Q00407_PathOfTheElvenScout extends Quest
htmltext = "30328-03.htm";
}
}
else if (player.getClassId() == ClassId.elvenScout)
else if (player.getClassId() == ClassId.ELVEN_SCOUT)
{
htmltext = "30328-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java vendored
View File

@ -82,9 +82,9 @@ public final class Q00408_PathOfTheElvenWizard extends Quest
{
case "ACCEPT":
{
if (player.getClassId() != ClassId.elvenMage)
if (player.getClassId() != ClassId.ELVEN_MAGE)
{
if (player.getClassId() == ClassId.elvenWizard)
if (player.getClassId() == ClassId.ELVEN_WIZARD)
{
htmltext = "30414-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java vendored
View File

@ -78,7 +78,7 @@ public final class Q00409_PathOfTheElvenOracle extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.elvenMage)
if (player.getClassId() == ClassId.ELVEN_MAGE)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -99,7 +99,7 @@ public final class Q00409_PathOfTheElvenOracle extends Quest
htmltext = "30293-03.htm";
}
}
else if (player.getClassId() == ClassId.oracle)
else if (player.getClassId() == ClassId.ORACLE)
{
htmltext = "30293-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java vendored
View File

@ -74,7 +74,7 @@ public final class Q00410_PathOfThePalusKnight extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.darkFighter)
if (player.getClassId() == ClassId.DARK_FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -92,7 +92,7 @@ public final class Q00410_PathOfThePalusKnight extends Quest
htmltext = "30329-02.htm";
}
}
else if (player.getClassId() == ClassId.palusKnight)
else if (player.getClassId() == ClassId.PALUS_KNIGHT)
{
htmltext = "30329-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java vendored
View File

@ -74,7 +74,7 @@ public final class Q00411_PathOfTheAssassin extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.darkFighter)
if (player.getClassId() == ClassId.DARK_FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -94,7 +94,7 @@ public final class Q00411_PathOfTheAssassin extends Quest
htmltext = "30416-03.htm";
}
}
else if (player.getClassId() == ClassId.assassin)
else if (player.getClassId() == ClassId.ASSASSIN)
{
htmltext = "30416-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java vendored
View File

@ -81,7 +81,7 @@ public final class Q00412_PathOfTheDarkWizard extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.darkMage)
if (player.getClassId() == ClassId.DARK_MAGE)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -101,7 +101,7 @@ public final class Q00412_PathOfTheDarkWizard extends Quest
htmltext = "30421-02.htm";
}
}
else if (player.getClassId() == ClassId.darkWizard)
else if (player.getClassId() == ClassId.DARK_WIZARD)
{
htmltext = "30421-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java vendored
View File

@ -78,7 +78,7 @@ public final class Q00413_PathOfTheShillienOracle extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.darkMage)
if (player.getClassId() == ClassId.DARK_MAGE)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -96,7 +96,7 @@ public final class Q00413_PathOfTheShillienOracle extends Quest
htmltext = "30330-02.htm";
}
}
else if (player.getClassId() == ClassId.shillienOracle)
else if (player.getClassId() == ClassId.SHILLIEN_ORACLE)
{
htmltext = "30330-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java vendored
View File

@ -77,7 +77,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.orcFighter)
if (player.getClassId() == ClassId.ORC_FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -100,7 +100,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest
htmltext = "30570-02.htm";
}
}
else if (player.getClassId() == ClassId.orcRaider)
else if (player.getClassId() == ClassId.ORC_RAIDER)
{
htmltext = "30570-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java vendored
View File

@ -105,7 +105,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.orcFighter)
if (player.getClassId() == ClassId.ORC_FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -123,7 +123,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
htmltext = "30587-03.htm";
}
}
else if (player.getClassId() == ClassId.orcMonk)
else if (player.getClassId() == ClassId.ORC_MONK)
{
htmltext = "30587-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java vendored
View File

@ -104,9 +104,9 @@ public final class Q00416_PathOfTheOrcShaman extends Quest
{
case "START":
{
if (player.getClassId() != ClassId.orcMage)
if (player.getClassId() != ClassId.ORC_MAGE)
{
if (player.getClassId() == ClassId.orcShaman)
if (player.getClassId() == ClassId.ORC_SHAMAN)
{
htmltext = "30585-02.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java vendored
View File

@ -98,7 +98,7 @@ public final class Q00417_PathOfTheScavenger extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.dwarvenFighter)
if (player.getClassId() == ClassId.DWARVEN_FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -119,7 +119,7 @@ public final class Q00417_PathOfTheScavenger extends Quest
htmltext = "30524-02.htm";
}
}
else if (player.getClassId() == ClassId.scavenger)
else if (player.getClassId() == ClassId.SCAVENGER)
{
htmltext = "30524-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java vendored
View File

@ -81,7 +81,7 @@ public final class Q00418_PathOfTheArtisan extends Quest
{
case "ACCEPT":
{
if (player.getClassId() == ClassId.dwarvenFighter)
if (player.getClassId() == ClassId.DWARVEN_FIGHTER)
{
if (player.getLevel() >= MIN_LEVEL)
{
@ -99,7 +99,7 @@ public final class Q00418_PathOfTheArtisan extends Quest
htmltext = "30527-03.htm";
}
}
else if (player.getClassId() == ClassId.artisan)
else if (player.getClassId() == ClassId.ARTISAN)
{
htmltext = "30527-02a.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java vendored
View File

@ -113,12 +113,12 @@ public final class DarkElfChange1 extends Quest
{
switch (cid)
{
case darkFighter:
case DARK_FIGHTER:
{
htmltext = npc.getId() + "-01.html";
break;
}
case darkMage:
case DARK_MAGE:
{
htmltext = npc.getId() + "-08.html";
break;

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java vendored
View File

@ -132,22 +132,22 @@ public final class DarkElfChange2 extends Quest
{
switch (cid)
{
case palusKnight:
case PALUS_KNIGHT:
{
htmltext = "30474-01.html";
break;
}
case shillienOracle:
case SHILLIEN_ORACLE:
{
htmltext = "30474-08.html";
break;
}
case assassin:
case ASSASSIN:
{
htmltext = "30474-12.html";
break;
}
case darkWizard:
case DARK_WIZARD:
{
htmltext = "30474-19.html";
break;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java vendored
View File

@ -101,7 +101,7 @@ public final class DwarfBlacksmithChange1 extends AbstractNpcAI
{
htmltext = "30499-12.htm"; // fnYouAreFourthClass
}
else if ((classId == ARTISAN) && (player.getClassId() == ClassId.dwarvenFighter))
else if ((classId == ARTISAN) && (player.getClassId() == ClassId.DWARVEN_FIGHTER))
{
if (player.getLevel() < 20)
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java vendored
View File

@ -86,7 +86,7 @@ public final class DwarfBlacksmithChange2 extends AbstractNpcAI
{
htmltext = "30512-08.htm"; // fnYouAreThirdClass
}
else if ((classId == WARSMITH) && (player.getClassId() == ClassId.artisan))
else if ((classId == WARSMITH) && (player.getClassId() == ClassId.ARTISAN))
{
if (player.getLevel() < 40)
{
@ -128,7 +128,7 @@ public final class DwarfBlacksmithChange2 extends AbstractNpcAI
else if (player.isInCategory(CategoryType.WARSMITH_GROUP))
{
final ClassId classId = player.getClassId();
if ((classId == ClassId.artisan) || (classId == ClassId.warsmith))
if ((classId == ClassId.ARTISAN) || (classId == ClassId.WARSMITH))
{
htmltext = "30512-02.htm"; // fnClassList1
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java vendored
View File

@ -101,7 +101,7 @@ public final class DwarfWarehouseChange1 extends AbstractNpcAI
{
htmltext = "30498-12.htm"; // fnYouAreFourthClass
}
else if ((classId == SCAVENGER) && (player.getClassId() == ClassId.dwarvenFighter))
else if ((classId == SCAVENGER) && (player.getClassId() == ClassId.DWARVEN_FIGHTER))
{
if (player.getLevel() < 20)
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java vendored
View File

@ -86,7 +86,7 @@ public final class DwarfWarehouseChange2 extends AbstractNpcAI
{
htmltext = "30511-08.htm"; // fnYouAreThirdClass
}
else if ((classId == BOUNTY_HUNTER) && (player.getClassId() == ClassId.scavenger))
else if ((classId == BOUNTY_HUNTER) && (player.getClassId() == ClassId.SCAVENGER))
{
if (player.getLevel() < 40)
{
@ -128,7 +128,7 @@ public final class DwarfWarehouseChange2 extends AbstractNpcAI
else if (player.isInCategory(CategoryType.BOUNTY_HUNTER_GROUP))
{
final ClassId classId = player.getClassId();
if ((classId == ClassId.scavenger) || (classId == ClassId.bountyHunter))
if ((classId == ClassId.SCAVENGER) || (classId == ClassId.BOUNTY_HUNTER))
{
htmltext = "30511-02.htm"; // fnClassList1
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java vendored
View File

@ -98,7 +98,7 @@ public final class ElfHumanClericChange2 extends AbstractNpcAI
{
htmltext = "30120-15.htm"; // fnYouAreThirdClass
}
else if ((classId == BISHOP) && (player.getClassId() == ClassId.cleric))
else if ((classId == BISHOP) && (player.getClassId() == ClassId.CLERIC))
{
if (player.getLevel() < 40)
{
@ -126,7 +126,7 @@ public final class ElfHumanClericChange2 extends AbstractNpcAI
htmltext = "30120-19.htm"; // fnNoProof11
}
}
else if ((classId == PROPHET) && (player.getClassId() == ClassId.cleric))
else if ((classId == PROPHET) && (player.getClassId() == ClassId.CLERIC))
{
if (player.getLevel() < 40)
{
@ -154,7 +154,7 @@ public final class ElfHumanClericChange2 extends AbstractNpcAI
htmltext = "30120-23.htm"; // fnNoProof12
}
}
else if ((classId == ELDER) && (player.getClassId() == ClassId.oracle))
else if ((classId == ELDER) && (player.getClassId() == ClassId.ORACLE))
{
if (player.getLevel() < 40)
{
@ -196,11 +196,11 @@ public final class ElfHumanClericChange2 extends AbstractNpcAI
else if (player.isInCategory(CategoryType.CLERIC_GROUP) && (player.isInCategory(CategoryType.HUMAN_CALL_CLASS) || player.isInCategory(CategoryType.ELF_CALL_CLASS)))
{
final ClassId classId = player.getClassId();
if ((classId == ClassId.cleric) || (classId == ClassId.bishop) || (classId == ClassId.prophet))
if ((classId == ClassId.CLERIC) || (classId == ClassId.BISHOP) || (classId == ClassId.PROPHET))
{
htmltext = "30120-02.htm"; // fnClassList1
}
else if ((classId == ClassId.oracle) || (classId == ClassId.elder))
else if ((classId == ClassId.ORACLE) || (classId == ClassId.ELDER))
{
htmltext = "30120-09.htm"; // fnClassList2
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java vendored
View File

@ -166,7 +166,7 @@ public final class ElfHumanFighterChange1 extends AbstractNpcAI
{
htmltext = "30066-41.htm"; // fnYouAreFourthClass
}
else if ((classId == WARRIOR) && (player.getClassId() == ClassId.fighter))
else if ((classId == WARRIOR) && (player.getClassId() == ClassId.FIGHTER))
{
if (player.getLevel() < 20)
{
@ -194,7 +194,7 @@ public final class ElfHumanFighterChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-24.htm"; // fnNoProof11
}
}
else if ((classId == KNIGHT) && (player.getClassId() == ClassId.fighter))
else if ((classId == KNIGHT) && (player.getClassId() == ClassId.FIGHTER))
{
if (player.getLevel() < 20)
{
@ -222,7 +222,7 @@ public final class ElfHumanFighterChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-28.htm"; // fnNoProof12
}
}
else if ((classId == ROGUE) && (player.getClassId() == ClassId.fighter))
else if ((classId == ROGUE) && (player.getClassId() == ClassId.FIGHTER))
{
if (player.getLevel() < 20)
{
@ -250,7 +250,7 @@ public final class ElfHumanFighterChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-32.htm"; // fnNoProof13
}
}
else if ((classId == ELVEN_KNIGHT) && (player.getClassId() == ClassId.elvenFighter))
else if ((classId == ELVEN_KNIGHT) && (player.getClassId() == ClassId.ELVEN_FIGHTER))
{
if (player.getLevel() < 20)
{
@ -278,7 +278,7 @@ public final class ElfHumanFighterChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-36.htm"; // fnNoProof21
}
}
else if ((classId == ELVEN_SCOUT) && (player.getClassId() == ClassId.elvenFighter))
else if ((classId == ELVEN_SCOUT) && (player.getClassId() == ClassId.ELVEN_FIGHTER))
{
if (player.getLevel() < 20)
{

30
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java vendored
View File

@ -145,7 +145,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
{
htmltext = "30109-39.htm"; // fnYouAreThirdClass
}
else if ((classId == GLADIATOR) && (player.getClassId() == ClassId.warrior))
else if ((classId == GLADIATOR) && (player.getClassId() == ClassId.WARRIOR))
{
if (player.getLevel() < 40)
{
@ -173,7 +173,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-43.htm"; // fnNoProof11
}
}
else if ((classId == WARLORD) && (player.getClassId() == ClassId.warrior))
else if ((classId == WARLORD) && (player.getClassId() == ClassId.WARRIOR))
{
if (player.getLevel() < 40)
{
@ -201,7 +201,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-47.htm"; // fnNoProof12
}
}
else if ((classId == PALADIN) && (player.getClassId() == ClassId.knight))
else if ((classId == PALADIN) && (player.getClassId() == ClassId.KNIGHT))
{
if (player.getLevel() < 40)
{
@ -229,7 +229,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-51.htm"; // fnNoProof21
}
}
else if ((classId == DARK_AVENGER) && (player.getClassId() == ClassId.knight))
else if ((classId == DARK_AVENGER) && (player.getClassId() == ClassId.KNIGHT))
{
if (player.getLevel() < 40)
{
@ -257,7 +257,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-55.htm"; // fnNoProof22
}
}
else if ((classId == TREASURE_HUNTER) && (player.getClassId() == ClassId.rogue))
else if ((classId == TREASURE_HUNTER) && (player.getClassId() == ClassId.ROGUE))
{
if (player.getLevel() < 40)
{
@ -285,7 +285,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-59.htm"; // fnNoProof31
}
}
else if ((classId == HAWKEYE) && (player.getClassId() == ClassId.rogue))
else if ((classId == HAWKEYE) && (player.getClassId() == ClassId.ROGUE))
{
if (player.getLevel() < 40)
{
@ -313,7 +313,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-63.htm"; // fnNoProof32
}
}
else if ((classId == TEMPLE_KNIGHT) && (player.getClassId() == ClassId.elvenKnight))
else if ((classId == TEMPLE_KNIGHT) && (player.getClassId() == ClassId.ELVEN_KNIGHT))
{
if (player.getLevel() < 40)
{
@ -341,7 +341,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-67.htm"; // fnNoProof41
}
}
else if ((classId == SWORDSINGER) && (player.getClassId() == ClassId.elvenKnight))
else if ((classId == SWORDSINGER) && (player.getClassId() == ClassId.ELVEN_KNIGHT))
{
if (player.getLevel() < 40)
{
@ -369,7 +369,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-71.htm"; // fnNoProof42
}
}
else if ((classId == PLAINS_WALKER) && (player.getClassId() == ClassId.elvenScout))
else if ((classId == PLAINS_WALKER) && (player.getClassId() == ClassId.ELVEN_SCOUT))
{
if (player.getLevel() < 40)
{
@ -397,7 +397,7 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
htmltext = "30109-75.htm"; // fnNoProof51
}
}
else if ((classId == SILVER_RANGER) && (player.getClassId() == ClassId.elvenScout))
else if ((classId == SILVER_RANGER) && (player.getClassId() == ClassId.ELVEN_SCOUT))
{
if (player.getLevel() < 40)
{
@ -439,23 +439,23 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
else if (player.isInCategory(CategoryType.FIGHTER_GROUP) && (player.isInCategory(CategoryType.HUMAN_FALL_CLASS) || player.isInCategory(CategoryType.ELF_FALL_CLASS)))
{
final ClassId classId = player.getClassId();
if ((classId == ClassId.warrior) || (classId == ClassId.gladiator) || (classId == ClassId.warlord))
if ((classId == ClassId.WARRIOR) || (classId == ClassId.GLADIATOR) || (classId == ClassId.WARLORD))
{
htmltext = "30109-02.htm"; // fnClassList1
}
else if ((classId == ClassId.knight) || (classId == ClassId.paladin) || (classId == ClassId.darkAvenger))
else if ((classId == ClassId.KNIGHT) || (classId == ClassId.PALADIN) || (classId == ClassId.DARK_AVENGER))
{
htmltext = "30109-09.htm"; // fnClassList2
}
else if ((classId == ClassId.rogue) || (classId == ClassId.treasureHunter) || (classId == ClassId.hawkeye))
else if ((classId == ClassId.ROGUE) || (classId == ClassId.TREASURE_HUNTER) || (classId == ClassId.HAWKEYE))
{
htmltext = "30109-16.htm"; // fnClassList3
}
else if ((classId == ClassId.elvenKnight) || (classId == ClassId.templeKnight) || (classId == ClassId.swordSinger))
else if ((classId == ClassId.ELVEN_KNIGHT) || (classId == ClassId.TEMPLE_KNIGHT) || (classId == ClassId.SWORDSINGER))
{
htmltext = "30109-23.htm"; // fnClassList4
}
else if ((classId == ClassId.elvenScout) || (classId == ClassId.plainsWalker) || (classId == ClassId.silverRanger))
else if ((classId == ClassId.ELVEN_SCOUT) || (classId == ClassId.PLAINS_WALKER) || (classId == ClassId.SILVER_RANGER))
{
htmltext = "30109-30.htm"; // fnClassList5
}

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java vendored
View File

@ -166,7 +166,7 @@ public final class ElfHumanWizardChange1 extends AbstractNpcAI
{
htmltext = "30037-34.htm"; // fnYouAreFourthClass
}
else if ((classId == WIZARD) && (player.getClassId() == ClassId.mage))
else if ((classId == WIZARD) && (player.getClassId() == ClassId.MAGE))
{
if (player.getLevel() < 20)
{
@ -194,7 +194,7 @@ public final class ElfHumanWizardChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-21.htm"; // fnNoProof11
}
}
else if ((classId == CLERIC) && (player.getClassId() == ClassId.mage))
else if ((classId == CLERIC) && (player.getClassId() == ClassId.MAGE))
{
if (player.getLevel() < 20)
{
@ -222,7 +222,7 @@ public final class ElfHumanWizardChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-25.htm"; // fnNoProof12
}
}
else if ((classId == ELVEN_WIZARD) && (player.getClassId() == ClassId.elvenMage))
else if ((classId == ELVEN_WIZARD) && (player.getClassId() == ClassId.ELVEN_MAGE))
{
if (player.getLevel() < 20)
{
@ -250,7 +250,7 @@ public final class ElfHumanWizardChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-29.htm"; // fnNoProof21
}
}
else if ((classId == ORACLE) && (player.getClassId() == ClassId.elvenMage))
else if ((classId == ORACLE) && (player.getClassId() == ClassId.ELVEN_MAGE))
{
if (player.getLevel() < 20)
{

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java vendored
View File

@ -111,7 +111,7 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
{
htmltext = "30115-21.htm"; // fnYouAreThirdClass
}
else if ((classId == SORCERER) && (player.getClassId() == ClassId.wizard))
else if ((classId == SORCERER) && (player.getClassId() == ClassId.WIZARD))
{
if (player.getLevel() < 40)
{
@ -139,7 +139,7 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
htmltext = "30115-25.htm"; // fnNoProof11
}
}
else if ((classId == NECROMANCER) && (player.getClassId() == ClassId.wizard))
else if ((classId == NECROMANCER) && (player.getClassId() == ClassId.WIZARD))
{
if (player.getLevel() < 40)
{
@ -167,7 +167,7 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
htmltext = "30115-29.htm"; // fnNoProof12
}
}
else if ((classId == WARLOCK) && (player.getClassId() == ClassId.wizard))
else if ((classId == WARLOCK) && (player.getClassId() == ClassId.WIZARD))
{
if (player.getLevel() < 40)
{
@ -195,7 +195,7 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
htmltext = "30115-33.htm"; // fnNoProof13
}
}
else if ((classId == SPELLSINGER) && (player.getClassId() == ClassId.elvenWizard))
else if ((classId == SPELLSINGER) && (player.getClassId() == ClassId.ELVEN_WIZARD))
{
if (player.getLevel() < 40)
{
@ -223,7 +223,7 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
htmltext = "30115-37.htm"; // fnNoProof21
}
}
else if ((classId == ELEMENTAL_SUMMONER) && (player.getClassId() == ClassId.elvenWizard))
else if ((classId == ELEMENTAL_SUMMONER) && (player.getClassId() == ClassId.ELVEN_WIZARD))
{
if (player.getLevel() < 40)
{
@ -265,11 +265,11 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
else if (player.isInCategory(CategoryType.WIZARD_GROUP) && (player.isInCategory(CategoryType.HUMAN_MALL_CLASS) || player.isInCategory(CategoryType.ELF_MALL_CLASS)))
{
final ClassId classId = player.getClassId();
if ((classId == ClassId.wizard) || (classId == ClassId.sorceror) || (classId == ClassId.necromancer) || (classId == ClassId.warlock))
if ((classId == ClassId.WIZARD) || (classId == ClassId.SORCERER) || (classId == ClassId.NECROMANCER) || (classId == ClassId.WARLOCK))
{
htmltext = "30115-02.htm"; // fnClassList1
}
else if ((classId == ClassId.elvenWizard) || (classId == ClassId.spellsinger) || (classId == ClassId.elementalSummoner))
else if ((classId == ClassId.ELVEN_WIZARD) || (classId == ClassId.SPELLSINGER) || (classId == ClassId.ELEMENTAL_SUMMONER))
{
htmltext = "30115-12.htm"; // fnClassList2
}

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java vendored
View File

@ -101,7 +101,7 @@ public final class KamaelChange1 extends AbstractNpcAI
{
htmltext = "32191-12.htm"; // master_all_kamael100a
}
else if ((classId == 125) && (player.getClassId() == ClassId.maleSoldier))
else if ((classId == 125) && (player.getClassId() == ClassId.MALE_SOLDIER))
{
final QuestState qs = player.getQuestState(Q00062_PathOfTheTrooper.class.getSimpleName());
if (player.getLevel() < 20)
@ -130,7 +130,7 @@ public final class KamaelChange1 extends AbstractNpcAI
htmltext = "32191-16.htm"; // master_all_kamael011ma
}
}
else if ((classId == 126) && (player.getClassId() == ClassId.femaleSoldier))
else if ((classId == 126) && (player.getClassId() == ClassId.FEMALE_SOLDIER))
{
final QuestState qs = player.getQuestState(Q00063_PathOfTheWarder.class.getSimpleName());
if (player.getLevel() < 20)
@ -173,11 +173,11 @@ public final class KamaelChange1 extends AbstractNpcAI
}
else if (player.isInCategory(CategoryType.KAMAEL_FIRST_CLASS_GROUP))
{
if (player.getClassId() == ClassId.maleSoldier)
if (player.getClassId() == ClassId.MALE_SOLDIER)
{
htmltext = "32191-02.htm"; // master_all_kamael003m
}
else if (player.getClassId() == ClassId.femaleSoldier)
else if (player.getClassId() == ClassId.FEMALE_SOLDIER)
{
htmltext = "32191-06.htm"; // master_all_kamael003f
}

16
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java vendored
View File

@ -147,7 +147,7 @@ public final class KamaelChange2 extends AbstractNpcAI
htmltext = "32145-19.htm"; // master_all_kamael100c
}
}
else if (player.getClassId() == ClassId.trooper)
else if (player.getClassId() == ClassId.TROOPER)
{
if (Util.contains(NPCS_MALE, npc.getId()))
{
@ -215,7 +215,7 @@ public final class KamaelChange2 extends AbstractNpcAI
htmltext = "32145-10.htm"; // master_all_kamael002c
}
}
else if (player.getClassId() == ClassId.warder)
else if (player.getClassId() == ClassId.WARDER)
{
if (Util.contains(NPCS_MALE, npc.getId()))
{
@ -297,11 +297,11 @@ public final class KamaelChange2 extends AbstractNpcAI
}
else if (player.isInCategory(CategoryType.KAMAEL_FIRST_CLASS_GROUP))
{
if (player.getClassId() == ClassId.maleSoldier)
if (player.getClassId() == ClassId.MALE_SOLDIER)
{
htmltext = "32145-02.htm"; // master_all_kamael012b
}
else if (player.getClassId() == ClassId.femaleSoldier)
else if (player.getClassId() == ClassId.FEMALE_SOLDIER)
{
htmltext = "32145-03.htm"; // master_all_kamael012c
}
@ -316,11 +316,11 @@ public final class KamaelChange2 extends AbstractNpcAI
return htmltext;
}
if (player.getClassId() == ClassId.trooper)
if (player.getClassId() == ClassId.TROOPER)
{
htmltext = "32145-05.htm"; // master_all_kamael003t
}
else if (player.getClassId() == ClassId.warder)
else if (player.getClassId() == ClassId.WARDER)
{
htmltext = "32145-02.htm"; // master_all_kamael012b
}
@ -333,11 +333,11 @@ public final class KamaelChange2 extends AbstractNpcAI
return htmltext;
}
if (player.getClassId() == ClassId.trooper)
if (player.getClassId() == ClassId.TROOPER)
{
htmltext = "32145-03.htm"; // master_all_kamael012c
}
else if (player.getClassId() == ClassId.warder)
else if (player.getClassId() == ClassId.WARDER)
{
htmltext = "32145-11.htm"; // master_all_kamael003w
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java vendored
View File

@ -120,7 +120,7 @@ public final class OrcChange1 extends AbstractNpcAI
{
htmltext = "30500-24.htm"; // fnYouAreFourthClass
}
else if ((classId == 45) && (player.getClassId() == ClassId.orcFighter))
else if ((classId == 45) && (player.getClassId() == ClassId.ORC_FIGHTER))
{
if (player.getLevel() < 20)
{
@ -148,7 +148,7 @@ public final class OrcChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-13.htm"; // fnNoProof11
}
}
else if ((classId == 47) && (player.getClassId() == ClassId.orcFighter))
else if ((classId == 47) && (player.getClassId() == ClassId.ORC_FIGHTER))
{
if (player.getLevel() < 20)
{
@ -176,7 +176,7 @@ public final class OrcChange1 extends AbstractNpcAI
htmltext = npc.getId() + "-17.htm"; // fnNoProof12
}
}
else if ((classId == 50) && (player.getClassId() == ClassId.orcMage))
else if ((classId == 50) && (player.getClassId() == ClassId.ORC_MAGE))
{
if (player.getLevel() < 20)
{

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java vendored
View File

@ -107,7 +107,7 @@ public final class OrcChange2 extends AbstractNpcAI
{
htmltext = "30513-19.htm"; // fnYouAreThirdClass
}
else if ((classId == DESTROYER) && (player.getClassId() == ClassId.orcRaider))
else if ((classId == DESTROYER) && (player.getClassId() == ClassId.ORC_RAIDER))
{
if (player.getLevel() < 40)
{
@ -135,7 +135,7 @@ public final class OrcChange2 extends AbstractNpcAI
htmltext = "30513-23.htm"; // fnNoProof11
}
}
else if ((classId == TYRANT) && (player.getClassId() == ClassId.orcMonk))
else if ((classId == TYRANT) && (player.getClassId() == ClassId.ORC_MONK))
{
if (player.getLevel() < 40)
{
@ -163,7 +163,7 @@ public final class OrcChange2 extends AbstractNpcAI
htmltext = "30513-27.htm"; // fnNoProof21
}
}
else if ((classId == OVERLORD) && (player.getClassId() == ClassId.orcShaman))
else if ((classId == OVERLORD) && (player.getClassId() == ClassId.ORC_SHAMAN))
{
if (player.getLevel() < 40)
{
@ -191,7 +191,7 @@ public final class OrcChange2 extends AbstractNpcAI
htmltext = "30513-31.htm"; // fnNoProof31
}
}
else if ((classId == WARCRYER) && (player.getClassId() == ClassId.orcShaman))
else if ((classId == WARCRYER) && (player.getClassId() == ClassId.ORC_SHAMAN))
{
if (player.getLevel() < 40)
{
@ -233,15 +233,15 @@ public final class OrcChange2 extends AbstractNpcAI
else if (player.isInCategory(CategoryType.ORC_MALL_CLASS) || player.isInCategory(CategoryType.ORC_FALL_CLASS))
{
final ClassId classId = player.getClassId();
if ((classId == ClassId.orcRaider) || (classId == ClassId.destroyer))
if ((classId == ClassId.ORC_RAIDER) || (classId == ClassId.DESTROYER))
{
htmltext = "30513-02.htm"; // fnClassList1
}
else if ((classId == ClassId.orcMonk) || (classId == ClassId.tyrant))
else if ((classId == ClassId.ORC_MONK) || (classId == ClassId.TYRANT))
{
htmltext = "30513-06.htm"; // fnClassList2
}
else if ((classId == ClassId.orcShaman) || (classId == ClassId.overlord) || (classId == ClassId.warcryer))
else if ((classId == ClassId.ORC_SHAMAN) || (classId == ClassId.OVERLORD) || (classId == ClassId.WARCRYER))
{
htmltext = "30513-10.htm"; // fnClassList3
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java
View File

@ -274,7 +274,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
final StringBuilder menu = new StringBuilder(100);
for (ClassId cid : ClassId.values())
{
if ((cid == ClassId.inspector) && (player.getTotalSubClasses() < 2))
if ((cid == ClassId.INSPECTOR) && (player.getTotalSubClasses() < 2))
{
continue;
}
@ -330,7 +330,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
final StringBuilder menu = new StringBuilder(100);
for (ClassId cid : ClassId.values())
{
if ((cid == ClassId.inspector) && (player.getTotalSubClasses() < 2))
if ((cid == ClassId.INSPECTOR) && (player.getTotalSubClasses() < 2))
{
continue;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -2247,7 +2247,7 @@ public final class L2PcInstance extends L2Playable
try
{
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)
{

321
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/ClassId.java
View File

@ -16,6 +16,9 @@
*/
package com.l2jmobius.gameserver.model.base;
import java.util.HashSet;
import java.util.Set;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
@ -32,169 +35,160 @@ import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
*/
public enum ClassId implements IIdentifiable
{
fighter(0x00, false, Race.HUMAN, null),
FIGHTER(0, 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),
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(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, true, Race.HUMAN, wizard),
cleric(0x0f, true, Race.HUMAN, mage),
bishop(0x10, true, Race.HUMAN, cleric),
prophet(0x11, true, Race.HUMAN, cleric),
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),
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),
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),
elvenMage(0x19, true, Race.ELF, null),
elvenWizard(0x1a, true, Race.ELF, elvenMage),
spellsinger(0x1b, true, Race.ELF, elvenWizard),
elementalSummoner(0x1c, true, true, Race.ELF, elvenWizard),
oracle(0x1d, true, Race.ELF, elvenMage),
elder(0x1e, true, Race.ELF, oracle),
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),
darkFighter(0x1f, false, Race.DARK_ELF, null),
palusKnight(0x20, false, Race.DARK_ELF, darkFighter),
shillienKnight(0x21, false, Race.DARK_ELF, palusKnight),
bladedancer(0x22, false, Race.DARK_ELF, palusKnight),
assassin(0x23, false, Race.DARK_ELF, darkFighter),
abyssWalker(0x24, false, Race.DARK_ELF, assassin),
phantomRanger(0x25, false, Race.DARK_ELF, assassin),
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),
darkMage(0x26, true, Race.DARK_ELF, null),
darkWizard(0x27, true, Race.DARK_ELF, darkMage),
spellhowler(0x28, true, Race.DARK_ELF, darkWizard),
phantomSummoner(0x29, true, true, Race.DARK_ELF, darkWizard),
shillienOracle(0x2a, true, Race.DARK_ELF, darkMage),
shillenElder(0x2b, true, Race.DARK_ELF, shillienOracle),
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),
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),
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),
orcMage(0x31, false, Race.ORC, null),
orcShaman(0x32, true, Race.ORC, orcMage),
overlord(0x33, true, Race.ORC, orcShaman),
warcryer(0x34, true, Race.ORC, orcShaman),
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),
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),
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 Entries (id's already in decimal format) btw FU NCSoft for the amount of work you put me through to do this!! <START>
*/
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),
/*
* <END> Of Dummy entries
*/
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),
/*
* Now the bad boys! new class ids :)) (3rd classes)
*/
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, true, Race.HUMAN, warlock),
cardinal(0x61, true, Race.HUMAN, bishop),
hierophant(0x62, true, Race.HUMAN, prophet),
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),
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, true, Race.ELF, elementalSummoner),
evaSaint(0x69, true, Race.ELF, elder),
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),
shillienTemplar(0x6a, false, Race.DARK_ELF, shillienKnight),
spectralDancer(0x6b, false, Race.DARK_ELF, bladedancer),
ghostHunter(0x6c, false, Race.DARK_ELF, abyssWalker),
ghostSentinel(0x6d, false, Race.DARK_ELF, phantomRanger),
stormScreamer(0x6e, true, Race.DARK_ELF, spellhowler),
spectralMaster(0x6f, true, true, Race.DARK_ELF, phantomSummoner),
shillienSaint(0x70, true, Race.DARK_ELF, shillenElder),
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(0x71, false, Race.ORC, destroyer),
grandKhavatari(0x72, false, Race.ORC, tyrant),
dominator(0x73, true, Race.ORC, overlord),
doomcryer(0x74, true, Race.ORC, warcryer),
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),
fortuneSeeker(0x75, false, Race.DWARF, bountyHunter),
maestro(0x76, false, Race.DWARF, warsmith),
FORTUNE_SEEKER(117, false, Race.DWARF, BOUNTY_HUNTER),
MAESTRO(118, false, Race.DWARF, WARSMITH),
dummyEntry31(0x77, false, null, null),
dummyEntry32(0x78, false, null, null),
dummyEntry33(0x79, false, null, null),
dummyEntry34(0x7a, false, null, null),
DUMMY_ENTRY_31(119, false, null, null),
DUMMY_ENTRY_32(120, false, null, null),
DUMMY_ENTRY_33(121, false, null, null),
DUMMY_ENTRY_34(122, false, null, null),
maleSoldier(0x7b, false, Race.KAMAEL, null),
femaleSoldier(0x7C, false, Race.KAMAEL, null),
trooper(0x7D, false, Race.KAMAEL, maleSoldier),
warder(0x7E, false, Race.KAMAEL, femaleSoldier),
berserker(0x7F, false, Race.KAMAEL, trooper),
maleSoulbreaker(0x80, false, Race.KAMAEL, trooper),
femaleSoulbreaker(0x81, false, Race.KAMAEL, warder),
arbalester(0x82, false, Race.KAMAEL, warder),
doombringer(0x83, false, Race.KAMAEL, berserker),
maleSoulhound(0x84, false, Race.KAMAEL, maleSoulbreaker),
femaleSoulhound(0x85, false, Race.KAMAEL, femaleSoulbreaker),
trickster(0x86, false, Race.KAMAEL, arbalester),
inspector(0x87, false, Race.KAMAEL, warder), // DS: yes, both male/female inspectors use skills from warder
judicator(0x88, false, Race.KAMAEL, inspector);
MALE_SOLDIER(123, false, Race.KAMAEL, null),
FEMALE_SOLDIER(124, false, Race.KAMAEL, null),
TROOPER(125, false, Race.KAMAEL, MALE_SOLDIER),
WARDER(126, false, Race.KAMAEL, FEMALE_SOLDIER),
BERSERKER(127, false, Race.KAMAEL, TROOPER),
MALE_SOULBREAKER(128, false, Race.KAMAEL, TROOPER),
FEMALE_SOULBREAKER(129, false, Race.KAMAEL, WARDER),
ARBALESTER(130, false, Race.KAMAEL, WARDER),
DOOMBRINGER(131, false, Race.KAMAEL, BERSERKER),
MALE_SOUL_HOUND(132, false, Race.KAMAEL, MALE_SOULBREAKER),
FEMALE_SOUL_HOUND(133, false, Race.KAMAEL, FEMALE_SOULBREAKER),
TRICKSTER(134, false, Race.KAMAEL, ARBALESTER),
INSPECTOR(135, false, Race.KAMAEL, WARDER),
JUDICATOR(136, false, Race.KAMAEL, INSPECTOR);
/** The Identifier of the Class */
private final int _id;
@ -211,6 +205,9 @@ public enum ClassId implements IIdentifiable
/** 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<ClassId> _nextClassIds = new HashSet<>(1);
/**
* Class constructor.
* @param pId the class Id.
@ -225,6 +222,11 @@ public enum ClassId implements IIdentifiable
_isSummoner = false;
_race = race;
_parent = pParent;
if (_parent != null)
{
_parent.addNextClassId(this);
}
}
/**
@ -242,6 +244,11 @@ public enum ClassId implements IIdentifiable
_isSummoner = pIsSummoner;
_race = race;
_parent = pParent;
if (_parent != null)
{
_parent.addNextClassId(this);
}
}
/**
@ -327,6 +334,23 @@ public enum ClassId implements IIdentifiable
return _parent;
}
public final ClassId getRootClassId()
{
if (_parent != null)
{
return _parent.getRootClassId();
}
return this;
}
/**
* @return list of possible class transfer for this class
*/
public Set<ClassId> getNextClassIds()
{
return _nextClassIds;
}
public static ClassId getClassId(int cId)
{
try
@ -338,4 +362,9 @@ public enum ClassId implements IIdentifiable
return null;
}
}
private final void addNextClassId(ClassId cId)
{
_nextClassIds.add(cId);
}
}

19
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/ClassInfo.java
View File

@ -30,9 +30,9 @@ public final class ClassInfo
/**
* Constructor for ClassInfo.
* @param classId the class ID
* @param className the in game class name
* @param parentClassId the parent class for the given {@code classId}
* @param classId the class Id.
* @param className the in game class name.
* @param parentClassId the parent class for the given {@code classId}.
*/
public ClassInfo(ClassId classId, String className, ClassId parentClassId)
{
@ -42,7 +42,7 @@ public final class ClassInfo
}
/**
* @return the class ID
* @return the class Id.
*/
public ClassId getClassId()
{
@ -50,7 +50,7 @@ public final class ClassInfo
}
/**
* @return the hardcoded in-game class name
* @return the hardcoded in-game class name.
*/
public String getClassName()
{
@ -58,7 +58,7 @@ public final class ClassInfo
}
/**
* @return the class client ID
* @return the class client Id.
*/
private int getClassClientId()
{
@ -75,11 +75,12 @@ public final class ClassInfo
{
classClientId += 1438;
}
return classClientId;
}
/**
* @return the class client ID formatted to be displayed on a HTML.
* @return the class client Id formatted to be displayed on a HTML.
*/
public String getClientCode()
{
@ -87,7 +88,7 @@ public final class ClassInfo
}
/**
* @return the escaped class client ID formatted to be displayed on a HTML
* @return the escaped class client Id formatted to be displayed on a HTML.
*/
public String getEscapedClientCode()
{
@ -95,7 +96,7 @@ public final class ClassInfo
}
/**
* @return the parent class ID
* @return the parent class Id.
*/
public ClassId getParentClassId()
{

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/ClassLevel.java
View File

@ -22,8 +22,8 @@ package com.l2jmobius.gameserver.model.base;
*/
public enum ClassLevel
{
First,
Second,
Third,
Fourth
FIRST,
SECOND,
THIRD,
FOURTH
}

226
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java
View File

@ -16,10 +16,10 @@
*/
package com.l2jmobius.gameserver.model.base;
import static com.l2jmobius.gameserver.model.base.ClassLevel.First;
import static com.l2jmobius.gameserver.model.base.ClassLevel.Fourth;
import static com.l2jmobius.gameserver.model.base.ClassLevel.Second;
import static com.l2jmobius.gameserver.model.base.ClassLevel.Third;
import static com.l2jmobius.gameserver.model.base.ClassLevel.FIRST;
import static com.l2jmobius.gameserver.model.base.ClassLevel.FOURTH;
import static com.l2jmobius.gameserver.model.base.ClassLevel.SECOND;
import static com.l2jmobius.gameserver.model.base.ClassLevel.THIRD;
import static com.l2jmobius.gameserver.model.base.ClassType.Fighter;
import static com.l2jmobius.gameserver.model.base.ClassType.Mystic;
import static com.l2jmobius.gameserver.model.base.ClassType.Priest;
@ -37,68 +37,68 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public enum PlayerClass
{
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),
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(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),
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(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),
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(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),
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(Race.DWARF, Fighter, First),
DwarvenScavenger(Race.DWARF, Fighter, Second),
BountyHunter(Race.DWARF, Fighter, Third),
DwarvenArtisan(Race.DWARF, Fighter, Second),
Warsmith(Race.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),
@ -133,61 +133,61 @@ public enum PlayerClass
/*
* (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(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),
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(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),
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(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),
titan(Race.ORC, Fighter, Fourth),
grandKhavatari(Race.ORC, Fighter, Fourth),
dominator(Race.ORC, Mystic, Fourth),
doomcryer(Race.ORC, Mystic, Fourth),
titan(Race.ORC, Fighter, FOURTH),
grandKhavatari(Race.ORC, Fighter, FOURTH),
dominator(Race.ORC, Mystic, FOURTH),
doomcryer(Race.ORC, Mystic, FOURTH),
fortuneSeeker(Race.DWARF, Fighter, Fourth),
maestro(Race.DWARF, Fighter, Fourth),
fortuneSeeker(Race.DWARF, Fighter, FOURTH),
maestro(Race.DWARF, Fighter, FOURTH),
dummyEntry31(null, null, null),
dummyEntry32(null, null, null),
dummyEntry33(null, null, null),
dummyEntry34(null, null, null),
maleSoldier(Race.KAMAEL, Fighter, First),
femaleSoldier(Race.KAMAEL, Fighter, First),
trooper(Race.KAMAEL, Fighter, Second),
warder(Race.KAMAEL, Fighter, Second),
berserker(Race.KAMAEL, Fighter, Third),
maleSoulbreaker(Race.KAMAEL, Fighter, Third),
femaleSoulbreaker(Race.KAMAEL, Fighter, Third),
arbalester(Race.KAMAEL, Fighter, Third),
doombringer(Race.KAMAEL, Fighter, Fourth),
maleSoulhound(Race.KAMAEL, Fighter, Fourth),
femaleSoulhound(Race.KAMAEL, Fighter, Fourth),
trickster(Race.KAMAEL, Fighter, Fourth),
inspector(Race.KAMAEL, Fighter, Third),
judicator(Race.KAMAEL, Fighter, Fourth);
maleSoldier(Race.KAMAEL, Fighter, FIRST),
femaleSoldier(Race.KAMAEL, Fighter, FIRST),
trooper(Race.KAMAEL, Fighter, SECOND),
warder(Race.KAMAEL, Fighter, SECOND),
berserker(Race.KAMAEL, Fighter, THIRD),
maleSoulbreaker(Race.KAMAEL, Fighter, THIRD),
femaleSoulbreaker(Race.KAMAEL, Fighter, THIRD),
arbalester(Race.KAMAEL, Fighter, THIRD),
doombringer(Race.KAMAEL, Fighter, FOURTH),
maleSoulhound(Race.KAMAEL, Fighter, FOURTH),
femaleSoulhound(Race.KAMAEL, Fighter, FOURTH),
trickster(Race.KAMAEL, Fighter, FOURTH),
inspector(Race.KAMAEL, Fighter, THIRD),
judicator(Race.KAMAEL, Fighter, FOURTH);
private Race _race;
private ClassLevel _level;
@ -206,7 +206,7 @@ public enum PlayerClass
static
{
final Set<PlayerClass> subclasses = getSet(null, Third);
final Set<PlayerClass> subclasses = getSet(null, THIRD);
subclasses.removeAll(neverSubclassed);
mainSubclassSet = subclasses;
@ -244,7 +244,7 @@ public enum PlayerClass
{
Set<PlayerClass> subclasses = null;
if (_level == Third)
if (_level == THIRD)
{
if (player.getRace() != Race.KAMAEL)
{
@ -256,17 +256,17 @@ public enum PlayerClass
{
case ELF:
{
subclasses.removeAll(getSet(Race.DARK_ELF, Third));
subclasses.removeAll(getSet(Race.DARK_ELF, THIRD));
break;
}
case DARK_ELF:
{
subclasses.removeAll(getSet(Race.ELF, Third));
subclasses.removeAll(getSet(Race.ELF, THIRD));
break;
}
}
subclasses.removeAll(getSet(Race.KAMAEL, Third));
subclasses.removeAll(getSet(Race.KAMAEL, THIRD));
final Set<PlayerClass> unavailableClasses = subclassSetMap.get(this);
@ -278,7 +278,7 @@ public enum PlayerClass
}
else
{
subclasses = getSet(Race.KAMAEL, Third);
subclasses = getSet(Race.KAMAEL, THIRD);
subclasses.remove(this);
// Check sex, male subclasses female and vice versa
// If server owner set MaxSubclass > 3 some kamael's cannot take 4 sub

22
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
View File

@ -37,17 +37,17 @@ public final class NewCharacter implements IClientIncomingPacket
public void run(L2GameClient client)
{
final NewCharacterSuccess ct = new NewCharacterSuccess();
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.fighter)); // Human Figther
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.mage)); // Human Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.elvenFighter)); // Elven Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.elvenMage)); // Elven Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.darkFighter)); // Dark Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.darkMage)); // Dark Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.orcFighter)); // Orc Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.orcMage)); // Orc Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.dwarvenFighter)); // Dwarf Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.maleSoldier)); // Male Kamael Soldier
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.femaleSoldier)); // Female Kamael Soldier
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.FIGHTER)); // Human Figther
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.MAGE)); // Human Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ELVEN_FIGHTER)); // Elven Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ELVEN_MAGE)); // Elven Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.DARK_FIGHTER)); // Dark Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.DARK_MAGE)); // Dark Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ORC_FIGHTER)); // Orc Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.ORC_MAGE)); // Orc Mystic
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.DWARVEN_FIGHTER)); // Dwarf Fighter
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.MALE_SOLDIER)); // Male Kamael Soldier
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.FEMALE_SOLDIER)); // Female Kamael Soldier
client.sendPacket(ct);
}
}