Advertisement
CostyKiller

Some updates for exalted quests

Apr 2nd, 2021 (edited)
1,055
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 24.08 KB | None | 0 0
  1. Index: dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
  2. ===================================================================
  3. --- dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java    (revision 8502)
  4. +++ dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java    (working copy)
  5. @@ -16,13 +16,18 @@
  6.   */
  7.  package quests.Q10507_ObtainingNewPower;
  8.  
  9. +import java.util.HashSet;
  10. +import java.util.Set;
  11. +
  12.  import org.l2jmobius.Config;
  13.  import org.l2jmobius.gameserver.enums.QuestSound;
  14.  import org.l2jmobius.gameserver.model.actor.Npc;
  15.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  16. +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
  17.  import org.l2jmobius.gameserver.model.quest.Quest;
  18.  import org.l2jmobius.gameserver.model.quest.QuestState;
  19.  import org.l2jmobius.gameserver.model.quest.State;
  20. +import org.l2jmobius.gameserver.network.NpcStringId;
  21.  
  22.  import quests.Q10879_ExaltedGuideToPower.Q10879_ExaltedGuideToPower;
  23.  
  24. @@ -40,6 +45,7 @@
  25.     // Misc
  26.     private static final int MIN_LEVEL = 107;
  27.     private static final int MIN_COMPLETE_LEVEL = 110;
  28. +   private static final int REACH_LV_110 = NpcStringId.REACH_LV_110.getId();
  29.     private static final int PROOF_OF_STRENGTH_NEEDED = 160000;
  30.     // Monsters
  31.     private static final int[] MONSTERS =
  32. @@ -233,6 +239,23 @@
  33.             {
  34.                 qs.setCond(2, true);
  35.             }
  36. +           sendNpcLogList(player);
  37.         }
  38.     }
  39. +  
  40. +   @Override
  41. +   public Set<NpcLogListHolder> getNpcLogList(PlayerInstance player)
  42. +   {
  43. +       final QuestState qs = getQuestState(player, false);
  44. +       if ((qs != null) && qs.isCond(1))
  45. +       {
  46. +           final Set<NpcLogListHolder> holder = new HashSet<>();
  47. +           if (player.getLevel() >= MIN_COMPLETE_LEVEL)
  48. +           {
  49. +               holder.add(new NpcLogListHolder(REACH_LV_110, true, 1));
  50. +           }
  51. +           return holder;
  52. +       }
  53. +       return super.getNpcLogList(player);
  54. +   }
  55.  }
  56. Index: dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
  57. ===================================================================
  58. --- dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java  (revision 8502)
  59. +++ dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java  (working copy)
  60. @@ -16,6 +16,9 @@
  61.   */
  62.  package quests.Q10811_ExaltedOneWhoFacesTheLimit;
  63.  
  64. +import java.util.HashSet;
  65. +import java.util.Set;
  66. +
  67.  import org.l2jmobius.Config;
  68.  import org.l2jmobius.gameserver.data.xml.CategoryData;
  69.  import org.l2jmobius.gameserver.enums.CategoryType;
  70. @@ -24,9 +27,11 @@
  71.  import org.l2jmobius.gameserver.enums.Race;
  72.  import org.l2jmobius.gameserver.model.actor.Npc;
  73.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  74. +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
  75.  import org.l2jmobius.gameserver.model.quest.Quest;
  76.  import org.l2jmobius.gameserver.model.quest.QuestState;
  77.  import org.l2jmobius.gameserver.model.quest.State;
  78. +import org.l2jmobius.gameserver.network.NpcStringId;
  79.  
  80.  /**
  81.   * Exalted, One Who Faces the Limit (10811)
  82. @@ -42,12 +47,13 @@
  83.     // Misc
  84.     private static final int MIN_LEVEL = 100;
  85.     private static final int MIN_COMPLETE_LEVEL = 101;
  86. +   private static final int REACH_LV_101 = NpcStringId.REACH_LV_101.getId();
  87.     private static final int SLAYERS_PROOF_NEEDED = 40000;
  88.     // Reward
  89. -   private static final int SPELLBOOK_DIGNITY_OF_THE_EXALTED = 45922;
  90. -   private static final int EXATLED_HEAVY_ARMOR_PACK = 81203;
  91. -   private static final int EXATLED_LIGHT_ARMOR_PACK = 81204;
  92. -   private static final int EXATLED_ROBE_PACK = 81205;
  93. +   private static final int SPELLBOOK_DIGNITY_OF_THE_EXALTED_LV1 = 45922;
  94. +   private static final int EXALTED_HEAVY_ARMOR_PACK = 81203;
  95. +   private static final int EXALTED_LIGHT_ARMOR_PACK = 81204;
  96. +   private static final int EXALTED_ROBE_PACK = 81205;
  97.     private static final int FIRST_EXALTED_QUEST_REWARD_PHYSICAL = 81207;
  98.     private static final int FIRST_EXALTED_QUEST_REWARD_MAGIC = 81208;
  99.     private static final int EXALTED_CUTTER = 81157;
  100. @@ -54,12 +60,12 @@
  101.     private static final int EXALTED_SLASHER = 81158;
  102.     private static final int EXALTED_AVENGER = 81159;
  103.     private static final int EXALTED_FIGHTER = 81160;
  104. -   private static final int EXALTED_STROMER = 81161;
  105. +   private static final int EXALTED_STORMER = 81161;
  106.     private static final int EXALTED_THROWER = 81162;
  107.     private static final int EXALTED_SHOOTER = 81163;
  108.     private static final int EXALTED_BUSTER = 81164;
  109.     private static final int EXALTED_CASTER = 81165;
  110. -   private static final int EXALTED_RETIBUTER = 81166;
  111. +   private static final int EXALTED_RETRIBUTER = 81166;
  112.     private static final int EXALTED_DUAL_SWORDS = 81167;
  113.     private static final int EXALTED_DUAL_DAGGERS = 81168;
  114.     // Monsters
  115. @@ -256,7 +262,7 @@
  116.             {
  117.                 if (qs.isCond(3))
  118.                 {
  119. -                   giveItems(player, SPELLBOOK_DIGNITY_OF_THE_EXALTED, 1);
  120. +                   giveItems(player, SPELLBOOK_DIGNITY_OF_THE_EXALTED_LV1, 1);
  121.                     switch (race)
  122.                     {
  123.                         case HUMAN:
  124. @@ -266,49 +272,49 @@
  125.                             if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, classId.getId()))
  126.                             {
  127.                                 giveItems(player, EXALTED_BUSTER, 1);
  128. -                               giveItems(player, EXATLED_ROBE_PACK, 1);
  129. +                               giveItems(player, EXALTED_ROBE_PACK, 1);
  130.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_MAGIC, 1);
  131.                             }
  132.                             else if ((CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, classId.getId())))
  133.                             {
  134. -                               giveItems(player, EXALTED_RETIBUTER, 1);
  135. -                               giveItems(player, EXATLED_ROBE_PACK, 1);
  136. +                               giveItems(player, EXALTED_RETRIBUTER, 1);
  137. +                               giveItems(player, EXALTED_ROBE_PACK, 1);
  138.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  139.                             }
  140.                             else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_EOLH_GROUP, classId.getId()))
  141.                             {
  142.                                 giveItems(player, EXALTED_CASTER, 1);
  143. -                               giveItems(player, EXATLED_ROBE_PACK, 1);
  144. +                               giveItems(player, EXALTED_ROBE_PACK, 1);
  145.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_MAGIC, 1);
  146.                             }
  147.                             else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, classId.getId()))
  148.                             {
  149.                                 giveItems(player, EXALTED_DUAL_DAGGERS, 1);
  150. -                               giveItems(player, EXATLED_LIGHT_ARMOR_PACK, 1);
  151. +                               giveItems(player, EXALTED_LIGHT_ARMOR_PACK, 1);
  152.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  153.                             }
  154.                             else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, classId.getId()))
  155.                             {
  156.                                 giveItems(player, EXALTED_THROWER, 1);
  157. -                               giveItems(player, EXATLED_LIGHT_ARMOR_PACK, 1);
  158. +                               giveItems(player, EXALTED_LIGHT_ARMOR_PACK, 1);
  159.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  160.                             }
  161.                             else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, classId.getId()) || (player.getClassId() == ClassId.TYRR_DUELIST))
  162.                             {
  163.                                 giveItems(player, EXALTED_DUAL_SWORDS, 1);
  164. -                               giveItems(player, EXATLED_HEAVY_ARMOR_PACK, 1);
  165. +                               giveItems(player, EXALTED_HEAVY_ARMOR_PACK, 1);
  166.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  167.                             }
  168.                             else if (player.getClassId() == ClassId.TYRR_DREADNOUGHT)
  169.                             {
  170. -                               giveItems(player, EXALTED_STROMER, 1);
  171. -                               giveItems(player, EXATLED_HEAVY_ARMOR_PACK, 1);
  172. +                               giveItems(player, EXALTED_STORMER, 1);
  173. +                               giveItems(player, EXALTED_HEAVY_ARMOR_PACK, 1);
  174.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  175.                             }
  176.                             else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_SIGEL_GROUP, classId.getId()))
  177.                             {
  178.                                 giveItems(player, EXALTED_CUTTER, 1);
  179. -                               giveItems(player, EXATLED_HEAVY_ARMOR_PACK, 1);
  180. +                               giveItems(player, EXALTED_HEAVY_ARMOR_PACK, 1);
  181.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  182.                             }
  183.                             break;
  184. @@ -318,13 +324,13 @@
  185.                             if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_OTHEL_GROUP, classId.getId()))
  186.                             {
  187.                                 giveItems(player, EXALTED_DUAL_DAGGERS, 1);
  188. -                               giveItems(player, EXATLED_LIGHT_ARMOR_PACK, 1);
  189. +                               giveItems(player, EXALTED_LIGHT_ARMOR_PACK, 1);
  190.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  191.                             }
  192.                             else
  193.                             {
  194.                                 giveItems(player, EXALTED_AVENGER, 1);
  195. -                               giveItems(player, EXATLED_HEAVY_ARMOR_PACK, 1);
  196. +                               giveItems(player, EXALTED_HEAVY_ARMOR_PACK, 1);
  197.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  198.                             }
  199.                             break;
  200. @@ -334,19 +340,19 @@
  201.                             if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_IS_GROUP, classId.getId()))
  202.                             {
  203.                                 giveItems(player, EXALTED_DUAL_SWORDS, 1);
  204. -                               giveItems(player, EXATLED_HEAVY_ARMOR_PACK, 1);
  205. +                               giveItems(player, EXALTED_HEAVY_ARMOR_PACK, 1);
  206.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  207.                             }
  208.                             else if (player.getClassId() == ClassId.TYRR_GRAND_KHAVATARI)
  209.                             {
  210.                                 giveItems(player, EXALTED_FIGHTER, 1);
  211. -                               giveItems(player, EXATLED_LIGHT_ARMOR_PACK, 1);
  212. +                               giveItems(player, EXALTED_LIGHT_ARMOR_PACK, 1);
  213.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  214.                             }
  215.                             else if (player.getClassId() == ClassId.TYRR_TITAN)
  216.                             {
  217.                                 giveItems(player, EXALTED_SLASHER, 1);
  218. -                               giveItems(player, EXATLED_HEAVY_ARMOR_PACK, 1);
  219. +                               giveItems(player, EXALTED_HEAVY_ARMOR_PACK, 1);
  220.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  221.                             }
  222.                             break;
  223. @@ -356,19 +362,19 @@
  224.                             if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, classId.getId()))
  225.                             {
  226.                                 giveItems(player, EXALTED_BUSTER, 1);
  227. -                               giveItems(player, EXATLED_ROBE_PACK, 1);
  228. +                               giveItems(player, EXALTED_ROBE_PACK, 1);
  229.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_MAGIC, 1);
  230.                             }
  231.                             else if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, classId.getId()))
  232.                             {
  233.                                 giveItems(player, EXALTED_SHOOTER, 1);
  234. -                               giveItems(player, EXATLED_LIGHT_ARMOR_PACK, 1);
  235. +                               giveItems(player, EXALTED_LIGHT_ARMOR_PACK, 1);
  236.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  237.                             }
  238.                             else
  239.                             {
  240.                                 giveItems(player, EXALTED_SLASHER, 1);
  241. -                               giveItems(player, EXATLED_LIGHT_ARMOR_PACK, 1);
  242. +                               giveItems(player, EXALTED_LIGHT_ARMOR_PACK, 1);
  243.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  244.                                 break;
  245.                             }
  246. @@ -378,14 +384,14 @@
  247.                         {
  248.                             if (player.isMageClass())
  249.                             {
  250. -                               giveItems(player, EXALTED_RETIBUTER, 1);
  251. -                               giveItems(player, EXATLED_ROBE_PACK, 1);
  252. +                               giveItems(player, EXALTED_RETRIBUTER, 1);
  253. +                               giveItems(player, EXALTED_ROBE_PACK, 1);
  254.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_MAGIC, 1);
  255.                             }
  256.                             else
  257.                             {
  258.                                 giveItems(player, EXALTED_FIGHTER, 1);
  259. -                               giveItems(player, EXATLED_LIGHT_ARMOR_PACK, 1);
  260. +                               giveItems(player, EXALTED_LIGHT_ARMOR_PACK, 1);
  261.                                 giveItems(player, FIRST_EXALTED_QUEST_REWARD_PHYSICAL, 1);
  262.                             }
  263.                             break;
  264. @@ -459,6 +465,23 @@
  265.             {
  266.                 qs.setCond(3, true);
  267.             }
  268. +           sendNpcLogList(player);
  269.         }
  270.     }
  271. -}
  272. \ No newline at end of file
  273. +  
  274. +   @Override
  275. +   public Set<NpcLogListHolder> getNpcLogList(PlayerInstance player)
  276. +   {
  277. +       final QuestState qs = getQuestState(player, false);
  278. +       if ((qs != null) && qs.isCond(2))
  279. +       {
  280. +           final Set<NpcLogListHolder> holder = new HashSet<>();
  281. +           if (player.getLevel() >= MIN_COMPLETE_LEVEL)
  282. +           {
  283. +               holder.add(new NpcLogListHolder(REACH_LV_101, true, 1));
  284. +           }
  285. +           return holder;
  286. +       }
  287. +       return super.getNpcLogList(player);
  288. +   }
  289. +}
  290. Index: dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
  291. ===================================================================
  292. --- dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java  (revision 8502)
  293. +++ dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java  (working copy)
  294. @@ -16,6 +16,9 @@
  295.   */
  296.  package quests.Q10817_ExaltedOneWhoOvercomesTheLimit;
  297.  
  298. +import java.util.HashSet;
  299. +import java.util.Set;
  300. +
  301.  import org.l2jmobius.Config;
  302.  import org.l2jmobius.gameserver.data.xml.CategoryData;
  303.  import org.l2jmobius.gameserver.enums.CategoryType;
  304. @@ -23,9 +26,11 @@
  305.  import org.l2jmobius.gameserver.enums.Race;
  306.  import org.l2jmobius.gameserver.model.actor.Npc;
  307.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  308. +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
  309.  import org.l2jmobius.gameserver.model.quest.Quest;
  310.  import org.l2jmobius.gameserver.model.quest.QuestState;
  311.  import org.l2jmobius.gameserver.model.quest.State;
  312. +import org.l2jmobius.gameserver.network.NpcStringId;
  313.  
  314.  import quests.Q10811_ExaltedOneWhoFacesTheLimit.Q10811_ExaltedOneWhoFacesTheLimit;
  315.  
  316. @@ -42,15 +47,16 @@
  317.     private static final int PROOF_OF_RESISTANCE = 80823;
  318.     private static final int LIONEL_MISSION_LIST_2 = 45632;
  319.     // Rewards
  320. -   private static final int SPELLBOOK_DIGNITY_OF_THE_EXALTED = 45923;
  321. +   private static final int SPELLBOOK_DIGNITY_OF_THE_EXALTED_LV2 = 45923;
  322.     private static final int SPELLBOOK_BELIEF_OF_THE_EXALTED = 45925;
  323. -   private static final int SPELLBOOK_FAVOR_OF_THE_EXALTED = 45928;
  324. -   private static final int EXALSTED_WEAPON_UPGRADE_STONE = 81200;
  325. +   private static final int SPELLBOOK_FAVOR_OF_THE_EXALTED_LV1 = 45928;
  326. +   private static final int EXALTED_WEAPON_UPGRADE_STONE = 81200;
  327.     private static final int SECOND_EXALTED_QUEST_REWARD_P = 81209;
  328.     private static final int SECOND_EXALTED_QUEST_REWARD_M = 81210;
  329.     // Misc
  330.     private static final int MIN_LEVEL = 101;
  331.     private static final int MIN_COMPLETE_LEVEL = 102;
  332. +   private static final int REACH_LV_102 = NpcStringId.REACH_LV_102.getId();
  333.     private static final int PROOF_OF_RESISTANCE_NEEDED = 40000;
  334.     // Monsters
  335.     private static final int[] MONSTERS =
  336. @@ -207,7 +213,7 @@
  337.         addKillId(MONSTERS);
  338.         addCondMinLevel(MIN_LEVEL, "33907-07.html");
  339.         addCondCompletedQuest(Q10811_ExaltedOneWhoFacesTheLimit.class.getSimpleName(), "33907-02.html");
  340. -       registerQuestItems(LIONEL_MISSION_LIST_2, PROOF_OF_RESISTANCE_NEEDED);
  341. +       registerQuestItems(LIONEL_MISSION_LIST_2, PROOF_OF_RESISTANCE);
  342.     }
  343.    
  344.     @Override
  345. @@ -244,10 +250,10 @@
  346.             {
  347.                 if (qs.isCond(2) && (player.getLevel() >= MIN_COMPLETE_LEVEL))
  348.                 {
  349. -                   giveItems(player, SPELLBOOK_DIGNITY_OF_THE_EXALTED, 1);
  350. +                   giveItems(player, SPELLBOOK_DIGNITY_OF_THE_EXALTED_LV2, 1);
  351.                     giveItems(player, SPELLBOOK_BELIEF_OF_THE_EXALTED, 1);
  352. -                   giveItems(player, SPELLBOOK_FAVOR_OF_THE_EXALTED, 1);
  353. -                   giveItems(player, EXALSTED_WEAPON_UPGRADE_STONE, 1);
  354. +                   giveItems(player, SPELLBOOK_FAVOR_OF_THE_EXALTED_LV1, 1);
  355. +                   giveItems(player, EXALTED_WEAPON_UPGRADE_STONE, 1);
  356.                    
  357.                     switch (race)
  358.                     {
  359. @@ -468,7 +474,23 @@
  360.             {
  361.                 qs.setCond(2, true);
  362.             }
  363. +           sendNpcLogList(player);
  364.         }
  365.     }
  366.    
  367. +   @Override
  368. +   public Set<NpcLogListHolder> getNpcLogList(PlayerInstance player)
  369. +   {
  370. +       final QuestState qs = getQuestState(player, false);
  371. +       if ((qs != null) && qs.isCond(1))
  372. +       {
  373. +           final Set<NpcLogListHolder> holder = new HashSet<>();
  374. +           if (player.getLevel() >= MIN_COMPLETE_LEVEL)
  375. +           {
  376. +               holder.add(new NpcLogListHolder(REACH_LV_102, true, 1));
  377. +           }
  378. +           return holder;
  379. +       }
  380. +       return super.getNpcLogList(player);
  381. +   }
  382.  }
  383. Index: dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
  384. ===================================================================
  385. --- dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java    (revision 8502)
  386. +++ dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java    (working copy)
  387. @@ -16,12 +16,17 @@
  388.   */
  389.  package quests.Q10823_ExaltedOneWhoShattersTheLimit;
  390.  
  391. +import java.util.HashSet;
  392. +import java.util.Set;
  393. +
  394.  import org.l2jmobius.Config;
  395.  import org.l2jmobius.gameserver.model.actor.Npc;
  396.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  397. +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
  398.  import org.l2jmobius.gameserver.model.quest.Quest;
  399.  import org.l2jmobius.gameserver.model.quest.QuestState;
  400.  import org.l2jmobius.gameserver.model.quest.State;
  401. +import org.l2jmobius.gameserver.network.NpcStringId;
  402.  
  403.  import quests.Q10817_ExaltedOneWhoOvercomesTheLimit.Q10817_ExaltedOneWhoOvercomesTheLimit;
  404.  
  405. @@ -41,14 +46,15 @@
  406.     private static final int EXALTED_CLOAK = 37763;
  407.     private static final int OBTAIN_EXALTED_STATUS = 45638;
  408.     private static final int EXALTED_TIARA = 45644;
  409. -   private static final int DIGNITY_OF_THE_EXALTED = 45924;
  410. +   private static final int DIGNITY_OF_THE_EXALTED_LV3 = 45924;
  411.     private static final int BLESSING_OF_THE_EXALTED = 45926;
  412.     private static final int SUMMON_BATTLE_POTION = 45927;
  413.     private static final int FATE_OF_THE_EXALTED = 46036;
  414. -   private static final int FAVOR_OF_THE_EXALTED = 45870;
  415. +   private static final int FAVOR_OF_THE_EXALTED_LV2 = 45870;
  416.     // Misc
  417.     private static final int MIN_LEVEL = 102;
  418.     private static final int MIN_COMPLETE_LEVEL = 103;
  419. +   private static final int REACH_LV_103 = NpcStringId.REACH_LV_103.getId();
  420.     private static final int PROOF_OF_PREPARATION_NEEDED = 40000;
  421.     // Monsters
  422.     private static final int[] MONSTERS =
  423. @@ -228,11 +234,11 @@
  424.                     giveItems(player, EXALTED_CLOAK, 1);
  425.                     giveItems(player, OBTAIN_EXALTED_STATUS, 1);
  426.                     giveItems(player, EXALTED_TIARA, 1);
  427. -                   giveItems(player, DIGNITY_OF_THE_EXALTED, 1);
  428. +                   giveItems(player, DIGNITY_OF_THE_EXALTED_LV3, 1);
  429.                     giveItems(player, BLESSING_OF_THE_EXALTED, 1);
  430.                     giveItems(player, SUMMON_BATTLE_POTION, 1);
  431.                     giveItems(player, FATE_OF_THE_EXALTED, 1);
  432. -                   giveItems(player, FAVOR_OF_THE_EXALTED, 1);
  433. +                   giveItems(player, FAVOR_OF_THE_EXALTED_LV2, 1);
  434.                     // Give Exalted status here?
  435.                     // https://l2wiki.com/Noblesse
  436.                     player.setNobleLevel(2);
  437. @@ -301,6 +307,23 @@
  438.             {
  439.                 qs.setCond(2, true);
  440.             }
  441. +           sendNpcLogList(player);
  442.         }
  443.     }
  444. +  
  445. +   @Override
  446. +   public Set<NpcLogListHolder> getNpcLogList(PlayerInstance player)
  447. +   {
  448. +       final QuestState qs = getQuestState(player, false);
  449. +       if ((qs != null) && qs.isCond(1))
  450. +       {
  451. +           final Set<NpcLogListHolder> holder = new HashSet<>();
  452. +           if (player.getLevel() >= MIN_COMPLETE_LEVEL)
  453. +           {
  454. +               holder.add(new NpcLogListHolder(REACH_LV_103, true, 1));
  455. +           }
  456. +           return holder;
  457. +       }
  458. +       return super.getNpcLogList(player);
  459. +   }
  460.  }
  461. Index: dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
  462. ===================================================================
  463. --- dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java    (revision 8502)
  464. +++ dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java    (working copy)
  465. @@ -16,12 +16,17 @@
  466.   */
  467.  package quests.Q10873_ExaltedReachingAnotherLevel;
  468.  
  469. +import java.util.HashSet;
  470. +import java.util.Set;
  471. +
  472.  import org.l2jmobius.Config;
  473.  import org.l2jmobius.gameserver.model.actor.Npc;
  474.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  475. +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
  476.  import org.l2jmobius.gameserver.model.quest.Quest;
  477.  import org.l2jmobius.gameserver.model.quest.QuestState;
  478.  import org.l2jmobius.gameserver.model.quest.State;
  479. +import org.l2jmobius.gameserver.network.NpcStringId;
  480.  
  481.  import quests.Q10823_ExaltedOneWhoShattersTheLimit.Q10823_ExaltedOneWhoShattersTheLimit;
  482.  
  483. @@ -38,11 +43,12 @@
  484.     private static final int PROOF_OF_REPUTATION = 80826;
  485.     private static final int LIONEL_MISSION_LIST_4 = 47829;
  486.     // Rewards
  487. -   private static final int DIGNITY_OF_THE_EXALTED = 47852;
  488. -   private static final int VITALITY_OF_THE_EXALTED = 47854;
  489. +   private static final int DIGNITY_OF_THE_EXALTED_LV4 = 47852;
  490. +   private static final int VITALITY_OF_THE_EXALTED_LV1 = 47854;
  491.     // Misc
  492.     private static final int MIN_LEVEL = 103;
  493.     private static final int MIN_COMPLETE_LEVEL = 105;
  494. +   private static final int REACH_LV_105 = NpcStringId.REACH_LV_105.getId();
  495.     private static final int PROOF_OF_REPUTATION_NEEDED = 80000;
  496.     // Monsters
  497.     private static final int[] MONSTERS =
  498. @@ -221,8 +227,8 @@
  499.             {
  500.                 if (qs.isCond(2) && (player.getLevel() >= MIN_COMPLETE_LEVEL))
  501.                 {
  502. -                   giveItems(player, DIGNITY_OF_THE_EXALTED, 1);
  503. -                   giveItems(player, VITALITY_OF_THE_EXALTED, 1);
  504. +                   giveItems(player, DIGNITY_OF_THE_EXALTED_LV4, 1);
  505. +                   giveItems(player, VITALITY_OF_THE_EXALTED_LV1, 1);
  506.                     qs.exitQuest(false, true);
  507.                     htmltext = event;
  508.                 }
  509. @@ -293,6 +299,23 @@
  510.             {
  511.                 qs.setCond(2, true);
  512.             }
  513. +           sendNpcLogList(player);
  514.         }
  515.     }
  516. +  
  517. +   @Override
  518. +   public Set<NpcLogListHolder> getNpcLogList(PlayerInstance player)
  519. +   {
  520. +       final QuestState qs = getQuestState(player, false);
  521. +       if ((qs != null) && qs.isCond(1))
  522. +       {
  523. +           final Set<NpcLogListHolder> holder = new HashSet<>();
  524. +           if (player.getLevel() >= MIN_COMPLETE_LEVEL)
  525. +           {
  526. +               holder.add(new NpcLogListHolder(REACH_LV_105, true, 1));
  527. +           }
  528. +           return holder;
  529. +       }
  530. +       return super.getNpcLogList(player);
  531. +   }
  532.  }
  533. Index: dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
  534. ===================================================================
  535. --- dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java    (revision 8502)
  536. +++ dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java    (working copy)
  537. @@ -16,12 +16,17 @@
  538.   */
  539.  package quests.Q10879_ExaltedGuideToPower;
  540.  
  541. +import java.util.HashSet;
  542. +import java.util.Set;
  543. +
  544.  import org.l2jmobius.Config;
  545.  import org.l2jmobius.gameserver.model.actor.Npc;
  546.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  547. +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
  548.  import org.l2jmobius.gameserver.model.quest.Quest;
  549.  import org.l2jmobius.gameserver.model.quest.QuestState;
  550.  import org.l2jmobius.gameserver.model.quest.State;
  551. +import org.l2jmobius.gameserver.network.NpcStringId;
  552.  
  553.  import quests.Q10873_ExaltedReachingAnotherLevel.Q10873_ExaltedReachingAnotherLevel;
  554.  
  555. @@ -38,11 +43,12 @@
  556.     private static final int PROOF_OF_PRIDE = 80827;
  557.     private static final int LIONEL_MISSION_LIST_5 = 47834;
  558.     // Rewards
  559. -   private static final int DIGNITY_OF_THE_EXALTED = 47853;
  560. -   private static final int VITALITY_OF_THE_EXALTED = 47855;
  561. +   private static final int DIGNITY_OF_THE_EXALTED_LV5 = 47853;
  562. +   private static final int VITALITY_OF_THE_EXALTED_LV2 = 47855;
  563.     // Misc
  564.     private static final int MIN_LEVEL = 105;
  565.     private static final int MIN_COMPLETE_LEVEL = 107;
  566. +   private static final int REACH_LV_107 = NpcStringId.REACH_LV_107.getId();
  567.     private static final int PROOF_OF_PRIDE_NEEDED = 80000;
  568.     // Monsters
  569.     private static final int[] MONSTERS =
  570. @@ -210,8 +216,8 @@
  571.             {
  572.                 if (qs.isCond(2) && (player.getLevel() >= MIN_COMPLETE_LEVEL))
  573.                 {
  574. -                   giveItems(player, DIGNITY_OF_THE_EXALTED, 1);
  575. -                   giveItems(player, VITALITY_OF_THE_EXALTED, 1);
  576. +                   giveItems(player, DIGNITY_OF_THE_EXALTED_LV5, 1);
  577. +                   giveItems(player, VITALITY_OF_THE_EXALTED_LV2, 1);
  578.                     qs.exitQuest(false, true);
  579.                     htmltext = event;
  580.                 }
  581. @@ -282,6 +288,23 @@
  582.             {
  583.                 qs.setCond(2, true);
  584.             }
  585. +           sendNpcLogList(player);
  586.         }
  587.     }
  588. +  
  589. +   @Override
  590. +   public Set<NpcLogListHolder> getNpcLogList(PlayerInstance player)
  591. +   {
  592. +       final QuestState qs = getQuestState(player, false);
  593. +       if ((qs != null) && qs.isCond(1))
  594. +       {
  595. +           final Set<NpcLogListHolder> holder = new HashSet<>();
  596. +           if (player.getLevel() >= MIN_COMPLETE_LEVEL)
  597. +           {
  598. +               holder.add(new NpcLogListHolder(REACH_LV_107, true, 1));
  599. +           }
  600. +           return holder;
  601. +       }
  602. +       return super.getNpcLogList(player);
  603. +   }
  604.  }
  605.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement