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
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
}