Minor format changes for previous commit.

This commit is contained in:
MobiusDevelopment 2022-06-07 12:01:39 +00:00
parent d389cd45d7
commit a0dd0d82d1
8 changed files with 40 additions and 8 deletions

View File

@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
{
player.setOriginalClass(player.getClassId());
}
// Ertheias can only be female
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
{
player.getAppearance().setFemale();
}
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
// Change class
player.setClassId(newClass.getId());
if (player.isDualClassActive())
@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
{
player.setBaseClass(player.getActiveClass());
}
// Adjustments
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))

View File

@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
{
player.setOriginalClass(player.getClassId());
}
// Ertheias can only be female
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
{
player.getAppearance().setFemale();
}
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
// Change class
player.setClassId(newClass.getId());
if (player.isDualClassActive())
@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
{
player.setBaseClass(player.getActiveClass());
}
// Adjustments
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))

View File

@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
{
player.setOriginalClass(player.getClassId());
}
// Ertheias can only be female
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
{
player.getAppearance().setFemale();
}
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
// Change class
player.setClassId(newClass.getId());
if (player.isDualClassActive())
@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
{
player.setBaseClass(player.getActiveClass());
}
// Adjustments
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))

View File

@ -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);
return;
}
// TODO: SET 1000 points for Olympiad after change main class.
if (player.getOriginalClass() == null)
{
player.setOriginalClass(player.getClassId());
}
takeItem(player, STONE_OF_DESTINY);
takeItem(player, getCloakItemId(player));
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -334,6 +337,7 @@ public class Eraton extends AbstractNpcAI
}
}
}
player.abortCast();
player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.stopAllEffects();

View File

@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
{
player.setOriginalClass(player.getClassId());
}
// Ertheias can only be female
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
{
player.getAppearance().setFemale();
}
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
// Change class
player.setClassId(newClass.getId());
if (player.isDualClassActive())
@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
{
player.setBaseClass(player.getActiveClass());
}
// Adjustments
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))

View File

@ -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);
return;
}
// TODO: SET 1000 points for Olympiad after change main class.
if (player.getOriginalClass() == null)
{
player.setOriginalClass(player.getClassId());
}
takeItem(player, STONE_OF_DESTINY);
takeItem(player, getCloakItemId(player));
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -339,6 +342,7 @@ public class Eraton extends AbstractNpcAI
}
}
}
player.abortCast();
player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.stopAllEffects();

View File

@ -138,13 +138,15 @@ public class Hardin extends AbstractNpcAI
{
player.setOriginalClass(player.getClassId());
}
// Ertheias can only be female
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
{
player.getAppearance().setFemale();
}
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -185,6 +187,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
// Change class
player.setClassId(newClass.getId());
if (player.isDualClassActive())
@ -195,6 +198,7 @@ public class Hardin extends AbstractNpcAI
{
player.setBaseClass(player.getActiveClass());
}
// Adjustments
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))

View File

@ -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);
return;
}
// TODO: SET 1000 points for Olympiad after change main class.
if (player.getOriginalClass() == null)
{
player.setOriginalClass(player.getClassId());
}
takeItem(player, STONE_OF_DESTINY);
takeItem(player, getCloakItemId(player));
// Stop Auto Use Skills
// Stop auto use.
for (Shortcut shortcut : player.getAllShortCuts())
{
if (!shortcut.isAutoUse())
@ -339,6 +342,7 @@ public class Eraton extends AbstractNpcAI
}
}
}
player.abortCast();
player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.stopAllEffects();