Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a lot of "next" on Old Pharmacist (#2308)

Browse Source 
* Corrected the usage of script command next which was causing the NPC dialogue to be combined in certain cases.
Thanks to @Daegaladh!
This commit is contained in:
Daegaladh 2017-08-03 20:17:21 +02:00 committed by Aleos
parent 915c9ddb26
commit 627a178ca9
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
npc/merchants/old_pharmacist.txt
View File

@ -36,9 +36,9 @@ alberta_in,16,28,4 script Pharmacist 61,{
mes "[Old Pharmacist]";
mes "Ummmm...";
mes "What brings you here...?";
next;
switch(select("Make Potion:Talk.:Mixing Information:Cancel")) {
case 1:
next;
if (MaxWeight - Weight < 5000) {
mes "[Old Pharmacist]";
mes "Why are you carrying these so many!";
@ -51,11 +51,11 @@ alberta_in,16,28,4 script Pharmacist 61,{
} else {
mes "[Old Pharmacist]";
mes "You have all the stuff ready, right? Which one would you like?";
next;
switch(select("Red Potion.:Orange Potion.:Yellow Potion.:White Potion.:Blue Potion.:Green Potion.:Actually, I don't want anything.")) {
case 1:
callsub L_Making,507,3,501;
case 2:
next;
mes "[Old Pharmacist]";
if (countitem(507) < countitem(713)) {
set .@max,countitem(507);
@ -77,9 +77,9 @@ alberta_in,16,28,4 script Pharmacist 61,{
close;
}
mes "How many?";
next;
switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
case 1:
next;
if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) {
mes "[Old Pharmacist]";
mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
@ -92,24 +92,21 @@ alberta_in,16,28,4 script Pharmacist 61,{
getitem 502,.@max; //Orange_Potion
break;
case 2:
next;
mes "[Old Pharmacist]";
mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
next;
input .@amount,0,101;
if (.@amount == 0) {
next;
mes "[Old Pharmacist]";
mes "Make up your mind, will you?!";
close;
}
if (.@amount > 100) {
next;
mes "[Old Pharmacist]";
mes "Are you deaf? I said less than 100!";
close;
}
if ((countitem(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) {
next;
mes "[Old Pharmacist]";
mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
close;
@ -122,7 +119,6 @@ alberta_in,16,28,4 script Pharmacist 61,{
getitem 502,.@amount; //Orange_Potion
break;
case 3:
next;
mes "[Old Pharmacist]";
mes "What?!";
mes "Grrr...";
@ -188,7 +184,6 @@ L_Making:
.@item_req = getarg(0);
.@req_amount = getarg(1);
next;
mes "[Old Pharmacist]";
if ((countitem(.@item_req)/2) < countitem(713)) {
.@max = countitem(.@item_req) /2;
@ -206,9 +201,9 @@ L_Making:
close;
}
mes "How many?";
next;
switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
case 1:
next;
if ((countitem(.@item_req) < .@max*2) || countitem(713) < .@max || (Zeny < .@max*.@req_amount)) {
mes "[Old Pharmacist]";
mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
@ -220,11 +215,10 @@ L_Making:
getitem getarg(2),.@max;
break;
case 2:
next;
mes "[Old Pharmacist]";
mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
input .@amount;
next;
input .@amount;
if (.@amount == 0) {
mes "[Old Pharmacist]";
mes "Make up your mind, will you?!";
@ -246,7 +240,6 @@ L_Making:
getitem getarg(2),.@amount;
break;
case 3:
next;
mes "[Old Pharmacist]";
mes "What?!";
mes "Grrr...";