diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
index 24ace64043..a37295a703 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
@@ -171,7 +171,7 @@ public class Q00529_RegularBarrierMaintenance extends Quest
 		{
 			if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true))
 			{
-				qs.setCond(FINISH_COND);
+				qs.setCond(FINISH_COND, true);
 			}
 			sendNpcLogList(killer);
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
index 071b485aeb..dc91aa2b9b 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
@@ -169,7 +169,7 @@ public class Q00560_HowToOvercomeFear extends Quest
 		{
 			if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true))
 			{
-				qs.setCond(FINISH_COND);
+				qs.setCond(FINISH_COND, true);
 			}
 			sendNpcLogList(killer);
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
index aac745d678..800c419185 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
@@ -35,6 +35,9 @@ public class Q10516_UnveiledFafurionTemple extends Quest
 	private static final int TALK_NPC_2 = 34489;
 	private static final int FINISH_NPC = 34490;
 	// Misc
+	private static final int TALK_NPC_1_COND = 1;
+	private static final int TALK_NPC_2_COND = 2;
+	private static final int FINISH_NPC_COND = 3;
 	private static final int MIN_LEVEL = 110;
 	
 	public Q10516_UnveiledFafurionTemple()
@@ -61,28 +64,29 @@ public class Q10516_UnveiledFafurionTemple extends Quest
 				if (qs.isCreated())
 				{
 					qs.startQuest();
+					qs.setCond(TALK_NPC_1_COND);
 				}
 				break;
 			}
 			case "talk_1_2.html":
 			{
-				if ((npc.getId() == TALK_NPC_1) && qs.isCond(1))
+				if ((npc.getId() == TALK_NPC_1) && qs.isCond(TALK_NPC_1_COND))
 				{
-					qs.setCond(2, true);
+					qs.setCond(TALK_NPC_2_COND, true);
 				}
 				break;
 			}
 			case "talk_2_2.html":
 			{
-				if ((npc.getId() == TALK_NPC_2) && qs.isCond(2))
+				if ((npc.getId() == TALK_NPC_2) && qs.isCond(TALK_NPC_2_COND))
 				{
-					qs.setCond(3, true);
+					qs.setCond(FINISH_NPC_COND, true);
 				}
 				break;
 			}
 			case "reward.html":
 			{
-				if ((npc.getId() == FINISH_NPC) && qs.isCond(3))
+				if ((npc.getId() == FINISH_NPC) && qs.isCond(FINISH_NPC_COND))
 				{
 					// Reward.
 					addExpAndSp(player, 5556186900L, 5556186);
@@ -126,11 +130,11 @@ public class Q10516_UnveiledFafurionTemple extends Quest
 					}
 					case TALK_NPC_1:
 					{
-						if (qs.isCond(1))
+						if (qs.isCond(TALK_NPC_1_COND))
 						{
 							htmltext = "talk_1_1.html";
 						}
-						else if (qs.getCond() > 1)
+						else if (qs.getCond() > TALK_NPC_1_COND)
 						{
 							htmltext = "talk_1_2.html";
 						}
@@ -138,11 +142,11 @@ public class Q10516_UnveiledFafurionTemple extends Quest
 					}
 					case TALK_NPC_2:
 					{
-						if (qs.isCond(2))
+						if (qs.isCond(TALK_NPC_2_COND))
 						{
 							htmltext = "talk_2_1.html";
 						}
-						else if (qs.getCond() > 2)
+						else if (qs.getCond() > TALK_NPC_2_COND)
 						{
 							htmltext = "talk_2_2.html";
 						}
@@ -150,7 +154,7 @@ public class Q10516_UnveiledFafurionTemple extends Quest
 					}
 					case FINISH_NPC:
 					{
-						if (qs.isCond(3))
+						if (qs.isCond(FINISH_NPC_COND))
 						{
 							htmltext = "finish.html";
 						}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
index d6cac255ee..66e92516c4 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
@@ -182,7 +182,7 @@ public class Q10517_FafurionsMinions extends Quest
 			
 			if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
 			{
-				qs.setCond(FINISH_COND);
+				qs.setCond(FINISH_COND, true);
 			}
 			
 			sendNpcLogList(killer);
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java
index a7bf338df4..c22581c26e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java
@@ -102,7 +102,7 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest
 				if (qs.isCreated())
 				{
 					qs.startQuest();
-					qs.setCond(KILLING_COND_1, true);
+					qs.setCond(KILLING_COND_1);
 				}
 				break;
 			}
@@ -198,7 +198,7 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest
 			{
 				if (giveItemRandomly(killer, npc, MONSTER_DROP_1, 1, REQUIRED_DROP_COUNT_1, 1, true))
 				{
-					qs.setCond(FINISH_COND_1);
+					qs.setCond(FINISH_COND_1, true);
 				}
 				sendNpcLogList(killer);
 			}
@@ -206,7 +206,7 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest
 			{
 				if (giveItemRandomly(killer, npc, MONSTER_DROP_2, 1, REQUIRED_DROP_COUNT_2, 1, true))
 				{
-					qs.setCond(FINISH_COND_2);
+					qs.setCond(FINISH_COND_2, true);
 				}
 			}
 		}