diff options
| author | Reid <reidyaro@gmail.com> | 2012-12-28 17:10:29 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-12-28 17:10:29 +0100 |
| commit | e5974e8829ef2ae7cde48e5c5373dae975350c57 (patch) | |
| tree | 3def716e42623cad7d07453010be2bc9e04badac /db | |
| parent | ece03c7602b3409b7f1c5da2152a7c19dd45a51f (diff) | |
| download | serverdata-e5974e8829ef2ae7cde48e5c5373dae975350c57.tar.gz serverdata-e5974e8829ef2ae7cde48e5c5373dae975350c57.tar.bz2 serverdata-e5974e8829ef2ae7cde48e5c5373dae975350c57.tar.xz serverdata-e5974e8829ef2ae7cde48e5c5373dae975350c57.zip | |
Revert "Correct bugs."
This reverts commit 6db8b93740a75feb7c3126a91145293e4c554de3.
Conflicts:
db/questvars.txt
npc/000-1/gugli.txt
Diffstat (limited to 'db')
| -rw-r--r-- | db/questvars.txt | 5 |
1 files changed, 5 insertions, 0 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 |