diff options
| author | Ridley <ridley8819@gmail.com> | 2017-04-23 11:59:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-23 11:59:58 +0200 |
| commit | 7a1dbca29bcf6aa9066e5501d3e0ab20d6416383 (patch) | |
| tree | cf3e755c7e81aab9b92d4d05c511584a30d34fb2 /npc/events/MemorialDay_2008.txt | |
| parent | 1bc4994db3b611dd489d6bde0a218b232ca785f5 (diff) | |
| parent | 060c4ba50162363315f2f50b35cad931e2b75ec9 (diff) | |
| download | hercules-7a1dbca29bcf6aa9066e5501d3e0ab20d6416383.tar.gz hercules-7a1dbca29bcf6aa9066e5501d3e0ab20d6416383.tar.bz2 hercules-7a1dbca29bcf6aa9066e5501d3e0ab20d6416383.tar.xz hercules-7a1dbca29bcf6aa9066e5501d3e0ab20d6416383.zip | |
Merge pull request #1548 from AtlantisRO/goto_removal
Removed the usage of deprecated command goto from npc scripts (except custom folder)
Diffstat (limited to 'npc/events/MemorialDay_2008.txt')
| -rw-r--r-- | npc/events/MemorialDay_2008.txt | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index 41ff5b610..b87bba5f2 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -211,12 +211,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ next; Memorial08 = 9; getexp 93750,43750; - goto L_CleanPlaque; - } else if (Memorial08 >= 9) { - goto L_CleanPlaque; } - -L_CleanPlaque: mes "- You see a message from the cleaned plaque.-"; next; mes "-Although no sculptured marble should rise to their memory,-"; @@ -285,9 +280,9 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "I can provide you all the materials."; next; if (select("I'll gather the rest.", "Give me the materials.") == 2) { - goto L_GiveUp; + callsub L_GiveUp; } - goto L_Continue; + callsub L_Continue; } else { mes "[Grast]"; mes "Oh, you've brought the materials I asked."; @@ -313,9 +308,9 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "If you feel too burdened to gather them all, I can provide you all the materials."; next; if (select("I'll gather the rest.", "Give me the materials.") == 2) { - goto L_GiveUp; + callsub L_GiveUp; } - goto L_Continue; + callsub L_Continue; } else { mes "[Grast]"; mes "Oh, you've brought everything I asked."; @@ -342,9 +337,9 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "It's your call, " + strcharinfo(PC_NAME) + "."; next; if (select("I'll gather the rest.", "Give me the materials.") == 2) { - goto L_GiveUp; + callsub L_GiveUp; } - goto L_Continue; + callsub L_Continue; } else { mes "[Grast]"; mes "Have you brought the materials I asked?"; |