From 31e7c50c128db7e7230301cafe0c91be9b59d79c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 18 Dec 2020 00:16:24 +0000 Subject: [PATCH] Mentor, mammon and Paulina's Equipment Set (R-grade) adjustments. Contributed by Sero. --- .../dist/game/config/MentorCoins.xml | 9 ++++----- .../scripts/ai/others/BlackMarketeerOfMammon/31092.html | 6 +++--- .../data/scripts/ai/others/MentorGuide/MentorGuide.java | 3 ++- .../handlers/itemhandlers/PaulinasSupportBox.java | 7 ++++++- .../Q10590_ReawakenedFate/Q10590_ReawakenedFate.java | 2 +- .../dist/game/data/xsd/MentorCoins.xsd | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/config/MentorCoins.xml b/L2J_Mobius_8.0_Homunculus/dist/game/config/MentorCoins.xml index 8b702fdfb9..b0f206a493 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/config/MentorCoins.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/config/MentorCoins.xml @@ -1,8 +1,7 @@ - - - - - + + + + diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html index 60655f7231..39cb11bd50 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html @@ -2,7 +2,7 @@ The LordHush!
The government is out to get me, so I am forced to do business in the shadows.
- - - + + + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 2c891425d6..579e1b2489 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -70,6 +70,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader // Items private static final int MENTEE_CERT = 33800; private static final int MENTEE_MARK = 33804; + private static final int GRADUTION_BOX = 81348; private static final int MENTEE_HEADPHONE = 34759; private static final int DIPLOMA = 33805; // Skills @@ -486,7 +487,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader // Clear mentee status player.sendPacket(new ExMentorList(player)); player.sendPacket(new SystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); - sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); + sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, GRADUTION_BOX, 1); } } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index ac623e42db..cec9a6b3e5 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -595,11 +595,16 @@ public class PaulinasSupportBox implements IItemHandler case ELF: case DARK_ELF: { - if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, classId.getId()) || (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, classId.getId()))) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, classId.getId())) { player.addItem(getClass().getSimpleName(), BOX_R_ROBE, 1, player, true); player.addItem(getClass().getSimpleName(), WEAPON_STAFF_R, 1, player, true); } + else if ((CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, classId.getId()))) + { + player.addItem(getClass().getSimpleName(), BOX_R_LIGHT, 1, player, true); + player.addItem(getClass().getSimpleName(), WEAPON_STAFF_R, 1, player, true); + } else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, classId.getId())) { player.addItem(getClass().getSimpleName(), BOX_R_ROBE, 1, player, true); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java index c43dcea598..80f68450b0 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java @@ -55,7 +55,7 @@ public class Q10590_ReawakenedFate extends Quest 24459, // Marsh Vampire Wizard 24460 // Marsh Vampire Shooter }; - // Item + // Items private static final int VAMPIRE_ICHOR = 80854; // Vampire Ichor - monster drop private static final ItemHolder SOE_JOACHIM = new ItemHolder(80858, 1); // Rewards diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/MentorCoins.xsd b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/MentorCoins.xsd index 2a12ef2ce2..b0fcbc8bd9 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/MentorCoins.xsd +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/MentorCoins.xsd @@ -6,7 +6,7 @@ - +