diff options
Diffstat (limited to 'npc/003-1_Beach/stranger.txt')
| -rw-r--r-- | npc/003-1_Beach/stranger.txt | 54 |
1 files changed, 44 insertions, 10 deletions
diff --git a/npc/003-1_Beach/stranger.txt b/npc/003-1_Beach/stranger.txt index 1eb98d1f..b322eb5d 100644 --- a/npc/003-1_Beach/stranger.txt +++ b/npc/003-1_Beach/stranger.txt @@ -13,7 +13,7 @@ // if (gettime(6) != @month) goto L_No_Event; // if (gettime(5) < @start_day) goto L_No_Event; // if (gettime(5) > @end_day) goto L_No_Event; -// if ((gettimetick(2)-TUT_var < 4*7*86400) || (baselevel < 42 )) //player must be created at least 4 weeks ago and at least level 42 +// if ((gettimetick(2)-TUT_var < 6*7*86400) || (baselevel < 42 )) //player must be created at least 6 weeks ago and at least level 42 // goto L_No_Event; // if ((gettime(5) == @end_day) && (FLAGS & FLAG_TOWEL_HELPED)) goto L_Towel; if (FLAGS & FLAG_TOWEL_HELPED) goto L_Towel; // TODO: remove @@ -85,15 +85,26 @@ L_Towel: if (@easy_answers_amount[@random] < 4) goto L_Easy_Skip4; - if (("###" + @answer$ == getspellinvocation("towelanswer0" + @random + "d"))) + set @quizparam$, "towelanswer0" + @random + "d"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Easy; L_Easy_Skip4: if (@easy_answers_amount[@random] < 3) goto L_Easy_Skip3; - if (("###" + @answer$ == getspellinvocation("towelanswer0" + @random + "c"))) + set @quizparam$, "towelanswer0" + @random + "c"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Easy; L_Easy_Skip3: - if (("###" + @answer$ == getspellinvocation("towelanswer0" + @random + "a")) || ("###" + @answer$ == getspellinvocation("towelanswer0" + @random + "b"))) + set @quizparam$, "towelanswer0" + @random + "b"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) + goto L_Right_Answer_Easy; + + set @quizparam$, "towelanswer0" + @random + "a"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Easy; goto L_Wrong_Answer; @@ -125,15 +136,27 @@ L_Right_Answer_Easy: if (@medium_answers_amount[@random] < 4) goto L_Medium_Skip4; - if (("###" + @answer$ == getspellinvocation("towelanswer1" + @random + "d"))) + + set @quizparam$, "towelanswer1" + @random + "d"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Medium; L_Medium_Skip4: if (@medium_answers_amount[@random] < 3) goto L_Medium_Skip3; - if (("###" + @answer$ == getspellinvocation("towelanswer1" + @random + "c"))) + set @quizparam$, "towelanswer1" + @random + "c"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Medium; L_Medium_Skip3: - if (("###" + @answer$ == getspellinvocation("towelanswer1" + @random + "a")) || ("###" + @answer$ == getspellinvocation("towelanswer1" + @random + "b"))) + set @quizparam$, "towelanswer1" + @random + "b"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) + goto L_Right_Answer_Medium; + + set @quizparam$, "towelanswer1" + @random + "a"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Medium; goto L_Wrong_Answer; @@ -162,15 +185,26 @@ L_Right_Answer_Medium: if (@hard_answers_amount[@random] < 4) goto L_Hard_Skip4; - if (("###" + @answer$ == getspellinvocation("towelanswer2" + @random + "d"))) + set @quizparam$, "towelanswer2" + @random + "d"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Hard; L_Hard_Skip4: if (@hard_answers_amount[@random] < 3) goto L_Hard_Skip3; - if (("###" + @answer$ == getspellinvocation("towelanswer2" + @random + "c"))) + set @quizparam$, "towelanswer2" + @random + "c"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Hard; L_Hard_Skip3: - if (("###" + @answer$ == getspellinvocation("towelanswer2" + @random + "a")) || ("###" + @answer$ == getspellinvocation("towelanswer2" + @random + "b"))) + set @quizparam$, "towelanswer2" + @random + "b"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) + goto L_Right_Answer_Hard; + + set @quizparam$, "towelanswer2" + @random + "a"; + callfunc "StrangerQuiz"; + if (("###" + @answer$ == @quizanswer$)) goto L_Right_Answer_Hard; goto L_Wrong_Answer; |