API tools faq
paste
Advertisement
CostyKiller

Few fixes for exalted quests

CostyKiller
Nov 20th, 2020
1,361
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 27.28 KB | None | 0 0
raw download clone embed print report
  1. Index: dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-05.html
  2. ===================================================================
  3. --- dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-05.html   (revision 7809)
  4. +++ dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-05.html   (working copy)
  5. @@ -1,4 +1,4 @@
  6.  <html><body>Cardinal Seresin:<br>
  7. -Listen carefully, I won't explain this again. Hunt monsters in <font color="LEVEL">Atelia Refinery, Ivory Tower Crater, Alligator Island and Tanor Canyon</font> and collect 80.000 <font color="LEVEL">Proof of Reputation</font>. What do you say? It's quite hard, right? Hahahaha!!!<br>
  8. +Listen carefully, I won't explain this again. Hunt monsters in <font color="LEVEL">Atelia Refinery, Ivory Tower Crater, Alligator Island and Tanor Canyon</font> and collect 80.000 <font color="LEVEL">Proof of Pride</font>. What do you say? It's quite hard, right? Hahahaha!!!<br>
  9.  Come to me after completing the mission to get a certificate.<br>
  10.  </body></html>
  11. \ No newline at end of file
  12. Index: dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-06.html
  13. ===================================================================
  14. --- dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-06.html   (revision 7809)
  15. +++ dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-06.html   (working copy)
  16. @@ -1,5 +1,5 @@
  17.  <html><body>Cardinal Seresin:<br>
  18.  You did not get what I asked for.<br>
  19. -Hunt monsters in <font color="LEVEL">Atelia Refinery, Ivory Tower Crater, Alligator Island and Tanor Canyon</font> and collect 80.000 <font color="LEVEL">Proof of Reputation</font>.<br>
  20. +Hunt monsters in <font color="LEVEL">Atelia Refinery, Ivory Tower Crater, Alligator Island and Tanor Canyon</font> and collect 80.000 <font color="LEVEL">Proof of Pride</font>.<br>
  21.  Come to me after completing the mission to get a certificate.<br>
  22.  </body></html>
  23. \ No newline at end of file
  24. Index: dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-07.html
  25. ===================================================================
  26. --- dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-07.html   (revision 7809)
  27. +++ dist/game/data/scripts/quests/Q10515_NewWayForPride/30657-07.html   (working copy)
  28. @@ -1,4 +1,4 @@
  29.  <html><body>Cardinal Seresin:<br>
  30. -Did you get 80.000 <font color="LEVEL">Proof of Reputation</font>?<br>
  31. +Did you get 80.000 <font color="LEVEL">Proof of Pride</font>?<br>
  32.  <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10515_NewWayForPride 30657-08.html">"Yes, here."</Button>
  33.  </body></html>
  34. \ No newline at end of file
  35. Index: dist/game/data/scripts/quests/Q10515_NewWayForPride/Q10515_NewWayForPride.java
  36. ===================================================================
  37. --- dist/game/data/scripts/quests/Q10515_NewWayForPride/Q10515_NewWayForPride.java  (revision 7809)
  38. +++ dist/game/data/scripts/quests/Q10515_NewWayForPride/Q10515_NewWayForPride.java  (working copy)
  39. @@ -40,7 +40,7 @@
  40.     private static final int CARDINAL_SERESIN = 30657;
  41.     // Items
  42.     private static final int SERESIN_CERTIFICATE = 80829;
  43. -   private static final int PROOF_OF_REPUTATION = 80826;
  44. +   private static final int PROOF_OF_PRIDE = 80827;
  45.     private static final ItemHolder LIONEL_HUNTERS_LIST_PART_5 = new ItemHolder(47834, 1);
  46.     // Monsters
  47.     private static final int[] MONSTERS =
  48. @@ -92,7 +92,7 @@
  49.    
  50.     // Misc
  51.     private static final int MIN_LEVEL = 104;
  52. -   private static final int PROOF_OF_REPUTATION_NEEDED = 80000;
  53. +   private static final int PROOF_OF_PRIDE_NEEDED = 80000;
  54.    
  55.     public Q10515_NewWayForPride()
  56.     {
  57. @@ -102,7 +102,7 @@
  58.         addKillId(MONSTERS);
  59.         addCondMinLevel(MIN_LEVEL, "30657-00.html");
  60.         addCondStartedQuest(Q10879_ExaltedGuideToPower.class.getSimpleName(), "30657-00.html");
  61. -       registerQuestItems(PROOF_OF_REPUTATION);
  62. +       registerQuestItems(PROOF_OF_PRIDE);
  63.     }
  64.    
  65.     @Override
  66. @@ -136,11 +136,11 @@
  67.             }
  68.             case "30657-08.html":
  69.             {
  70. -               if (qs.isCond(2) && (getQuestItemsCount(player, PROOF_OF_REPUTATION) >= PROOF_OF_REPUTATION_NEEDED))
  71. +               if (qs.isCond(2) && (getQuestItemsCount(player, PROOF_OF_PRIDE) >= PROOF_OF_PRIDE_NEEDED))
  72.                 {
  73.                     if ((player.getLevel() >= MIN_LEVEL))
  74.                     {
  75. -                       takeItems(player, PROOF_OF_REPUTATION, PROOF_OF_REPUTATION_NEEDED);
  76. +                       takeItems(player, PROOF_OF_PRIDE, PROOF_OF_PRIDE_NEEDED);
  77.                         giveItems(player, SERESIN_CERTIFICATE, 1);
  78.                         addExpAndSp(player, 3480527972686L, 0);
  79.                         qs.exitQuest(false, true);
  80. @@ -184,7 +184,14 @@
  81.             }
  82.             case State.STARTED:
  83.             {
  84. -               htmltext = "30657-05.html";
  85. +               if (getQuestItemsCount(player, PROOF_OF_PRIDE) >= PROOF_OF_PRIDE_NEEDED)
  86. +               {
  87. +                   htmltext = "30657-07.html";
  88. +               }
  89. +               else
  90. +               {
  91. +                   htmltext = "30657-06.html";
  92. +               }
  93.                 break;
  94.             }
  95.             case State.COMPLETED:
  96. @@ -209,10 +216,10 @@
  97.         final QuestState qs = getQuestState(player, false);
  98.         if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && CommonUtil.contains(MONSTERS, npc.getId()))
  99.         {
  100. -           giveItems(player, PROOF_OF_REPUTATION, 1);
  101. +           giveItems(player, PROOF_OF_PRIDE, 1);
  102.             playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  103.            
  104. -           if (getQuestItemsCount(player, PROOF_OF_REPUTATION) >= PROOF_OF_REPUTATION_NEEDED)
  105. +           if (getQuestItemsCount(player, PROOF_OF_PRIDE) >= PROOF_OF_PRIDE_NEEDED)
  106.             {
  107.                 qs.setCond(2, true);
  108.             }
  109. Index: dist/game/data/scripts/quests/Q10813_ForGlory/33685-08.html
  110. ===================================================================
  111. --- dist/game/data/scripts/quests/Q10813_ForGlory/33685-08.html (revision 7809)
  112. +++ dist/game/data/scripts/quests/Q10813_ForGlory/33685-08.html (working copy)
  113. @@ -1,3 +1,3 @@
  114.  <html><body>Mysterious Butler:<br>
  115. -When you participate in the <font color="LEVEL">Ceremony of Chaos</font> or the <font color="LEVEL">Olympiad</font>, you'll be able to to get <font color="LEVEL">Proof of Battle.</font> If you can get <font color="LEVEL">10</font> of these, I'll recognize your strengh.
  116. +When you participate in the <font color="LEVEL">Ceremony of Chaos</font> or the <font color="LEVEL">Olympiad</font>, you'll be able to to get <font color="LEVEL">Proof of Battle.</font> If you can get <font color="LEVEL">10</font> of these, I'll recognize your strength.
  117.  </body></html>
  118. \ No newline at end of file
  119. Index: dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
  120. ===================================================================
  121. --- dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java  (revision 7809)
  122. +++ dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java  (working copy)
  123. @@ -53,7 +53,7 @@
  124.     private static final int SIR_ERIC_RODEMAI_CERTIFICATE = 45626;
  125.     // Misc
  126.     private static final int MIN_LEVEL = 99;
  127. -   private static final int WORLD_CHAT_COUNT = 120;
  128. +   private static final int WORLD_CHAT_COUNT = 30; // POW Client description says 30 times
  129.     private static final Map<Integer, Instant> REUSE = new ConcurrentHashMap<>();
  130.    
  131.     public Q10815_StepUp()
  132. Index: dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
  133. ===================================================================
  134. --- dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java  (revision 7809)
  135. +++ dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java  (working copy)
  136. @@ -50,21 +50,21 @@
  137.     {
  138.         // Giant's Cave Monsters
  139.         23727, // Shaqrima Bathus
  140. -       23728, // Shaqrima Carcass -->
  141. -       23729, // Shaqrima Kshana -->
  142. -       23733, // Lesser Giant Warrior -->
  143. -       23734, // Lesser Giant Wizard -->
  144. -       23735, // Captive Familiar Spirit -->
  145. -       23736, // Captive Hell Demon -->
  146. -       23737, // Captive Succubus -->
  147. -       23738, // Captive Phantom -->
  148. -       23742, // Naia Bathus, Demons Foreman -->
  149. -       23743, // Naia Karkus, Demons Foreman -->
  150. -       23744, // Naia Kshana, Demons Foreman -->
  151. -       23746, // Recovering Lesser Giant Warrior -->
  152. -       23747, // Recovering Lesser Giant Wizard -->
  153. -       23749, // Root of the Lesser Giant -->
  154. -       23754, // Essence of the Lesser Giant -->
  155. +       23728, // Shaqrima Carcass
  156. +       23729, // Shaqrima Kshana
  157. +       23733, // Lesser Giant Warrior
  158. +       23734, // Lesser Giant Wizard
  159. +       23735, // Captive Familiar Spirit
  160. +       23736, // Captive Hell Demon
  161. +       23737, // Captive Succubus
  162. +       23738, // Captive Phantom
  163. +       23742, // Naia Bathus, Demons Foreman
  164. +       23743, // Naia Karkus, Demons Foreman
  165. +       23744, // Naia Kshana, Demons Foreman
  166. +       23746, // Recovering Lesser Giant Warrior
  167. +       23747, // Recovering Lesser Giant Wizard
  168. +       23749, // Root of the Lesser Giant
  169. +       23754, // Essence of the Lesser Giant
  170.        
  171.         // Fairy Settlement Monsters
  172.         18972, // Treekin Defender Scout
  173. @@ -149,7 +149,7 @@
  174.         addKillId(MONSTERS);
  175.         addCondMinLevel(MIN_LEVEL, "30537-02.html");
  176.         addCondStartedQuest(Q10817_ExaltedOneWhoOvercomesTheLimit.class.getSimpleName(), "30537-03.html");
  177. -       registerQuestItems(DARK_SOUL_STONE, VERIDAN_SOUL_STONE, KECHI_SOUL_STONE, MICHAELA_SOUL_STONE);
  178. +       registerQuestItems(DARK_SOUL_STONE, VERIDAN_SOUL_STONE, KECHI_SOUL_STONE, MICHAELA_SOUL_STONE, PROOF_OF_RESISTANCE);
  179.     }
  180.    
  181.     @Override
  182. @@ -200,10 +200,6 @@
  183.                         {
  184.                             htmltext = "30537-10.html";
  185.                         }
  186. -                       else
  187. -                       {
  188. -                           htmltext = event;
  189. -                       }
  190.                         if (qs.isCond(2))
  191.                         {
  192.                             takeItems(player, DARK_SOUL_STONE, 1);
  193. @@ -212,6 +208,7 @@
  194.                             qs.unset(Integer.toString(TAUTI));
  195.                             qs.unset(Integer.toString(EKIMUS));
  196.                         }
  197. +                       htmltext = event;
  198.                         giveItems(player, DAICHIR_CERTIFICATE, 1);
  199.                         addExpAndSp(player, EXP_AMOUNT, 0);
  200.                         qs.exitQuest(false, true);
  201. @@ -299,7 +296,7 @@
  202.     @Override
  203.     public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
  204.     {
  205. -       executeForEachPlayer(player, npc, isSummon, true, false);
  206. +       executeForEachPlayer(player, npc, isSummon, true, true); // Since enter requirement is cc, every cc member should be rewarded.
  207.         return super.onKill(npc, player, isSummon);
  208.     }
  209.    
  210. Index: dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
  211. ===================================================================
  212. --- dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java    (revision 7809)
  213. +++ dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java    (working copy)
  214. @@ -16,6 +16,9 @@
  215.   */
  216.  package quests.Q10821_HelpingOthers;
  217.  
  218. +import java.util.HashSet;
  219. +import java.util.Set;
  220. +
  221.  import org.l2jmobius.gameserver.model.actor.Npc;
  222.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  223.  import org.l2jmobius.gameserver.model.events.EventType;
  224. @@ -23,9 +26,11 @@
  225.  import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
  226.  import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
  227.  import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill;
  228. +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
  229.  import org.l2jmobius.gameserver.model.quest.Quest;
  230.  import org.l2jmobius.gameserver.model.quest.QuestState;
  231.  import org.l2jmobius.gameserver.model.quest.State;
  232. +import org.l2jmobius.gameserver.network.NpcStringId;
  233.  
  234.  import quests.Q10817_ExaltedOneWhoOvercomesTheLimit.Q10817_ExaltedOneWhoOvercomesTheLimit;
  235.  
  236. @@ -49,6 +54,7 @@
  237.     // Misc
  238.     private static final int MIN_LEVEL = 99;
  239.     private static final int MENTEE_MARKS_NEEDED = 45000;
  240. +   private static final int KILLING_NPCSTRING_ID = NpcStringId.BE_PARTY_LEADER.getId();
  241.    
  242.     public Q10821_HelpingOthers()
  243.     {
  244. @@ -87,6 +93,7 @@
  245.             case "30756-06a.html":
  246.             {
  247.                 qs.setCond(2);
  248. +               qs.setMemoState(0);
  249.                 htmltext = event;
  250.                 break;
  251.             }
  252. @@ -151,7 +158,7 @@
  253.                         }
  254.                         break;
  255.                     }
  256. -                   case 2:
  257. +                   case 3:
  258.                     {
  259.                         if (qs.isMemoState(2))
  260.                         {
  261. @@ -164,6 +171,7 @@
  262.                         break;
  263.                     }
  264.                 }
  265. +               break;
  266.             }
  267.             case State.COMPLETED:
  268.             {
  269. @@ -209,8 +217,7 @@
  270.         {
  271.             final int memo = qs.getMemoState() + 1;
  272.             qs.setMemoState(memo);
  273. -           // sendNpcLogList(player);
  274. -          
  275. +           sendNpcLogList(player);
  276.             if (memo >= 2)
  277.             {
  278.                 qs.setCond(3, true);
  279. @@ -217,4 +224,17 @@
  280.             }
  281.         }
  282.     }
  283. +  
  284. +   @Override
  285. +   public Set<NpcLogListHolder> getNpcLogList(PlayerInstance player)
  286. +   {
  287. +       final QuestState qs = getQuestState(player, false);
  288. +       if ((qs != null) && qs.isCond(2))
  289. +       {
  290. +           final Set<NpcLogListHolder> holder = new HashSet<>();
  291. +           holder.add(new NpcLogListHolder(KILLING_NPCSTRING_ID, true, qs.getMemoState()));
  292. +           return holder;
  293. +       }
  294. +       return super.getNpcLogList(player);
  295. +   }
  296.  }
  297. \ No newline at end of file
  298. Index: dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-06.html
  299. ===================================================================
  300. --- dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-06.html (revision 7809)
  301. +++ dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-06.html (working copy)
  302. @@ -2,6 +2,6 @@
  303.  I would like you to go into the other dimension and participate in the <font color="LEVEL">Dimensional Raid</font> to defeat those monsters. I'm sure someone who can protect the world like that will go on to do greater things and acquire greater powers.<br>
  304.  When you defeat monsters in the other dimension, you'll get a <font color="LEVEL">Mark of Advance</font>. Get <font color="LEVEL">3</font> of these and bring them back to me. You need to keep in mind that each time you participate in the <font color="LEVEL">Dimensional Raid</font> you will only get <font color="LEVEL">1 Mark of Advance</font>. <br> <br> <br>
  305.  Also, remember that I can only open the gate on certain days. I can send you there on <font color="LEVEL">Saturdays when there are no Dimensional Castle Sieges, between 19:00~22:00</font>. Just come find me during those times.<br><br>
  306. -Or Defeat any monsters in <font color="LEVEL">Enchanted Valley</font> and <font color="LEVEL">Atelia Refinery</font>, you need to get Proof of Preparation Proof of Preparation  - 20000 pcs.<br>
  307. -<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-11.htm">"kill item 20,000 monsters !?."</Button>
  308. +Or Defeat any monsters in <font color="LEVEL">Enchanted Valley</font> and <font color="LEVEL">Atelia Refinery</font>, to get Proof of Preparation Proof of Preparation  - 20000 pcs.<br>
  309. +<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-11.htm">"Kill 20,000 monsters !?."</Button>
  310.  </body></html>
  311. \ No newline at end of file
  312. Index: dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-07.html
  313. ===================================================================
  314. --- dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-07.html (revision 7809)
  315. +++ dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-07.html (working copy)
  316. @@ -1,6 +1,6 @@
  317.  <html><body>Merlot:<br>
  318.  Please participate in the <font color="LEVEL">Dimensional Raid</font> to prevent those monsters from influencing this place, and collect <font color="LEVEL">3 Marks of Advance</font>. You can only get 1 Mark each time you participate in the Dimensional Raid, so you must participate 3 times in order to pass my test.<br>
  319. -You may teleport to another dimension <font color="LEVEL">only on Saturdays when there are no Dimensional Sieges between 19:00-22:00</font>. Don't forget this last part.
  320. -Or Defeat any monsters in <font color="LEVEL">Enchanted Valley</font> and <font color="LEVEL">Atelia Refinery</font>, you need to get Proof of Preparation Proof of Preparation  - 20000 pcs.<br>
  321. -<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-11.htm">"kill item 20,000 monsters !?."</Button>
  322. +You may teleport to another dimension <font color="LEVEL">only on Saturdays when there are no Dimensional Sieges between 19:00-22:00</font>. Don't forget this last part.<br>
  323. +Or Defeat any monsters in <font color="LEVEL">Enchanted Valley</font> and <font color="LEVEL">Atelia Refinery</font>, to get Proof of Preparation - 20000 pcs.<br><br>
  324. +<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-11.htm">"Kill 20,000 monsters !?."</Button>
  325.  </body></html>
  326. \ No newline at end of file
  327. Index: dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-08.html
  328. ===================================================================
  329. --- dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-08.html (revision 7809)
  330. +++ dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-08.html (working copy)
  331. @@ -1,5 +1,5 @@
  332.  <html><body>Merlot:<br>
  333. -You've compelted it! Great!<br>
  334. +You've completed it! Great!<br>
  335.  We won't need to worry about the monsters from the other dimension.<br>
  336.  <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-09.html">"No doubt about it."</Button>
  337.  </body></html>
  338. \ No newline at end of file
  339. Index: dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-11.htm
  340. ===================================================================
  341. --- dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-11.htm  (revision 7809)
  342. +++ dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-11.htm  (working copy)
  343. @@ -1,4 +1,4 @@
  344.  <html><body>Merlot:<br>
  345. -You need to get Proof of Preparation - 20000 pcs. from monsters - <font color="LEVEL">Devil Warrior, Devil Nightmare, Devil Varos, Devil Sinist, Devil Guardian, Death Rogue, Death Shooter, Death Warrior, Death Sorcerer, Death Pondus, Demonic Warrior, Demonic Wizard, Demonic Weiss, Demonic Keras, Demonic Archer</font> in <font color="LEVEL">Atelia Refinery</font> or <font color="LEVEL">Nymph Astra, Nymph Lily, Nymph rose, Nymph Tulip, Afros, Nymph Sentinel</font> in <font color="LEVEL">Enchanted Valley</font>.<br>
  346. -How to get Proof of Preparation - 20,000 pcs. from monsters, come to me and get a reward.
  347. +You need to get Proof of Preparation - 20000 pcs. from monsters - <font color="LEVEL">Devil Warrior, Devil Nightmare, Devil Varos, Devil Sinist, Devil Guardian, Death Rogue, Death Shooter, Death Warrior, Death Sorcerer, Death Pondus, Demonic Warrior, Demonic Wizard, Demonic Weiss, Demonic Keras, Demonic Archer</font> in <font color="LEVEL">Atelia Refinery</font> or <font color="LEVEL">Nymph Astra, Nymph Lily, Nymph Rose, Nymph Tulip, Afros, Nymph Sentinel</font> in <font color="LEVEL">Enchanted Valley</font>.<br>
  348. +After you get Proof of Preparation - 20,000 pcs. from monsters, come to me and get a reward.
  349.  </body></html>
  350. \ No newline at end of file
  351. Index: dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-12.html
  352. ===================================================================
  353. --- dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-12.html (revision 7809)
  354. +++ dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-12.html (working copy)
  355. @@ -1,5 +1,5 @@
  356.  <html><body>Merlot:<br>
  357. -You've compelted it! Great!<br>
  358. +You've completed it! Great!<br>
  359.  We won't need to worry about the monsters from the other dimension.<br>
  360.  <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-13.html">"No doubt about it."</Button>
  361.  </body></html>
  362. \ No newline at end of file
  363. Index: dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
  364. ===================================================================
  365. --- dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java  (revision 7809)
  366. +++ dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java  (working copy)
  367. @@ -109,6 +109,7 @@
  368.     private static final int SPELLBOOK_BLESSING_OF_THE_EXALTED = 45926;
  369.     // Misc
  370.     private static final int MIN_LEVEL = 100;
  371. +   private static final int PROOF_OF_PREPARATION_NEEDED = 20000;
  372.    
  373.     public Q10824_ConfrontingTheGreatestDanger()
  374.     {
  375. @@ -194,7 +195,7 @@
  376.                         {
  377.                             htmltext = event;
  378.                         }
  379. -                       takeItems(player, PROOF_OF_PREPARATION, -20000);
  380. +                       takeItems(player, PROOF_OF_PREPARATION, PROOF_OF_PREPARATION_NEEDED);
  381.                         giveItems(player, MERLOT_CERTIFICATE, 1);
  382.                         giveItems(player, SPELLBOOK_BLESSING_OF_THE_EXALTED, 1);
  383.                         qs.exitQuest(false, true);
  384. @@ -273,7 +274,7 @@
  385.         {
  386.             giveItems(player, PROOF_OF_PREPARATION, 1);
  387.             playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  388. -           if (getQuestItemsCount(player, PROOF_OF_PREPARATION) >= 20000)
  389. +           if (getQuestItemsCount(player, PROOF_OF_PREPARATION) >= PROOF_OF_PREPARATION_NEEDED)
  390.             {
  391.                 qs.setCond(4, true);
  392.             }
  393. Index: dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
  394. ===================================================================
  395. --- dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java  (revision 7809)
  396. +++ dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java  (working copy)
  397. @@ -115,18 +115,15 @@
  398.                         {
  399.                             htmltext = "30870-10.html";
  400.                         }
  401. -                       else
  402. -                       {
  403. -                           htmltext = event;
  404. -                       }
  405.                         if (qs.isCond(2))
  406.                         {
  407.                             takeItems(player, MARK_OF_VALOR, MARK_OF_VALOR_NEEDED);
  408.                         }
  409. -                       if (qs.isCond(4))
  410. +                       else if (qs.isCond(4))
  411.                         {
  412.                             takeItems(player, PROOF_OF_SETTLEMENT, PROOF_OF_SETTLEMENT_NEEDED);
  413.                         }
  414. +                       htmltext = event;
  415.                         giveItems(player, KURTIZ_CERTIFICATE, 1);
  416.                         giveItems(player, SPELLBOOK_SUMMON_BATTLE_POTION, 1);
  417.                         qs.exitQuest(false, true);
  418. @@ -236,27 +233,29 @@
  419.                 {
  420.                     case 1:
  421.                     {
  422. +                       htmltext = "30870-07.html";
  423. +                       break;
  424. +                   }
  425. +                   case 2:
  426. +                   {
  427.                         if (getQuestItemsCount(player, MARK_OF_VALOR) >= MARK_OF_VALOR_NEEDED)
  428.                         {
  429.                             htmltext = "30870-08.html";
  430.                         }
  431. -                       else
  432. -                       {
  433. -                           htmltext = "30870-07.html";
  434. -                       }
  435.                         break;
  436.                     }
  437.                     case 3:
  438.                     {
  439. +                       htmltext = "30870-07a.html";
  440. +                       break;
  441. +                   }
  442. +                   case 4:
  443. +                   {
  444.                         if (getQuestItemsCount(player, PROOF_OF_SETTLEMENT) >= PROOF_OF_SETTLEMENT_NEEDED)
  445.                         {
  446.                             htmltext = "30870-08a.html";
  447. +                           break;
  448.                         }
  449. -                       else
  450. -                       {
  451. -                           htmltext = "30870-07a.html";
  452. -                       }
  453. -                       break;
  454.                     }
  455.                 }
  456.                 break;
  457. @@ -275,7 +274,7 @@
  458.         if (player != null)
  459.         {
  460.             final QuestState qs = getQuestState(player, false);
  461. -           if ((qs != null) && qs.isCond(1))
  462. +           if ((qs != null) && qs.isCond(3))
  463.             {
  464.                 giveItems(player, PROOF_OF_SETTLEMENT, 1);
  465.                 playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  466. Index: dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/33907-05a.html
  467. ===================================================================
  468. --- dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/33907-05a.html (revision 7809)
  469. +++ dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/33907-05a.html (working copy)
  470. @@ -1,5 +1,5 @@
  471.  <html><body>Eva's Knight Lionel Hunter:<br>
  472.  I'll tell you about the fourth test.<br>
  473.  You need to complete a mission from <font color="LEVEL">High Priest Sylvain</font> in the <font color="LEVEL">Einhasad Temple</font> in the <font color="LEVEL">Town of Dion</font>.<br>
  474. -Only him knows what he'll test you on, so go talk to him. If you forget who you must go to, refer to the guide I'll be giving you<br>
  475. +Only him knows what he'll test you on, so go talk to him. If you forget who you must go to, refer to the guide I'll be giving you.<br>
  476.  </body></html>
  477. \ No newline at end of file
  478. Index: dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
  479. ===================================================================
  480. --- dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java    (revision 7809)
  481. +++ dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java    (working copy)
  482. @@ -79,6 +79,7 @@
  483.                 {
  484.                     giveItems(player, LIONEL_MISSION_LIST_4, 1);
  485.                     qs.startQuest();
  486. +                   qs.setMemoState(1);
  487.                     htmltext = event;
  488.                 }
  489.                 break;
  490. @@ -85,7 +86,7 @@
  491.             }
  492.             case "33907-05a.html":
  493.             {
  494. -               qs.setCond(3);
  495. +               qs.setMemoState(2);
  496.                 htmltext = event;
  497.                 break;
  498.             }
  499. @@ -118,7 +119,7 @@
  500.             }
  501.             case State.STARTED:
  502.             {
  503. -               switch (qs.getCond())
  504. +               switch (qs.getMemoState())
  505.                 {
  506.                     case 1:
  507.                     {
  508. @@ -132,7 +133,7 @@
  509.                         }
  510.                         break;
  511.                     }
  512. -                   case 3:
  513. +                   case 2:
  514.                     {
  515.                         if (hasQuestItems(player, SYLVAIN_CERTIFICATE) && (player.getLevel() >= MIN_COMPLETE_LEVEL))
  516.                         {
  517. Index: dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/33907-05a.html
  518. ===================================================================
  519. --- dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/33907-05a.html (revision 7809)
  520. +++ dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/33907-05a.html (working copy)
  521. @@ -1,8 +1,5 @@
  522.  <html><body>Eva's Knight Lionel Hunter:<br>
  523.  I'll tell you about the fifth test.<br>
  524. -First, you must reach <font color="LEVEL">Lv.105</font> to prove that you're qualified to be Guide of Power. You must also pass the tests of the following people and receive their certificates.<br>
  525. -The testers include <font color="LEVEL">Master Cyphona</font> and <font color="LEVEL">Quartermaster Dinford</font> in the <font color="LEVEL">Blackbird Campsite</font>, <font color="LEVEL">Owner Settlen</font> of <font color="LEVEL">Underground Gainak Mystic Tavern</font>, and <font color="LEVEL">Admiral Keucereus</font> in the <font color="LEVEL">Keucereus Alliance Base</font>.<br><br><br>
  526. -Only they know what they'll test you on, so go talk to them. If you forget who you must go to, refer to the guide I'll be giving you.<br><br>
  527. -All this can be substituted by completing a mission from <font color="LEVEL">Cardinal Seresin</font> in the <font color="LEVEL">Town of Oren</font>.<br>
  528. -<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10879_ExaltedGuideToPower 33907-05a.html">"I'll do that."</Button>
  529. +You need to complete a mission from <font color="LEVEL">Cardinal Seresin</font> in the <font color="LEVEL">Town of Oren</font>.<br>
  530. +Only her knows what she'll test you on, so go talk to her. If you forget who you must go to, refer to the guide I'll be giving you.<br>
  531.  </body></html>
  532. \ No newline at end of file
  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 7809)
  536. +++ dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java    (working copy)
  537. @@ -79,6 +79,7 @@
  538.                 {
  539.                     giveItems(player, LIONEL_MISSION_LIST_5, 1);
  540.                     qs.startQuest();
  541. +                   qs.setMemoState(1);
  542.                     htmltext = event;
  543.                 }
  544.                 break;
  545. @@ -85,7 +86,7 @@
  546.             }
  547.             case "33907-05a.html":
  548.             {
  549. -               qs.setCond(3);
  550. +               qs.setMemoState(2);
  551.                 htmltext = event;
  552.                 break;
  553.             }
  554. @@ -118,7 +119,7 @@
  555.             }
  556.             case State.STARTED:
  557.             {
  558. -               switch (qs.getCond())
  559. +               switch (qs.getMemoState())
  560.                 {
  561.                     case 1:
  562.                     {
  563. @@ -132,7 +133,7 @@
  564.                         }
  565.                         break;
  566.                     }
  567. -                   case 3:
  568. +                   case 2:
  569.                     {
  570.                         if (hasQuestItems(player, SERESIN_CERTIFICATE) && (player.getLevel() >= MIN_COMPLETE_LEVEL))
  571.                         {
  572.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!