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

Minor improvement for previous commit.

Browse Source
This commit is contained in:
MobiusDev
2017-11-18 01:31:48 +00:00
parent c6b7ca7b68
commit 579177bb5a
4 changed files with 132 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,37 +423,40 @@ public final class Raina extends AbstractNpcAI
} }
case "upgradeSubClassToDualClass": case "upgradeSubClassToDualClass":
{ {
if (player.isTransformed()) if (Config.ALT_GAME_DUALCLASS_WITHOUT_QUEST)
{ {
htmltext = "noTransform.html"; if (player.isTransformed())
} {
else if (player.hasSummon()) htmltext = "noTransform.html";
{ }
htmltext = "noSummon.html"; else if (player.hasSummon())
} {
else if (player.getRace() == Race.ERTHEIA) htmltext = "noSummon.html";
{ }
htmltext = "noErtheia.html"; else if (player.getRace() == Race.ERTHEIA)
} {
else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2)) htmltext = "noErtheia.html";
{ }
htmltext = "inventoryLimit.html"; else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2))
} {
else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80)) htmltext = "inventoryLimit.html";
{ }
htmltext = "addDualClassWithoutQuestFailed.html"; else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80))
} {
else htmltext = "addDualClassWithoutQuestFailed.html";
{ }
player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true); else
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS); player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true);
msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId()); final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS);
player.sendPacket(msg); msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId());
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED)); player.sendPacket(msg);
player.broadcastSocialAction(SocialAction.LEVEL_UP);
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.broadcastSocialAction(SocialAction.LEVEL_UP);
}
} }
break; break;
} }

63
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -423,37 +423,40 @@ public final class Raina extends AbstractNpcAI
} }
case "upgradeSubClassToDualClass": case "upgradeSubClassToDualClass":
{ {
if (player.isTransformed()) if (Config.ALT_GAME_DUALCLASS_WITHOUT_QUEST)
{ {
htmltext = "noTransform.html"; if (player.isTransformed())
} {
else if (player.hasSummon()) htmltext = "noTransform.html";
{ }
htmltext = "noSummon.html"; else if (player.hasSummon())
} {
else if (player.getRace() == Race.ERTHEIA) htmltext = "noSummon.html";
{ }
htmltext = "noErtheia.html"; else if (player.getRace() == Race.ERTHEIA)
} {
else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2)) htmltext = "noErtheia.html";
{ }
htmltext = "inventoryLimit.html"; else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2))
} {
else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80)) htmltext = "inventoryLimit.html";
{ }
htmltext = "addDualClassWithoutQuestFailed.html"; else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80))
} {
else htmltext = "addDualClassWithoutQuestFailed.html";
{ }
player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true); else
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS); player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true);
msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId()); final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS);
player.sendPacket(msg); msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId());
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED)); player.sendPacket(msg);
player.broadcastSocialAction(SocialAction.LEVEL_UP);
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.broadcastSocialAction(SocialAction.LEVEL_UP);
}
} }
break; break;
} }

63
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -423,37 +423,40 @@ public final class Raina extends AbstractNpcAI
} }
case "upgradeSubClassToDualClass": case "upgradeSubClassToDualClass":
{ {
if (player.isTransformed()) if (Config.ALT_GAME_DUALCLASS_WITHOUT_QUEST)
{ {
htmltext = "noTransform.html"; if (player.isTransformed())
} {
else if (player.hasSummon()) htmltext = "noTransform.html";
{ }
htmltext = "noSummon.html"; else if (player.hasSummon())
} {
else if (player.getRace() == Race.ERTHEIA) htmltext = "noSummon.html";
{ }
htmltext = "noErtheia.html"; else if (player.getRace() == Race.ERTHEIA)
} {
else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2)) htmltext = "noErtheia.html";
{ }
htmltext = "inventoryLimit.html"; else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2))
} {
else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80)) htmltext = "inventoryLimit.html";
{ }
htmltext = "addDualClassWithoutQuestFailed.html"; else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80))
} {
else htmltext = "addDualClassWithoutQuestFailed.html";
{ }
player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true); else
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS); player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true);
msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId()); final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS);
player.sendPacket(msg); msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId());
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED)); player.sendPacket(msg);
player.broadcastSocialAction(SocialAction.LEVEL_UP);
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.broadcastSocialAction(SocialAction.LEVEL_UP);
}
} }
break; break;
} }

63
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -423,37 +423,40 @@ public final class Raina extends AbstractNpcAI
} }
case "upgradeSubClassToDualClass": case "upgradeSubClassToDualClass":
{ {
if (player.isTransformed()) if (Config.ALT_GAME_DUALCLASS_WITHOUT_QUEST)
{ {
htmltext = "noTransform.html"; if (player.isTransformed())
} {
else if (player.hasSummon()) htmltext = "noTransform.html";
{ }
htmltext = "noSummon.html"; else if (player.hasSummon())
} {
else if (player.getRace() == Race.ERTHEIA) htmltext = "noSummon.html";
{ }
htmltext = "noErtheia.html"; else if (player.getRace() == Race.ERTHEIA)
} {
else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2)) htmltext = "noErtheia.html";
{ }
htmltext = "inventoryLimit.html"; else if (!player.isInventoryUnder90(true) || (player.getWeightPenalty() >= 2))
} {
else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80)) htmltext = "inventoryLimit.html";
{ }
htmltext = "addDualClassWithoutQuestFailed.html"; else if (player.hasDualClass() || !player.isSubClassActive() || (player.getLevel() < 80))
} {
else htmltext = "addDualClassWithoutQuestFailed.html";
{ }
player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true); else
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS); player.getSubClasses().get(player.getClassIndex()).setIsDualClass(true);
msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId()); final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUBCLASS_S1_HAS_BEEN_UPGRADED_TO_DUEL_CLASS_S2_CONGRATULATIONS);
player.sendPacket(msg); msg.addClassId(player.getClassId().getId());
msg.addClassId(player.getClassId().getId());
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED)); player.sendPacket(msg);
player.broadcastSocialAction(SocialAction.LEVEL_UP);
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.broadcastSocialAction(SocialAction.LEVEL_UP);
}
} }
break; break;
} }