From a13989338946f35073bd7f20e4718e6ddc243902 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 16 May 2018 19:33:45 +0000
Subject: [PATCH] Various quest improvements. Contributed by Stayway.

---
 .../Q11001_TombsOfAncestors.java              | 64 +++++++++++--------
 .../Q11002_HelpWithTempleRestoration.java     |  6 +-
 .../Q11004_PerfectLeatherArmor2/30001-01.html |  2 +-
 .../Q11001_TombsOfAncestors.java              | 64 +++++++++++--------
 .../Q11002_HelpWithTempleRestoration.java     |  6 +-
 .../Q11004_PerfectLeatherArmor2/30001-01.html |  2 +-
 6 files changed, 84 insertions(+), 60 deletions(-)

diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index 2daddd623b..314ce8c4aa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -52,8 +52,8 @@ public class Q11001_TombsOfAncestors extends Quest
 	private static final int ORC = 20130;
 	private static final int ORC_SOLDIER = 20131;
 	private static final int ORC_ARCHER = 20006;
-	private static final int ORC_WARRIOR = 20386;
-	private static final int WEREWOLVES = 20387;
+	private static final int ORC_WARRIOR = 20093;
+	private static final int WEREWOLVES = 20132;
 	// Misc
 	private static final int MIN_LVL = 2;
 	private static final int MAX_LVL = 20;
@@ -197,14 +197,17 @@ public class Q11001_TombsOfAncestors extends Quest
 				case WOLF:
 				case ELDER_WOLF:
 				{
-					if (qs.isCond(2))
+					if (qs.isCond(2) && (getQuestItemsCount(killer, WOLF_PELT) < 10))
 					{
-						giveItems(killer, WOLF_PELT, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if (getQuestItemsCount(killer, WOLF_PELT) >= 10)
+						if (getRandom(100) < 93)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(3);
+							giveItems(killer, WOLF_PELT, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if (getQuestItemsCount(killer, WOLF_PELT) >= 10)
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(3);
+							}
 						}
 					}
 					break;
@@ -213,42 +216,51 @@ public class Q11001_TombsOfAncestors extends Quest
 				case ORC_SOLDIER:
 				case ORC_ARCHER:
 				{
-					if (qs.isCond(3))
+					if (qs.isCond(3) && (getQuestItemsCount(killer, ORC_AMULET) < 10))
 					{
-						giveItems(killer, ORC_AMULET, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if (getQuestItemsCount(killer, ORC_AMULET) >= 10)
+						if (getRandom(100) < 93)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(4);
+							giveItems(killer, ORC_AMULET, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if (getQuestItemsCount(killer, ORC_AMULET) >= 10)
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(4);
+							}
 						}
 					}
 					break;
 				}
 				case ORC_WARRIOR:
 				{
-					if (qs.isCond(4))
+					if (qs.isCond(4) && (getQuestItemsCount(killer, BROKEN_SWORD) < 10))
 					{
-						giveItems(killer, BROKEN_SWORD, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10))
+						if (getRandom(100) < 89)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(5);
+							giveItems(killer, BROKEN_SWORD, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10))
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(5);
+							}
 						}
 					}
 					break;
 				}
 				case WEREWOLVES:
 				{
-					if (qs.isCond(4))
+					if (qs.isCond(4) && (getQuestItemsCount(killer, WEREWOLFS_FANG) < 10))
 					{
-						giveItems(killer, WEREWOLFS_FANG, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10))
+						if (getRandom(100) < 100)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(5);
+							giveItems(killer, WEREWOLFS_FANG, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10))
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(5);
+							}
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index 7c683dd815..fd4f5608a2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -208,8 +208,8 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 								qs.setCond(3);
 							}
 						}
-						break;
 					}
+					break;
 				}
 				case WEREWOLF_HUMTER:
 				case WEREWOLF_CHIEFTAIN:
@@ -226,8 +226,8 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 								qs.setCond(4);
 							}
 						}
-						break;
 					}
+					break;
 				}
 				case CRASHER:
 				case STONE_GOLEM:
@@ -244,8 +244,8 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 								qs.setCond(5);
 							}
 						}
-						break;
 					}
+					break;
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html
index f6000b0974..84c50df1ae 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html
@@ -1,5 +1,5 @@
 <html><body>Weapon Merchant Lector:<br>
-Oh! Have you chnaged your mind?<br>
+Oh! Have you changed your mind?<br>
 With just a bit more of your help I could make a real masterpiece here.<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q11004_PerfectLeatherArmor2 30001-02.htm">"Okay, I will help you."</Button><br>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index 2daddd623b..314ce8c4aa 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -52,8 +52,8 @@ public class Q11001_TombsOfAncestors extends Quest
 	private static final int ORC = 20130;
 	private static final int ORC_SOLDIER = 20131;
 	private static final int ORC_ARCHER = 20006;
-	private static final int ORC_WARRIOR = 20386;
-	private static final int WEREWOLVES = 20387;
+	private static final int ORC_WARRIOR = 20093;
+	private static final int WEREWOLVES = 20132;
 	// Misc
 	private static final int MIN_LVL = 2;
 	private static final int MAX_LVL = 20;
@@ -197,14 +197,17 @@ public class Q11001_TombsOfAncestors extends Quest
 				case WOLF:
 				case ELDER_WOLF:
 				{
-					if (qs.isCond(2))
+					if (qs.isCond(2) && (getQuestItemsCount(killer, WOLF_PELT) < 10))
 					{
-						giveItems(killer, WOLF_PELT, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if (getQuestItemsCount(killer, WOLF_PELT) >= 10)
+						if (getRandom(100) < 93)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(3);
+							giveItems(killer, WOLF_PELT, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if (getQuestItemsCount(killer, WOLF_PELT) >= 10)
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(3);
+							}
 						}
 					}
 					break;
@@ -213,42 +216,51 @@ public class Q11001_TombsOfAncestors extends Quest
 				case ORC_SOLDIER:
 				case ORC_ARCHER:
 				{
-					if (qs.isCond(3))
+					if (qs.isCond(3) && (getQuestItemsCount(killer, ORC_AMULET) < 10))
 					{
-						giveItems(killer, ORC_AMULET, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if (getQuestItemsCount(killer, ORC_AMULET) >= 10)
+						if (getRandom(100) < 93)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(4);
+							giveItems(killer, ORC_AMULET, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if (getQuestItemsCount(killer, ORC_AMULET) >= 10)
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(4);
+							}
 						}
 					}
 					break;
 				}
 				case ORC_WARRIOR:
 				{
-					if (qs.isCond(4))
+					if (qs.isCond(4) && (getQuestItemsCount(killer, BROKEN_SWORD) < 10))
 					{
-						giveItems(killer, BROKEN_SWORD, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10))
+						if (getRandom(100) < 89)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(5);
+							giveItems(killer, BROKEN_SWORD, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10))
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(5);
+							}
 						}
 					}
 					break;
 				}
 				case WEREWOLVES:
 				{
-					if (qs.isCond(4))
+					if (qs.isCond(4) && (getQuestItemsCount(killer, WEREWOLFS_FANG) < 10))
 					{
-						giveItems(killer, WEREWOLFS_FANG, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-						if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10))
+						if (getRandom(100) < 100)
 						{
-							showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
-							qs.setCond(5);
+							giveItems(killer, WEREWOLFS_FANG, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10))
+							{
+								showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000);
+								qs.setCond(5);
+							}
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index 7c683dd815..fd4f5608a2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -208,8 +208,8 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 								qs.setCond(3);
 							}
 						}
-						break;
 					}
+					break;
 				}
 				case WEREWOLF_HUMTER:
 				case WEREWOLF_CHIEFTAIN:
@@ -226,8 +226,8 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 								qs.setCond(4);
 							}
 						}
-						break;
 					}
+					break;
 				}
 				case CRASHER:
 				case STONE_GOLEM:
@@ -244,8 +244,8 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 								qs.setCond(5);
 							}
 						}
-						break;
 					}
+					break;
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html
index f6000b0974..84c50df1ae 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/30001-01.html
@@ -1,5 +1,5 @@
 <html><body>Weapon Merchant Lector:<br>
-Oh! Have you chnaged your mind?<br>
+Oh! Have you changed your mind?<br>
 With just a bit more of your help I could make a real masterpiece here.<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q11004_PerfectLeatherArmor2 30001-02.htm">"Okay, I will help you."</Button><br>
 </body></html>
\ No newline at end of file