summaryrefslogtreecommitdiff
path: root/npc/quests/seals
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/seals
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/seals')
-rw-r--r--npc/quests/seals/brisingamen_seal.txt14
-rw-r--r--npc/quests/seals/god_global.txt4
-rw-r--r--npc/quests/seals/megingard_seal.txt8
-rw-r--r--npc/quests/seals/sleipnir_seal.txt6
4 files changed, 16 insertions, 16 deletions
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index ed63847a2..cd8bd0d12 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -2621,7 +2621,7 @@ gef_dun01,89,192,0 script #lowentrace HIDDEN_NPC,3,3,{
next;
switch(select("Yes", "No")) {
case 1:
- input @lowenstring$;
+ input(@lowenstring$);
if (@lowenstring$ == "Lowen") {
if (god_brising == 30) {
mes "[Lowen Ellenen]";
@@ -2743,7 +2743,7 @@ gef_dun01,203,48,0 script #lowentrace1 HIDDEN_NPC,3,3,{
next;
switch(select("Yes", "No")) {
case 1:
- input @lowenstring$;
+ input(@lowenstring$);
if (@lowenstring$ == "Lowen") {
if (god_brising == 31) {
mes "[Lowen Ellenen]";
@@ -4523,35 +4523,35 @@ mjo_dun02,126,36,0 script #brisindwarf4 HIDDEN_NPC,3,3,{
mes "Um, that song.";
mes "What was the first line...?";
next;
- input @dwarfsong1$;
+ input(@dwarfsong1$);
if (@dwarfsong1$ == "No jewel in the world can compare.") @point += 1;
mes "[" + strcharinfo(PC_NAME) + "]";
mes " " + @dwarfsong1$ + "";
mes "Then...ummm..";
mes "The second line?";
next;
- input @dwarfsong2$;
+ input(@dwarfsong2$);
if (@dwarfsong2$ == "Our masterpiece made from love.") @point += 1;
mes "[" + strcharinfo(PC_NAME) + "]";
mes " " + @dwarfsong2$ + "";
mes "Now, what was";
mes "the third line...?";
next;
- input @dwarfsong3$;
+ input(@dwarfsong3$);
if (@dwarfsong3$ == "She wanted the dazzling necklace.") @point += 1;
mes "[" + strcharinfo(PC_NAME) + "]";
mes " " + @dwarfsong3$ + "";
mes "Now, the fourth";
mes "line after that...";
next;
- input @dwarfsong4$;
+ input(@dwarfsong4$);
if (@dwarfsong4$ == "We wanted the goddess of beauty.") @point += 1;
mes "[" + strcharinfo(PC_NAME) + "]";
mes " " + @dwarfsong4$ + "";
mes "Alright, now";
mes "for the last line...";
next;
- input @dwarfsong5$;
+ input(@dwarfsong5$);
if (@dwarfsong5$ == "Our happiest times were with her.") @point += 1;
mes "[" + strcharinfo(PC_NAME) + "]";
mes " " + @dwarfsong5$ + "";
diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt
index 7486bcc23..fb2b13aeb 100644
--- a/npc/quests/seals/god_global.txt
+++ b/npc/quests/seals/god_global.txt
@@ -93,7 +93,7 @@ sec_in02,15,170,0 script Golbal var 4_F_CHNDRESS3,{
}
L_Number:
- input .@input,0,$@god_check2;
+ input(.@input, 0, $@god_check2);
mes "[Check]";
mes "Would you like to change to "+.@input+"?";
mes "Please enter the password.";
@@ -112,7 +112,7 @@ L_Number:
}
L_Var:
- input .@input;
+ input(.@input, 0);
setd getarg(0),.@input;
next;
mes "[Check]";
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 96a634a4e..75510d9a0 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -954,7 +954,7 @@ prt_in,172,106,0 script Librarian#megin 4_M_ZONDAOYAJI,{
mes "[" + strcharinfo(PC_NAME) + "]";
mes "But isn't";
mes "the file about...";
- input @str$;
+ input(@str$);
mes "^0000FF" + @str$ + "?";
next;
if (@str$ == "the 1st squad's final mission") {
@@ -1007,7 +1007,7 @@ prt_in,172,106,0 script Librarian#megin 4_M_ZONDAOYAJI,{
next;
mes "[" + strcharinfo(PC_NAME) + "]";
mes "Isn't the file...";
- input @str$;
+ input(@str$);
mes "[" + strcharinfo(PC_NAME) + "]";
mes "^0000FF" + @str$ + "?";
next;
@@ -1155,7 +1155,7 @@ prt_in,172,106,0 script Librarian#megin 4_M_ZONDAOYAJI,{
mes "Please do not use";
mes "capital letters.^000000";
next;
- input .@input$;
+ input(.@input$);
if (compare(.@input$,"crusader") == 1) {
mes "^663300[Keyword: ^996633Crusader^663300]";
mes "Crusaders are warriors preparing for the upcoming Holy War against Evil. Experienced swordsmen, usually with remarkable spiritual prowess.^000000";
@@ -1817,7 +1817,7 @@ morocc_in,146,179,0 script Employee#megin1 1_F_01,{
mes "Are you looking for";
mes "someone...?";
next;
- input @str$;
+ input(@str$);
if (@str$ == "Cuaque Donon" || @str$ == "Cuaque" || @str$ == "Donon") {
mes "[" + strcharinfo(PC_NAME) + "]";
mes "Do you happen to know a person named " + @str$ + " ...?";
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index d3982699c..4450c1778 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -1316,7 +1316,7 @@ que_god01,20,48,0 script Slab#G HIDDEN_NPC,{
mes "wkrdjswhgks shfh wkrdjswhgks wkdus wkr...";
mes "^ff00ffghswka^000000gks ........fusjs tmld.........";
next;
- input .@input$;
+ input(.@input$);
if (.@input$ == "dirdnl") {
mes "Zap~";
mes "^3355FFAs you press the word '^ff0000dirdnl^3355FF,' the slab emitted a strange beeping noise but nothing else happened. Perhaps you must press some of the other words.^000000";
@@ -1335,7 +1335,7 @@ que_god01,20,48,0 script Slab#G HIDDEN_NPC,{
mes "is not on the slab.^000000";
close;
}
- input .@input$;
+ input(.@input$);
if (.@input$ == "tkaryf") {
mes "^3355FFYou press the word '^ff0000tkaryf^3355FF,' and another beep was emitted from";
mes "the slab.^000000";
@@ -1354,7 +1354,7 @@ que_god01,20,48,0 script Slab#G HIDDEN_NPC,{
mes "is not on the slab.^000000";
close;
}
- input .@input$;
+ input(.@input$);
if (.@input$ == "ghswka") {
mes "^3355FFYou press on the word '^ff0000ghswka^3355FF,' resulting in an affirmative beep. Nothing has still happened, so perhaps you must press another word.^000000";
next;