diff options
| author | Reid <reidyaro@gmail.com> | 2012-12-28 17:18:39 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-12-28 17:18:39 +0100 |
| commit | 8001530014f46f14c58396cd324e7d7b5e3222ef (patch) | |
| tree | 94ef9042633d15dc61d8660fad8ff276e0621dc2 /npc | |
| parent | e5974e8829ef2ae7cde48e5c5373dae975350c57 (diff) | |
| download | clientdata-8001530014f46f14c58396cd324e7d7b5e3222ef.tar.gz clientdata-8001530014f46f14c58396cd324e7d7b5e3222ef.tar.bz2 clientdata-8001530014f46f14c58396cd324e7d7b5e3222ef.tar.xz clientdata-8001530014f46f14c58396cd324e7d7b5e3222ef.zip | |
Correct some merge issue.
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/000-1/gugli.txt | 7 |
1 files changed, 2 insertions, 5 deletions
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: |