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 | |
| parent | e5974e8829ef2ae7cde48e5c5373dae975350c57 (diff) | |
| download | serverdata-8001530014f46f14c58396cd324e7d7b5e3222ef.tar.gz serverdata-8001530014f46f14c58396cd324e7d7b5e3222ef.tar.bz2 serverdata-8001530014f46f14c58396cd324e7d7b5e3222ef.tar.xz serverdata-8001530014f46f14c58396cd324e7d7b5e3222ef.zip | |
Correct some merge issue.
| -rw-r--r-- | db/const.txt | 4 | ||||
| -rw-r--r-- | db/questvars.txt | 9 | ||||
| -rw-r--r-- | npc/000-1/gugli.txt | 7 |
3 files changed, 6 insertions, 14 deletions
diff --git a/db/const.txt b/db/const.txt index 11f40816..5bdb0019 100644 --- a/db/const.txt +++ b/db/const.txt @@ -208,8 +208,8 @@ ShipQuests_Nard 4 ShipQuests_Knife 5 ShipQuests_ArpanMoney 6 ShipQuests_Door 7 -ShipQuests_TreasureChest 8 -ShipQuests_Couwan 9 +ShipQuests_Couwan 8 +ShipQuests_TreasureChest 9 ShipQuests_Ale 10 ShipQuests_Astapolos 11 ShipQuests_Gulukan 12 diff --git a/db/questvars.txt b/db/questvars.txt index 26b181ed..8c93f856 100644 --- a/db/questvars.txt +++ b/db/questvars.txt @@ -15,13 +15,8 @@ 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,3,8192 // ShipQuests_Couwan 8 +ShipQuests,1,524288 // ShipQuests_TreasureChest 9 ShipQuests,1,1048576 // ShipQuests_Ale 10 ShipQuests,1,2097152 // ShipQuests_Astapolos 11 ShipQuests,1,4194304 // ShipQuests_Gulukan 12 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: |