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

ClassMaster optional reward fixes.

Browse Source
This commit is contained in:
MobiusDev 2017-10-16 00:40:22 +00:00
parent 79646b1e2a
commit 6fe2a25cc8
4 changed files with 272 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,19 +376,41 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
final ClassChangeData data = getClassChangeData(classDataIndex);
if ((data != null) && (data.getItemsRequired().size() > 0))
if (data != null)
{
for (ItemHolder ri : data.getItemsRequired())
// Required items.
if (data.getItemsRequired().size() > 0)
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
for (ItemHolder ri : data.getItemsRequired())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
}
}
for (ItemHolder ri : data.getItemsRequired())
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNoble(true);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
@ -782,6 +804,45 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else
{
final ClassChangeData data = _classChangeData.stream().filter(ccd -> ccd.isInCategory(player)).findFirst().get();
if (data != null)
{
// Required items.
if (data.getItemsRequired().size() > 0)
{
for (ItemHolder ri : data.getItemsRequired())
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return false; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), player, true);
}
}
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNoble(true);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
player.setClassId(newClass.getId());
if (player.isSubClassActive())
{

75
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@ -376,19 +376,41 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
final ClassChangeData data = getClassChangeData(classDataIndex);
if ((data != null) && (data.getItemsRequired().size() > 0))
if (data != null)
{
for (ItemHolder ri : data.getItemsRequired())
// Required items.
if (data.getItemsRequired().size() > 0)
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
for (ItemHolder ri : data.getItemsRequired())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
}
}
for (ItemHolder ri : data.getItemsRequired())
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNobleLevel(1);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
@ -782,6 +804,45 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else
{
final ClassChangeData data = _classChangeData.stream().filter(ccd -> ccd.isInCategory(player)).findFirst().get();
if (data != null)
{
// Required items.
if (data.getItemsRequired().size() > 0)
{
for (ItemHolder ri : data.getItemsRequired())
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return false; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), player, true);
}
}
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNobleLevel(1);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
player.setClassId(newClass.getId());
if (player.isSubClassActive())
{

75
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@ -376,19 +376,41 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
final ClassChangeData data = getClassChangeData(classDataIndex);
if ((data != null) && (data.getItemsRequired().size() > 0))
if (data != null)
{
for (ItemHolder ri : data.getItemsRequired())
// Required items.
if (data.getItemsRequired().size() > 0)
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
for (ItemHolder ri : data.getItemsRequired())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
}
}
for (ItemHolder ri : data.getItemsRequired())
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNobleLevel(1);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
@ -782,6 +804,45 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else
{
final ClassChangeData data = _classChangeData.stream().filter(ccd -> ccd.isInCategory(player)).findFirst().get();
if (data != null)
{
// Required items.
if (data.getItemsRequired().size() > 0)
{
for (ItemHolder ri : data.getItemsRequired())
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return false; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), player, true);
}
}
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNobleLevel(1);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
player.setClassId(newClass.getId());
if (player.isSubClassActive())
{

75
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@ -344,19 +344,41 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
final ClassChangeData data = getClassChangeData(classDataIndex);
if ((data != null) && (data.getItemsRequired().size() > 0))
if (data != null)
{
for (ItemHolder ri : data.getItemsRequired())
// Required items.
if (data.getItemsRequired().size() > 0)
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
for (ItemHolder ri : data.getItemsRequired())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return null; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
}
}
for (ItemHolder ri : data.getItemsRequired())
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), npc, true);
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNoble(true);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
@ -750,6 +772,45 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else
{
final ClassChangeData data = _classChangeData.stream().filter(ccd -> ccd.isInCategory(player)).findFirst().get();
if (data != null)
{
// Required items.
if (data.getItemsRequired().size() > 0)
{
for (ItemHolder ri : data.getItemsRequired())
{
if (player.getInventory().getInventoryItemCount(ri.getId(), -1) < ri.getCount())
{
player.sendMessage("You do not have enough items.");
return false; // No class change if payment failed.
}
}
for (ItemHolder ri : data.getItemsRequired())
{
player.destroyItemByItemId(getClass().getSimpleName(), ri.getId(), ri.getCount(), player, true);
}
}
// Give possible rewards.
if (data.getItemsRewarded().size() > 0)
{
for (ItemHolder ri : data.getItemsRewarded())
{
giveItems(player, ri);
}
}
// Give possible nobless status reward.
if (data.isRewardNoblesse())
{
player.setNoble(true);
}
// Give possible hero status reward.
if (data.isRewardHero())
{
player.setHero(true);
}
}
player.setClassId(newClass.getId());
if (player.isSubClassActive())
{