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/easter_2010.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/easter_2010.txt')
| -rw-r--r-- | npc/events/easter_2010.txt | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt index 645e0cacf..0ccd987cf 100644 --- a/npc/events/easter_2010.txt +++ b/npc/events/easter_2010.txt @@ -119,31 +119,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ setquest 9117; close; } else if (.@quest1 == 1) { - L_HuntingInfo: - mes "[Rina]"; - mes "What you need to do is"; - mes "to choose one monster among"; - mes "^FF0000DEVIRUCHI,^000000 ^FF0000WRAITH DEAD,^000000"; - mes "^FF0000DULLAHAN,^000000 ^FF0000NIGHTMARE TERROR^000000"; - mes "and then kill ^0000FF50^000000 monsters"; - mes "and come back to me."; - next; - mes "[Rina]"; - mes "It must be a tough task,"; - mes "but you are the right person"; - mes "who did the oath-taking ceremony."; - mes "I hope you succeed."; - if (.@quest1 < 2) { - completequest 9117; - setquest 9118; - setquest 9119; - setquest 9120; - setquest 9121; - } - close2; - npcskill "AL_INCAGI",1,0,0; - npcskill "AL_BLESSING",1,0,0; - end; + callsub(L_HuntingInfo, .@quest1); } else if (.@quest1 == 2) { if (questprogress(9118) != 2 || questprogress(9119) != 2 || questprogress(9120) != 2 || questprogress(9121) != 2) { if (questprogress(9118,HUNTING) == 2 || questprogress(9119,HUNTING) == 2 || questprogress(9120,HUNTING) == 2 || questprogress(9121,HUNTING) == 2) { @@ -162,7 +138,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ completequest 9121; setquest 9122; } else - goto L_HuntingInfo; + callsub(L_HuntingInfo, .@quest1); end; } } @@ -309,6 +285,32 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ npcskill "AL_INCAGI",1,0,0; npcskill "AL_BLESSING",1,0,0; end; + +L_HuntingInfo: + mes "[Rina]"; + mes "What you need to do is"; + mes "to choose one monster among"; + mes "^FF0000DEVIRUCHI,^000000 ^FF0000WRAITH DEAD,^000000"; + mes "^FF0000DULLAHAN,^000000 ^FF0000NIGHTMARE TERROR^000000"; + mes "and then kill ^0000FF50^000000 monsters"; + mes "and come back to me."; + next; + mes "[Rina]"; + mes "It must be a tough task,"; + mes "but you are the right person"; + mes "who did the oath-taking ceremony."; + mes "I hope you succeed."; + if (getarg(0) < 2) { + completequest 9117; + setquest 9118; + setquest 9119; + setquest 9120; + setquest 9121; + } + close2; + npcskill "AL_INCAGI",1,0,0; + npcskill "AL_BLESSING",1,0,0; + end; } geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{ |