summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/alchemist.txt11
-rw-r--r--npc/merchants/ammo_boxes.txt4
-rw-r--r--npc/merchants/ammo_dealer.txt2
-rw-r--r--npc/merchants/buying_shops.txt66
-rw-r--r--npc/merchants/gemstone.txt12
-rw-r--r--npc/merchants/hair_style.txt936
-rw-r--r--npc/merchants/icecream.txt8
-rw-r--r--npc/merchants/kunai_maker.txt2
-rw-r--r--npc/merchants/novice_exchange.txt11
-rw-r--r--npc/merchants/old_pharmacist.txt8
-rw-r--r--npc/merchants/refine.txt68
11 files changed, 579 insertions, 549 deletions
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index ea926ae6b..cdfdd06fc 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -64,22 +64,21 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{
mes "Enter '0' if you want to quit.";
next;
while(1) {
- input .@input, 0, 2001;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Gever Al Sharp]";
mes "The deal was cancelled.";
mes "Come again next time.";
close;
}
- else if (.@input < 1 || .@input > 2000) {
+ if (.@input > 2000) {
mes "[Gever Al Sharp]";
mes "The number must";
mes "be less than 2000.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
if (RENEWAL) {
.@sell = .@input * 250;
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 69310388f..aef74f81f 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -102,8 +102,8 @@ function script Func_Casing {
mes "the number of Magazines you";
mes "want to receive. If you want to cancel, then just enter ''0.''";
next;
- input .@amount;
- if (.@amount > 50 || .@amount == 0) {
+ input(.@amount);
+ if (.@amount > 50 || .@amount <= 0) {
mes "[Kenny]";
mes "Hey, I can't give you";
mes "that many Magazines.";
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 490be66ba..313f54653 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -97,7 +97,7 @@ function script Bullet_Trade {
mes "that you'd like. If you want to";
mes "cancel, then just enter ''0.''";
next;
- input .@amount;
+ input(.@amount);
if (.@amount < 1 || .@amount > 500) {
mes "[Tony]";
mes "Hey, I can't give you";
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index eaf62bbe1..ff368d910 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -67,31 +67,32 @@ que_job01,68,84,1 script Black Marketeer#Buying 4_M_SITDOWN,{
mes "It'll cost 500 zeny for each one.";
next;
while(1) {
- input .@input;
+ input(.@input);
mes "[Mr. Jass]";
- if (.@input == 0) {
+ if (.@input <= 0) {
mes "Don't you need those licenses?";
close;
- } else if (.@input > 10) {
+ }
+ if (.@input > 10) {
mes "I can only make up to 10 at a time, you know.";
next;
- } else {
- mes "It'll cost "+(.@input*500)+" zeny.";
- if (Zeny < (.@input*500)) {
- mes "but you don't have enough money.";
- next;
- mes "[Mr. Jass]";
- mes "Don't you know the basics of business? Everything has a price.";
- mes "If you want something, you gotta pay for it.";
- } else {
- mes "Ha... Ha ha ha!";
- mes "Mr. Hugh, I'll take over your license business. You'll see!";
- mes "*Giggle Giggle*";
- getitem Buy_Market_Permit2,.@input;
- Zeny -= (.@input*500);
- }
- close;
+ continue;
}
+ mes "It'll cost "+(.@input*500)+" zeny.";
+ if (Zeny < (.@input*500)) {
+ mes "but you don't have enough money.";
+ next;
+ mes "[Mr. Jass]";
+ mes "Don't you know the basics of business? Everything has a price.";
+ mes "If you want something, you gotta pay for it.";
+ close();
+ }
+ mes "Ha... Ha ha ha!";
+ mes "Mr. Hugh, I'll take over your license business. You'll see!";
+ mes "*Giggle Giggle*";
+ getitem Buy_Market_Permit2,.@input;
+ Zeny -= (.@input*500);
+ close;
}
case 2:
mes "[Mr. Jass]";
@@ -139,26 +140,27 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{
mes "How many licenses do you need?";
next;
while(1) {
- input .@input;
+ input(.@input);
mes "[Mr. Hugh]";
- if (.@input == 0) {
+ if (.@input <= 0) {
mes "You have cancelled the trade.";
mes "Have a good day.";
close;
- } else if (.@input > 50) {
+ }
+ if (.@input > 50) {
mes "Please enter a value of 50 or less.";
next;
+ continue;
+ }
+ mes "It'll cost "+(.@input*200)+" zeny for "+.@input+" licenses.";
+ if (Zeny < (.@input*200)) {
+ mes "but you don't seem to have enough money.";
} else {
- mes "It'll cost "+(.@input*200)+" zeny for "+.@input+" licenses.";
- if (Zeny < (.@input*200)) {
- mes "but you don't seem to have enough money.";
- } else {
- mes "Thank you for your patronage.";
- getitem Buy_Market_Permit,.@input; //Buy_Stall_Permit
- Zeny -= (.@input*200);
- }
- close;
+ mes "Thank you for your patronage.";
+ getitem Buy_Market_Permit,.@input; //Buy_Stall_Permit
+ Zeny -= (.@input*200);
}
+ close;
}
} else {
mes "I'm Hugh from the Purchasing Team at the Alberta Merchant Guild.";
@@ -234,7 +236,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{
mes "You've made a good decision.";
mes "Please give me the registration fee, and sign right here....";
next;
- input .@name$;
+ input(.@name$);
mes "[Mr. Hugh]";
mes .@name$+"....";
mes "I like your handwriting.";
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 6028d9ddb..44be2569c 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -84,31 +84,33 @@ S_TradeGems:
mes "that you can enter is 100.";
next;
while(1) {
- input .@input,0,101;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Jade]";
mes "None at all?";
mes "I guess you";
mes "changed your mind...";
close;
}
- else if (.@input > 100) {
+ if (.@input > 100) {
mes "[Jade]";
mes "Errm...";
mes "I asked you to enter";
mes "an amount no greater";
mes "than 100, remember...?";
next;
+ continue;
}
- else if (.@gems < .@input) {
+ if (.@gems < .@input) {
// Custom dialogue
mes "[Jade]";
mes "Errm...";
mes "You don't have that";
mes "many gems to trade...";
next;
+ continue;
}
- else break;
+ break;
}
delitem getarg(0),.@input * 2;
getitem getarg(1),.@input;
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index f940a5982..fd6cc1b96 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -51,15 +51,8 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{
mes "If you wish to cancel,";
mes "please enter 0.";
next;
- input .@style;
- if(.@style > 19) {
- mes "[Veronica]";
- mes "Oops, I'm sorry, but that";
- mes "style is not available.";
- mes "Remember to enter a number";
- mes "from 1 to 19.";
- next;
- } else if(.@style == 0) {
+ input(.@style);
+ if(.@style == 0) {
mes "[Veronica]";
mes "So, how do you like the style?";
mes "Feel free to ask me about any";
@@ -68,313 +61,357 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{
mes "hair.";
close;
}
- else {
- callsub L_cutin,.@style;
+ if (.@style < 1 || .@style > 19) {
mes "[Veronica]";
- switch(.@style) {
- case 1:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Play Dead' style!";
- mes "It's a nice, basic haircut.";
- mes "I notice that usually the";
- mes "cute, conversative types seem";
- mes "to prefer this style.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'First Aid' style!";
- mes "The shoulder length tresses";
- mes "are straightened for those";
- mes "no nonsense adventurers. It";
- mes "seems to be the style of";
- mes "choice for Novices.";
- close2; cutin "",255; end;
- case 2:
- if (Sex == SEX_MALE) {
- mes "Oh, that's the 'Two Handed Sword";
- mes "Mastery' style! It's perfect for";
- mes "for Swordmen who might muss their";
- mes "hair while swinging their swords";
- mes "all day long.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Bash' style!";
- mes "For the powerful woman that's";
- mes "not afraid to get a little";
- mes "blood on her hands, but knows";
- mes "how great her hair will look";
- mes "while wildly flailing a sword.";
- close2; cutin "",255; end;
- case 3:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Napalm Beat' style!";
- mes "It's a unique look with a hint";
- mes "of eccentricity that's offset";
- mes "with a helping of elegance.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Frost Diver' style!";
- mes "The pigtails lend an innocent,";
- mes "demure look for those Mages";
- mes "and Wizards that usually scare";
- mes "off the boys with their spells.";
- close2; cutin "",255; end;
- case 4:
- if (Sex == SEX_MALE) {
- mes "Oh, that's the 'Double Strafe'";
- mes "style! The arrangement of the";
- mes "hair conducts ambient static";
- mes "electricity, naturally clearing";
- mes "the mind. At least, that's what";
- mes "I was taught in fashion school.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Arrow Shower' style!";
- mes "For the Bowswoman who doesn't";
- mes "want fashion to interfere with";
- mes "her depth perception. Much more";
- mes "attractive than those horrid";
- mes "granny-style hairbuns.";
- close2; cutin "",255; end;
- case 5:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Angelus' style!";
- mes "It's for calm and devout people,";
- mes "as well as those bashful,";
- mes "mild-mannered types.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Heal' style!";
- mes "This is in trend among";
- mes "Priests and Acolytes since";
- mes "this style is appropriate";
- mes "for formal situations, but";
- mes "is also practical in battle.";
- close2; cutin "",255; end;
- case 6:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Push Cart' style!";
- mes "It was based on the design of a";
- mes "cart...at least, that's what";
- mes "I learned in beautician school.";
- close2; cutin "",255; end;
- }
- mes "Ooh, that's 'Vending' style!";
- mes "It's the hairdo of money";
- mes "makers...and if I may say so,";
- mes "it's also economical.";
- close2; cutin "",255; end;
- case 7:
- if (Sex == SEX_MALE) {
- mes "Ooh, that's 'Envenom' style!";
- mes "It looks great on Thieves and";
- mes "and Assassins when they're";
- mes "out poisoning people and animals.";
- mes "It's fashion for the aggressive";
- mes "and eclectic~!";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Double Attack' style!";
- mes "The adorable pigtail, paired with";
- mes "those provacative bangs are sure";
- mes "to help you steal the heart of";
- mes "some cute guy.";
- close2; cutin "",255; end;
- case 8:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Bowling Bash' style!";
- mes "A popular style for Knights, its";
- mes "manly, rugged look tends to";
- mes "attract all of the ladies,";
- mes "and looks great on men with";
- mes "strong chins.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Gloria' style!";
- mes "It's very elegant and looks";
- mes "great on holy Priests. This";
- mes "style is most attractive to";
- mes "ladies who aren't that used";
- mes "to fighting with their hands.";
- close2; cutin "",255; end;
- case 9:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Venom Dust' style!";
- mes "Definitely a look for rebels,";
- mes "the sweeping, yet decidedly";
- mes "luxorious locks seems to enchant";
- mes "girls with a fatal attraction.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'SP Recovery' style!";
- mes "To add more body to the special";
- mes "style of these bangs, I use a";
- mes "special conditioner that makes";
- mes "you feel like you're regaining SP";
- mes "...Although, it acutally doesn't.";
- close2; cutin "",255; end;
- case 10:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Turn Undead' style!";
- mes "This is popular among Priests";
- mes "that want a serious, yet a bit";
- mes "of a wild, agressive look.";
- mes "Definitely more attractive";
- mes "than the 'Holy Light' mullet.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Prepare Potion' style!";
- mes "The flared out tresses are chosen";
- mes "by beginning Alchemists, since";
- mes "early, explosive experiments would";
- mes "make their hair to stick out anyway.";
- close2; cutin "",255; end;
- case 11:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Dragonology' style!";
- mes "It's neat and clean cut, perfect";
- mes "for studious people and looks";
- mes "great with eyeglasses. This";
- mes "is a fashion well suited to";
- mes "intellectual types.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Grand Cross' style!";
- mes "It's in style among those pious";
- mes "Crusaders that need hair that";
- mes "won't muss during fighting, yet";
- mes "is respectable enough to attend";
- mes "religious services.";
- close2; cutin "",255; end;
- case 12:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Mace Mastery' style!";
- mes "A lot of care goes into making";
- mes "that tussled hair say, 'I don't";
- mes "care how I look at all.'";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Intimidate' style!";
- mes "The Rogue women seem to like";
- mes "this style...although I imagine";
- mes "that more of them would prefer";
- mes "something wilder to match those";
- mes "stockings...";
- close2; cutin "",255; end;
- case 13:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Thunder Storm' style!";
- mes "This hot, flamboyant hairstyle";
- mes "flares out wildly like thunder.";
- mes "...And you will too with this new look.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Spiritual Sphere";
- mes "Absorption' style! There's a";
- mes "charismatic quality to this";
- mes "fashion: it's tough, slightly";
- mes "tomboyish, but not so much";
- mes "that it can't be cute.";
- close2; cutin "",255; end;
- case 14:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Encore' style!";
- mes "The elegant, flowing locks";
- mes "fit well with Bards, or men who";
- mes "appreciate the value of male";
- mes "beauty.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Gypsy's Kiss' style!";
- mes "Dancers seem to like this style,";
- mes "although personally, I think";
- mes "this fashion fits very well";
- mes "with glasses.";
- close2; cutin "",255; end;
- case 15:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Grimtooth' style!";
- mes "Spiky and unkempt, this style";
- mes "is a popular counterculture";
- mes "street fashion. You might";
- mes "not want to wear your hair";
- mes "this way at a wedding, though.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Counter Attack' style!";
- mes "This is an intimidating look for";
- mes "girls that want to say 'You hit";
- mes "me, I'll hit you back!' It really";
- mes "emphasizes strong looking";
- mes "foreheads and cheekbones.";
- close2; cutin "",255; end;
- case 16:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Blitz Beat' style!";
- mes "A funky and lively fashion,";
- mes "this style was developed for a";
- mes "Hunter who liked really long";
- mes "bangs and wanted to see";
- mes "through them at the same time.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Anke Snare' style!";
- mes "The style style is specially";
- mes "made for Hunters that don't like";
- mes "to get their hair tangled...";
- mes "After all, what kind of Hunter";
- mes "lets their hair get trapped?";
- close2; cutin "",255; end;
- case 17:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Find Ore' style!";
- mes "It's a practical, economical look";
- mes "that is popular among Blacksmiths.";
- mes "Some swear that this fashion helps";
- mes "them in finding ores, but where's";
- mes "the science in that??";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Hammer Fall' style!";
- mes "For the woman that doesn't want";
- mes "her hair to get in the way when";
- mes "she's savagely swinging heavy";
- mes "objects. Of course, this is a";
- mes "Blacksmith favorite.";
- close2; cutin "",255; end;
- case 18:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Fire Pillar' style!";
- mes "It's a trendy look, in which";
- mes "you cover one eye for that";
- mes "intrigue effect. The element";
- mes "of mystery is always in";
- mes "fashion, don't you think?";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Jupitel Thunder'";
- mes "style! A look that strikes";
- mes "like lightening, without";
- mes "any of that annoying static";
- mes "cling or muss. This fashion";
- mes "looks great with Mage Hats.";
- close2; cutin "",255; end;
- case 19:
- if (Sex == SEX_MALE) {
- mes "Oh, that's 'Guillotine Fist'";
- mes "style! The smooth, slicked back";
- mes "pompadour shows that you're";
- mes "serious about your passion";
- mes "for brawling... or just your passion.";
- close2; cutin "",255; end;
- }
- mes "Oh, that's 'Whirlwind' style!";
- mes "A favorite among the studious";
- mes "Sages, the hair is tied back";
- mes "in a stylish braid so that";
- mes "it doesn't fly around after";
- mes "casting those windy spells.";
- close2; cutin "",255; end;
+ mes "Oops, I'm sorry, but that";
+ mes "style is not available.";
+ mes "Remember to enter a number";
+ mes "from 1 to 19.";
+ close();
+ }
+ callsub L_cutin,.@style;
+ mes "[Veronica]";
+ switch(.@style) {
+ case 1:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Play Dead' style!";
+ mes "It's a nice, basic haircut.";
+ mes "I notice that usually the";
+ mes "cute, conversative types seem";
+ mes "to prefer this style.";
+ } else {
+ mes "Oh, that's 'First Aid' style!";
+ mes "The shoulder length tresses";
+ mes "are straightened for those";
+ mes "no nonsense adventurers. It";
+ mes "seems to be the style of";
+ mes "choice for Novices.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 2:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's the 'Two Handed Sword";
+ mes "Mastery' style! It's perfect for";
+ mes "for Swordmen who might muss their";
+ mes "hair while swinging their swords";
+ mes "all day long.";
+ } else {
+ mes "Oh, that's 'Bash' style!";
+ mes "For the powerful woman that's";
+ mes "not afraid to get a little";
+ mes "blood on her hands, but knows";
+ mes "how great her hair will look";
+ mes "while wildly flailing a sword.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 3:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Napalm Beat' style!";
+ mes "It's a unique look with a hint";
+ mes "of eccentricity that's offset";
+ mes "with a helping of elegance.";
+ } else {
+ mes "Oh, that's 'Frost Diver' style!";
+ mes "The pigtails lend an innocent,";
+ mes "demure look for those Mages";
+ mes "and Wizards that usually scare";
+ mes "off the boys with their spells.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 4:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's the 'Double Strafe'";
+ mes "style! The arrangement of the";
+ mes "hair conducts ambient static";
+ mes "electricity, naturally clearing";
+ mes "the mind. At least, that's what";
+ mes "I was taught in fashion school.";
+ } else {
+ mes "Oh, that's 'Arrow Shower' style!";
+ mes "For the Bowswoman who doesn't";
+ mes "want fashion to interfere with";
+ mes "her depth perception. Much more";
+ mes "attractive than those horrid";
+ mes "granny-style hairbuns.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 5:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Angelus' style!";
+ mes "It's for calm and devout people,";
+ mes "as well as those bashful,";
+ mes "mild-mannered types.";
+ } else {
+ mes "Oh, that's 'Heal' style!";
+ mes "This is in trend among";
+ mes "Priests and Acolytes since";
+ mes "this style is appropriate";
+ mes "for formal situations, but";
+ mes "is also practical in battle.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 6:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Push Cart' style!";
+ mes "It was based on the design of a";
+ mes "cart...at least, that's what";
+ mes "I learned in beautician school.";
+ } else {
+ mes "Ooh, that's 'Vending' style!";
+ mes "It's the hairdo of money";
+ mes "makers...and if I may say so,";
+ mes "it's also economical.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 7:
+ if (Sex == SEX_MALE) {
+ mes "Ooh, that's 'Envenom' style!";
+ mes "It looks great on Thieves and";
+ mes "and Assassins when they're";
+ mes "out poisoning people and animals.";
+ mes "It's fashion for the aggressive";
+ mes "and eclectic~!";
+ } else {
+ mes "Oh, that's 'Double Attack' style!";
+ mes "The adorable pigtail, paired with";
+ mes "those provacative bangs are sure";
+ mes "to help you steal the heart of";
+ mes "some cute guy.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 8:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Bowling Bash' style!";
+ mes "A popular style for Knights, its";
+ mes "manly, rugged look tends to";
+ mes "attract all of the ladies,";
+ mes "and looks great on men with";
+ mes "strong chins.";
+ } else {
+ mes "Oh, that's 'Gloria' style!";
+ mes "It's very elegant and looks";
+ mes "great on holy Priests. This";
+ mes "style is most attractive to";
+ mes "ladies who aren't that used";
+ mes "to fighting with their hands.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 9:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Venom Dust' style!";
+ mes "Definitely a look for rebels,";
+ mes "the sweeping, yet decidedly";
+ mes "luxorious locks seems to enchant";
+ mes "girls with a fatal attraction.";
+ } else {
+ mes "Oh, that's 'SP Recovery' style!";
+ mes "To add more body to the special";
+ mes "style of these bangs, I use a";
+ mes "special conditioner that makes";
+ mes "you feel like you're regaining SP";
+ mes "...Although, it acutally doesn't.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 10:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Turn Undead' style!";
+ mes "This is popular among Priests";
+ mes "that want a serious, yet a bit";
+ mes "of a wild, agressive look.";
+ mes "Definitely more attractive";
+ mes "than the 'Holy Light' mullet.";
+ } else {
+ mes "Oh, that's 'Prepare Potion' style!";
+ mes "The flared out tresses are chosen";
+ mes "by beginning Alchemists, since";
+ mes "early, explosive experiments would";
+ mes "make their hair to stick out anyway.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 11:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Dragonology' style!";
+ mes "It's neat and clean cut, perfect";
+ mes "for studious people and looks";
+ mes "great with eyeglasses. This";
+ mes "is a fashion well suited to";
+ mes "intellectual types.";
+ } else {
+ mes "Oh, that's 'Grand Cross' style!";
+ mes "It's in style among those pious";
+ mes "Crusaders that need hair that";
+ mes "won't muss during fighting, yet";
+ mes "is respectable enough to attend";
+ mes "religious services.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 12:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Mace Mastery' style!";
+ mes "A lot of care goes into making";
+ mes "that tussled hair say, 'I don't";
+ mes "care how I look at all.'";
+ } else {
+ mes "Oh, that's 'Intimidate' style!";
+ mes "The Rogue women seem to like";
+ mes "this style...although I imagine";
+ mes "that more of them would prefer";
+ mes "something wilder to match those";
+ mes "stockings...";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 13:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Thunder Storm' style!";
+ mes "This hot, flamboyant hairstyle";
+ mes "flares out wildly like thunder.";
+ mes "...And you will too with this new look.";
+ } else {
+ mes "Oh, that's 'Spiritual Sphere";
+ mes "Absorption' style! There's a";
+ mes "charismatic quality to this";
+ mes "fashion: it's tough, slightly";
+ mes "tomboyish, but not so much";
+ mes "that it can't be cute.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 14:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Encore' style!";
+ mes "The elegant, flowing locks";
+ mes "fit well with Bards, or men who";
+ mes "appreciate the value of male";
+ mes "beauty.";
+ } else {
+ mes "Oh, that's 'Gypsy's Kiss' style!";
+ mes "Dancers seem to like this style,";
+ mes "although personally, I think";
+ mes "this fashion fits very well";
+ mes "with glasses.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 15:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Grimtooth' style!";
+ mes "Spiky and unkempt, this style";
+ mes "is a popular counterculture";
+ mes "street fashion. You might";
+ mes "not want to wear your hair";
+ mes "this way at a wedding, though.";
+ } else {
+ mes "Oh, that's 'Counter Attack' style!";
+ mes "This is an intimidating look for";
+ mes "girls that want to say 'You hit";
+ mes "me, I'll hit you back!' It really";
+ mes "emphasizes strong looking";
+ mes "foreheads and cheekbones.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 16:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Blitz Beat' style!";
+ mes "A funky and lively fashion,";
+ mes "this style was developed for a";
+ mes "Hunter who liked really long";
+ mes "bangs and wanted to see";
+ mes "through them at the same time.";
+ } else {
+ mes "Oh, that's 'Anke Snare' style!";
+ mes "The style style is specially";
+ mes "made for Hunters that don't like";
+ mes "to get their hair tangled...";
+ mes "After all, what kind of Hunter";
+ mes "lets their hair get trapped?";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 17:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Find Ore' style!";
+ mes "It's a practical, economical look";
+ mes "that is popular among Blacksmiths.";
+ mes "Some swear that this fashion helps";
+ mes "them in finding ores, but where's";
+ mes "the science in that??";
+ } else {
+ mes "Oh, that's 'Hammer Fall' style!";
+ mes "For the woman that doesn't want";
+ mes "her hair to get in the way when";
+ mes "she's savagely swinging heavy";
+ mes "objects. Of course, this is a";
+ mes "Blacksmith favorite.";
+ }
+ close2;
+ cutin "",255;
+ end;
+ case 18:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Fire Pillar' style!";
+ mes "It's a trendy look, in which";
+ mes "you cover one eye for that";
+ mes "intrigue effect. The element";
+ mes "of mystery is always in";
+ mes "fashion, don't you think?";
+ } else {
+ mes "Oh, that's 'Jupitel Thunder'";
+ mes "style! A look that strikes";
+ mes "like lightening, without";
+ mes "any of that annoying static";
+ mes "cling or muss. This fashion";
+ mes "looks great with Mage Hats.";
}
+ close2;
+ cutin "",255;
+ end;
+ case 19:
+ if (Sex == SEX_MALE) {
+ mes "Oh, that's 'Guillotine Fist'";
+ mes "style! The smooth, slicked back";
+ mes "pompadour shows that you're";
+ mes "serious about your passion";
+ mes "for brawling... or just your passion.";
+ } else {
+ mes "Oh, that's 'Whirlwind' style!";
+ mes "A favorite among the studious";
+ mes "Sages, the hair is tied back";
+ mes "in a stylish braid so that";
+ mes "it doesn't fly around after";
+ mes "casting those windy spells.";
+ }
+ close2;
+ cutin "",255;
+ end;
}
case 2:
if(BaseLevel < 60) {
@@ -413,17 +450,19 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{
mes "no.19. I will do my best to";
mes "make you look your very best.";
next;
- input .@style;
- if(.@style > 19) {
+ input(.@style);
+ if(.@style == 0) {
mes "[Veronica]";
- mes "I am sorry, you chose an unavailable style.";
- mes "Make sure you enter the correct number.";
+ mes "You have canceled your request.";
close;
- } else if(.@style == 0) {
+ }
+ if (.@style < 1 || .@style > 19) {
mes "[Veronica]";
- mes "You have canceled your request.";
+ mes "I am sorry, you chose an unavailable style.";
+ mes "Make sure you enter the correct number.";
close;
- } else if(getlook(1) == .@style) {
+ }
+ if(getlook(1) == .@style) {
mes "[Veronica]";
mes "I am sorry, but you are already";
mes "wearing the style you have";
@@ -976,7 +1015,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
mes "No. 27: Oratio Cut.";
}
next;
- input .@input;
+ input(.@input);
if (.@input == 0) {
mes "[Prince Shammi]";
mes "Oh...?";
@@ -986,7 +1025,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
mes "Still, I'm so disappointed~";
close;
}
- else if ((.@input < 20) || (.@input > 27)) {
+ if (.@input < 20 || .@input > 27) {
mes "[Prince Shammi]";
mes "Dearie, please enter";
mes "a number from ''20'' to";
@@ -995,7 +1034,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
mes "you soooooooo beautiful!";
close;
}
- else if (getlook(LOOK_HAIR) == .@input) {
+ if (getlook(LOOK_HAIR) == .@input) {
mes "[Prince Shammi]";
mes "Oh dear me, you're not";
mes "going to waste money for";
@@ -1005,107 +1044,104 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
mes "your hair color, you know.";
close;
}
- else {
- if (Sex == SEX_MALE)
- cutin "hair_m_"+.@input+".BMP",4;
- else
- cutin "hair_f_"+.@input+".BMP",4;
- mes "[Prince Shammi]";
- mes "Oooh! Now, is this the";
- mes "hairstyle that you wanted?";
- mes "This is No. "+.@input+", by the way.";
- next;
- switch(select("Yes.", "No.")) {
- case 1:
- if (getlook(LOOK_HAIR_COLOR) == 0) {
- mes "[Prince Shammi]";
- mes "Oh, Sweet Christmas,";
- mes "I almost forgot! Would";
- mes "you like me to dye your";
- mes "hair, free of charge? It's";
- mes "a part of my service, so";
- mes "please choose a color~";
- next;
- switch(select("Red", "Yellow", "Purple", "Orange", "Green", "Blue", "White", "Dark Brown")) {
- case 1:
- .@headpalette = 8;
- break;
- case 2:
- .@headpalette = 1;
- break;
- case 3:
- .@headpalette = 2;
- break;
- case 4:
- .@headpalette = 3;
- break;
- case 5:
- .@headpalette = 4;
- break;
- case 6:
- .@headpalette = 5;
- break;
- case 7:
- .@headpalette = 6;
- break;
- case 8:
- .@headpalette = 7;
- break;
- }
- }
+ if (Sex == SEX_MALE)
+ cutin "hair_m_"+.@input+".BMP",4;
+ else
+ cutin "hair_f_"+.@input+".BMP",4;
+ mes "[Prince Shammi]";
+ mes "Oooh! Now, is this the";
+ mes "hairstyle that you wanted?";
+ mes "This is No. "+.@input+", by the way.";
+ next;
+ switch(select("Yes.", "No.")) {
+ case 1:
+ if (getlook(LOOK_HAIR_COLOR) == 0) {
mes "[Prince Shammi]";
- mes "Okay, let's get";
- mes "started, shall we?";
- mes "Keep your head still,";
- mes "now. Yes, that's good...";
+ mes "Oh, Sweet Christmas,";
+ mes "I almost forgot! Would";
+ mes "you like me to dye your";
+ mes "hair, free of charge? It's";
+ mes "a part of my service, so";
+ mes "please choose a color~";
next;
- mes "^3355FF*Snip snip*";
- mes "*Rustle rustle*";
- mes "*Clip clip clip clip*";
- mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000";
- next;
- Zeny -= 99800;
- delitem Counteragent,3;
- delitem Mixture,3;
- delitem Danggie,100;
- delitem Short_Daenggie,100;
- delitem Long_Hair,100;
- delitem Golden_Hair,100;
- delitem Glossy_Hair,100;
- setlook LOOK_HAIR,.@input;
- setlook LOOK_HAIR_COLOR,.@headpalette;
- mes "[Prince Shammi]";
- mes "Well, we're all finished!";
- mes "And my, oh my, you look even";
- mes "more fabulous that I thought";
- mes "you would! Oh, I can't believe";
- if (Sex == SEX_MALE) {
- mes "how tough and elegant you are~";
- mes "So ruggedly manly and handsome!";
- }
- else {
- mes "how graceful and elegant you";
- mes "look! Absolutely gorgeous!";
+ switch(select("Red", "Yellow", "Purple", "Orange", "Green", "Blue", "White", "Dark Brown")) {
+ case 1:
+ .@headpalette = 8;
+ break;
+ case 2:
+ .@headpalette = 1;
+ break;
+ case 3:
+ .@headpalette = 2;
+ break;
+ case 4:
+ .@headpalette = 3;
+ break;
+ case 5:
+ .@headpalette = 4;
+ break;
+ case 6:
+ .@headpalette = 5;
+ break;
+ case 7:
+ .@headpalette = 6;
+ break;
+ case 8:
+ .@headpalette = 7;
+ break;
}
- emotion e_kis,"Hair Dresser#li";
- next;
- mes "[Prince Shammi]";
- mes "You love your new";
- mes "hair, don't you? Feel";
- mes "free to come back anytime.";
- mes "I'll make you the best looking";
- mes "person in the entire world!";
- emotion e_no1,"Hair Dresser#li";
- close;
- case 2:
- mes "[Prince Shammi]";
- mes "Oh, did you forget which";
- mes "hairstyle goes with which";
- mes "number? By all means, please";
- mes "check again! Find the one that";
- mes "is perfect just for you, okay?";
- close;
}
+ mes "[Prince Shammi]";
+ mes "Okay, let's get";
+ mes "started, shall we?";
+ mes "Keep your head still,";
+ mes "now. Yes, that's good...";
+ next;
+ mes "^3355FF*Snip snip*";
+ mes "*Rustle rustle*";
+ mes "*Clip clip clip clip*";
+ mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000";
+ next;
+ Zeny -= 99800;
+ delitem Counteragent,3;
+ delitem Mixture,3;
+ delitem Danggie,100;
+ delitem Short_Daenggie,100;
+ delitem Long_Hair,100;
+ delitem Golden_Hair,100;
+ delitem Glossy_Hair,100;
+ setlook LOOK_HAIR,.@input;
+ setlook LOOK_HAIR_COLOR,.@headpalette;
+ mes "[Prince Shammi]";
+ mes "Well, we're all finished!";
+ mes "And my, oh my, you look even";
+ mes "more fabulous that I thought";
+ mes "you would! Oh, I can't believe";
+ if (Sex == SEX_MALE) {
+ mes "how tough and elegant you are~";
+ mes "So ruggedly manly and handsome!";
+ } else {
+ mes "how graceful and elegant you";
+ mes "look! Absolutely gorgeous!";
+ }
+ emotion e_kis,"Hair Dresser#li";
+ next;
+ mes "[Prince Shammi]";
+ mes "You love your new";
+ mes "hair, don't you? Feel";
+ mes "free to come back anytime.";
+ mes "I'll make you the best looking";
+ mes "person in the entire world!";
+ emotion e_no1,"Hair Dresser#li";
+ close;
+ case 2:
+ mes "[Prince Shammi]";
+ mes "Oh, did you forget which";
+ mes "hairstyle goes with which";
+ mes "number? By all means, please";
+ mes "check again! Find the one that";
+ mes "is perfect just for you, okay?";
+ close;
}
break;
case 3:
@@ -1200,7 +1236,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{
mes "Um, if you need to";
mes "cancel, just enter ''0.''";
next;
- input .@input;
+ input(.@input);
if (.@input == 0) {
mes "[Assistant Beautician]";
mes "Awwww...";
@@ -1208,7 +1244,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{
mes "trust me after all...";
close;
}
- else if ((.@input < 1) || (.@input > 23)) {
+ if (.@input < 1 || .@input > 23) {
mes "[Assistant Beautician]";
mes "Huh? I thought I asked";
mes "you to enter a number from";
@@ -1216,34 +1252,31 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{
mes "wrong this time? Hmmm...";
close;
}
- else {
+ mes "[Assistant Beautician]";
+ mes "So this is the";
+ mes "style you want me";
+ mes "to try to do for you?";
+ if (Sex == SEX_MALE) {
+ if (.@input < 10)
+ cutin "hair_m_0"+.@input+".BMP",4;
+ else
+ cutin "hair_m_"+.@input+".BMP",4;
+ } else {
+ if (.@input < 10)
+ cutin "hair_f_0"+.@input+".BMP",4;
+ else
+ cutin "hair_f_"+.@input+".BMP",4;
+ }
+ next;
+ switch(select("Yes, let's try it~", "Cancel.")) {
+ case 1:
+ break;
+ case 2:
mes "[Assistant Beautician]";
- mes "So this is the";
- mes "style you want me";
- mes "to try to do for you?";
- if (Sex == SEX_MALE) {
- if (.@input < 10)
- cutin "hair_m_0"+.@input+".BMP",4;
- else
- cutin "hair_m_"+.@input+".BMP",4;
- }
- else {
- if (.@input < 10)
- cutin "hair_f_0"+.@input+".BMP",4;
- else
- cutin "hair_f_"+.@input+".BMP",4;
- }
- next;
- switch(select("Yes, let's try it~", "Cancel.")) {
- case 1:
- break;
- case 2:
- mes "[Assistant Beautician]";
- mes "Oooh, there must";
- mes "be some style that";
- mes "you like, right? Hmmm...";
- close;
- }
+ mes "Oooh, there must";
+ mes "be some style that";
+ mes "you like, right? Hmmm...";
+ close;
}
mes "[Assistant Beautician]";
mes "Great, you finally";
@@ -1279,8 +1312,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{
if (.@input == .@style_r) {
mes "So... How do you like";
mes "your new style? I love it!";
- }
- else {
+ } else {
mes "Wha...? This isn't what";
mes "you wanted? Uh oh... Um...";
mes "Well, next time I know I can";
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index 14f83b2a0..99da2fc18 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -56,8 +56,8 @@
mes "so you can only purchase 5 at a time!!";
next;
while(1) {
- input .@input;
- if(.@input < 1) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Ice Cream Maker]";
mes "If you don't want to buy any,";
mes "could you please let the next customer";
@@ -65,7 +65,7 @@
mes "Thank you.";
close;
}
- if(.@input > 5) {
+ if (.@input > 5) {
mes "[Ice Cream Maker]";
mes "Ouch";
mes "You expect too much.";
@@ -74,7 +74,9 @@
mes "If you might haveto make a lot of trips";
mes "to the bathroom tonight.";
next;
+ continue;
}
+ break;
}
if(Zeny<.@input*100) {
mes "[Ice Cream Maker]";
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 06a2f8bdb..05d322ec6 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -84,7 +84,7 @@ function script Kunai_Trade {
mes "If you want to cancel the trade, then please enter ''0.'' How many";
mes "Kunai sets would you like?";
next;
- input .@amount;
+ input(.@amount);
if(.@amount < 1 || .@amount > 500) {
mes "[Kashin]";
mes "Eh? I'm sorry, but";
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index c27fc6570..7e023588d 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -355,8 +355,8 @@ function script F_PotExchange {
mes "mind, just enter '0' to cancel.";
next;
while(1) {
- input .@input,0,101;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Merchant]";
mes "What...?";
mes "Why the hell do you";
@@ -364,17 +364,16 @@ function script F_PotExchange {
mes "Pretty indecisive, aren't you?";
close;
}
- else if (.@input > 100) {
+ if (.@input > 100) {
mes "[Merchant]";
mes "I can't give you more";
mes "than 100 Red Potions";
mes "at once. Let's try";
mes "this again.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@put_out_item = .@input * getarg(1);
if (countitem(getarg(0)) < .@put_out_item) {
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index 0cbbeda6d..f87f55d83 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -106,8 +106,8 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{
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,0,101;
- if (.@amount == 0) {
+ input(.@amount);
+ if (.@amount <= 0) {
next;
mes "[Old Pharmacist]";
mes "Make up your mind, will you?!";
@@ -235,9 +235,9 @@ L_Making:
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;
+ input(.@amount);
next;
- if (.@amount == 0) {
+ if (.@amount <= 0) {
mes "[Old Pharmacist]";
mes "Make up your mind, will you?!";
close;
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 19ebf4a8e..87b5270a8 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -120,20 +120,19 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{
mes "It's a much needed tool fer refining metal! So, How many do ye wish to buy? If ye want to quit, just type the number '0.'";
next;
while(1) {
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Christopher Guillenrow]";
mes "Aye, the deal is canceled. Fare ye well.";
close;
}
- else if ((.@input < 0) || (.@input > 500)) {
+ if (.@input > 500) {
mes "[Christopher Guillenrow]";
mes "Ye can buy 500, er less.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@sell = .@input * 150;
if (Zeny < .@sell) {
@@ -199,22 +198,21 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{
mes "So, How many do ye wish to buy? If ye dont want anything, just type the number as '0.'";
next;
while(1) {
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Christopher Guillenrow]";
mes "Deal has";
mes "been canceled.";
mes "Fare ye well.";
close;
}
- else if ((.@input < 0) || (.@input > 500)) {
+ if (.@input > 500) {
mes "[Christopher Guillenrow]";
mes "Ye can buy 500, er less.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@sell = .@input * 200;
if (Zeny < .@sell) {
@@ -237,22 +235,21 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{
mes "So, how many do ye wish to buy? If ye dont want anything at all, just type the number as '0.'";
next;
while(1) {
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Christopher Guillenrow]";
mes "Deal has";
mes "been canceled.";
mes "Fare ye well.";
close;
}
- else if ((.@input < 0) || (.@input > 500)) {
+ if (.@input > 500) {
mes "[Christopher Guillenrow]";
mes "Ye can buy 500, er less.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@sell = .@input * 1000;
if (Zeny < .@sell) {
@@ -424,20 +421,19 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{
mes "So, how many do you need? If you want to cancel the trade, enter '0'.";
next;
while(1) {
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Paul Spanner]";
mes "You have canceled the trade. If you need anything, just let me know.";
close;
}
- else if ((.@input < 0) || (.@input > 500)) {
+ if (.@input > 500) {
mes "[Paul Spanner]";
mes "You can only buy 500 or less at a time.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@sell = .@input * .@item_cost;
if (Zeny < .@sell) {
@@ -478,20 +474,19 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{
mes "So, how many of them do you need? If you want to cancel the trade, enter '0'.";
next;
while(1) {
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Paul Spanner]";
mes "The trade has been canceled. If you need anything, just let me know.";
close;
}
- else if ((.@input < 0) || (.@input > 500)) {
+ if (.@input > 500) {
mes "[Paul Spanner]";
mes "You can buy 500 or less at a time.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@sell = .@input * .@item_price;
if (Zeny < .@sell) {
@@ -808,7 +803,7 @@ function script refinemain {
mes "[" + getarg(0) + "]";
mes "How many times would you like me to refine your item?";
next;
- input .@refinecnt;
+ input(.@refinecnt);
.@refinecheck = .@refinecnt + getequiprefinerycnt(.@part);
if (.@refinecnt < 1 || .@refinecheck > 10) {
mes "[" + getarg(0) + "]";
@@ -954,24 +949,23 @@ function script phramain {
mes "If you don't want any, please enter the number, '0.'";
next;
while(1) {
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[" + getarg(0) + "]";
mes "The deal has";
mes "been cancelled.";
close;
}
- else if (.@input < 0 || .@input > 500) {
+ if (.@input > 500) {
mes "[" + getarg(0) + "]";
mes "Alright, you can";
mes "puchase up to 500.";
mes "No more than that,";
mes "got it? Good.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@sell = .@input * .@price;
if (Zeny < .@sell) {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-16 11:11:13 +0000