Revert "Correct bugs."

This reverts commit 6db8b93740a75feb7c3126a91145293e4c554de3.

Conflicts:

	db/questvars.txt
	npc/000-1/gugli.txt

3 files changed, 17 insertions, 6 deletions

diff --git a/db/questvars.txt b/db/questvars.txt
index f667f0a5..26b181ed 100644
--- a/db/questvars.txt
+++ b/db/questvars.txt
@@ -15,8 +15,13 @@ ShipQuests,15,32768     // ShipQuests_Nard             4
 ShipQuests,1,1024       // ShipQuests_Knife            5
 ShipQuests,1,2048       // ShipQuests_ArpanMoney       6
 ShipQuests,1,4096       // ShipQuests_Door             7
+<<<<<<< HEAD
 ShipQuests,3,8192       // ShipQuests_TreasureChest    8
 ShipQuests,1,524288     // ShipQuests_Couwan           9
+=======
+ShipQuests,3,8192       // ShipQuests_Darlin           8
+ShipQuests,3,524288     // ShipQuests_Couwan           9
+>>>>>>> parent of 6db8b93... Correct bugs.
 ShipQuests,1,1048576    // ShipQuests_Ale              10
 ShipQuests,1,2097152    // ShipQuests_Astapolos        11
 ShipQuests,1,4194304    // ShipQuests_Gulukan          12
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
index 9b769e3f..a4a0b799 100644
--- a/npc/000-1/couwan.txt
+++ b/npc/000-1/couwan.txt
@@ -14,8 +14,9 @@
 000-1.gat,89,36,0,1	script	Couwan	111;2,{
 
     set @q, getq(ShipQuests_Couwan);
-    if (countitem("FishBox") > 0) goto l_QuestGiven;
-    if (@q == 1) goto l_QuestDone;
+    if (@q == 1) goto l_QuestGiven;
+    if (@q > 1) goto l_QuestDone;
+
 
     mesn;
     mesq l("Hello yeye.");
@@ -53,6 +54,7 @@
     next;
     mes col(l("The sailor turns his back to you."), 9);
 
+    setq ShipQuests_Couwan, 1;
     close;
 
 l_Water:
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index b2c9001f..f72bb6f1 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -79,7 +79,7 @@ l_TaskGiven:
 
 l_Menu:
     menu
-        rif(countitem("FishBox") > 0, l("Couwan gave me this box, it is for you.")), l_Couwan,
+        rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), l_Couwan,
         rif(countitem("AquadaBox") > 0 || countitem("CroconutBox") > 0 || countitem("PlushroomBox") > 0, l("I have some food for you.")), l_CollectSmthing,
         l("Who should I search for?"), l_SailorNames,
         l("Where can I find your crew?"), l_Location,
@@ -87,7 +87,7 @@ l_Menu:
 
 l_MenuDone:
     menu
-        rif(countitem("FishBox") > 0, l("Couwan gave me this box, it is for you.")), l_Couwan,
+        rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), l_Couwan,
         l("I have collected all the boxes you needed."), l_TaskDone,
         l("See you!"), l_Quit;
 
@@ -137,10 +137,14 @@ l_Couwan:
     next;
     mesq l("May this be a lesson for you.");
 
-    setq ShipQuests_Couwan, 1;
-    if (countitem("FishBox") > 0) delitem "FishBox", 1;
+    setq ShipQuests_Couwan, 2;
     set zeny, zeny+10;
+<<<<<<< HEAD
     message strcharinfo(0), l("You receive 10 GP!");
+=======
+    if (countitem("FishBox") > 0) delitem "FishBox", 1;
+    message strcharinfo(0), l("You receive 5GP!");
+>>>>>>> parent of 6db8b93... Correct bugs.
     close;
 
 l_Location: