summaryrefslogtreecommitdiff
path: root/npc/quests/juice_maker.txt
diff options
context:
space:
mode:
authorEmistry Haoyan <equinox1991@gmail.com>2019-06-16 18:44:45 +0800
committerHaru <haru@dotalux.com>2019-07-28 18:17:09 +0200
commit371d056df80b6f83484534f64883c3d020c4112d (patch)
tree20d38a8581f3a6159157bfa6644027d4007485bc /npc/quests/juice_maker.txt
parentef8bc3a8375d4fe9a5f75faf951b3deecb891d57 (diff)
downloadhercules-371d056df80b6f83484534f64883c3d020c4112d.tar.gz
hercules-371d056df80b6f83484534f64883c3d020c4112d.tar.bz2
hercules-371d056df80b6f83484534f64883c3d020c4112d.tar.xz
hercules-371d056df80b6f83484534f64883c3d020c4112d.zip
Sanitize handling of the input() values.
- avoid potential hacks for old scripts that use `input()` script commands. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/quests/juice_maker.txt')
-rw-r--r--npc/quests/juice_maker.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index 4c5d34b3c..250090495 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -256,21 +256,20 @@ payon_in03,188,146,5 script Marx Hansen#juice 4_M_04,{
mes "Choose a number less than 100. If you don't want to, put '0'. You can make up to " + countitem(.@fruit) + " bottles of juice.";
next;
while(1) {
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Merchant Marx Hansen]";
mes "Well then...";
mes "Come again.";
close;
}
- else if (.@input > 100) {
+ if (.@input > 100) {
mes "[Merchant Marx Hansen]";
mes "More than 100 bottles is impossible. Choose a different amount.";
next;
+ continue;
}
- else {
- break;
- }
+ break;
}
.@make = .@input;
break;