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 /npc/000-1 | |
| 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 'npc/000-1')
| -rw-r--r-- | npc/000-1/couwan.txt | 6 | ||||
| -rw-r--r-- | npc/000-1/gugli.txt | 12 |
2 files changed, 12 insertions, 6 deletions
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: |