Advertisement
CostyKiller

Fix for quests with double checks for finish.

Nov 7th, 2019
304
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.42 KB | None | 0 0
  1. Index: dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
  2. ===================================================================
  3. --- dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java    (revision 6289)
  4. +++ dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java    (working copy)
  5. @@ -19,6 +19,7 @@
  6.  import java.util.HashSet;
  7.  import java.util.Set;
  8.  
  9. +import org.l2jmobius.Config;
  10.  import org.l2jmobius.gameserver.enums.QuestType;
  11.  import org.l2jmobius.gameserver.model.actor.Npc;
  12.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  13. @@ -180,12 +181,12 @@
  14.             giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
  15.            
  16.             final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
  17. -           if (killCount < REQUIRED_KILL_COUNT)
  18. +           if (killCount < (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP))
  19.             {
  20.                 qs.set(KILL_COUNT_VAR, killCount);
  21.             }
  22.            
  23. -           if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  24. +           if ((killCount >= (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP)) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  25.             {
  26.                 qs.setCond(FINISH_COND, true);
  27.             }
  28. Index: dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
  29. ===================================================================
  30. --- dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java  (revision 6289)
  31. +++ dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java  (working copy)
  32. @@ -19,6 +19,7 @@
  33.  import java.util.HashSet;
  34.  import java.util.Set;
  35.  
  36. +import org.l2jmobius.Config;
  37.  import org.l2jmobius.gameserver.enums.QuestType;
  38.  import org.l2jmobius.gameserver.model.actor.Npc;
  39.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  40. @@ -183,12 +184,12 @@
  41.             giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
  42.            
  43.             final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
  44. -           if (killCount < REQUIRED_KILL_COUNT)
  45. +           if (killCount < (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP))
  46.             {
  47.                 qs.set(KILL_COUNT_VAR, killCount);
  48.             }
  49.            
  50. -           if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  51. +           if ((killCount >= (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP)) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  52.             {
  53.                 qs.setCond(FINISH_COND, true);
  54.             }
  55. Index: dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
  56. ===================================================================
  57. --- dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java    (revision 6289)
  58. +++ dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java    (working copy)
  59. @@ -19,6 +19,7 @@
  60.  import java.util.HashSet;
  61.  import java.util.Set;
  62.  
  63. +import org.l2jmobius.Config;
  64.  import org.l2jmobius.gameserver.enums.QuestType;
  65.  import org.l2jmobius.gameserver.model.actor.Npc;
  66.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  67. @@ -181,12 +182,12 @@
  68.             giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
  69.            
  70.             final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
  71. -           if (killCount < REQUIRED_KILL_COUNT)
  72. +           if (killCount < (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP))
  73.             {
  74.                 qs.set(KILL_COUNT_VAR, killCount);
  75.             }
  76.            
  77. -           if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  78. +           if ((killCount >= (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP)) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  79.             {
  80.                 qs.setCond(FINISH_COND, true);
  81.             }
  82. Index: dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
  83. ===================================================================
  84. --- dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java    (revision 6289)
  85. +++ dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java    (working copy)
  86. @@ -19,6 +19,7 @@
  87.  import java.util.HashSet;
  88.  import java.util.Set;
  89.  
  90. +import org.l2jmobius.Config;
  91.  import org.l2jmobius.gameserver.enums.QuestType;
  92.  import org.l2jmobius.gameserver.model.actor.Npc;
  93.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  94. @@ -184,12 +185,12 @@
  95.             giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
  96.            
  97.             final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
  98. -           if (killCount < REQUIRED_KILL_COUNT)
  99. +           if (killCount < (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP))
  100.             {
  101.                 qs.set(KILL_COUNT_VAR, killCount);
  102.             }
  103.            
  104. -           if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  105. +           if ((killCount >= (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP)) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  106.             {
  107.                 qs.setCond(FINISH_COND, true);
  108.             }
  109. Index: dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
  110. ===================================================================
  111. --- dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java   (revision 6289)
  112. +++ dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java   (working copy)
  113. @@ -19,6 +19,7 @@
  114.  import java.util.HashSet;
  115.  import java.util.Set;
  116.  
  117. +import org.l2jmobius.Config;
  118.  import org.l2jmobius.gameserver.enums.QuestSound;
  119.  import org.l2jmobius.gameserver.enums.QuestType;
  120.  import org.l2jmobius.gameserver.model.actor.Npc;
  121. @@ -175,13 +176,13 @@
  122.             giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
  123.            
  124.             final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
  125. -           if (killCount < REQUIRED_KILL_COUNT)
  126. +           if (killCount < (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP))
  127.             {
  128.                 qs.set(KILL_COUNT_VAR, killCount);
  129.                 playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  130.             }
  131.            
  132. -           if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  133. +           if ((killCount >= (REQUIRED_KILL_COUNT / Config.RATE_QUEST_DROP)) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
  134.             {
  135.                 qs.setCond(FINISH_COND, true);
  136.             }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement