From 8001530014f46f14c58396cd324e7d7b5e3222ef Mon Sep 17 00:00:00 2001 From: Reid Date: Fri, 28 Dec 2012 17:18:39 +0100 Subject: Correct some merge issue. --- npc/000-1/gugli.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'npc') diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index f72bb6f1..c7a2f505 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -137,14 +137,11 @@ l_Couwan: next; mesq l("May this be a lesson for you."); + 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: -- cgit v1.2.3-70-g09d2