API tools faq
paste
Guest User

Untitled

a guest
Sep 3rd, 2020
138
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 126.54 KB | None | 0 0
raw download clone embed print report
  1. From 5c17c8f96ecf8d398fb54646cd3d60f11a3ff297 Mon Sep 17 00:00:00 2001
  2. From: Kamek
  3. Date: Thu, 3 Sep 2020 15:32:15 -0400
  4. Subject: [PATCH] fix quest sounds, incorrect reward in Q10996
  5.  
  6. ---
  7. .../Q10995_MutualBenefit.java                 | 54 +++++++++++++------
  8.  .../Q10996_TemplesDecorations.java            | 48 +++++++++++------
  9.  .../Q10998_LoserPriest2.java                  | 32 ++++++-----
  10.  .../Q10999_LoserPriest3.java                  | 38 ++++++++-----
  11.  .../Q11001_TombsOfAncestors.java              | 42 ++++++++++-----
  12.  .../Q11002_HelpWithTempleRestoration.java     | 42 +++++++++------
  13.  .../Q11003_PerfectLeatherArmor1.java          | 30 +++++++----
  14.  .../Q11004_PerfectLeatherArmor2.java          | 32 ++++++-----
  15.  .../Q11005_PerfectLeatherArmor3.java          | 32 ++++++-----
  16.  .../Q11007_NoiseInWoods.java                  | 42 ++++++++++-----
  17.  .../Q11008_PreparationForDungeon.java         | 42 +++++++++------
  18.  .../Q11009_NewPotionDevelopment1.java         | 30 +++++++----
  19.  .../Q11010_NewPotionDevelopment2.java         | 32 ++++++-----
  20.  .../Q11011_NewPotionDevelopment3.java         | 32 ++++++-----
  21.  .../Q11013_ShilensHunt.java                   | 48 ++++++++++++-----
  22.  .../Q11014_SurpriseGift.java                  | 48 +++++++++++------
  23.  .../Q11015_PrepareForTrade1.java              | 36 ++++++++-----
  24.  .../Q11016_PrepareForTrade2.java              | 38 ++++++++-----
  25.  .../Q11017_PrepareForTrade3.java              | 38 ++++++++-----
  26.  .../Q11019_TribalBenefit.java                 | 54 +++++++++++++------
  27.  .../Q11020_BlacksmithsRequest.java            | 44 ++++++++++-----
  28.  .../Q11021_RedGemNecklace1.java               | 30 +++++++----
  29.  .../Q11022_RedGemNecklace2.java               | 32 ++++++-----
  30.  .../Q11023_RedGemNecklace3.java               | 32 ++++++-----
  31.  24 files changed, 614 insertions(+), 314 deletions(-)
  32.  
  33. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
  34. index 6953a254e1..7719fdd8e5 100644
  35. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
  36. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
  37. @@ -1,16 +1,16 @@
  38.  /*
  39.   * This file is part of the L2J Mobius project.
  40. - *
  41. + *
  42.   * This program is free software: you can redistribute it and/or modify
  43.   * it under the terms of the GNU General Public License as published by
  44.   * the Free Software Foundation, either version 3 of the License, or
  45.   * (at your option) any later version.
  46. - *
  47. + *
  48.   * This program is distributed in the hope that it will be useful,
  49.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  50.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  51.   * General Public License for more details.
  52. - *
  53. + *
  54.   * You should have received a copy of the GNU General Public License
  55.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  56.   */
  57. @@ -59,7 +59,7 @@ public class Q10995_MutualBenefit extends Quest
  58.     // Misc
  59.     private static final int MIN_LVL = 2;
  60.     private static final int MAX_LVL = 20;
  61. -  
  62. +
  63.     public Q10995_MutualBenefit()
  64.     {
  65.         super(10995);
  66. @@ -71,7 +71,7 @@ public class Q10995_MutualBenefit extends Quest
  67.         registerQuestItems(BOUNTY_POSTER, BALCK_WOLF_TOOTH, GOBLINS_NAVIGATION_DEVICE, UTUKU_ORC_AMULET, GOBLIN_BRIGANDS_OLD_SWORD, GARUM_WEREWOLF_TAIL, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE);
  68.         setQuestNameNpcStringId(NpcStringId.LV_2_20_MUTUAL_BENEFIT);
  69.     }
  70. -  
  71. +
  72.     @Override
  73.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  74.     {
  75. @@ -80,7 +80,7 @@ public class Q10995_MutualBenefit extends Quest
  76.         {
  77.             return null;
  78.         }
  79. -      
  80. +
  81.         String htmltext = null;
  82.         switch (event)
  83.         {
  84. @@ -112,7 +112,7 @@ public class Q10995_MutualBenefit extends Quest
  85.         }
  86.         return htmltext;
  87.     }
  88. -  
  89. +
  90.     @Override
  91.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  92.     {
  93. @@ -126,12 +126,16 @@ public class Q10995_MutualBenefit extends Quest
  94.                     if ((qs.isCond(2) && (getQuestItemsCount(killer, BALCK_WOLF_TOOTH) < 10)))
  95.                     {
  96.                         giveItems(killer, BALCK_WOLF_TOOTH, 1);
  97. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  98.                         if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10))
  99.                         {
  100. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  101.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000);
  102.                             qs.setCond(3);
  103.                         }
  104. +                       else
  105. +                       {
  106. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  107. +                       }
  108.                     }
  109.                     break;
  110.                 }
  111. @@ -140,12 +144,16 @@ public class Q10995_MutualBenefit extends Quest
  112.                     if ((qs.isCond(2) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) < 10)))
  113.                     {
  114.                         giveItems(killer, GOBLINS_NAVIGATION_DEVICE, 1);
  115. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  116.                         if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10))
  117.                         {
  118. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  119.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000);
  120.                             qs.setCond(3);
  121.                         }
  122. +                       else
  123. +                       {
  124. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  125. +                       }
  126.                     }
  127.                     break;
  128.                 }
  129. @@ -155,12 +163,16 @@ public class Q10995_MutualBenefit extends Quest
  130.                     if (qs.isCond(3) && (getQuestItemsCount(killer, UTUKU_ORC_AMULET) < 10))
  131.                     {
  132.                         giveItems(killer, UTUKU_ORC_AMULET, 1);
  133. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  134.                         if (getQuestItemsCount(killer, UTUKU_ORC_AMULET) >= 10)
  135.                         {
  136. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  137.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS_NGO_HUNTING_AND_KILL_GOBLIN_BRIGANDS, ExShowScreenMessage.TOP_CENTER, 10000);
  138.                             qs.setCond(4);
  139.                         }
  140. +                       else
  141. +                       {
  142. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  143. +                       }
  144.                     }
  145.                     break;
  146.                 }
  147. @@ -169,12 +181,16 @@ public class Q10995_MutualBenefit extends Quest
  148.                     if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) < 10))
  149.                     {
  150.                         giveItems(killer, GOBLIN_BRIGANDS_OLD_SWORD, 1);
  151. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  152.                         if (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) >= 10)
  153.                         {
  154. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  155.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGANDS_N_GO_HUNTING_AND_KILL_GARUM_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
  156.                             qs.setCond(5);
  157.                         }
  158. +                       else
  159. +                       {
  160. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  161. +                       }
  162.                     }
  163.                     break;
  164.                 }
  165. @@ -183,12 +199,16 @@ public class Q10995_MutualBenefit extends Quest
  166.                     if (qs.isCond(5) && (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) < 10))
  167.                     {
  168.                         giveItems(killer, GARUM_WEREWOLF_TAIL, 1);
  169. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  170.                         if (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) >= 10)
  171.                         {
  172. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  173.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GARUM_WEREWOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_BRIGAND_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000);
  174.                             qs.setCond(6);
  175.                         }
  176. +                       else
  177. +                       {
  178. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  179. +                       }
  180.                     }
  181.                     break;
  182.                 }
  183. @@ -197,12 +217,16 @@ public class Q10995_MutualBenefit extends Quest
  184.                     if (qs.isCond(6) && (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) < 10))
  185.                     {
  186.                         giveItems(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE, 1);
  187. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  188.                         if (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) >= 10)
  189.                         {
  190. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  191.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGAND_LIEUTENANTS_NRETURN_TO_WEAPON_MERCHANT_REEP, ExShowScreenMessage.TOP_CENTER, 10000);
  192.                             qs.setCond(7);
  193.                         }
  194. +                       else
  195. +                       {
  196. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  197. +                       }
  198.                     }
  199.                     break;
  200.                 }
  201. @@ -210,7 +234,7 @@ public class Q10995_MutualBenefit extends Quest
  202.         }
  203.         return super.onKill(npc, killer, isSummon);
  204.     }
  205. -  
  206. +
  207.     @Override
  208.     public String onTalk(Npc npc, PlayerInstance talker)
  209.     {
  210. @@ -274,4 +298,4 @@ public class Q10995_MutualBenefit extends Quest
  211.         }
  212.         return htmltext;
  213.     }
  214. -}
  215. \ No newline at end of file
  216. +}
  217. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
  218. index 65030dd65f..0ae724c7af 100644
  219. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
  220. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
  221. @@ -1,16 +1,16 @@
  222.  /*
  223.   * This file is part of the L2J Mobius project.
  224. - *
  225. + *
  226.   * This program is free software: you can redistribute it and/or modify
  227.   * it under the terms of the GNU General Public License as published by
  228.   * the Free Software Foundation, either version 3 of the License, or
  229.   * (at your option) any later version.
  230. - *
  231. + *
  232.   * This program is distributed in the hope that it will be useful,
  233.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  234.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  235.   * General Public License for more details.
  236. - *
  237. + *
  238.   * You should have received a copy of the GNU General Public License
  239.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  240.   */
  241. @@ -46,7 +46,7 @@ public class Q10996_TemplesDecorations extends Quest
  242.     private static final int WARRIORS_GAITERS = 90307;
  243.     private static final int MEDIUMS_TUNIC = 90308;
  244.     private static final int MEDIUMS_STOCKINGS = 90309;
  245. -   private static final int RING_NOVICE = 29497;
  246. +   private static final int EARRING_NOVICE = 29486;
  247.     // Monsters
  248.     private static final int BARBED_BATS = 20370;
  249.     private static final int CRYSTAL_PUMA = 20510;
  250. @@ -57,7 +57,7 @@ public class Q10996_TemplesDecorations extends Quest
  251.     // Misc
  252.     private static final int MIN_LVL = 11;
  253.     private static final int MAX_LVL = 20;
  254. -  
  255. +
  256.     public Q10996_TemplesDecorations()
  257.     {
  258.         super(10996);
  259. @@ -69,7 +69,7 @@ public class Q10996_TemplesDecorations extends Quest
  260.         registerQuestItems(TEMPLE_RECONSTRUCTION_REQUEST, BARBED_BAT_WING_SAC, PUMA_FUR, GOBLIN_JEWEL, GOLEM_ORE);
  261.         setQuestNameNpcStringId(NpcStringId.LV_11_20_TEMPLE_S_DECORATIONS);
  262.     }
  263. -  
  264. +
  265.     @Override
  266.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  267.     {
  268. @@ -78,7 +78,7 @@ public class Q10996_TemplesDecorations extends Quest
  269.         {
  270.             return null;
  271.         }
  272. -      
  273. +
  274.         String htmltext = null;
  275.         switch (event)
  276.         {
  277. @@ -99,7 +99,7 @@ public class Q10996_TemplesDecorations extends Quest
  278.                     takeItems(player, GOLEM_ORE, 20);
  279.                     giveItems(player, WARRIORS_ARMOR, 1);
  280.                     giveItems(player, WARRIORS_GAITERS, 1);
  281. -                   giveItems(player, RING_NOVICE, 2);
  282. +                   giveItems(player, EARRING_NOVICE, 2);
  283.                     addExpAndSp(player, 80000, 0);
  284.                     qs.exitQuest(false, true);
  285.                     htmltext = "30538-03.html";
  286. @@ -117,7 +117,7 @@ public class Q10996_TemplesDecorations extends Quest
  287.                     takeItems(player, GOLEM_ORE, 20);
  288.                     giveItems(player, MEDIUMS_TUNIC, 1);
  289.                     giveItems(player, MEDIUMS_STOCKINGS, 1);
  290. -                   giveItems(player, RING_NOVICE, 2);
  291. +                   giveItems(player, EARRING_NOVICE, 2);
  292.                     addExpAndSp(player, 80000, 0);
  293.                     qs.exitQuest(false, true);
  294.                     htmltext = "30538-04.html";
  295. @@ -127,7 +127,7 @@ public class Q10996_TemplesDecorations extends Quest
  296.         }
  297.         return htmltext;
  298.     }
  299. -  
  300. +
  301.     @Override
  302.     public String onTalk(Npc npc, PlayerInstance talker)
  303.     {
  304. @@ -187,7 +187,7 @@ public class Q10996_TemplesDecorations extends Quest
  305.         }
  306.         return htmltext;
  307.     }
  308. -  
  309. +
  310.     @Override
  311.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  312.     {
  313. @@ -201,12 +201,16 @@ public class Q10996_TemplesDecorations extends Quest
  314.                     if (qs.isCond(2) && (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) < 20) && (getRandom(100) < 90))
  315.                     {
  316.                         giveItems(killer, BARBED_BAT_WING_SAC, 1);
  317. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  318.                         if (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) >= 20)
  319.                         {
  320. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  321.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BARBED_BATS_N_GO_HUNTING_AND_KILL_CRYSTAL_PUMAS, ExShowScreenMessage.TOP_CENTER, 10000);
  322.                             qs.setCond(3);
  323.                         }
  324. +                       else
  325. +                       {
  326. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  327. +                       }
  328.                     }
  329.                     break;
  330.                 }
  331. @@ -215,12 +219,16 @@ public class Q10996_TemplesDecorations extends Quest
  332.                     if (qs.isCond(3) && (getQuestItemsCount(killer, PUMA_FUR) < 20) && (getRandom(100) < 90))
  333.                     {
  334.                         giveItems(killer, PUMA_FUR, 1);
  335. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  336.                         if (getQuestItemsCount(killer, PUMA_FUR) >= 20)
  337.                         {
  338. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  339.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTAL_PUMAS_N_GO_HUNTING_AND_KILL_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000);
  340.                             qs.setCond(4);
  341.                         }
  342. +                       else
  343. +                       {
  344. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  345. +                       }
  346.                     }
  347.                     break;
  348.                 }
  349. @@ -230,12 +238,16 @@ public class Q10996_TemplesDecorations extends Quest
  350.                     if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_JEWEL) < 20) && (getRandom(100) < 90))
  351.                     {
  352.                         giveItems(killer, GOBLIN_JEWEL, 1);
  353. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  354.                         if ((getQuestItemsCount(killer, GOBLIN_JEWEL) >= 20))
  355.                         {
  356. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  357.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS_N_GO_HUNTING_AND_KILL_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000);
  358.                             qs.setCond(5);
  359.                         }
  360. +                       else
  361. +                       {
  362. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  363. +                       }
  364.                     }
  365.                     break;
  366.                 }
  367. @@ -245,12 +257,16 @@ public class Q10996_TemplesDecorations extends Quest
  368.                     if (qs.isCond(5) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90))
  369.                     {
  370.                         giveItems(killer, GOLEM_ORE, 1);
  371. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  372.                         if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20))
  373.                         {
  374. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  375.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS_NRETURN_TO_PRIEST_OF_THE_EARTH_ZIMENF, ExShowScreenMessage.TOP_CENTER, 10000);
  376.                             qs.setCond(6);
  377.                         }
  378. +                       else
  379. +                       {
  380. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  381. +                       }
  382.                     }
  383.                     break;
  384.                 }
  385. @@ -258,4 +274,4 @@ public class Q10996_TemplesDecorations extends Quest
  386.         }
  387.         return super.onKill(npc, killer, isSummon);
  388.     }
  389. -}
  390. \ No newline at end of file
  391. +}
  392. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
  393. index 90bcf6472c..197fd651ff 100644
  394. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
  395. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
  396. @@ -1,16 +1,16 @@
  397.  /*
  398.   * This file is part of the L2J Mobius project.
  399. - *
  400. + *
  401.   * This program is free software: you can redistribute it and/or modify
  402.   * it under the terms of the GNU General Public License as published by
  403.   * the Free Software Foundation, either version 3 of the License, or
  404.   * (at your option) any later version.
  405. - *
  406. + *
  407.   * This program is distributed in the hope that it will be useful,
  408.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  409.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  410.   * General Public License for more details.
  411. - *
  412. + *
  413.   * You should have received a copy of the GNU General Public License
  414.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  415.   */
  416. @@ -52,7 +52,7 @@ public class Q10998_LoserPriest2 extends Quest
  417.     // Misc
  418.     private static final int MIN_LVL = 15;
  419.     private static final int MAX_LVL = 20;
  420. -  
  421. +
  422.     public Q10998_LoserPriest2()
  423.     {
  424.         super(10998);
  425. @@ -65,7 +65,7 @@ public class Q10998_LoserPriest2 extends Quest
  426.         registerQuestItems(MAINTENANCE_REQUEST, HUNTER_TARANTULA_VENOM, PLUNDER_TARANTULA_KIDNEY);
  427.         setQuestNameNpcStringId(NpcStringId.LV_15_LOSER_PRIEST_2_3);
  428.     }
  429. -  
  430. +
  431.     @Override
  432.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  433.     {
  434. @@ -74,7 +74,7 @@ public class Q10998_LoserPriest2 extends Quest
  435.         {
  436.             return null;
  437.         }
  438. -      
  439. +
  440.         String htmltext = null;
  441.         switch (event)
  442.         {
  443. @@ -130,13 +130,13 @@ public class Q10998_LoserPriest2 extends Quest
  444.         }
  445.         return htmltext;
  446.     }
  447. -  
  448. +
  449.     @Override
  450.     public String onTalk(Npc npc, PlayerInstance talker)
  451.     {
  452.         final QuestState qs = getQuestState(talker, true);
  453.         String htmltext = getNoQuestMsg(talker);
  454. -      
  455. +
  456.         switch (qs.getState())
  457.         {
  458.             case State.CREATED:
  459. @@ -164,7 +164,7 @@ public class Q10998_LoserPriest2 extends Quest
  460.         }
  461.         return htmltext;
  462.     }
  463. -  
  464. +
  465.     @Override
  466.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  467.     {
  468. @@ -178,12 +178,16 @@ public class Q10998_LoserPriest2 extends Quest
  469.                     if (qs.isCond(2) && (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) < 20) && (getRandom(100) < 94))
  470.                     {
  471.                         giveItems(killer, HUNTER_TARANTULA_VENOM, 1);
  472. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  473.                         if (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) >= 20)
  474.                         {
  475. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  476.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_HUNTER_TARANTULAS_N_GO_HUNTING_AND_KILL_PLUNDER_TARANTULAS, ExShowScreenMessage.TOP_CENTER, 10000);
  477.                             qs.setCond(3);
  478.                         }
  479. +                       else
  480. +                       {
  481. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  482. +                       }
  483.                     }
  484.                     break;
  485.                 }
  486. @@ -192,12 +196,16 @@ public class Q10998_LoserPriest2 extends Quest
  487.                     if (qs.isCond(3) && (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) < 20) && (getRandom(100) < 94))
  488.                     {
  489.                         giveItems(killer, PLUNDER_TARANTULA_KIDNEY, 1);
  490. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  491.                         if (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) >= 20)
  492.                         {
  493. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  494.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PLUNDER_TARANTULAS_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000);
  495.                             qs.setCond(4);
  496.                         }
  497. +                       else
  498. +                       {
  499. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  500. +                       }
  501.                     }
  502.                     break;
  503.                 }
  504. @@ -205,4 +213,4 @@ public class Q10998_LoserPriest2 extends Quest
  505.         }
  506.         return super.onKill(npc, killer, isSummon);
  507.     }
  508. -}
  509. \ No newline at end of file
  510. +}
  511. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
  512. index b6fb78ac08..1d1a278832 100644
  513. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
  514. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
  515. @@ -1,16 +1,16 @@
  516.  /*
  517.   * This file is part of the L2J Mobius project.
  518. - *
  519. + *
  520.   * This program is free software: you can redistribute it and/or modify
  521.   * it under the terms of the GNU General Public License as published by
  522.   * the Free Software Foundation, either version 3 of the License, or
  523.   * (at your option) any later version.
  524. - *
  525. + *
  526.   * This program is distributed in the hope that it will be useful,
  527.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  528.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  529.   * General Public License for more details.
  530. - *
  531. + *
  532.   * You should have received a copy of the GNU General Public License
  533.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  534.   */
  535. @@ -55,7 +55,7 @@ public class Q10999_LoserPriest3 extends Quest
  536.     // Misc
  537.     private static final int MIN_LVL = 15;
  538.     private static final int MAX_LVL = 20;
  539. -  
  540. +
  541.     public Q10999_LoserPriest3()
  542.     {
  543.         super(10999);
  544. @@ -68,7 +68,7 @@ public class Q10999_LoserPriest3 extends Quest
  545.         registerQuestItems(NEW_CLEANING_TOOLS_LIST, BAT_BRISTLE, TRIMDEN_WEB, KEROPE_WEREWOLF_TWIG_CHARM);
  546.         setQuestNameNpcStringId(NpcStringId.LV_15_LOSER_PRIEST_3_3);
  547.     }
  548. -  
  549. +
  550.     @Override
  551.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  552.     {
  553. @@ -77,7 +77,7 @@ public class Q10999_LoserPriest3 extends Quest
  554.         {
  555.             return null;
  556.         }
  557. -      
  558. +
  559.         String htmltext = null;
  560.         switch (event)
  561.         {
  562. @@ -134,13 +134,13 @@ public class Q10999_LoserPriest3 extends Quest
  563.         }
  564.         return htmltext;
  565.     }
  566. -  
  567. +
  568.     @Override
  569.     public String onTalk(Npc npc, PlayerInstance talker)
  570.     {
  571.         final QuestState qs = getQuestState(talker, true);
  572.         String htmltext = getNoQuestMsg(talker);
  573. -      
  574. +
  575.         switch (qs.getState())
  576.         {
  577.             case State.CREATED:
  578. @@ -168,7 +168,7 @@ public class Q10999_LoserPriest3 extends Quest
  579.         }
  580.         return htmltext;
  581.     }
  582. -  
  583. +
  584.     @Override
  585.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  586.     {
  587. @@ -182,12 +182,16 @@ public class Q10999_LoserPriest3 extends Quest
  588.                     if (qs.isCond(2) && (getQuestItemsCount(killer, BAT_BRISTLE) < 20) && (getRandom(100) < 90))
  589.                     {
  590.                         giveItems(killer, BAT_BRISTLE, 1);
  591. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  592.                         if (getQuestItemsCount(killer, BAT_BRISTLE) >= 20)
  593.                         {
  594. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  595.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RED_EYE_BARBED_BATS_NGO_HUNTING_AND_KILL_NORTHERN_TRIMDENS, ExShowScreenMessage.TOP_CENTER, 10000);
  596.                             qs.setCond(3);
  597.                         }
  598. +                       else
  599. +                       {
  600. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  601. +                       }
  602.                     }
  603.                     break;
  604.                 }
  605. @@ -196,12 +200,16 @@ public class Q10999_LoserPriest3 extends Quest
  606.                     if (qs.isCond(3) && (getQuestItemsCount(killer, TRIMDEN_WEB) < 20) && (getRandom(100) < 90))
  607.                     {
  608.                         giveItems(killer, TRIMDEN_WEB, 1);
  609. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  610.                         if (getQuestItemsCount(killer, TRIMDEN_WEB) >= 20)
  611.                         {
  612. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  613.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_NORTHERN_TRIMDENS_N_GO_HUNTING_AND_KILL_KEROPE_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
  614.                             qs.setCond(4);
  615.                         }
  616. +                       else
  617. +                       {
  618. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  619. +                       }
  620.                     }
  621.                     break;
  622.                 }
  623. @@ -211,12 +219,16 @@ public class Q10999_LoserPriest3 extends Quest
  624.                     if (qs.isCond(4) && (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) < 20) && (getRandom(100) < 90))
  625.                     {
  626.                         giveItems(killer, KEROPE_WEREWOLF_TWIG_CHARM, 1);
  627. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  628.                         if (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) >= 20)
  629.                         {
  630. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  631.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KEROPE_WEREWOLVES_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000);
  632.                             qs.setCond(5);
  633.                         }
  634. +                       else
  635. +                       {
  636. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  637. +                       }
  638.                     }
  639.                     break;
  640.                 }
  641. @@ -224,4 +236,4 @@ public class Q10999_LoserPriest3 extends Quest
  642.         }
  643.         return super.onKill(npc, killer, isSummon);
  644.     }
  645. -}
  646. \ No newline at end of file
  647. +}
  648. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
  649. index 7ad205fc25..efa06b2a4a 100644
  650. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
  651. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
  652. @@ -1,16 +1,16 @@
  653.  /*
  654.   * This file is part of the L2J Mobius project.
  655. - *
  656. + *
  657.   * This program is free software: you can redistribute it and/or modify
  658.   * it under the terms of the GNU General Public License as published by
  659.   * the Free Software Foundation, either version 3 of the License, or
  660.   * (at your option) any later version.
  661. - *
  662. + *
  663.   * This program is distributed in the hope that it will be useful,
  664.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  665.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  666.   * General Public License for more details.
  667. - *
  668. + *
  669.   * You should have received a copy of the GNU General Public License
  670.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  671.   */
  672. @@ -57,7 +57,7 @@ public class Q11001_TombsOfAncestors extends Quest
  673.     // Misc
  674.     private static final int MIN_LVL = 2;
  675.     private static final int MAX_LVL = 20;
  676. -  
  677. +
  678.     public Q11001_TombsOfAncestors()
  679.     {
  680.         super(11001);
  681. @@ -69,7 +69,7 @@ public class Q11001_TombsOfAncestors extends Quest
  682.         registerQuestItems(HUNTERS_MEMO, WOLF_PELT, ORC_AMULET, WEREWOLFS_FANG, BROKEN_SWORD);
  683.         setQuestNameNpcStringId(NpcStringId.LV_2_20_TOMBS_OF_ANCESTORS);
  684.     }
  685. -  
  686. +
  687.     @Override
  688.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  689.     {
  690. @@ -78,7 +78,7 @@ public class Q11001_TombsOfAncestors extends Quest
  691.         {
  692.             return null;
  693.         }
  694. -      
  695. +
  696.         String htmltext = null;
  697.         switch (event)
  698.         {
  699. @@ -125,7 +125,7 @@ public class Q11001_TombsOfAncestors extends Quest
  700.         }
  701.         return htmltext;
  702.     }
  703. -  
  704. +
  705.     @Override
  706.     public String onTalk(Npc npc, PlayerInstance talker)
  707.     {
  708. @@ -185,7 +185,7 @@ public class Q11001_TombsOfAncestors extends Quest
  709.         }
  710.         return htmltext;
  711.     }
  712. -  
  713. +
  714.     @Override
  715.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  716.     {
  717. @@ -200,12 +200,16 @@ public class Q11001_TombsOfAncestors extends Quest
  718.                     if (qs.isCond(2) && (getQuestItemsCount(killer, WOLF_PELT) < 10) && (getRandom(100) < 93))
  719.                     {
  720.                         giveItems(killer, WOLF_PELT, 1);
  721. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  722.                         if (getQuestItemsCount(killer, WOLF_PELT) >= 10)
  723.                         {
  724. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  725.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000);
  726.                             qs.setCond(3);
  727.                         }
  728. +                       else
  729. +                       {
  730. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  731. +                       }
  732.                     }
  733.                     break;
  734.                 }
  735. @@ -216,12 +220,16 @@ public class Q11001_TombsOfAncestors extends Quest
  736.                     if (qs.isCond(3) && (getQuestItemsCount(killer, ORC_AMULET) < 10) && (getRandom(100) < 93))
  737.                     {
  738.                         giveItems(killer, ORC_AMULET, 1);
  739. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  740.                         if (getQuestItemsCount(killer, ORC_AMULET) >= 10)
  741.                         {
  742. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  743.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
  744.                             qs.setCond(4);
  745.                         }
  746. +                       else
  747. +                       {
  748. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  749. +                       }
  750.                     }
  751.                     break;
  752.                 }
  753. @@ -230,12 +238,16 @@ public class Q11001_TombsOfAncestors extends Quest
  754.                     if (qs.isCond(4) && (getQuestItemsCount(killer, BROKEN_SWORD) < 10) && (getRandom(100) < 89))
  755.                     {
  756.                         giveItems(killer, BROKEN_SWORD, 1);
  757. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  758.                         if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10))
  759.                         {
  760. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  761.                             showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
  762.                             qs.setCond(5);
  763.                         }
  764. +                       else
  765. +                       {
  766. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  767. +                       }
  768.                     }
  769.                     break;
  770.                 }
  771. @@ -244,12 +256,16 @@ public class Q11001_TombsOfAncestors extends Quest
  772.                     if (qs.isCond(4) && (getQuestItemsCount(killer, WEREWOLFS_FANG) < 10) && (getRandom(100) < 100))
  773.                     {
  774.                         giveItems(killer, WEREWOLFS_FANG, 1);
  775. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  776.                         if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10))
  777.                         {
  778. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  779.                             showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
  780.                             qs.setCond(5);
  781.                         }
  782. +                       else
  783. +                       {
  784. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  785. +                       }
  786.                     }
  787.                     break;
  788.                 }
  789. @@ -257,4 +273,4 @@ public class Q11001_TombsOfAncestors extends Quest
  790.         }
  791.         return super.onKill(npc, killer, isSummon);
  792.     }
  793. -}
  794. \ No newline at end of file
  795. +}
  796. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
  797. index 1c7c062203..bfb2d07846 100644
  798. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
  799. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
  800. @@ -1,16 +1,16 @@
  801.  /*
  802.   * This file is part of the L2J Mobius project.
  803. - *
  804. + *
  805.   * This program is free software: you can redistribute it and/or modify
  806.   * it under the terms of the GNU General Public License as published by
  807.   * the Free Software Foundation, either version 3 of the License, or
  808.   * (at your option) any later version.
  809. - *
  810. + *
  811.   * This program is distributed in the hope that it will be useful,
  812.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  813.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  814.   * General Public License for more details.
  815. - *
  816. + *
  817.   * You should have received a copy of the GNU General Public License
  818.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  819.   */
  820. @@ -45,7 +45,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  821.     private static final int WARRIORS_GAITERS = 90307;
  822.     private static final int MEDIUMS_TUNIC = 90308;
  823.     private static final int MEDIUMS_STOCKINGS = 90309;
  824. -   private static final int RING_NOVICE = 29497;
  825. +   private static final int EARRING_NOVICE = 29486;
  826.     // Monsters
  827.     private static final int ORC_LIEUTENANT = 20096;
  828.     private static final int ORC_CAPTAIN = 20098;
  829. @@ -56,7 +56,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  830.     // Misc
  831.     private static final int MIN_LVL = 11;
  832.     private static final int MAX_LVL = 20;
  833. -  
  834. +
  835.     public Q11002_HelpWithTempleRestoration()
  836.     {
  837.         super(11002);
  838. @@ -68,7 +68,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  839.         registerQuestItems(INVENTORY_BOOK, WOODEN_POLE, WOODEN_DOOR_PANEL, STONE_POWDER);
  840.         setQuestNameNpcStringId(NpcStringId.LV_11_20_HELP_WITH_TEMPLE_RESTORATION);
  841.     }
  842. -  
  843. +
  844.     @Override
  845.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  846.     {
  847. @@ -77,7 +77,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  848.         {
  849.             return null;
  850.         }
  851. -      
  852. +
  853.         String htmltext = null;
  854.         switch (event)
  855.         {
  856. @@ -97,7 +97,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  857.                     takeItems(player, STONE_POWDER, 20);
  858.                     giveItems(player, WARRIORS_ARMOR, 1);
  859.                     giveItems(player, WARRIORS_GAITERS, 1);
  860. -                   giveItems(player, RING_NOVICE, 2);
  861. +                   giveItems(player, EARRING_NOVICE, 2);
  862.                     addExpAndSp(player, 80000, 0);
  863.                     qs.exitQuest(false, true);
  864.                     htmltext = "30035-03.html";
  865. @@ -114,7 +114,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  866.                     takeItems(player, STONE_POWDER, 20);
  867.                     giveItems(player, MEDIUMS_TUNIC, 1);
  868.                     giveItems(player, MEDIUMS_STOCKINGS, 1);
  869. -                   giveItems(player, RING_NOVICE, 2);
  870. +                   giveItems(player, EARRING_NOVICE, 2);
  871.                     addExpAndSp(player, 80000, 0);
  872.                     qs.exitQuest(false, true);
  873.                     htmltext = "30035-04.html";
  874. @@ -124,7 +124,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  875.         }
  876.         return htmltext;
  877.     }
  878. -  
  879. +
  880.     @Override
  881.     public String onTalk(Npc npc, PlayerInstance talker)
  882.     {
  883. @@ -184,7 +184,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  884.         }
  885.         return htmltext;
  886.     }
  887. -  
  888. +
  889.     @Override
  890.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  891.     {
  892. @@ -199,12 +199,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  893.                     if (qs.isCond(2) && (getQuestItemsCount(killer, WOODEN_POLE) < 20) && (getRandom(100) < 84))
  894.                     {
  895.                         giveItems(killer, WOODEN_POLE, 1);
  896. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  897.                         if (getQuestItemsCount(killer, WOODEN_POLE) >= 20)
  898.                         {
  899. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  900.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORC_LIEUTENANTS_AND_ORC_CAPTAINS_N_GO_HUNTING_AND_KILL_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS, ExShowScreenMessage.TOP_CENTER, 10000);
  901.                             qs.setCond(3);
  902.                         }
  903. +                       else
  904. +                       {
  905. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  906. +                       }
  907.                     }
  908.                     break;
  909.                 }
  910. @@ -214,12 +218,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  911.                     if (qs.isCond(3) && (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) < 25) && (getRandom(100) < 87))
  912.                     {
  913.                         giveItems(killer, WOODEN_DOOR_PANEL, 1);
  914. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  915.                         if (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) >= 25)
  916.                         {
  917. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  918.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS_N_GO_HUNTING_AND_KILL_STONE_GOLEMS_AND_CRASHERS, ExShowScreenMessage.TOP_CENTER, 10000);
  919.                             qs.setCond(4);
  920.                         }
  921. +                       else
  922. +                       {
  923. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  924. +                       }
  925.                     }
  926.                     break;
  927.                 }
  928. @@ -229,12 +237,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  929.                     if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_POWDER) < 20) && (getRandom(100) < 84))
  930.                     {
  931.                         giveItems(killer, STONE_POWDER, 1);
  932. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  933.                         if ((getQuestItemsCount(killer, STONE_POWDER) >= 20) && (getQuestItemsCount(killer, STONE_POWDER) >= 10))
  934.                         {
  935. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  936.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_HARRYS_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000);
  937.                             qs.setCond(5);
  938.                         }
  939. +                       else
  940. +                       {
  941. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  942. +                       }
  943.                     }
  944.                     break;
  945.                 }
  946. @@ -242,4 +254,4 @@ public class Q11002_HelpWithTempleRestoration extends Quest
  947.         }
  948.         return super.onKill(npc, killer, isSummon);
  949.     }
  950. -}
  951. \ No newline at end of file
  952. +}
  953. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
  954. index d0ed5b406e..532a302666 100644
  955. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
  956. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
  957. @@ -1,16 +1,16 @@
  958.  /*
  959.   * This file is part of the L2J Mobius project.
  960. - *
  961. + *
  962.   * This program is free software: you can redistribute it and/or modify
  963.   * it under the terms of the GNU General Public License as published by
  964.   * the Free Software Foundation, either version 3 of the License, or
  965.   * (at your option) any later version.
  966. - *
  967. + *
  968.   * This program is distributed in the hope that it will be useful,
  969.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  970.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  971.   * General Public License for more details.
  972. - *
  973. + *
  974.   * You should have received a copy of the GNU General Public License
  975.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  976.   */
  977. @@ -55,7 +55,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  978.     // Misc
  979.     private static final int MIN_LVL = 15;
  980.     private static final int MAX_LVL = 20;
  981. -  
  982. +
  983.     public Q11003_PerfectLeatherArmor1()
  984.     {
  985.         super(11003);
  986. @@ -67,7 +67,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  987.         registerQuestItems(LECTORS_NOTES, COBWEB, ESSENCE_OF_WATER);
  988.         setQuestNameNpcStringId(NpcStringId.LV_15_20_PERFECT_LEATHER_ARMOR_1_3);
  989.     }
  990. -  
  991. +
  992.     @Override
  993.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  994.     {
  995. @@ -76,7 +76,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  996.         {
  997.             return null;
  998.         }
  999. -      
  1000. +
  1001.         String htmltext = null;
  1002.         switch (event)
  1003.         {
  1004. @@ -123,7 +123,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  1005.         }
  1006.         return htmltext;
  1007.     }
  1008. -  
  1009. +
  1010.     @Override
  1011.     public String onTalk(Npc npc, PlayerInstance talker)
  1012.     {
  1013. @@ -182,7 +182,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  1014.         }
  1015.         return htmltext;
  1016.     }
  1017. -  
  1018. +
  1019.     @Override
  1020.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1021.     {
  1022. @@ -198,12 +198,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  1023.                     if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87))
  1024.                     {
  1025.                         giveItems(killer, COBWEB, 1);
  1026. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1027.                         if (getQuestItemsCount(killer, COBWEB) >= 25)
  1028.                         {
  1029. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1030.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000);
  1031.                             qs.setCond(3);
  1032.                         }
  1033. +                       else
  1034. +                       {
  1035. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1036. +                       }
  1037.                     }
  1038.                     break;
  1039.                 }
  1040. @@ -214,12 +218,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  1041.                     if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100))
  1042.                     {
  1043.                         giveItems(killer, ESSENCE_OF_WATER, 1);
  1044. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1045.                         if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20)
  1046.                         {
  1047. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1048.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000);
  1049.                             qs.setCond(4);
  1050.                         }
  1051. +                       else
  1052. +                       {
  1053. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1054. +                       }
  1055.                     }
  1056.                     break;
  1057.                 }
  1058. @@ -227,4 +235,4 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
  1059.         }
  1060.         return super.onKill(npc, killer, isSummon);
  1061.     }
  1062. -}
  1063. \ No newline at end of file
  1064. +}
  1065. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
  1066. index 081409f900..5b0777d6f8 100644
  1067. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
  1068. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
  1069. @@ -1,16 +1,16 @@
  1070.  /*
  1071.   * This file is part of the L2J Mobius project.
  1072. - *
  1073. + *
  1074.   * This program is free software: you can redistribute it and/or modify
  1075.   * it under the terms of the GNU General Public License as published by
  1076.   * the Free Software Foundation, either version 3 of the License, or
  1077.   * (at your option) any later version.
  1078. - *
  1079. + *
  1080.   * This program is distributed in the hope that it will be useful,
  1081.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1082.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1083.   * General Public License for more details.
  1084. - *
  1085. + *
  1086.   * You should have received a copy of the GNU General Public License
  1087.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1088.   */
  1089. @@ -56,7 +56,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1090.     // Misc
  1091.     private static final int MIN_LVL = 15;
  1092.     private static final int MAX_LVL = 20;
  1093. -  
  1094. +
  1095.     public Q11004_PerfectLeatherArmor2()
  1096.     {
  1097.         super(11004);
  1098. @@ -69,7 +69,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1099.         registerQuestItems(LECTORS_NOTES, COBWEB, ESSENCE_OF_WATER);
  1100.         setQuestNameNpcStringId(NpcStringId.LV_15_PERFECT_LEATHER_ARMOR_2_3);
  1101.     }
  1102. -  
  1103. +
  1104.     @Override
  1105.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1106.     {
  1107. @@ -78,7 +78,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1108.         {
  1109.             return null;
  1110.         }
  1111. -      
  1112. +
  1113.         String htmltext = null;
  1114.         switch (event)
  1115.         {
  1116. @@ -133,13 +133,13 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1117.         }
  1118.         return htmltext;
  1119.     }
  1120. -  
  1121. +
  1122.     @Override
  1123.     public String onTalk(Npc npc, PlayerInstance talker)
  1124.     {
  1125.         final QuestState qs = getQuestState(talker, true);
  1126.         String htmltext = getNoQuestMsg(talker);
  1127. -      
  1128. +
  1129.         switch (qs.getState())
  1130.         {
  1131.             case State.CREATED:
  1132. @@ -167,7 +167,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1133.         }
  1134.         return htmltext;
  1135.     }
  1136. -  
  1137. +
  1138.     @Override
  1139.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1140.     {
  1141. @@ -183,12 +183,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1142.                     if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87))
  1143.                     {
  1144.                         giveItems(killer, COBWEB, 1);
  1145. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1146.                         if (getQuestItemsCount(killer, COBWEB) >= 25)
  1147.                         {
  1148. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1149.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000);
  1150.                             qs.setCond(3);
  1151.                         }
  1152. +                       else
  1153. +                       {
  1154. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1155. +                       }
  1156.                     }
  1157.                     break;
  1158.                 }
  1159. @@ -199,12 +203,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1160.                     if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100))
  1161.                     {
  1162.                         giveItems(killer, ESSENCE_OF_WATER, 1);
  1163. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1164.                         if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20)
  1165.                         {
  1166. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1167.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000);
  1168.                             qs.setCond(4);
  1169.                         }
  1170. +                       else
  1171. +                       {
  1172. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1173. +                       }
  1174.                     }
  1175.                     break;
  1176.                 }
  1177. @@ -212,4 +220,4 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
  1178.         }
  1179.         return super.onKill(npc, killer, isSummon);
  1180.     }
  1181. -}
  1182. \ No newline at end of file
  1183. +}
  1184. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
  1185. index 9b268bcfb6..0890c80b45 100644
  1186. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
  1187. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
  1188. @@ -1,16 +1,16 @@
  1189.  /*
  1190.   * This file is part of the L2J Mobius project.
  1191. - *
  1192. + *
  1193.   * This program is free software: you can redistribute it and/or modify
  1194.   * it under the terms of the GNU General Public License as published by
  1195.   * the Free Software Foundation, either version 3 of the License, or
  1196.   * (at your option) any later version.
  1197. - *
  1198. + *
  1199.   * This program is distributed in the hope that it will be useful,
  1200.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1201.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1202.   * General Public License for more details.
  1203. - *
  1204. + *
  1205.   * You should have received a copy of the GNU General Public License
  1206.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1207.   */
  1208. @@ -56,7 +56,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1209.     // Misc
  1210.     private static final int MIN_LVL = 15;
  1211.     private static final int MAX_LVL = 20;
  1212. -  
  1213. +
  1214.     public Q11005_PerfectLeatherArmor3()
  1215.     {
  1216.         super(11005);
  1217. @@ -69,7 +69,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1218.         registerQuestItems(LECTORS_NOTES, COBWEB, ESSENCE_OF_WATER);
  1219.         setQuestNameNpcStringId(NpcStringId.LV_15_PERFECT_LEATHER_ARMOR);
  1220.     }
  1221. -  
  1222. +
  1223.     @Override
  1224.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1225.     {
  1226. @@ -78,7 +78,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1227.         {
  1228.             return null;
  1229.         }
  1230. -      
  1231. +
  1232.         String htmltext = null;
  1233.         switch (event)
  1234.         {
  1235. @@ -133,13 +133,13 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1236.         }
  1237.         return htmltext;
  1238.     }
  1239. -  
  1240. +
  1241.     @Override
  1242.     public String onTalk(Npc npc, PlayerInstance talker)
  1243.     {
  1244.         final QuestState qs = getQuestState(talker, true);
  1245.         String htmltext = getNoQuestMsg(talker);
  1246. -      
  1247. +
  1248.         switch (qs.getState())
  1249.         {
  1250.             case State.CREATED:
  1251. @@ -167,7 +167,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1252.         }
  1253.         return htmltext;
  1254.     }
  1255. -  
  1256. +
  1257.     @Override
  1258.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1259.     {
  1260. @@ -183,12 +183,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1261.                     if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87))
  1262.                     {
  1263.                         giveItems(killer, COBWEB, 1);
  1264. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1265.                         if (getQuestItemsCount(killer, COBWEB) >= 25)
  1266.                         {
  1267. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1268.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000);
  1269.                             qs.setCond(3);
  1270.                         }
  1271. +                       else
  1272. +                       {
  1273. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1274. +                       }
  1275.                     }
  1276.                     break;
  1277.                 }
  1278. @@ -199,12 +203,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1279.                     if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100))
  1280.                     {
  1281.                         giveItems(killer, ESSENCE_OF_WATER, 1);
  1282. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1283.                         if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20)
  1284.                         {
  1285. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1286.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000);
  1287.                             qs.setCond(4);
  1288.                         }
  1289. +                       else
  1290. +                       {
  1291. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1292. +                       }
  1293.                     }
  1294.                     break;
  1295.                 }
  1296. @@ -212,4 +220,4 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
  1297.         }
  1298.         return super.onKill(npc, killer, isSummon);
  1299.     }
  1300. -}
  1301. \ No newline at end of file
  1302. +}
  1303. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
  1304. index 280d5e10be..85ae672b5e 100644
  1305. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
  1306. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
  1307. @@ -1,16 +1,16 @@
  1308.  /*
  1309.   * This file is part of the L2J Mobius project.
  1310. - *
  1311. + *
  1312.   * This program is free software: you can redistribute it and/or modify
  1313.   * it under the terms of the GNU General Public License as published by
  1314.   * the Free Software Foundation, either version 3 of the License, or
  1315.   * (at your option) any later version.
  1316. - *
  1317. + *
  1318.   * This program is distributed in the hope that it will be useful,
  1319.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1320.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1321.   * General Public License for more details.
  1322. - *
  1323. + *
  1324.   * You should have received a copy of the GNU General Public License
  1325.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1326.   */
  1327. @@ -57,7 +57,7 @@ public class Q11007_NoiseInWoods extends Quest
  1328.     // Misc
  1329.     private static final int MIN_LVL = 2;
  1330.     private static final int MAX_LVL = 20;
  1331. -  
  1332. +
  1333.     public Q11007_NoiseInWoods()
  1334.     {
  1335.         super(11007);
  1336. @@ -69,7 +69,7 @@ public class Q11007_NoiseInWoods extends Quest
  1337.         registerQuestItems(MARK_OF_SECURITY, TAIL_OF_A_GRAY_WOLF, GOBLINS_PACK_OF_KNICKKNACKS, KABBO_ORC_STURDY_AMULET, MUSHROOM_SPORE_POWDER);
  1338.         setQuestNameNpcStringId(NpcStringId.LV_2_20_NOISE_IN_WOODS);
  1339.     }
  1340. -  
  1341. +
  1342.     @Override
  1343.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1344.     {
  1345. @@ -78,7 +78,7 @@ public class Q11007_NoiseInWoods extends Quest
  1346.         {
  1347.             return null;
  1348.         }
  1349. -      
  1350. +
  1351.         String htmltext = null;
  1352.         switch (event)
  1353.         {
  1354. @@ -127,7 +127,7 @@ public class Q11007_NoiseInWoods extends Quest
  1355.         }
  1356.         return htmltext;
  1357.     }
  1358. -  
  1359. +
  1360.     @Override
  1361.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1362.     {
  1363. @@ -141,12 +141,16 @@ public class Q11007_NoiseInWoods extends Quest
  1364.                     if ((qs.isCond(2) && (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) < 10)))
  1365.                     {
  1366.                         giveItems(killer, TAIL_OF_A_GRAY_WOLF, 1);
  1367. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1368.                         if (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) >= 10)
  1369.                         {
  1370. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1371.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GRAY_WOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_RAIDERS, ExShowScreenMessage.TOP_CENTER, 10000);
  1372.                             qs.setCond(3);
  1373.                         }
  1374. +                       else
  1375. +                       {
  1376. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1377. +                       }
  1378.                     }
  1379.                     break;
  1380.                 }
  1381. @@ -155,12 +159,16 @@ public class Q11007_NoiseInWoods extends Quest
  1382.                     if (qs.isCond(3) && (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) < 10))
  1383.                     {
  1384.                         giveItems(killer, GOBLINS_PACK_OF_KNICKKNACKS, 1);
  1385. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1386.                         if (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) >= 10)
  1387.                         {
  1388. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1389.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_RAIDERS_N_GO_HUNTING_AND_KILL_KABOO_ORCS, ExShowScreenMessage.TOP_CENTER, 10000);
  1390.                             qs.setCond(4);
  1391.                         }
  1392. +                       else
  1393. +                       {
  1394. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1395. +                       }
  1396.                     }
  1397.                     break;
  1398.                 }
  1399. @@ -171,12 +179,16 @@ public class Q11007_NoiseInWoods extends Quest
  1400.                     if (qs.isCond(4) && (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) < 10))
  1401.                     {
  1402.                         giveItems(killer, KABBO_ORC_STURDY_AMULET, 1);
  1403. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1404.                         if (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) >= 10)
  1405.                         {
  1406. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1407.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORCS_N_GO_HUNTING_AND_KILL_SPORE_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000);
  1408.                             qs.setCond(5);
  1409.                         }
  1410. +                       else
  1411. +                       {
  1412. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1413. +                       }
  1414.                     }
  1415.                     break;
  1416.                 }
  1417. @@ -185,12 +197,16 @@ public class Q11007_NoiseInWoods extends Quest
  1418.                     if (qs.isCond(5) && (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) < 20))
  1419.                     {
  1420.                         giveItems(killer, MUSHROOM_SPORE_POWDER, 1);
  1421. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1422.                         if (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) >= 20)
  1423.                         {
  1424. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1425.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SPORE_FUNGUS_N_RETURN_TO_SENTINEL_KENDELL, ExShowScreenMessage.TOP_CENTER, 10000);
  1426.                             qs.setCond(6);
  1427.                         }
  1428. +                       else
  1429. +                       {
  1430. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1431. +                       }
  1432.                     }
  1433.                     break;
  1434.                 }
  1435. @@ -198,7 +214,7 @@ public class Q11007_NoiseInWoods extends Quest
  1436.         }
  1437.         return super.onKill(npc, killer, isSummon);
  1438.     }
  1439. -  
  1440. +
  1441.     @Override
  1442.     public String onTalk(Npc npc, PlayerInstance talker)
  1443.     {
  1444. @@ -262,4 +278,4 @@ public class Q11007_NoiseInWoods extends Quest
  1445.         }
  1446.         return htmltext;
  1447.     }
  1448. -}
  1449. \ No newline at end of file
  1450. +}
  1451. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
  1452. index 6ee881f008..a268178fd8 100644
  1453. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
  1454. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
  1455. @@ -1,16 +1,16 @@
  1456.  /*
  1457.   * This file is part of the L2J Mobius project.
  1458. - *
  1459. + *
  1460.   * This program is free software: you can redistribute it and/or modify
  1461.   * it under the terms of the GNU General Public License as published by
  1462.   * the Free Software Foundation, either version 3 of the License, or
  1463.   * (at your option) any later version.
  1464. - *
  1465. + *
  1466.   * This program is distributed in the hope that it will be useful,
  1467.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1468.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1469.   * General Public License for more details.
  1470. - *
  1471. + *
  1472.   * You should have received a copy of the GNU General Public License
  1473.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1474.   */
  1475. @@ -45,7 +45,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1476.     private static final int WARRIORS_GAITERS = 90307;
  1477.     private static final int MEDIUMS_TUNIC = 90308;
  1478.     private static final int MEDIUMS_STOCKINGS = 90309;
  1479. -   private static final int RING_NOVICE = 29497;
  1480. +   private static final int EARRING_NOVICE = 29486;
  1481.     // Monsters
  1482.     private static final int KABOO_ORC_WARRIOR_CAPTAIN = 20472;
  1483.     private static final int KABOO_ORC_WARRIOR_LIEUTENANT = 20473;
  1484. @@ -58,7 +58,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1485.     // Misc
  1486.     private static final int MIN_LVL = 11;
  1487.     private static final int MAX_LVL = 20;
  1488. -  
  1489. +
  1490.     public Q11008_PreparationForDungeon()
  1491.     {
  1492.         super(11008);
  1493. @@ -70,7 +70,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1494.         registerQuestItems(NOTE_ABOUT_REQUIRED_INGREDIENTS, ORCS_BANDAGE, DRYADS_CRIMSON_HERB, SPIDER_VENOM);
  1495.         setQuestNameNpcStringId(NpcStringId.LV_11_20_PREPARATION_FOR_DUNGEON);
  1496.     }
  1497. -  
  1498. +
  1499.     @Override
  1500.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1501.     {
  1502. @@ -79,7 +79,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1503.         {
  1504.             return null;
  1505.         }
  1506. -      
  1507. +
  1508.         String htmltext = null;
  1509.         switch (event)
  1510.         {
  1511. @@ -99,7 +99,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1512.                     takeItems(player, SPIDER_VENOM, 20);
  1513.                     giveItems(player, WARRIORS_ARMOR, 1);
  1514.                     giveItems(player, WARRIORS_GAITERS, 1);
  1515. -                   giveItems(player, RING_NOVICE, 2);
  1516. +                   giveItems(player, EARRING_NOVICE, 2);
  1517.                     addExpAndSp(player, 80000, 0);
  1518.                     qs.exitQuest(false, true);
  1519.                     htmltext = "30220-03.html";
  1520. @@ -116,7 +116,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1521.                     takeItems(player, SPIDER_VENOM, 20);
  1522.                     giveItems(player, MEDIUMS_TUNIC, 1);
  1523.                     giveItems(player, MEDIUMS_STOCKINGS, 1);
  1524. -                   giveItems(player, RING_NOVICE, 2);
  1525. +                   giveItems(player, EARRING_NOVICE, 2);
  1526.                     addExpAndSp(player, 80000, 0);
  1527.                     qs.exitQuest(false, true);
  1528.                     htmltext = "30220-04.html"; // Custom
  1529. @@ -126,7 +126,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1530.         }
  1531.         return htmltext;
  1532.     }
  1533. -  
  1534. +
  1535.     @Override
  1536.     public String onTalk(Npc npc, PlayerInstance talker)
  1537.     {
  1538. @@ -186,7 +186,7 @@ public class Q11008_PreparationForDungeon extends Quest
  1539.         }
  1540.         return htmltext;
  1541.     }
  1542. -  
  1543. +
  1544.     @Override
  1545.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1546.     {
  1547. @@ -202,12 +202,16 @@ public class Q11008_PreparationForDungeon extends Quest
  1548.                     if (qs.isCond(2) && (getQuestItemsCount(killer, ORCS_BANDAGE) < 20) && (getRandom(100) < 90))
  1549.                     {
  1550.                         giveItems(killer, ORCS_BANDAGE, 1);
  1551. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1552.                         if (getQuestItemsCount(killer, ORCS_BANDAGE) >= 20)
  1553.                         {
  1554. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1555.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORC_WARRIOR_LIEUTENANTS_AND_KABOO_ORC_WARRIOR_CAPTAINS_N_GO_HUNTING_AND_KILL_DRYADS, ExShowScreenMessage.TOP_CENTER, 10000);
  1556.                             qs.setCond(3);
  1557.                         }
  1558. +                       else
  1559. +                       {
  1560. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1561. +                       }
  1562.                     }
  1563.                     break;
  1564.                 }
  1565. @@ -217,12 +221,16 @@ public class Q11008_PreparationForDungeon extends Quest
  1566.                     if (qs.isCond(3) && (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) < 20) && (getRandom(100) < 90))
  1567.                     {
  1568.                         giveItems(killer, DRYADS_CRIMSON_HERB, 1);
  1569. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1570.                         if (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) >= 20)
  1571.                         {
  1572. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1573.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DRYADS_N_GO_HUNTING_AND_KILL_CRIMSON_SPIDERS_HOOK_SPIDERS_AND_PINCER_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000);
  1574.                             qs.setCond(4);
  1575.                         }
  1576. +                       else
  1577. +                       {
  1578. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1579. +                       }
  1580.                     }
  1581.                     break;
  1582.                 }
  1583. @@ -233,12 +241,16 @@ public class Q11008_PreparationForDungeon extends Quest
  1584.                     if (qs.isCond(4) && (getQuestItemsCount(killer, SPIDER_VENOM) < 20) && (getRandom(100) < 90))
  1585.                     {
  1586.                         giveItems(killer, SPIDER_VENOM, 1);
  1587. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1588.                         if ((getQuestItemsCount(killer, SPIDER_VENOM) >= 20))
  1589.                         {
  1590. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1591.                             showOnScreenMsg(killer, NpcStringId.RETURN_TO_SENTINEL_STARDEN, ExShowScreenMessage.TOP_CENTER, 10000);
  1592.                             qs.setCond(5);
  1593.                         }
  1594. +                       else
  1595. +                       {
  1596. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1597. +                       }
  1598.                     }
  1599.                     break;
  1600.                 }
  1601. @@ -246,4 +258,4 @@ public class Q11008_PreparationForDungeon extends Quest
  1602.         }
  1603.         return super.onKill(npc, killer, isSummon);
  1604.     }
  1605. -}
  1606. \ No newline at end of file
  1607. +}
  1608. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
  1609. index 737e3499f5..8ff47ec3b7 100644
  1610. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
  1611. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
  1612. @@ -1,16 +1,16 @@
  1613.  /*
  1614.   * This file is part of the L2J Mobius project.
  1615. - *
  1616. + *
  1617.   * This program is free software: you can redistribute it and/or modify
  1618.   * it under the terms of the GNU General Public License as published by
  1619.   * the Free Software Foundation, either version 3 of the License, or
  1620.   * (at your option) any later version.
  1621. - *
  1622. + *
  1623.   * This program is distributed in the hope that it will be useful,
  1624.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1625.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1626.   * General Public License for more details.
  1627. - *
  1628. + *
  1629.   * You should have received a copy of the GNU General Public License
  1630.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1631.   */
  1632. @@ -52,7 +52,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1633.     // Misc
  1634.     private static final int MIN_LVL = 15;
  1635.     private static final int MAX_LVL = 20;
  1636. -  
  1637. +
  1638.     public Q11009_NewPotionDevelopment1()
  1639.     {
  1640.         super(11009);
  1641. @@ -64,7 +64,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1642.         registerQuestItems(MEDICINE_RESEARCH, SPIDER_ICHOR, MOONSTONE_BEAST_SCALES);
  1643.         setQuestNameNpcStringId(NpcStringId.LV_15_20_NEW_POTION_DEVELOPMENT_1_3);
  1644.     }
  1645. -  
  1646. +
  1647.     @Override
  1648.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1649.     {
  1650. @@ -73,7 +73,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1651.         {
  1652.             return null;
  1653.         }
  1654. -      
  1655. +
  1656.         String htmltext = null;
  1657.         switch (event)
  1658.         {
  1659. @@ -120,7 +120,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1660.         }
  1661.         return htmltext;
  1662.     }
  1663. -  
  1664. +
  1665.     @Override
  1666.     public String onTalk(Npc npc, PlayerInstance talker)
  1667.     {
  1668. @@ -180,7 +180,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1669.         }
  1670.         return htmltext;
  1671.     }
  1672. -  
  1673. +
  1674.     @Override
  1675.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1676.     {
  1677. @@ -195,12 +195,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1678.                     if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92))
  1679.                     {
  1680.                         giveItems(killer, SPIDER_ICHOR, 1);
  1681. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1682.                         if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20)
  1683.                         {
  1684. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1685.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000);
  1686.                             qs.setCond(3);
  1687.                         }
  1688. +                       else
  1689. +                       {
  1690. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1691. +                       }
  1692.                     }
  1693.                     break;
  1694.                 }
  1695. @@ -209,12 +213,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1696.                     if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92))
  1697.                     {
  1698.                         giveItems(killer, MOONSTONE_BEAST_SCALES, 1);
  1699. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1700.                         if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20)
  1701.                         {
  1702. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1703.                             showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000);
  1704.                             qs.setCond(4);
  1705.                         }
  1706. +                       else
  1707. +                       {
  1708. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1709. +                       }
  1710.                     }
  1711.                     break;
  1712.                 }
  1713. @@ -222,4 +230,4 @@ public class Q11009_NewPotionDevelopment1 extends Quest
  1714.         }
  1715.         return super.onKill(npc, killer, isSummon);
  1716.     }
  1717. -}
  1718. \ No newline at end of file
  1719. +}
  1720. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
  1721. index f31d865b17..b18c22321f 100644
  1722. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
  1723. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
  1724. @@ -1,16 +1,16 @@
  1725.  /*
  1726.   * This file is part of the L2J Mobius project.
  1727. - *
  1728. + *
  1729.   * This program is free software: you can redistribute it and/or modify
  1730.   * it under the terms of the GNU General Public License as published by
  1731.   * the Free Software Foundation, either version 3 of the License, or
  1732.   * (at your option) any later version.
  1733. - *
  1734. + *
  1735.   * This program is distributed in the hope that it will be useful,
  1736.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1737.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1738.   * General Public License for more details.
  1739. - *
  1740. + *
  1741.   * You should have received a copy of the GNU General Public License
  1742.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1743.   */
  1744. @@ -53,7 +53,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1745.     // Misc
  1746.     private static final int MIN_LVL = 15;
  1747.     private static final int MAX_LVL = 20;
  1748. -  
  1749. +
  1750.     public Q11010_NewPotionDevelopment2()
  1751.     {
  1752.         super(11010);
  1753. @@ -66,7 +66,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1754.         registerQuestItems(MEDICINE_RESEARCH, SPIDER_ICHOR, MOONSTONE_BEAST_SCALES);
  1755.         setQuestNameNpcStringId(NpcStringId.LV_15_NEW_POTION_DEVELOPMENT_2_3);
  1756.     }
  1757. -  
  1758. +
  1759.     @Override
  1760.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1761.     {
  1762. @@ -75,7 +75,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1763.         {
  1764.             return null;
  1765.         }
  1766. -      
  1767. +
  1768.         String htmltext = null;
  1769.         switch (event)
  1770.         {
  1771. @@ -130,13 +130,13 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1772.         }
  1773.         return htmltext;
  1774.     }
  1775. -  
  1776. +
  1777.     @Override
  1778.     public String onTalk(Npc npc, PlayerInstance talker)
  1779.     {
  1780.         final QuestState qs = getQuestState(talker, true);
  1781.         String htmltext = getNoQuestMsg(talker);
  1782. -      
  1783. +
  1784.         switch (qs.getState())
  1785.         {
  1786.             case State.CREATED:
  1787. @@ -164,7 +164,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1788.         }
  1789.         return htmltext;
  1790.     }
  1791. -  
  1792. +
  1793.     @Override
  1794.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1795.     {
  1796. @@ -179,12 +179,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1797.                     if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92))
  1798.                     {
  1799.                         giveItems(killer, SPIDER_ICHOR, 1);
  1800. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1801.                         if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20)
  1802.                         {
  1803. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1804.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000);
  1805.                             qs.setCond(3);
  1806.                         }
  1807. +                       else
  1808. +                       {
  1809. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1810. +                       }
  1811.                     }
  1812.                     break;
  1813.                 }
  1814. @@ -193,12 +197,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1815.                     if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92))
  1816.                     {
  1817.                         giveItems(killer, MOONSTONE_BEAST_SCALES, 1);
  1818. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1819.                         if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20)
  1820.                         {
  1821. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1822.                             showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000);
  1823.                             qs.setCond(4);
  1824.                         }
  1825. +                       else
  1826. +                       {
  1827. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1828. +                       }
  1829.                     }
  1830.                     break;
  1831.                 }
  1832. @@ -206,4 +214,4 @@ public class Q11010_NewPotionDevelopment2 extends Quest
  1833.         }
  1834.         return super.onKill(npc, killer, isSummon);
  1835.     }
  1836. -}
  1837. \ No newline at end of file
  1838. +}
  1839. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
  1840. index 79cc285964..ec215cfddf 100644
  1841. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
  1842. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
  1843. @@ -1,16 +1,16 @@
  1844.  /*
  1845.   * This file is part of the L2J Mobius project.
  1846. - *
  1847. + *
  1848.   * This program is free software: you can redistribute it and/or modify
  1849.   * it under the terms of the GNU General Public License as published by
  1850.   * the Free Software Foundation, either version 3 of the License, or
  1851.   * (at your option) any later version.
  1852. - *
  1853. + *
  1854.   * This program is distributed in the hope that it will be useful,
  1855.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1856.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1857.   * General Public License for more details.
  1858. - *
  1859. + *
  1860.   * You should have received a copy of the GNU General Public License
  1861.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1862.   */
  1863. @@ -52,7 +52,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1864.     // Misc
  1865.     private static final int MIN_LVL = 15;
  1866.     private static final int MAX_LVL = 20;
  1867. -  
  1868. +
  1869.     public Q11011_NewPotionDevelopment3()
  1870.     {
  1871.         super(11011);
  1872. @@ -65,7 +65,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1873.         registerQuestItems(MEDICATIONS_RESEARCH, ANTIDOTE, ARACHNID_TRACKER_THORN);
  1874.         setQuestNameNpcStringId(NpcStringId.LV_15_NEW_POTION_DEVELOPMENT_3_3);
  1875.     }
  1876. -  
  1877. +
  1878.     @Override
  1879.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1880.     {
  1881. @@ -74,7 +74,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1882.         {
  1883.             return null;
  1884.         }
  1885. -      
  1886. +
  1887.         String htmltext = null;
  1888.         switch (event)
  1889.         {
  1890. @@ -129,13 +129,13 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1891.         }
  1892.         return htmltext;
  1893.     }
  1894. -  
  1895. +
  1896.     @Override
  1897.     public String onTalk(Npc npc, PlayerInstance talker)
  1898.     {
  1899.         final QuestState qs = getQuestState(talker, true);
  1900.         String htmltext = getNoQuestMsg(talker);
  1901. -      
  1902. +
  1903.         switch (qs.getState())
  1904.         {
  1905.             case State.CREATED:
  1906. @@ -163,7 +163,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1907.         }
  1908.         return htmltext;
  1909.     }
  1910. -  
  1911. +
  1912.     @Override
  1913.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  1914.     {
  1915. @@ -177,12 +177,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1916.                     if (qs.isCond(2) && (getQuestItemsCount(killer, ANTIDOTE) < 20) && (getRandom(100) < 95))
  1917.                     {
  1918.                         giveItems(killer, ANTIDOTE, 1);
  1919. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1920.                         if (getQuestItemsCount(killer, ANTIDOTE) >= 20)
  1921.                         {
  1922. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1923.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RATMAN_SCAVENGERS_N_GO_HUNTING_AND_KILL_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000);
  1924.                             qs.setCond(3);
  1925.                         }
  1926. +                       else
  1927. +                       {
  1928. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1929. +                       }
  1930.                     }
  1931.                     break;
  1932.                 }
  1933. @@ -191,12 +195,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1934.                     if (qs.isCond(3) && (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) < 20) && (getRandom(100) < 90))
  1935.                     {
  1936.                         giveItems(killer, ARACHNID_TRACKER_THORN, 1);
  1937. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1938.                         if (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) >= 20)
  1939.                         {
  1940. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  1941.                             showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL_3, ExShowScreenMessage.TOP_CENTER, 10000);
  1942.                             qs.setCond(4);
  1943.                         }
  1944. +                       else
  1945. +                       {
  1946. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  1947. +                       }
  1948.                     }
  1949.                     break;
  1950.                 }
  1951. @@ -204,4 +212,4 @@ public class Q11011_NewPotionDevelopment3 extends Quest
  1952.         }
  1953.         return super.onKill(npc, killer, isSummon);
  1954.     }
  1955. -}
  1956. \ No newline at end of file
  1957. +}
  1958. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
  1959. index f8f1d03bbb..df47f8682d 100644
  1960. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
  1961. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
  1962. @@ -1,16 +1,16 @@
  1963.  /*
  1964.   * This file is part of the L2J Mobius project.
  1965. - *
  1966. + *
  1967.   * This program is free software: you can redistribute it and/or modify
  1968.   * it under the terms of the GNU General Public License as published by
  1969.   * the Free Software Foundation, either version 3 of the License, or
  1970.   * (at your option) any later version.
  1971. - *
  1972. + *
  1973.   * This program is distributed in the hope that it will be useful,
  1974.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1975.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  1976.   * General Public License for more details.
  1977. - *
  1978. + *
  1979.   * You should have received a copy of the GNU General Public License
  1980.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  1981.   */
  1982. @@ -59,7 +59,7 @@ public class Q11013_ShilensHunt extends Quest
  1983.     // Misc
  1984.     private static final int MIN_LVL = 2;
  1985.     private static final int MAX_LVL = 20;
  1986. -  
  1987. +
  1988.     public Q11013_ShilensHunt()
  1989.     {
  1990.         super(11013);
  1991. @@ -71,7 +71,7 @@ public class Q11013_ShilensHunt extends Quest
  1992.         registerQuestItems(HUNTING_PLAN, WOLF_TAIL, GOBLIN_POISONOUS_DART, IMP_WING, FUNGUS_JUICE, BALOR_ORC_FANG);
  1993.         setQuestNameNpcStringId(NpcStringId.LV_2_20_SHILEN_S_HUNT);
  1994.     }
  1995. -  
  1996. +
  1997.     @Override
  1998.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  1999.     {
  2000. @@ -80,7 +80,7 @@ public class Q11013_ShilensHunt extends Quest
  2001.         {
  2002.             return null;
  2003.         }
  2004. -      
  2005. +
  2006.         String htmltext = null;
  2007.         switch (event)
  2008.         {
  2009. @@ -131,7 +131,7 @@ public class Q11013_ShilensHunt extends Quest
  2010.         }
  2011.         return htmltext;
  2012.     }
  2013. -  
  2014. +
  2015.     @Override
  2016.     public String onTalk(Npc npc, PlayerInstance talker)
  2017.     {
  2018. @@ -191,7 +191,7 @@ public class Q11013_ShilensHunt extends Quest
  2019.         }
  2020.         return htmltext;
  2021.     }
  2022. -  
  2023. +
  2024.     @Override
  2025.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  2026.     {
  2027. @@ -205,12 +205,16 @@ public class Q11013_ShilensHunt extends Quest
  2028.                     if (qs.isCond(2))
  2029.                     {
  2030.                         giveItems(killer, WOLF_TAIL, 1);
  2031. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2032.                         if (getQuestItemsCount(killer, WOLF_TAIL) >= 10)
  2033.                         {
  2034. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2035.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ASHEN_WOLVES_N_GO_HUNTING_AND_KILL_GOBLINS, ExShowScreenMessage.TOP_CENTER, 10000);
  2036.                             qs.setCond(3);
  2037.                         }
  2038. +                       else
  2039. +                       {
  2040. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2041. +                       }
  2042.                     }
  2043.                     break;
  2044.                 }
  2045. @@ -219,12 +223,16 @@ public class Q11013_ShilensHunt extends Quest
  2046.                     if (qs.isCond(3))
  2047.                     {
  2048.                         giveItems(killer, GOBLIN_POISONOUS_DART, 1);
  2049. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2050.                         if (getQuestItemsCount(killer, GOBLIN_POISONOUS_DART) >= 10)
  2051.                         {
  2052. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2053.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLINS_N_GO_HUNTING_AND_KILL_IMPS_AND_IMP_ELDERS, ExShowScreenMessage.TOP_CENTER, 10000);
  2054.                             qs.setCond(4);
  2055.                         }
  2056. +                       else
  2057. +                       {
  2058. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2059. +                       }
  2060.                     }
  2061.                     break;
  2062.                 }
  2063. @@ -234,12 +242,16 @@ public class Q11013_ShilensHunt extends Quest
  2064.                     if (qs.isCond(4))
  2065.                     {
  2066.                         giveItems(killer, IMP_WING, 1);
  2067. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2068.                         if (getQuestItemsCount(killer, IMP_WING) >= 10)
  2069.                         {
  2070. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2071.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_IMPS_AND_IMP_ELDERS_N_GO_HUNTING_AND_KILL_GREEN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000);
  2072.                             qs.setCond(5);
  2073.                         }
  2074. +                       else
  2075. +                       {
  2076. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2077. +                       }
  2078.                     }
  2079.                     break;
  2080.                 }
  2081. @@ -248,12 +260,16 @@ public class Q11013_ShilensHunt extends Quest
  2082.                     if (qs.isCond(5))
  2083.                     {
  2084.                         giveItems(killer, FUNGUS_JUICE, 1);
  2085. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2086.                         if (getQuestItemsCount(killer, FUNGUS_JUICE) >= 10)
  2087.                         {
  2088. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2089.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREEN_FUNGUS_N_GO_HUNTING_AND_KILL_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000);
  2090.                             qs.setCond(6);
  2091.                         }
  2092. +                       else
  2093. +                       {
  2094. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2095. +                       }
  2096.                     }
  2097.                     break;
  2098.                 }
  2099. @@ -264,12 +280,16 @@ public class Q11013_ShilensHunt extends Quest
  2100.                     if (qs.isCond(6))
  2101.                     {
  2102.                         giveItems(killer, BALOR_ORC_FANG, 1);
  2103. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2104.                         if (getQuestItemsCount(killer, BALOR_ORC_FANG) >= 10)
  2105.                         {
  2106. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2107.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS_NRETURN_TO_HIERARCH_TALOS, ExShowScreenMessage.TOP_CENTER, 10000);
  2108.                             qs.setCond(7);
  2109.                         }
  2110. +                       else
  2111. +                       {
  2112. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2113. +                       }
  2114.                     }
  2115.                     break;
  2116.                 }
  2117. @@ -277,4 +297,4 @@ public class Q11013_ShilensHunt extends Quest
  2118.         }
  2119.         return super.onKill(npc, killer, isSummon);
  2120.     }
  2121. -}
  2122. \ No newline at end of file
  2123. +}
  2124. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
  2125. index 0ca80b1467..315675d2d1 100644
  2126. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
  2127. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
  2128. @@ -1,16 +1,16 @@
  2129.  /*
  2130.   * This file is part of the L2J Mobius project.
  2131. - *
  2132. + *
  2133.   * This program is free software: you can redistribute it and/or modify
  2134.   * it under the terms of the GNU General Public License as published by
  2135.   * the Free Software Foundation, either version 3 of the License, or
  2136.   * (at your option) any later version.
  2137. - *
  2138. + *
  2139.   * This program is distributed in the hope that it will be useful,
  2140.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  2141.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  2142.   * General Public License for more details.
  2143. - *
  2144. + *
  2145.   * You should have received a copy of the GNU General Public License
  2146.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2147.   */
  2148. @@ -46,7 +46,7 @@ public class Q11014_SurpriseGift extends Quest
  2149.     private static final int WARRIORS_GAITERS = 90307;
  2150.     private static final int MEDIUMS_TUNIC = 90308;
  2151.     private static final int MEDIUMS_STOCKINGS = 90309;
  2152. -   private static final int RING_NOVICE = 29497;
  2153. +   private static final int EARRING_NOVICE = 29486;
  2154.     // Monsters
  2155.     private static final int ZOMBIE_FOREST_ELF = 20015;
  2156.     private static final int ZOMBIE_FOREST_ELF_RESEARCHER = 20020;
  2157. @@ -58,7 +58,7 @@ public class Q11014_SurpriseGift extends Quest
  2158.     // Misc
  2159.     private static final int MIN_LVL = 11;
  2160.     private static final int MAX_LVL = 20;
  2161. -  
  2162. +
  2163.     public Q11014_SurpriseGift()
  2164.     {
  2165.         super(11014);
  2166. @@ -70,7 +70,7 @@ public class Q11014_SurpriseGift extends Quest
  2167.         registerQuestItems(ARMOR_DESIGN, ZOMBIE_FOREST_ELF_TOOTH, BAT_SKIN, STONE_GIANTS_SHINY_ROCK, OLD_BONE_FRAGMENT);
  2168.         setQuestNameNpcStringId(NpcStringId.LV_11_20_SURPRISE_GIFT);
  2169.     }
  2170. -  
  2171. +
  2172.     @Override
  2173.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  2174.     {
  2175. @@ -79,7 +79,7 @@ public class Q11014_SurpriseGift extends Quest
  2176.         {
  2177.             return null;
  2178.         }
  2179. -      
  2180. +
  2181.         String htmltext = null;
  2182.         switch (event)
  2183.         {
  2184. @@ -100,7 +100,7 @@ public class Q11014_SurpriseGift extends Quest
  2185.                     takeItems(player, OLD_BONE_FRAGMENT, 20);
  2186.                     giveItems(player, WARRIORS_ARMOR, 1);
  2187.                     giveItems(player, WARRIORS_GAITERS, 1);
  2188. -                   giveItems(player, RING_NOVICE, 2);
  2189. +                   giveItems(player, EARRING_NOVICE, 2);
  2190.                     addExpAndSp(player, 80000, 0);
  2191.                     qs.exitQuest(false, true);
  2192.                     htmltext = "30136-03.html";
  2193. @@ -118,7 +118,7 @@ public class Q11014_SurpriseGift extends Quest
  2194.                     takeItems(player, OLD_BONE_FRAGMENT, 20);
  2195.                     giveItems(player, MEDIUMS_TUNIC, 1);
  2196.                     giveItems(player, MEDIUMS_STOCKINGS, 1);
  2197. -                   giveItems(player, RING_NOVICE, 2);
  2198. +                   giveItems(player, EARRING_NOVICE, 2);
  2199.                     addExpAndSp(player, 80000, 0);
  2200.                     qs.exitQuest(false, true);
  2201.                     htmltext = "30136-04.html";
  2202. @@ -128,7 +128,7 @@ public class Q11014_SurpriseGift extends Quest
  2203.         }
  2204.         return htmltext;
  2205.     }
  2206. -  
  2207. +
  2208.     @Override
  2209.     public String onTalk(Npc npc, PlayerInstance talker)
  2210.     {
  2211. @@ -188,7 +188,7 @@ public class Q11014_SurpriseGift extends Quest
  2212.         }
  2213.         return htmltext;
  2214.     }
  2215. -  
  2216. +
  2217.     @Override
  2218.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  2219.     {
  2220. @@ -203,12 +203,16 @@ public class Q11014_SurpriseGift extends Quest
  2221.                     if (qs.isCond(2) && (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) < 10) && (getRandom(100) < 85))
  2222.                     {
  2223.                         giveItems(killer, ZOMBIE_FOREST_ELF_TOOTH, 1);
  2224. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2225.                         if (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) >= 10)
  2226.                         {
  2227. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2228.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ZOMBIE_FOREST_ELVES_AND_ZOMBIE_FOREST_ELF_RESEARCHERS_N_GO_HUNTING_AND_KILL_FESTERING_BATS_AND_RED_EYE_BATS, ExShowScreenMessage.TOP_CENTER, 10000);
  2229.                             qs.setCond(3);
  2230.                         }
  2231. +                       else
  2232. +                       {
  2233. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2234. +                       }
  2235.                     }
  2236.                     break;
  2237.                 }
  2238. @@ -218,12 +222,16 @@ public class Q11014_SurpriseGift extends Quest
  2239.                     if (qs.isCond(3) && (getQuestItemsCount(killer, BAT_SKIN) < 10) && (getRandom(100) < 85))
  2240.                     {
  2241.                         giveItems(killer, BAT_SKIN, 1);
  2242. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2243.                         if (getQuestItemsCount(killer, BAT_SKIN) >= 10)
  2244.                         {
  2245. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2246.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_FESTERING_BATS_AND_RED_EYE_BATS_N_GO_HUNTING_AND_KILL_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS, ExShowScreenMessage.TOP_CENTER, 10000);
  2247.                             qs.setCond(4);
  2248.                         }
  2249. +                       else
  2250. +                       {
  2251. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2252. +                       }
  2253.                     }
  2254.                     break;
  2255.                 }
  2256. @@ -233,12 +241,16 @@ public class Q11014_SurpriseGift extends Quest
  2257.                     if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) < 10) && (getRandom(100) < 85))
  2258.                     {
  2259.                         giveItems(killer, STONE_GIANTS_SHINY_ROCK, 1);
  2260. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2261.                         if ((getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) >= 10))
  2262.                         {
  2263. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2264.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_DARK_HORRORS, ExShowScreenMessage.TOP_CENTER, 10000);
  2265.                             qs.setCond(5);
  2266.                         }
  2267. +                       else
  2268. +                       {
  2269. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2270. +                       }
  2271.                     }
  2272.                     break;
  2273.                 }
  2274. @@ -247,12 +259,16 @@ public class Q11014_SurpriseGift extends Quest
  2275.                     if (qs.isCond(5) && (getQuestItemsCount(killer, OLD_BONE_FRAGMENT) < 20) && (getRandom(100) < 90))
  2276.                     {
  2277.                         giveItems(killer, OLD_BONE_FRAGMENT, 1);
  2278. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2279.                         if ((getQuestItemsCount(killer, OLD_BONE_FRAGMENT) >= 20))
  2280.                         {
  2281. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2282.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DARK_HORRORS_NRETURN_TO_ARMOR_MERCHANT_PAYNE, ExShowScreenMessage.TOP_CENTER, 10000);
  2283.                             qs.setCond(6);
  2284.                         }
  2285. +                       else
  2286. +                       {
  2287. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2288. +                       }
  2289.                     }
  2290.                     break;
  2291.                 }
  2292. @@ -260,4 +276,4 @@ public class Q11014_SurpriseGift extends Quest
  2293.         }
  2294.         return super.onKill(npc, killer, isSummon);
  2295.     }
  2296. -}
  2297. \ No newline at end of file
  2298. +}
  2299. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
  2300. index b865c0353a..0671835964 100644
  2301. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
  2302. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
  2303. @@ -1,16 +1,16 @@
  2304.  /*
  2305.   * This file is part of the L2J Mobius project.
  2306. - *
  2307. + *
  2308.   * This program is free software: you can redistribute it and/or modify
  2309.   * it under the terms of the GNU General Public License as published by
  2310.   * the Free Software Foundation, either version 3 of the License, or
  2311.   * (at your option) any later version.
  2312. - *
  2313. + *
  2314.   * This program is distributed in the hope that it will be useful,
  2315.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  2316.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  2317.   * General Public License for more details.
  2318. - *
  2319. + *
  2320.   * You should have received a copy of the GNU General Public License
  2321.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2322.   */
  2323. @@ -55,7 +55,7 @@ public class Q11015_PrepareForTrade1 extends Quest
  2324.     // Misc
  2325.     private static final int MIN_LVL = 15;
  2326.     private static final int MAX_LVL = 20;
  2327. -  
  2328. +
  2329.     public Q11015_PrepareForTrade1()
  2330.     {
  2331.         super(11015);
  2332. @@ -67,7 +67,7 @@ public class Q11015_PrepareForTrade1 extends Quest
  2333.         registerQuestItems(SUPPLIES_CERTIFICATE, STONE_GIANTS_GUARDIANS_CORE, CRYSTALLINE_BEASTS_SHINEDUST, GIANT_SPIDER_SKIN_FRAGMENT);
  2334.         setQuestNameNpcStringId(NpcStringId.LV_15_20_PREPARE_FOR_TRADE_1_3);
  2335.     }
  2336. -  
  2337. +
  2338.     @Override
  2339.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  2340.     {
  2341. @@ -76,7 +76,7 @@ public class Q11015_PrepareForTrade1 extends Quest
  2342.         {
  2343.             return null;
  2344.         }
  2345. -      
  2346. +
  2347.         String htmltext = null;
  2348.         switch (event)
  2349.         {
  2350. @@ -125,7 +125,7 @@ public class Q11015_PrepareForTrade1 extends Quest
  2351.         }
  2352.         return htmltext;
  2353.     }
  2354. -  
  2355. +
  2356.     @Override
  2357.     public String onTalk(Npc npc, PlayerInstance talker)
  2358.     {
  2359. @@ -185,7 +185,7 @@ public class Q11015_PrepareForTrade1 extends Quest
  2360.         }
  2361.         return htmltext;
  2362.     }
  2363. -  
  2364. +
  2365.     @Override
  2366.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  2367.     {
  2368. @@ -199,12 +199,16 @@ public class Q11015_PrepareForTrade1 extends Quest
  2369.                     if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90))
  2370.                     {
  2371.                         giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1);
  2372. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2373.                         if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20)
  2374.                         {
  2375. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2376.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000);
  2377.                             qs.setCond(3);
  2378.                         }
  2379. +                       else
  2380. +                       {
  2381. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2382. +                       }
  2383.                     }
  2384.                     break;
  2385.                 }
  2386. @@ -213,12 +217,16 @@ public class Q11015_PrepareForTrade1 extends Quest
  2387.                     if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87))
  2388.                     {
  2389.                         giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1);
  2390. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2391.                         if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10)
  2392.                         {
  2393. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2394.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000);
  2395.                             qs.setCond(4);
  2396.                         }
  2397. +                       else
  2398. +                       {
  2399. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2400. +                       }
  2401.                     }
  2402.                     break;
  2403.                 }
  2404. @@ -229,12 +237,16 @@ public class Q11015_PrepareForTrade1 extends Quest
  2405.                     if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90))
  2406.                     {
  2407.                         giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1);
  2408. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2409.                         if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20)
  2410.                         {
  2411. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2412.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000);
  2413.                             qs.setCond(5);
  2414.                         }
  2415. +                       else
  2416. +                       {
  2417. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2418. +                       }
  2419.                     }
  2420.                     break;
  2421.                 }
  2422. @@ -242,4 +254,4 @@ public class Q11015_PrepareForTrade1 extends Quest
  2423.         }
  2424.         return super.onKill(npc, killer, isSummon);
  2425.     }
  2426. -}
  2427. \ No newline at end of file
  2428. +}
  2429. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
  2430. index d40dc484c4..5e7d29470a 100644
  2431. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
  2432. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
  2433. @@ -1,16 +1,16 @@
  2434.  /*
  2435.   * This file is part of the L2J Mobius project.
  2436. - *
  2437. + *
  2438.   * This program is free software: you can redistribute it and/or modify
  2439.   * it under the terms of the GNU General Public License as published by
  2440.   * the Free Software Foundation, either version 3 of the License, or
  2441.   * (at your option) any later version.
  2442. - *
  2443. + *
  2444.   * This program is distributed in the hope that it will be useful,
  2445.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  2446.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  2447.   * General Public License for more details.
  2448. - *
  2449. + *
  2450.   * You should have received a copy of the GNU General Public License
  2451.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2452.   */
  2453. @@ -56,7 +56,7 @@ public class Q11016_PrepareForTrade2 extends Quest
  2454.     // Misc
  2455.     private static final int MIN_LVL = 15;
  2456.     private static final int MAX_LVL = 20;
  2457. -  
  2458. +
  2459.     public Q11016_PrepareForTrade2()
  2460.     {
  2461.         super(11016);
  2462. @@ -69,7 +69,7 @@ public class Q11016_PrepareForTrade2 extends Quest
  2463.         registerQuestItems(SUPPLIES_CERTIFICATE, STONE_GIANTS_GUARDIANS_CORE, CRYSTALLINE_BEASTS_SHINEDUST, GIANT_SPIDER_SKIN_FRAGMENT);
  2464.         setQuestNameNpcStringId(NpcStringId.LV_15_PREPARE_FOR_TRADE_2_3);
  2465.     }
  2466. -  
  2467. +
  2468.     @Override
  2469.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  2470.     {
  2471. @@ -78,7 +78,7 @@ public class Q11016_PrepareForTrade2 extends Quest
  2472.         {
  2473.             return null;
  2474.         }
  2475. -      
  2476. +
  2477.         String htmltext = null;
  2478.         switch (event)
  2479.         {
  2480. @@ -135,13 +135,13 @@ public class Q11016_PrepareForTrade2 extends Quest
  2481.         }
  2482.         return htmltext;
  2483.     }
  2484. -  
  2485. +
  2486.     @Override
  2487.     public String onTalk(Npc npc, PlayerInstance talker)
  2488.     {
  2489.         final QuestState qs = getQuestState(talker, true);
  2490.         String htmltext = getNoQuestMsg(talker);
  2491. -      
  2492. +
  2493.         switch (qs.getState())
  2494.         {
  2495.             case State.CREATED:
  2496. @@ -169,7 +169,7 @@ public class Q11016_PrepareForTrade2 extends Quest
  2497.         }
  2498.         return htmltext;
  2499.     }
  2500. -  
  2501. +
  2502.     @Override
  2503.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  2504.     {
  2505. @@ -183,12 +183,16 @@ public class Q11016_PrepareForTrade2 extends Quest
  2506.                     if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90))
  2507.                     {
  2508.                         giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1);
  2509. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2510.                         if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20)
  2511.                         {
  2512. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2513.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000);
  2514.                             qs.setCond(3);
  2515.                         }
  2516. +                       else
  2517. +                       {
  2518. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2519. +                       }
  2520.                     }
  2521.                     break;
  2522.                 }
  2523. @@ -197,12 +201,16 @@ public class Q11016_PrepareForTrade2 extends Quest
  2524.                     if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87))
  2525.                     {
  2526.                         giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1);
  2527. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2528.                         if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10)
  2529.                         {
  2530. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2531.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000);
  2532.                             qs.setCond(4);
  2533.                         }
  2534. +                       else
  2535. +                       {
  2536. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2537. +                       }
  2538.                     }
  2539.                     break;
  2540.                 }
  2541. @@ -213,12 +221,16 @@ public class Q11016_PrepareForTrade2 extends Quest
  2542.                     if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90))
  2543.                     {
  2544.                         giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1);
  2545. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2546.                         if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20)
  2547.                         {
  2548. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2549.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000);
  2550.                             qs.setCond(5);
  2551.                         }
  2552. +                       else
  2553. +                       {
  2554. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2555. +                       }
  2556.                     }
  2557.                     break;
  2558.                 }
  2559. @@ -226,4 +238,4 @@ public class Q11016_PrepareForTrade2 extends Quest
  2560.         }
  2561.         return super.onKill(npc, killer, isSummon);
  2562.     }
  2563. -}
  2564. \ No newline at end of file
  2565. +}
  2566. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
  2567. index be414edadd..5237e7750a 100644
  2568. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
  2569. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
  2570. @@ -1,16 +1,16 @@
  2571.  /*
  2572.   * This file is part of the L2J Mobius project.
  2573. - *
  2574. + *
  2575.   * This program is free software: you can redistribute it and/or modify
  2576.   * it under the terms of the GNU General Public License as published by
  2577.   * the Free Software Foundation, either version 3 of the License, or
  2578.   * (at your option) any later version.
  2579. - *
  2580. + *
  2581.   * This program is distributed in the hope that it will be useful,
  2582.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  2583.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  2584.   * General Public License for more details.
  2585. - *
  2586. + *
  2587.   * You should have received a copy of the GNU General Public License
  2588.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2589.   */
  2590. @@ -56,7 +56,7 @@ public class Q11017_PrepareForTrade3 extends Quest
  2591.     // Misc
  2592.     private static final int MIN_LVL = 15;
  2593.     private static final int MAX_LVL = 20;
  2594. -  
  2595. +
  2596.     public Q11017_PrepareForTrade3()
  2597.     {
  2598.         super(11017);
  2599. @@ -69,7 +69,7 @@ public class Q11017_PrepareForTrade3 extends Quest
  2600.         registerQuestItems(SUPPLIES_CERTIFICATE, STONE_GIANTS_GUARDIANS_CORE, CRYSTALLINE_BEASTS_SHINEDUST, GIANT_SPIDER_SKIN_FRAGMENT);
  2601.         setQuestNameNpcStringId(NpcStringId.LV_15_PREPARE_FOR_TRADE_3_3);
  2602.     }
  2603. -  
  2604. +
  2605.     @Override
  2606.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  2607.     {
  2608. @@ -78,7 +78,7 @@ public class Q11017_PrepareForTrade3 extends Quest
  2609.         {
  2610.             return null;
  2611.         }
  2612. -      
  2613. +
  2614.         String htmltext = null;
  2615.         switch (event)
  2616.         {
  2617. @@ -135,13 +135,13 @@ public class Q11017_PrepareForTrade3 extends Quest
  2618.         }
  2619.         return htmltext;
  2620.     }
  2621. -  
  2622. +
  2623.     @Override
  2624.     public String onTalk(Npc npc, PlayerInstance talker)
  2625.     {
  2626.         final QuestState qs = getQuestState(talker, true);
  2627.         String htmltext = getNoQuestMsg(talker);
  2628. -      
  2629. +
  2630.         switch (qs.getState())
  2631.         {
  2632.             case State.CREATED:
  2633. @@ -169,7 +169,7 @@ public class Q11017_PrepareForTrade3 extends Quest
  2634.         }
  2635.         return htmltext;
  2636.     }
  2637. -  
  2638. +
  2639.     @Override
  2640.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  2641.     {
  2642. @@ -183,12 +183,16 @@ public class Q11017_PrepareForTrade3 extends Quest
  2643.                     if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90))
  2644.                     {
  2645.                         giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1);
  2646. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2647.                         if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20)
  2648.                         {
  2649. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2650.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000);
  2651.                             qs.setCond(3);
  2652.                         }
  2653. +                       else
  2654. +                       {
  2655. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2656. +                       }
  2657.                     }
  2658.                     break;
  2659.                 }
  2660. @@ -197,12 +201,16 @@ public class Q11017_PrepareForTrade3 extends Quest
  2661.                     if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 85))
  2662.                     {
  2663.                         giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1);
  2664. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2665.                         if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10)
  2666.                         {
  2667. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2668.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000);
  2669.                             qs.setCond(4);
  2670.                         }
  2671. +                       else
  2672. +                       {
  2673. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2674. +                       }
  2675.                     }
  2676.                     break;
  2677.                 }
  2678. @@ -213,12 +221,16 @@ public class Q11017_PrepareForTrade3 extends Quest
  2679.                     if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90))
  2680.                     {
  2681.                         giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1);
  2682. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2683.                         if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20)
  2684.                         {
  2685. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2686.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000);
  2687.                             qs.setCond(5);
  2688.                         }
  2689. +                       else
  2690. +                       {
  2691. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2692. +                       }
  2693.                     }
  2694.                     break;
  2695.                 }
  2696. @@ -226,4 +238,4 @@ public class Q11017_PrepareForTrade3 extends Quest
  2697.         }
  2698.         return super.onKill(npc, killer, isSummon);
  2699.     }
  2700. -}
  2701. \ No newline at end of file
  2702. +}
  2703. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
  2704. index 1d445d68bc..50af9e3b44 100644
  2705. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
  2706. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
  2707. @@ -1,16 +1,16 @@
  2708.  /*
  2709.   * This file is part of the L2J Mobius project.
  2710. - *
  2711. + *
  2712.   * This program is free software: you can redistribute it and/or modify
  2713.   * it under the terms of the GNU General Public License as published by
  2714.   * the Free Software Foundation, either version 3 of the License, or
  2715.   * (at your option) any later version.
  2716. - *
  2717. + *
  2718.   * This program is distributed in the hope that it will be useful,
  2719.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  2720.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  2721.   * General Public License for more details.
  2722. - *
  2723. + *
  2724.   * You should have received a copy of the GNU General Public License
  2725.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2726.   */
  2727. @@ -58,7 +58,7 @@ public class Q11019_TribalBenefit extends Quest
  2728.     // Misc
  2729.     private static final int MIN_LVL = 2;
  2730.     private static final int MAX_LVL = 20;
  2731. -  
  2732. +
  2733.     public Q11019_TribalBenefit()
  2734.     {
  2735.         super(11019);
  2736. @@ -70,7 +70,7 @@ public class Q11019_TribalBenefit extends Quest
  2737.         registerQuestItems(TRIBAL_CHRONICLE, KASHA_WOLF_FUR, ASHES_OF_ANCESTORS, IMP_NECKLACE, MOUNTAIN_FUNGUS_SPORES, MARAKU_WEREWOLF_CLAW, EYE_OF_SEER_TEARS);
  2738.         setQuestNameNpcStringId(NpcStringId.LV_2_20_TRIBAL_BENEFIT);
  2739.     }
  2740. -  
  2741. +
  2742.     @Override
  2743.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  2744.     {
  2745. @@ -79,7 +79,7 @@ public class Q11019_TribalBenefit extends Quest
  2746.         {
  2747.             return null;
  2748.         }
  2749. -      
  2750. +
  2751.         String htmltext = null;
  2752.         switch (event)
  2753.         {
  2754. @@ -111,7 +111,7 @@ public class Q11019_TribalBenefit extends Quest
  2755.         }
  2756.         return htmltext;
  2757.     }
  2758. -  
  2759. +
  2760.     @Override
  2761.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  2762.     {
  2763. @@ -126,12 +126,16 @@ public class Q11019_TribalBenefit extends Quest
  2764.                     if ((qs.isCond(2) && (getQuestItemsCount(killer, KASHA_WOLF_FUR) < 10)))
  2765.                     {
  2766.                         giveItems(killer, KASHA_WOLF_FUR, 1);
  2767. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2768.                         if (getQuestItemsCount(killer, KASHA_WOLF_FUR) >= 10)
  2769.                         {
  2770. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2771.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_WOLVES_AND_KASHA_BEARS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS, ExShowScreenMessage.TOP_CENTER, 10000);
  2772.                             qs.setCond(3);
  2773.                         }
  2774. +                       else
  2775. +                       {
  2776. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2777. +                       }
  2778.                     }
  2779.                     break;
  2780.                 }
  2781. @@ -140,12 +144,16 @@ public class Q11019_TribalBenefit extends Quest
  2782.                     if (qs.isCond(3) && (getQuestItemsCount(killer, ASHES_OF_ANCESTORS) < 10))
  2783.                     {
  2784.                         giveItems(killer, ASHES_OF_ANCESTORS, 1);
  2785. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2786.                         if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10))
  2787.                         {
  2788. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2789.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000);
  2790.                             qs.setCond(4);
  2791.                         }
  2792. +                       else
  2793. +                       {
  2794. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2795. +                       }
  2796.                     }
  2797.                     break;
  2798.                 }
  2799. @@ -154,12 +162,16 @@ public class Q11019_TribalBenefit extends Quest
  2800.                     if (qs.isCond(3) && (getQuestItemsCount(killer, IMP_NECKLACE) < 10))
  2801.                     {
  2802.                         giveItems(killer, IMP_NECKLACE, 1);
  2803. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2804.                         if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10))
  2805.                         {
  2806. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2807.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000);
  2808.                             qs.setCond(4);
  2809.                         }
  2810. +                       else
  2811. +                       {
  2812. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2813. +                       }
  2814.                     }
  2815.                     break;
  2816.                 }
  2817. @@ -168,12 +180,16 @@ public class Q11019_TribalBenefit extends Quest
  2818.                     if (qs.isCond(4) && (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) < 10))
  2819.                     {
  2820.                         giveItems(killer, MOUNTAIN_FUNGUS_SPORES, 1);
  2821. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2822.                         if (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) >= 10)
  2823.                         {
  2824. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2825.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MOUNTAIN_FUNGUS_N_GO_HUNTING_AND_KILL_MARAKU_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
  2826.                             qs.setCond(5);
  2827.                         }
  2828. +                       else
  2829. +                       {
  2830. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2831. +                       }
  2832.                     }
  2833.                     break;
  2834.                 }
  2835. @@ -182,12 +198,16 @@ public class Q11019_TribalBenefit extends Quest
  2836.                     if (qs.isCond(5) && (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) < 10))
  2837.                     {
  2838.                         giveItems(killer, MARAKU_WEREWOLF_CLAW, 1);
  2839. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2840.                         if (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) >= 10)
  2841.                         {
  2842. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2843.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MARAKU_WEREWOLVES_N_GO_HUNTING_AND_KILL_EYES_OF_SEER, ExShowScreenMessage.TOP_CENTER, 10000);
  2844.                             qs.setCond(6);
  2845.                         }
  2846. +                       else
  2847. +                       {
  2848. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2849. +                       }
  2850.                     }
  2851.                     break;
  2852.                 }
  2853. @@ -196,12 +216,16 @@ public class Q11019_TribalBenefit extends Quest
  2854.                     if (qs.isCond(6) && (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) < 10))
  2855.                     {
  2856.                         giveItems(killer, EYE_OF_SEER_TEARS, 1);
  2857. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2858.                         if (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) >= 10)
  2859.                         {
  2860. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2861.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EYES_OF_SEER_NRETURN_TO_CENTURION_TIKU, ExShowScreenMessage.TOP_CENTER, 10000);
  2862.                             qs.setCond(7);
  2863.                         }
  2864. +                       else
  2865. +                       {
  2866. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2867. +                       }
  2868.                     }
  2869.                     break;
  2870.                 }
  2871. @@ -209,7 +233,7 @@ public class Q11019_TribalBenefit extends Quest
  2872.         }
  2873.         return super.onKill(npc, killer, isSummon);
  2874.     }
  2875. -  
  2876. +
  2877.     @Override
  2878.     public String onTalk(Npc npc, PlayerInstance talker)
  2879.     {
  2880. @@ -269,4 +293,4 @@ public class Q11019_TribalBenefit extends Quest
  2881.         }
  2882.         return htmltext;
  2883.     }
  2884. -}
  2885. \ No newline at end of file
  2886. +}
  2887. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
  2888. index 128f79faa2..9283f49a58 100644
  2889. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
  2890. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
  2891. @@ -1,16 +1,16 @@
  2892.  /*
  2893.   * This file is part of the L2J Mobius project.
  2894. - *
  2895. + *
  2896.   * This program is free software: you can redistribute it and/or modify
  2897.   * it under the terms of the GNU General Public License as published by
  2898.   * the Free Software Foundation, either version 3 of the License, or
  2899.   * (at your option) any later version.
  2900. - *
  2901. + *
  2902.   * This program is distributed in the hope that it will be useful,
  2903.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  2904.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  2905.   * General Public License for more details.
  2906. - *
  2907. + *
  2908.   * You should have received a copy of the GNU General Public License
  2909.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2910.   */
  2911. @@ -46,7 +46,7 @@ public class Q11020_BlacksmithsRequest extends Quest
  2912.     private static final int WARRIORS_GAITERS = 90307;
  2913.     private static final int MEDIUMS_TUNIC = 90308;
  2914.     private static final int MEDIUMS_STOCKINGS = 90309;
  2915. -   private static final int EARRING_NOVICE = 49040;
  2916. +   private static final int EARRING_NOVICE = 29486;
  2917.     // Monsters
  2918.     private static final int BLACKWING_BAT = 20316;
  2919.     private static final int TOMB_RAIDER_LEADER = 20320;
  2920. @@ -55,7 +55,7 @@ public class Q11020_BlacksmithsRequest extends Quest
  2921.     // Misc
  2922.     private static final int MIN_LVL = 11;
  2923.     private static final int MAX_LVL = 20;
  2924. -  
  2925. +
  2926.     public Q11020_BlacksmithsRequest()
  2927.     {
  2928.         super(11020);
  2929. @@ -67,7 +67,7 @@ public class Q11020_BlacksmithsRequest extends Quest
  2930.         registerQuestItems(REQUIRED_MATERIALS, BLACKWING_BAT_WING, GRAVE_ROBBERS_BELT, GOLEM_ORE, EVIL_EYE_PATROL_HIDE);
  2931.         setQuestNameNpcStringId(NpcStringId.LV_11_20_BLACKSMITH_S_REQUEST);
  2932.     }
  2933. -  
  2934. +
  2935.     @Override
  2936.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  2937.     {
  2938. @@ -76,7 +76,7 @@ public class Q11020_BlacksmithsRequest extends Quest
  2939.         {
  2940.             return null;
  2941.         }
  2942. -      
  2943. +
  2944.         String htmltext = null;
  2945.         switch (event)
  2946.         {
  2947. @@ -125,7 +125,7 @@ public class Q11020_BlacksmithsRequest extends Quest
  2948.         }
  2949.         return htmltext;
  2950.     }
  2951. -  
  2952. +
  2953.     @Override
  2954.     public String onTalk(Npc npc, PlayerInstance talker)
  2955.     {
  2956. @@ -185,7 +185,7 @@ public class Q11020_BlacksmithsRequest extends Quest
  2957.         }
  2958.         return htmltext;
  2959.     }
  2960. -  
  2961. +
  2962.     @Override
  2963.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  2964.     {
  2965. @@ -199,12 +199,16 @@ public class Q11020_BlacksmithsRequest extends Quest
  2966.                     if (qs.isCond(2) && (getQuestItemsCount(killer, BLACKWING_BAT_WING) < 20) && (getRandom(100) < 90))
  2967.                     {
  2968.                         giveItems(killer, BLACKWING_BAT_WING, 1);
  2969. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2970.                         if (getQuestItemsCount(killer, BLACKWING_BAT_WING) >= 20)
  2971.                         {
  2972. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2973.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACKWING_BATS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDER_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000);
  2974.                             qs.setCond(3);
  2975.                         }
  2976. +                       else
  2977. +                       {
  2978. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2979. +                       }
  2980.                     }
  2981.                     break;
  2982.                 }
  2983. @@ -213,12 +217,16 @@ public class Q11020_BlacksmithsRequest extends Quest
  2984.                     if (qs.isCond(3) && (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) < 20) && (getRandom(100) < 90))
  2985.                     {
  2986.                         giveItems(killer, GRAVE_ROBBERS_BELT, 1);
  2987. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2988.                         if (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) >= 20)
  2989.                         {
  2990. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  2991.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDER_LEADERS_N_GO_HUNTING_AND_KILL_GREYSTONE_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000);
  2992.                             qs.setCond(4);
  2993.                         }
  2994. +                       else
  2995. +                       {
  2996. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  2997. +                       }
  2998.                     }
  2999.                     break;
  3000.                 }
  3001. @@ -227,12 +235,16 @@ public class Q11020_BlacksmithsRequest extends Quest
  3002.                     if (qs.isCond(4) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90))
  3003.                     {
  3004.                         giveItems(killer, GOLEM_ORE, 1);
  3005. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3006.                         if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20))
  3007.                         {
  3008. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3009.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREYSTONE_GOLEMS_N_GO_HUNTING_AND_KILL_EVIL_EYE_PATROLS, ExShowScreenMessage.TOP_CENTER, 10000);
  3010.                             qs.setCond(5);
  3011.                         }
  3012. +                       else
  3013. +                       {
  3014. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3015. +                       }
  3016.                     }
  3017.                     break;
  3018.                 }
  3019. @@ -241,12 +253,16 @@ public class Q11020_BlacksmithsRequest extends Quest
  3020.                     if (qs.isCond(5) && (getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) < 20) && (getRandom(100) < 90))
  3021.                     {
  3022.                         giveItems(killer, EVIL_EYE_PATROL_HIDE, 1);
  3023. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3024.                         if ((getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) >= 20))
  3025.                         {
  3026. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3027.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_PATROLS_NRETURN_TO_BLACKSMITH_SUMARI, ExShowScreenMessage.TOP_CENTER, 10000);
  3028.                             qs.setCond(6);
  3029.                         }
  3030. +                       else
  3031. +                       {
  3032. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3033. +                       }
  3034.                     }
  3035.                     break;
  3036.                 }
  3037. @@ -254,4 +270,4 @@ public class Q11020_BlacksmithsRequest extends Quest
  3038.         }
  3039.         return super.onKill(npc, killer, isSummon);
  3040.     }
  3041. -}
  3042. \ No newline at end of file
  3043. +}
  3044. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
  3045. index 2789641cef..436552456d 100644
  3046. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
  3047. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
  3048. @@ -1,16 +1,16 @@
  3049.  /*
  3050.   * This file is part of the L2J Mobius project.
  3051. - *
  3052. + *
  3053.   * This program is free software: you can redistribute it and/or modify
  3054.   * it under the terms of the GNU General Public License as published by
  3055.   * the Free Software Foundation, either version 3 of the License, or
  3056.   * (at your option) any later version.
  3057. - *
  3058. + *
  3059.   * This program is distributed in the hope that it will be useful,
  3060.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  3061.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  3062.   * General Public License for more details.
  3063. - *
  3064. + *
  3065.   * You should have received a copy of the GNU General Public License
  3066.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  3067.   */
  3068. @@ -53,7 +53,7 @@ public class Q11021_RedGemNecklace1 extends Quest
  3069.     // Misc
  3070.     private static final int MIN_LVL = 15;
  3071.     private static final int MAX_LVL = 20;
  3072. -  
  3073. +
  3074.     public Q11021_RedGemNecklace1()
  3075.     {
  3076.         super(11021);
  3077. @@ -65,7 +65,7 @@ public class Q11021_RedGemNecklace1 extends Quest
  3078.         registerQuestItems(LIST_OF_MATERIALS, BEARS_SHIN_BONE, SHARP_SPIDER_LEG);
  3079.         setQuestNameNpcStringId(NpcStringId.LV_15_20_RED_GEM_NECKLACE_1_3);
  3080.     }
  3081. -  
  3082. +
  3083.     @Override
  3084.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  3085.     {
  3086. @@ -74,7 +74,7 @@ public class Q11021_RedGemNecklace1 extends Quest
  3087.         {
  3088.             return null;
  3089.         }
  3090. -      
  3091. +
  3092.         String htmltext = null;
  3093.         switch (event)
  3094.         {
  3095. @@ -121,7 +121,7 @@ public class Q11021_RedGemNecklace1 extends Quest
  3096.         }
  3097.         return htmltext;
  3098.     }
  3099. -  
  3100. +
  3101.     @Override
  3102.     public String onTalk(Npc npc, PlayerInstance talker)
  3103.     {
  3104. @@ -181,7 +181,7 @@ public class Q11021_RedGemNecklace1 extends Quest
  3105.         }
  3106.         return htmltext;
  3107.     }
  3108. -  
  3109. +
  3110.     @Override
  3111.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  3112.     {
  3113. @@ -195,12 +195,16 @@ public class Q11021_RedGemNecklace1 extends Quest
  3114.                     if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92))
  3115.                     {
  3116.                         giveItems(killer, BEARS_SHIN_BONE, 1);
  3117. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3118.                         if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20)
  3119.                         {
  3120. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3121.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000);
  3122.                             qs.setCond(3);
  3123.                         }
  3124. +                       else
  3125. +                       {
  3126. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3127. +                       }
  3128.                     }
  3129.                     break;
  3130.                 }
  3131. @@ -211,12 +215,16 @@ public class Q11021_RedGemNecklace1 extends Quest
  3132.                     if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89))
  3133.                     {
  3134.                         giveItems(killer, SHARP_SPIDER_LEG, 1);
  3135. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3136.                         if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30)
  3137.                         {
  3138. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3139.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000);
  3140.                             qs.setCond(4);
  3141.                         }
  3142. +                       else
  3143. +                       {
  3144. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3145. +                       }
  3146.                     }
  3147.                     break;
  3148.                 }
  3149. @@ -224,4 +232,4 @@ public class Q11021_RedGemNecklace1 extends Quest
  3150.         }
  3151.         return super.onKill(npc, killer, isSummon);
  3152.     }
  3153. -}
  3154. \ No newline at end of file
  3155. +}
  3156. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
  3157. index 240332f99f..4a91909413 100644
  3158. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
  3159. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
  3160. @@ -1,16 +1,16 @@
  3161.  /*
  3162.   * This file is part of the L2J Mobius project.
  3163. - *
  3164. + *
  3165.   * This program is free software: you can redistribute it and/or modify
  3166.   * it under the terms of the GNU General Public License as published by
  3167.   * the Free Software Foundation, either version 3 of the License, or
  3168.   * (at your option) any later version.
  3169. - *
  3170. + *
  3171.   * This program is distributed in the hope that it will be useful,
  3172.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  3173.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  3174.   * General Public License for more details.
  3175. - *
  3176. + *
  3177.   * You should have received a copy of the GNU General Public License
  3178.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  3179.   */
  3180. @@ -54,7 +54,7 @@ public class Q11022_RedGemNecklace2 extends Quest
  3181.     // Misc
  3182.     private static final int MIN_LVL = 15;
  3183.     private static final int MAX_LVL = 20;
  3184. -  
  3185. +
  3186.     public Q11022_RedGemNecklace2()
  3187.     {
  3188.         super(11022);
  3189. @@ -67,7 +67,7 @@ public class Q11022_RedGemNecklace2 extends Quest
  3190.         registerQuestItems(LIST_OF_MATERIALS, BEARS_SHIN_BONE, SHARP_SPIDER_LEG);
  3191.         setQuestNameNpcStringId(NpcStringId.LV_15_RED_GEM_NECKLACE_2_3);
  3192.     }
  3193. -  
  3194. +
  3195.     @Override
  3196.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  3197.     {
  3198. @@ -76,7 +76,7 @@ public class Q11022_RedGemNecklace2 extends Quest
  3199.         {
  3200.             return null;
  3201.         }
  3202. -      
  3203. +
  3204.         String htmltext = null;
  3205.         switch (event)
  3206.         {
  3207. @@ -131,13 +131,13 @@ public class Q11022_RedGemNecklace2 extends Quest
  3208.         }
  3209.         return htmltext;
  3210.     }
  3211. -  
  3212. +
  3213.     @Override
  3214.     public String onTalk(Npc npc, PlayerInstance talker)
  3215.     {
  3216.         final QuestState qs = getQuestState(talker, true);
  3217.         String htmltext = getNoQuestMsg(talker);
  3218. -      
  3219. +
  3220.         switch (qs.getState())
  3221.         {
  3222.             case State.CREATED:
  3223. @@ -165,7 +165,7 @@ public class Q11022_RedGemNecklace2 extends Quest
  3224.         }
  3225.         return htmltext;
  3226.     }
  3227. -  
  3228. +
  3229.     @Override
  3230.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  3231.     {
  3232. @@ -179,12 +179,16 @@ public class Q11022_RedGemNecklace2 extends Quest
  3233.                     if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92))
  3234.                     {
  3235.                         giveItems(killer, BEARS_SHIN_BONE, 1);
  3236. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3237.                         if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20)
  3238.                         {
  3239. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3240.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000);
  3241.                             qs.setCond(3);
  3242.                         }
  3243. +                       else
  3244. +                       {
  3245. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3246. +                       }
  3247.                     }
  3248.                     break;
  3249.                 }
  3250. @@ -195,12 +199,16 @@ public class Q11022_RedGemNecklace2 extends Quest
  3251.                     if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89))
  3252.                     {
  3253.                         giveItems(killer, SHARP_SPIDER_LEG, 1);
  3254. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3255.                         if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30)
  3256.                         {
  3257. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3258.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000);
  3259.                             qs.setCond(4);
  3260.                         }
  3261. +                       else
  3262. +                       {
  3263. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3264. +                       }
  3265.                     }
  3266.                     break;
  3267.                 }
  3268. @@ -208,4 +216,4 @@ public class Q11022_RedGemNecklace2 extends Quest
  3269.         }
  3270.         return super.onKill(npc, killer, isSummon);
  3271.     }
  3272. -}
  3273. \ No newline at end of file
  3274. +}
  3275. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
  3276. index 4618633511..846c1f4286 100644
  3277. --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
  3278. +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
  3279. @@ -1,16 +1,16 @@
  3280.  /*
  3281.   * This file is part of the L2J Mobius project.
  3282. - *
  3283. + *
  3284.   * This program is free software: you can redistribute it and/or modify
  3285.   * it under the terms of the GNU General Public License as published by
  3286.   * the Free Software Foundation, either version 3 of the License, or
  3287.   * (at your option) any later version.
  3288. - *
  3289. + *
  3290.   * This program is distributed in the hope that it will be useful,
  3291.   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  3292.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  3293.   * General Public License for more details.
  3294. - *
  3295. + *
  3296.   * You should have received a copy of the GNU General Public License
  3297.   * along with this program. If not, see <http://www.gnu.org/licenses/>.
  3298.   */
  3299. @@ -52,7 +52,7 @@ public class Q11023_RedGemNecklace3 extends Quest
  3300.     // Misc
  3301.     private static final int MIN_LVL = 15;
  3302.     private static final int MAX_LVL = 20;
  3303. -  
  3304. +
  3305.     public Q11023_RedGemNecklace3()
  3306.     {
  3307.         super(11023);
  3308. @@ -65,7 +65,7 @@ public class Q11023_RedGemNecklace3 extends Quest
  3309.         registerQuestItems(NECKLACE_MATERIALS_TICKET, HARD_LENS, RED_STONE);
  3310.         setQuestNameNpcStringId(NpcStringId.LV_15_RED_GEM_NECKLACE_3_3);
  3311.     }
  3312. -  
  3313. +
  3314.     @Override
  3315.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  3316.     {
  3317. @@ -74,7 +74,7 @@ public class Q11023_RedGemNecklace3 extends Quest
  3318.         {
  3319.             return null;
  3320.         }
  3321. -      
  3322. +
  3323.         String htmltext = null;
  3324.         switch (event)
  3325.         {
  3326. @@ -129,13 +129,13 @@ public class Q11023_RedGemNecklace3 extends Quest
  3327.         }
  3328.         return htmltext;
  3329.     }
  3330. -  
  3331. +
  3332.     @Override
  3333.     public String onTalk(Npc npc, PlayerInstance talker)
  3334.     {
  3335.         final QuestState qs = getQuestState(talker, true);
  3336.         String htmltext = getNoQuestMsg(talker);
  3337. -      
  3338. +
  3339.         switch (qs.getState())
  3340.         {
  3341.             case State.CREATED:
  3342. @@ -163,7 +163,7 @@ public class Q11023_RedGemNecklace3 extends Quest
  3343.         }
  3344.         return htmltext;
  3345.     }
  3346. -  
  3347. +
  3348.     @Override
  3349.     public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
  3350.     {
  3351. @@ -177,12 +177,16 @@ public class Q11023_RedGemNecklace3 extends Quest
  3352.                     if (qs.isCond(2) && (getQuestItemsCount(killer, HARD_LENS) < 20) && (getRandom(100) < 92))
  3353.                     {
  3354.                         giveItems(killer, HARD_LENS, 1);
  3355. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3356.                         if (getQuestItemsCount(killer, HARD_LENS) >= 20)
  3357.                         {
  3358. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3359.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_SEERS_N_GO_HUNTING_AND_KILL_KASHA_IMPS, ExShowScreenMessage.TOP_CENTER, 10000);
  3360.                             qs.setCond(3);
  3361.                         }
  3362. +                       else
  3363. +                       {
  3364. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3365. +                       }
  3366.                     }
  3367.                     break;
  3368.                 }
  3369. @@ -191,12 +195,16 @@ public class Q11023_RedGemNecklace3 extends Quest
  3370.                     if (qs.isCond(3) && (getQuestItemsCount(killer, RED_STONE) < 20) && (getRandom(100) < 91))
  3371.                     {
  3372.                         giveItems(killer, RED_STONE, 1);
  3373. -                       playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3374.                         if (getQuestItemsCount(killer, RED_STONE) >= 20)
  3375.                         {
  3376. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
  3377.                             showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_IMPS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000);
  3378.                             qs.setCond(4);
  3379.                         }
  3380. +                       else
  3381. +                       {
  3382. +                           playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  3383. +                       }
  3384.                     }
  3385.                     break;
  3386.                 }
  3387. @@ -204,4 +212,4 @@ public class Q11023_RedGemNecklace3 extends Quest
  3388.         }
  3389.         return super.onKill(npc, killer, isSummon);
  3390.     }
  3391. -}
  3392. \ No newline at end of file
  3393. +}
  3394. --
  3395. 2.28.0
  3396.  
  3397.  
Add Comment
Please, Sign In to add comment
Public Pastes
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!