Minor format changes for previous commit.
This commit is contained in:
@@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setFemale();
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
if (player.isDualClassActive())
|
if (player.isDualClassActive())
|
||||||
@@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setBaseClass(player.getActiveClass());
|
player.setBaseClass(player.getActiveClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjustments
|
// Adjustments
|
||||||
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
||||||
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
||||||
|
@@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setFemale();
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
if (player.isDualClassActive())
|
if (player.isDualClassActive())
|
||||||
@@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setBaseClass(player.getActiveClass());
|
player.setBaseClass(player.getActiveClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjustments
|
// Adjustments
|
||||||
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
||||||
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
||||||
|
@@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setFemale();
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
if (player.isDualClassActive())
|
if (player.isDualClassActive())
|
||||||
@@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setBaseClass(player.getActiveClass());
|
player.setBaseClass(player.getActiveClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjustments
|
// Adjustments
|
||||||
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
||||||
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
||||||
|
@@ -286,14 +286,17 @@ public class Eraton extends AbstractNpcAI
|
|||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_WHEN_YOU_ARE_A_HERO_OR_ON_THE_WAIT_LIST_FOR_HERO_STATUS);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_WHEN_YOU_ARE_A_HERO_OR_ON_THE_WAIT_LIST_FOR_HERO_STATUS);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: SET 1000 points for Olympiad after change main class.
|
// TODO: SET 1000 points for Olympiad after change main class.
|
||||||
|
|
||||||
if (player.getOriginalClass() == null)
|
if (player.getOriginalClass() == null)
|
||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
takeItem(player, STONE_OF_DESTINY);
|
takeItem(player, STONE_OF_DESTINY);
|
||||||
takeItem(player, getCloakItemId(player));
|
takeItem(player, getCloakItemId(player));
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -334,6 +337,7 @@ public class Eraton extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
player.abortCast();
|
player.abortCast();
|
||||||
player.stopAllEffectsExceptThoseThatLastThroughDeath();
|
player.stopAllEffectsExceptThoseThatLastThroughDeath();
|
||||||
player.stopAllEffects();
|
player.stopAllEffects();
|
||||||
|
@@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setFemale();
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
if (player.isDualClassActive())
|
if (player.isDualClassActive())
|
||||||
@@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setBaseClass(player.getActiveClass());
|
player.setBaseClass(player.getActiveClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjustments
|
// Adjustments
|
||||||
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
||||||
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
||||||
|
@@ -291,14 +291,17 @@ public class Eraton extends AbstractNpcAI
|
|||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_WHEN_YOU_ARE_A_HERO_OR_ON_THE_WAIT_LIST_FOR_HERO_STATUS);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_WHEN_YOU_ARE_A_HERO_OR_ON_THE_WAIT_LIST_FOR_HERO_STATUS);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: SET 1000 points for Olympiad after change main class.
|
// TODO: SET 1000 points for Olympiad after change main class.
|
||||||
|
|
||||||
if (player.getOriginalClass() == null)
|
if (player.getOriginalClass() == null)
|
||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
takeItem(player, STONE_OF_DESTINY);
|
takeItem(player, STONE_OF_DESTINY);
|
||||||
takeItem(player, getCloakItemId(player));
|
takeItem(player, getCloakItemId(player));
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -339,6 +342,7 @@ public class Eraton extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
player.abortCast();
|
player.abortCast();
|
||||||
player.stopAllEffectsExceptThoseThatLastThroughDeath();
|
player.stopAllEffectsExceptThoseThatLastThroughDeath();
|
||||||
player.stopAllEffects();
|
player.stopAllEffects();
|
||||||
|
@@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setFemale();
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
if (player.isDualClassActive())
|
if (player.isDualClassActive())
|
||||||
@@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
player.setBaseClass(player.getActiveClass());
|
player.setBaseClass(player.getActiveClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjustments
|
// Adjustments
|
||||||
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
|
||||||
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
|
||||||
|
@@ -291,14 +291,17 @@ public class Eraton extends AbstractNpcAI
|
|||||||
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_WHEN_YOU_ARE_A_HERO_OR_ON_THE_WAIT_LIST_FOR_HERO_STATUS);
|
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_WHEN_YOU_ARE_A_HERO_OR_ON_THE_WAIT_LIST_FOR_HERO_STATUS);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: SET 1000 points for Olympiad after change main class.
|
// TODO: SET 1000 points for Olympiad after change main class.
|
||||||
|
|
||||||
if (player.getOriginalClass() == null)
|
if (player.getOriginalClass() == null)
|
||||||
{
|
{
|
||||||
player.setOriginalClass(player.getClassId());
|
player.setOriginalClass(player.getClassId());
|
||||||
}
|
}
|
||||||
takeItem(player, STONE_OF_DESTINY);
|
takeItem(player, STONE_OF_DESTINY);
|
||||||
takeItem(player, getCloakItemId(player));
|
takeItem(player, getCloakItemId(player));
|
||||||
// Stop Auto Use Skills
|
|
||||||
|
// Stop auto use.
|
||||||
for (Shortcut shortcut : player.getAllShortCuts())
|
for (Shortcut shortcut : player.getAllShortCuts())
|
||||||
{
|
{
|
||||||
if (!shortcut.isAutoUse())
|
if (!shortcut.isAutoUse())
|
||||||
@@ -339,6 +342,7 @@ public class Eraton extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
player.abortCast();
|
player.abortCast();
|
||||||
player.stopAllEffectsExceptThoseThatLastThroughDeath();
|
player.stopAllEffectsExceptThoseThatLastThroughDeath();
|
||||||
player.stopAllEffects();
|
player.stopAllEffects();
|
||||||
|
Reference in New Issue
Block a user