1 files changed, 25 insertions, 16 deletions
diff --git a/npc/005-3/barrel.txt b/npc/005-3/barrel.txt
index ec7f06b4f..721ec6f97 100644
--- a/npc/005-3/barrel.txt
+++ b/npc/005-3/barrel.txt
@@ -1,23 +1,24 @@
-// Evol scripts.
+// TMW-2 script.
 // Author:
 //    Crazyfefe
+//    Jesusalva
 // Description:
-//    Blacksmith's assistant of Artis
+//    Barrels
 // Variables:
-//    ArtisQuests_Enora
+//    CandorQuest_Barrel
 // Values:
 //    0    Default.
-//    1    BlackSmith quest delivered.
-//    2    Chelios Quest given.
-//    3    Chelios Quest done.
-//    4    BlackSmith gave the sword.
+//    1    Quest Found.
+//    2    Quest Accepted.
+//    3    Bomb Defused.
+//    4    Quest Completed.
 
 function	script	CheckBarrel	{
     .questCheck = .questCheck + 1;
     areamonster "005-3", 24, 34, 45, 42, "Cave Maggot", 1027, 1;
     if (.questCheck == 8)
     {
-        setq CandorQuest_Barrel, 1;
+        setq CandorQuest_Barrel, 3;
     }
     .@rand = rand(6);
     if (.@rand == 0)
@@ -36,7 +37,8 @@ function	script	CheckBarrel	{
 }
 
 005-3,24,36,0	script	Barrel#1	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();
@@ -49,7 +51,8 @@ OnInit:
 }
 
 005-3,24,39,0	script	Barrel#2	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();
@@ -62,7 +65,8 @@ OnInit:
 }
 
 005-3,29,37,0	script	Barrel#3	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();
@@ -74,7 +78,8 @@ OnInit:
     end;
 }
 005-3,35,34,0	script	Barrel#4	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();
@@ -86,7 +91,8 @@ OnInit:
     end;
 }
 005-3,38,34,0	script	Barrel#5	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();
@@ -98,7 +104,8 @@ OnInit:
     end;
 }
 005-3,44,40,0	script	Barrel#6	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();
@@ -110,7 +117,8 @@ OnInit:
     end;
 }
 005-3,38,41,0	script	Barrel#7	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();
@@ -122,7 +130,8 @@ OnInit:
     end;
 }
 005-3,29,41,0	script	Barrel#8	NPC_NO_SPRITE,{
-    if (.questState == 0)
+    .@q = getq(CandorQuest_Barrel);
+    if (.questState == 0 && .@q == 2)
     {
         .questState = 1;
         CheckBarrel();