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

Updated category data XML file.

Browse Source 
Adapted from: L2jUnity free files.
This commit is contained in:
MobiusDev
2017-11-20 23:01:06 +00:00
parent fa13672236
commit 5d75ddc762
280 changed files with 31341 additions and 13865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -68,17 +68,16 @@ public final class AwakeningMaster extends AbstractNpcAI
private static final int CHAOS_POMANDER = 37374;
private static final int CHAOS_POMANDER_DUAL_CLASS = 37375;
private static final Map<CategoryType, Integer> AWAKE_POWER = new HashMap<>();
static
{
AWAKE_POWER.put(CategoryType.SIGEL_GROUP, 32264);
AWAKE_POWER.put(CategoryType.TYRR_GROUP, 32265);
AWAKE_POWER.put(CategoryType.OTHELL_GROUP, 32266);
AWAKE_POWER.put(CategoryType.YUL_GROUP, 32267);
AWAKE_POWER.put(CategoryType.FEOH_GROUP, 32268);
AWAKE_POWER.put(CategoryType.ISS_GROUP, 32269);
AWAKE_POWER.put(CategoryType.WYNN_GROUP, 32270);
AWAKE_POWER.put(CategoryType.AEORE_GROUP, 32271);
AWAKE_POWER.put(CategoryType.SIXTH_SIGEL_GROUP, 32264);
AWAKE_POWER.put(CategoryType.SIXTH_TIR_GROUP, 32265);
AWAKE_POWER.put(CategoryType.SIXTH_OTHEL_GROUP, 32266);
AWAKE_POWER.put(CategoryType.SIXTH_YR_GROUP, 32267);
AWAKE_POWER.put(CategoryType.SIXTH_FEOH_GROUP, 32268);
AWAKE_POWER.put(CategoryType.SIXTH_WYNN_GROUP, 32269);
AWAKE_POWER.put(CategoryType.SIXTH_IS_GROUP, 32270);
AWAKE_POWER.put(CategoryType.SIXTH_EOLH_GROUP, 32271);
}
// Skills
@@ -117,7 +116,7 @@ public final class AwakeningMaster extends AbstractNpcAI
{
case SIGEL_MASTER:
{
if (!player.isInCategory(CategoryType.SIGEL_CANDIDATE))
if (!player.isInCategory(CategoryType.TANKER_CATEGORY))
{
return SIGEL_MASTER + "-no_class.htm";
}
@@ -125,7 +124,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case TYRR_MASTER:
{
if (!player.isInCategory(CategoryType.TYRR_CANDIDATE))
if (!player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
return TYRR_MASTER + "-no_class.htm";
}
@@ -133,7 +132,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case OTHELL_MASTER:
{
if (!player.isInCategory(CategoryType.OTHELL_CANDIDATE))
if (!player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
return OTHELL_MASTER + "-no_class.htm";
}
@@ -141,7 +140,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case YUL_MASTER:
{
if (!player.isInCategory(CategoryType.YUL_CANDIDATE))
if (!player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
return YUL_MASTER + "-no_class.htm";
}
@@ -149,7 +148,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case FEOH_MASTER:
{
if (!player.isInCategory(CategoryType.FEOH_CANDIDATE))
if (!player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
return FEOH_MASTER + "-no_class.htm";
}
@@ -157,7 +156,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case ISS_MASTER:
{
if (!player.isInCategory(CategoryType.ISS_CANDIDATE))
if (!player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
return ISS_MASTER + "-no_class.htm";
}
@@ -165,7 +164,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case WYNN_MASTER:
{
if (!player.isInCategory(CategoryType.WYNN_CANDIDATE))
if (!player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
return WYNN_MASTER + "-no_class.htm";
}
@@ -173,7 +172,7 @@ public final class AwakeningMaster extends AbstractNpcAI
}
case AEORE_MASTER:
{
if (!player.isInCategory(CategoryType.AEORE_CANDIDATE))
if (!player.isInCategory(CategoryType.HEALER_CATEGORY))
{
return AEORE_MASTER + "-no_class.htm";
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java vendored
View File

@@ -62,7 +62,7 @@ public final class Hadel extends AbstractNpcAI
}
case "teleportToHarnak":
{
if ((!player.isInCategory(CategoryType.AWAKEN_GROUP)) || (player.getLevel() < 85))
if ((!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) || (player.getLevel() < 85))
{
htmltext = "33344-noClass.html";
break;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@@ -183,7 +183,7 @@ public final class Hardin extends AbstractNpcAI
return "33870-02.html";
}
}
if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
return "33870-no.html";
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java vendored
View File

@@ -78,7 +78,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
case "LearnRevelationSkills":
{
if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP))
if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "no-learn.html";
break;
@@ -139,7 +139,7 @@ public final class MonkOfChaos extends AbstractNpcAI
}
}
if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || (count == 0))
if ((player.getLevel() < MIN_LEVEL) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || (count == 0))
{
htmltext = "no-cancel.html";
break;

66
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@@ -111,14 +111,14 @@ public final class Raina extends AbstractNpcAI
private static final Map<CategoryType, Integer> classCloak = new HashMap<>();
{
classCloak.put(CategoryType.SIGEL_GROUP, 30310); // Abelius Cloak
classCloak.put(CategoryType.TYRR_GROUP, 30311); // Sapyros Cloak Grade
classCloak.put(CategoryType.OTHELL_GROUP, 30312); // Ashagen Cloak Grade
classCloak.put(CategoryType.YUL_GROUP, 30313); // Cranigg Cloak Grade
classCloak.put(CategoryType.FEOH_GROUP, 30314); // Soltkreig Cloak Grade
classCloak.put(CategoryType.WYNN_GROUP, 30315); // Naviarope Cloak Grade
classCloak.put(CategoryType.ISS_GROUP, 30316); // Leister Cloak Grade
classCloak.put(CategoryType.AEORE_GROUP, 30317); // Laksis Cloak Grade
classCloak.put(CategoryType.SIXTH_SIGEL_GROUP, 30310); // Abelius Cloak
classCloak.put(CategoryType.SIXTH_TIR_GROUP, 30311); // Sapyros Cloak Grade
classCloak.put(CategoryType.SIXTH_OTHEL_GROUP, 30312); // Ashagen Cloak Grade
classCloak.put(CategoryType.SIXTH_YR_GROUP, 30313); // Cranigg Cloak Grade
classCloak.put(CategoryType.SIXTH_FEOH_GROUP, 30314); // Soltkreig Cloak Grade
classCloak.put(CategoryType.SIXTH_WYNN_GROUP, 30315); // Naviarope Cloak Grade
classCloak.put(CategoryType.SIXTH_IS_GROUP, 30316); // Leister Cloak Grade
classCloak.put(CategoryType.SIXTH_EOLH_GROUP, 30317); // Laksis Cloak Grade
}
private static final List<PlayerClass> dualClassList = new ArrayList<>();
@@ -290,7 +290,7 @@ public final class Raina extends AbstractNpcAI
case "ertheiaDualClass":
{
// TODO: Maybe html is different when you have 85lvl but you haven't completed quest
if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
}
@@ -309,7 +309,7 @@ public final class Raina extends AbstractNpcAI
case "addDualClass_WYNN_GROUP":
case "addDualClass_AEORE_GROUP":
{
if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.AWAKEN_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";
break;
@@ -659,31 +659,31 @@ public final class Raina extends AbstractNpcAI
private void addPowerItem(L2PcInstance player)
{
int itemId = ABELIUS_POWER; // Sigel
if (player.isInCategory(CategoryType.TYRR_GROUP))
if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
itemId = SAPYROS_POWER;
}
else if (player.isInCategory(CategoryType.OTHELL_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
itemId = ASHAGEN_POWER;
}
else if (player.isInCategory(CategoryType.YUL_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
itemId = CRANIGG_POWER;
}
else if (player.isInCategory(CategoryType.FEOH_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
itemId = SOLTKREIG_POWER;
}
else if (player.isInCategory(CategoryType.WYNN_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
itemId = NAVIAROPE_POWER;
}
else if (player.isInCategory(CategoryType.ISS_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
itemId = LEISTER_POWER;
}
else if (player.isInCategory(CategoryType.AEORE_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
itemId = LAKCIS_POWER;
}
@@ -905,37 +905,37 @@ public final class Raina extends AbstractNpcAI
{
CategoryType catType = null;
if (player.isInCategory(CategoryType.SIGEL_GROUP))
if (player.isInCategory(CategoryType.SIXTH_SIGEL_GROUP))
{
catType = CategoryType.SIGEL_GROUP;
catType = CategoryType.SIXTH_SIGEL_GROUP;
}
else if (player.isInCategory(CategoryType.TYRR_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
catType = CategoryType.TYRR_GROUP;
catType = CategoryType.SIXTH_TIR_GROUP;
}
else if (player.isInCategory(CategoryType.OTHELL_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
catType = CategoryType.OTHELL_GROUP;
catType = CategoryType.SIXTH_OTHEL_GROUP;
}
else if (player.isInCategory(CategoryType.YUL_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
catType = CategoryType.YUL_GROUP;
catType = CategoryType.SIXTH_YR_GROUP;
}
else if (player.isInCategory(CategoryType.FEOH_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_FEOH_GROUP))
{
catType = CategoryType.FEOH_GROUP;
catType = CategoryType.SIXTH_FEOH_GROUP;
}
else if (player.isInCategory(CategoryType.ISS_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
catType = CategoryType.ISS_GROUP;
catType = CategoryType.SIXTH_IS_GROUP;
}
else if (player.isInCategory(CategoryType.WYNN_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
catType = CategoryType.WYNN_GROUP;
catType = CategoryType.SIXTH_WYNN_GROUP;
}
else if (player.isInCategory(CategoryType.AEORE_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
catType = CategoryType.AEORE_GROUP;
catType = CategoryType.SIXTH_EOLH_GROUP;
}
return classCloak.get(catType);
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java vendored
View File

@@ -152,7 +152,7 @@ public final class KimerianCommon extends AbstractInstance
{
if (hasQuestItems(player, FLUTE))
{
if (player.isInCategory(CategoryType.AEORE_GROUP))
if (player.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
addSpawn(FAIRY_REBEL, player.getX() + 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());
addSpawn(FAIRY_REBEL, player.getX() - 60, player.getY(), player.getZ(), 0, false, 0, false, instance.getId());

7
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java vendored
View File

@@ -53,6 +53,9 @@ public final class AdventurersGuide extends AbstractNpcAI
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
};
// Misc
private static int MAX_LEVEL_BUFFS = 90;
private static int MIN_LEVEL_PROTECTION = 40;
private AdventurersGuide()
{
@@ -115,7 +118,7 @@ public final class AdventurersGuide extends AbstractNpcAI
private String applyBuffs(L2Npc npc, L2PcInstance player, Skill skill)
{
if (player.getLevel() > 90)
if (player.getLevel() > MAX_LEVEL_BUFFS)
{
return "guide-noBuffs.html";
}
@@ -126,7 +129,7 @@ public final class AdventurersGuide extends AbstractNpcAI
}
SkillCaster.triggerCast(npc, player, skill);
if ((player.getLevel() < 40) && (player.getClassId().level() <= 1))
if ((player.getLevel() < MIN_LEVEL_PROTECTION) && (player.getClassId().level() <= 1))
{
SkillCaster.triggerCast(npc, player, BLESS_PROTECTION.getSkill());
}

18
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java vendored
View File

@@ -121,14 +121,14 @@ public final class CastleCourtMagician extends AbstractNpcAI
// Misc
private static final CategoryType[] AWAKENED_CT =
{
CategoryType.SIGEL_GROUP,
CategoryType.TYRR_GROUP,
CategoryType.OTHELL_GROUP,
CategoryType.YUL_GROUP,
CategoryType.FEOH_GROUP,
CategoryType.ISS_GROUP,
CategoryType.WYNN_GROUP,
CategoryType.AEORE_GROUP,
CategoryType.SIXTH_SIGEL_GROUP,
CategoryType.SIXTH_TIR_GROUP,
CategoryType.SIXTH_OTHEL_GROUP,
CategoryType.SIXTH_YR_GROUP,
CategoryType.SIXTH_FEOH_GROUP,
CategoryType.SIXTH_IS_GROUP,
CategoryType.SIXTH_WYNN_GROUP,
CategoryType.SIXTH_EOLH_GROUP,
};
private CastleCourtMagician()
@@ -266,7 +266,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
}
case "giveTalismanR":
{
htmltext = player.isInCategory(CategoryType.AWAKEN_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
htmltext = player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "courtmagician-09.html" : "courtmagician-10.html";
break;
}
case "giveTalismanR_classSpecific":

16
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@@ -297,7 +297,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -319,7 +319,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
htmltext = "test_server_helper021.html";
}
}
else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -352,7 +352,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (player.getLevel() >= 85)) // 9
{
canChange = CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, classId); // 11
canChange = CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId); // 11
}
if (canChange)
@@ -422,7 +422,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
if (player.isInCategory(CategoryType.AWAKEN_GROUP))
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
@@ -450,7 +450,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
case "learnskills":
{
// Retail class master only lets you learn all third class skills.
if (player.isInCategory(CategoryType.AWAKEN_GROUP))
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper001_failed.html";
}
@@ -578,7 +578,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -762,7 +762,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
htmltext = "test_server_helper011.html";
}
else if (player.isInCategory(CategoryType.AWAKEN_GROUP))
else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "test_server_helper011a.html";
}
@@ -853,7 +853,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
if (player.isInCategory(CategoryType.AWAKEN_GROUP))
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java vendored
View File

@@ -97,7 +97,7 @@ public final class HermuncusMinion extends AbstractNpcAI
if (event.equals("teleportList"))
{
if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "HermuncusMinion-no.html";
}
@@ -155,7 +155,7 @@ public final class HermuncusMinion extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
return player.isInCategory(CategoryType.AWAKEN_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
return player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) ? "HermuncusMinion.html" : "HermuncusMinion-no.html";
}
private String generateButton(Integer locationId)

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -369,7 +369,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMenteeSkills(player);
if (player.isInCategory(CategoryType.AWAKEN_GROUP))
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
handleGraduateMentee(player);
}

19
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -57,16 +57,15 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
private static final int MANAGER = 31688;
// Misc
private static final Map<CategoryType, Integer> EQUIPMENT_MULTISELL = new HashMap<>();
{
EQUIPMENT_MULTISELL.put(CategoryType.SIGEL_GROUP, 917);
EQUIPMENT_MULTISELL.put(CategoryType.TYRR_GROUP, 918);
EQUIPMENT_MULTISELL.put(CategoryType.OTHELL_GROUP, 919);
EQUIPMENT_MULTISELL.put(CategoryType.YUL_GROUP, 920);
EQUIPMENT_MULTISELL.put(CategoryType.FEOH_GROUP, 921);
EQUIPMENT_MULTISELL.put(CategoryType.ISS_GROUP, 923);
EQUIPMENT_MULTISELL.put(CategoryType.WYNN_GROUP, 922);
EQUIPMENT_MULTISELL.put(CategoryType.AEORE_GROUP, 924);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_SIGEL_GROUP, 917);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_TIR_GROUP, 918);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_OTHEL_GROUP, 919);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_YR_GROUP, 920);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_FEOH_GROUP, 921);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_IS_GROUP, 923);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_WYNN_GROUP, 922);
EQUIPMENT_MULTISELL.put(CategoryType.SIXTH_EOLH_GROUP, 924);
}
private static final String[] BYPASSES =
@@ -144,7 +143,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-subclass.html";
}
else if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
else if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
htmltext = "OlyManager-awaken.html";
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -416,7 +416,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
if (player.isInCategory(CategoryType.AWAKEN_GROUP))
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java vendored
View File

@@ -114,7 +114,7 @@ public final class AirBind extends AbstractEffect
for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200))
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) //
&& nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
&& nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -173,7 +173,7 @@ public final class KnockBack extends AbstractEffect
{
continue;
}
if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive())
if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = _chainKnockSkills.get(nearbyPlayer.getClassId());
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)

17
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java vendored
View File

@@ -79,17 +79,16 @@ public final class HarnakUndergroundRuins extends AbstractInstance
private static final int DOOR_ONE = 16240100;
private static final int DOOR_TWO = 16240102;
private static final Map<CategoryType, Integer> MOB_CATEGORY = new HashMap<>();
static
{
MOB_CATEGORY.put(CategoryType.SIGEL_CANDIDATE, RAKZAN);
MOB_CATEGORY.put(CategoryType.TYRR_CANDIDATE, KRAKIA_BATHUS);
MOB_CATEGORY.put(CategoryType.OTHELL_CANDIDATE, BAMONTI);
MOB_CATEGORY.put(CategoryType.YUL_CANDIDATE, KRAKIA_CARCASS);
MOB_CATEGORY.put(CategoryType.FEOH_CANDIDATE, WEISS_KHAN);
MOB_CATEGORY.put(CategoryType.ISS_CANDIDATE, SEKNUS);
MOB_CATEGORY.put(CategoryType.WYNN_CANDIDATE, KRAKIA_LOTUS);
MOB_CATEGORY.put(CategoryType.AEORE_CANDIDATE, WEISS_ELE);
MOB_CATEGORY.put(CategoryType.SIXTH_SIGEL_GROUP, RAKZAN);
MOB_CATEGORY.put(CategoryType.SIXTH_TIR_GROUP, KRAKIA_BATHUS);
MOB_CATEGORY.put(CategoryType.SIXTH_OTHEL_GROUP, BAMONTI);
MOB_CATEGORY.put(CategoryType.SIXTH_YR_GROUP, KRAKIA_CARCASS);
MOB_CATEGORY.put(CategoryType.SIXTH_FEOH_GROUP, WEISS_KHAN);
MOB_CATEGORY.put(CategoryType.SIXTH_IS_GROUP, SEKNUS);
MOB_CATEGORY.put(CategoryType.SIXTH_WYNN_GROUP, KRAKIA_LOTUS);
MOB_CATEGORY.put(CategoryType.SIXTH_EOLH_GROUP, WEISS_ELE);
}
public HarnakUndergroundRuins()

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java vendored
View File

@@ -363,27 +363,27 @@ public final class Nursery extends AbstractInstance
{
int pointsCount = getRandom(6) + 3;
if (killer.isInCategory(CategoryType.SIGEL_GROUP) || killer.isInCategory(CategoryType.AEORE_GROUP))
if (killer.isInCategory(CategoryType.SIXTH_SIGEL_GROUP) || killer.isInCategory(CategoryType.SIXTH_EOLH_GROUP))
{
pointsCount += 6;
}
else if (killer.isInCategory(CategoryType.TYRR_GROUP))
else if (killer.isInCategory(CategoryType.SIXTH_TIR_GROUP))
{
pointsCount -= 1;
}
else if (killer.isInCategory(CategoryType.OTHELL_GROUP))
else if (killer.isInCategory(CategoryType.SIXTH_OTHEL_GROUP))
{
pointsCount += 2;
}
else if (killer.isInCategory(CategoryType.YUL_GROUP))
else if (killer.isInCategory(CategoryType.SIXTH_YR_GROUP))
{
pointsCount += 1;
}
else if (killer.isInCategory(CategoryType.FEOH_GROUP) || killer.isInCategory(CategoryType.ISS_GROUP))
else if (killer.isInCategory(CategoryType.SIXTH_FEOH_GROUP) || killer.isInCategory(CategoryType.SIXTH_IS_GROUP))
{
pointsCount += 0;
}
else if (killer.isInCategory(CategoryType.WYNN_GROUP))
else if (killer.isInCategory(CategoryType.SIXTH_WYNN_GROUP))
{
pointsCount += 3;
}

18
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java vendored
View File

@@ -239,39 +239,39 @@ public final class Q00177_SplitDestiny extends Quest
{
htmltext = "33344-02.htm";
}
else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClass()))
else if (!CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, player.getBaseClass()))
{
htmltext = "33344-03.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_SIGEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TANKER_CATEGORY))
{
htmltext = "33344-sigel.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_TIR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WARRIOR_CATEGORY))
{
htmltext = "33344-tyrr.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ROGUE_CATEGORY))
{
htmltext = "33344-othell.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ARCHER_CATEGORY))
{
htmltext = "33344-yul.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WIZARD_CATEGORY))
{
htmltext = "33344-feoh.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.ENCHANTER_CATEGORY))
{
htmltext = "33344-iss.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.SUMMONER_CATEGORY))
{
htmltext = "33344-wynn.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, player.getBaseClass()) && player.isInCategory(CategoryType.HEALER_CATEGORY))
{
htmltext = "33344-aeore.htm";
}

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java vendored
View File

@@ -91,7 +91,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case "33477-03.html":
{
if (!player.isInCategory(CategoryType.AWAKEN_GROUP))
if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
qs.setSimulated(false);
qs.setState(State.CREATED);
@@ -149,7 +149,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
{
htmltext = "33477-06.html";
}
else if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
else if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33477-05.html";
}
@@ -167,7 +167,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
}
case HADEL:
{
if (player.isInCategory(CategoryType.AWAKEN_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || hasQuestItems(player, SCROLL_OF_AFTERLIFE.getId()))
{
htmltext = "33344-07.html";
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java vendored
View File

@@ -62,7 +62,7 @@ public final class Q10339_FightingTheForgotten extends Quest
addTalkId(THEODORE, HADEL);
addKillId(MONSTERS);
addCondMinLevel(MIN_LV, "32975-06.html");
addCondInCategory(CategoryType.AWAKEN_GROUP, "32975-06.html");
addCondInCategory(CategoryType.SIXTH_CLASS_GROUP, "32975-06.html");
}
@Override