summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/005-4/tolchi.txt51
1 files changed, 25 insertions, 26 deletions
diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt
index 117ae7ad8..3bf83314b 100644
--- a/npc/005-4/tolchi.txt
+++ b/npc/005-4/tolchi.txt
@@ -67,10 +67,9 @@
break;
default:
quest_close();
- goodbye;
break;
}
- } while (@menu != 4);
+ } while (@menu != 6);
closedialog;
goodbye;
@@ -83,7 +82,6 @@ function quest_close {
mesq l("Maybe next time, then.");
next;
}
- closeclientdialog;
return;
}
@@ -92,12 +90,12 @@ function quest_giveitem {
@q = getq(CandorQuest_Tolchi);
if (@q == 2)
{
- if (countitem("Iron Ingot") == 0)
+ if (countitem(IronIngot) == 0)
{
- speech S_FIRST_BLANK_LINE,
- l("You don't have the Iron Ingot.");
- close2;
- goodbye;
+ mesn;
+ mesq l("You don't have the Iron Ingot.");
+ next;
+ return;
}
delitem IronIngot, 1;
Zeny = Zeny + 8000; // Real worth: 2820 GP + 2400 (ship fee) = 5220 gp poll (the plus is net profit)
@@ -108,12 +106,12 @@ function quest_giveitem {
}
if (@q == 1)
{
- if (countitem("Coal") <= 2)
+ if (countitem(Coal) < 3)
{
- speech S_FIRST_BLANK_LINE,
- l("You don't have the three Coal lumps.");
- close2;
- goodbye;
+ mesn;
+ mesq l("You don't have the three Coal lumps.");
+ next;
+ return;
}
delitem Coal, 3;
Zeny = Zeny + 825;
@@ -124,10 +122,10 @@ function quest_giveitem {
{
if (countitem("Iron Ore") == 0)
{
- speech S_FIRST_BLANK_LINE,
- l("You don't have the Iron Ore.");
- close2;
- goodbye;
+ mesn;
+ mesq l("You don't have the Iron Ore.");
+ next;
+ return;
}
delitem IronOre, 1;
Zeny = Zeny + 225;
@@ -220,8 +218,8 @@ function tolchi_arrows {
mesq l("Well, I can sell you a random box with almost 100 @@ for just @@ GP.", getitemlink(TolchiArrow), .@price);
next;
if (Zeny < .@price || askyesno() == ASK_NO) {
- close2;
- goodbye;
+ mesc l("Come back when you are willing to spend money.");
+ next;
} else {
mes "";
inventoryplace TolchiArrow, 110;
@@ -229,9 +227,9 @@ function tolchi_arrows {
getitem TolchiArrow, rand2(102,106);
mesn;
mesq l("Here you go. Uhm, I really prefer if you buy with Rosen, though."); // I just don't want to add loops or inputs
- close;
+ next;
}
- close;
+ return;
}
// Supreme Tweaking
@@ -262,7 +260,8 @@ function tolchi_tweaks {
if (countitem(.@handle) != 1) {
mesn;
mesq l("Sorry, but you have multiple %s.", getitemlink(.@handle));
- close;
+ next;
+ return;
}
// Calculate price
@@ -275,8 +274,8 @@ function tolchi_tweaks {
next;
if (Zeny < .@price || askyesno() == ASK_NO) {
- close2;
- goodbye;
+ mesc l("Come back when you are willing to spend money.");
+ next;
} else {
mes "";
// Okay, time to force a tweaking
@@ -319,9 +318,9 @@ function tolchi_tweaks {
mesn;
mesc l("Well, here you are. I hope you enjoy ^^", 3);
- close;
+ next;
}
- close;
+ return;
}
OnTimer1000: