summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/kunai_maker.txt2
-rw-r--r--npc/merchants/novice_exchange.txt2
-rw-r--r--npc/merchants/refine.txt3
3 files changed, 6 insertions, 1 deletions
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index f836befdf..3f2eae55c 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -38,6 +38,7 @@ switch(select("10 Poison Kunais:10 Icycle Kunais:10 Rough Wind Kunais:10 Black S
callfunc "Kunai_Trade",13254,1,7521,2,13258;
goto L_Bye;
case 6:
+ case 255:
goto L_Bye;
}
L_Bye:
@@ -90,6 +91,7 @@ function script Kunai_Trade {
next;
return;
case 2:
+ case 255:
return;
}
L_Return:
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index 6c2dda72b..aed369124 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -134,6 +134,8 @@ function script F_NMerch {
mes "Hah, no problem.";
mes "Bah!";
close;
+ case 255:
+ end;
}
}
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 1ea743dc3..5f3922984 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -798,12 +798,13 @@ function script repairmain {
getitemname(getbrokenid(3)),getitemname(getbrokenid(4)),getitemname(getbrokenid(5)),
getitemname(getbrokenid(6)),getitemname(getbrokenid(7)),getitemname(getbrokenid(8)),
getitemname(getbrokenid(9)),getitemname(getbrokenid(10)));
+ if(@choice == 255) end;
mes "[" + @name$ + "]";
mes "You're gonna repair " + getitemname(getbrokenid(@choice)) + ".";
mes "To repair this, I need " + @repairprice + " Zeny.";
mes "Continue?";
next;
- if(select("Yes","No") == 2) {
+ if(select("Yes","No") == 2 || @menu == 255) {
mes "[" + @name$ + "]";
mes "Ok, but don't expect to be using that...";
close;