Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quest bugfixes.

Browse Source 
bugreport:4089, bugreport:3600, bugreport:5046

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15023 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
calciumkid 2011-12-08 11:03:24 +00:00
parent f358398d3e
commit 9119423735
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
npc/quests/newgears/2005_headgears.txt
View File

@ -1957,6 +1957,8 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
break; break;
case 3: case 3:
mes "Phendark.";
next;
if((@temp1 == 1 || @temp1 == 2) && @temp2 == 1) if((@temp1 == 1 || @temp1 == 2) && @temp2 == 1)
{ {
mes "[Phendark]"; mes "[Phendark]";
@ -2000,6 +2002,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
case 4: case 4:
mes "Zealotus."; mes "Zealotus.";
next;
break; break;
} }
switch( select( "Insult him.", "Apologize." ) ) switch( select( "Insult him.", "Apologize." ) )

8
npc/quests/quests_ein.txt
View File

@ -3424,7 +3424,7 @@ einbroch,132,84,3 script Liotzburg#ein 853,2,2,{
close; close;
OnTouch: OnTouch:
if ($EinPolution > 9) { if ($EinPolution > 9 && !$@AlrdEinPoll) {
mes "[Liotzburg]"; mes "[Liotzburg]";
mes "What's going on?!"; mes "What's going on?!";
mes "Who's responsible?!"; mes "Who's responsible?!";
@ -3438,8 +3438,10 @@ OnTouch:
mes "fix this! I gotta hide and find"; mes "fix this! I gotta hide and find";
mes "someplace safe!"; mes "someplace safe!";
close2; close2;
donpcevent "Einbroch Smog Alert::OnEnable"; if ($EinPolution > 9 && !$@AlrdEinPoll) {
hideonnpc "Liotzburg#ein"; donpcevent "Einbroch Smog Alert::OnEnable";
hideonnpc "Liotzburg#ein";
}
end; end;
} }
else { else {

42
npc/quests/quiz/quiz_qt.txt
View File

@ -1482,7 +1482,7 @@ if(quiz_rvl == 18) {
mes "Name of monster which drop"; mes "Name of monster which drop";
mes "'Big Ribbon'?"; mes "'Big Ribbon'?";
next; next;
menu "Eclipse",sM1_6,"Dragon Fly",sM1_6,"Vocal",sM1_6,"Toad,",-; menu "Eclipse",sM1_6,"Dragon Fly",sM1_6,"Vocal",sM1_6,"Toad",-;
set @score_test2, @score_test2 + 10; set @score_test2, @score_test2 + 10;
@ -1676,11 +1676,11 @@ if(quiz_rvl == 20) {
mes "For reference, number of particapants are"; mes "For reference, number of particapants are";
next; next;
mes "[Kantryl]"; mes "[Kantryl]";
mes "1st Quiz Revolution - " + quiz1 + "/200"; mes "1st Quiz Revolution - " + $quiz1 + "/200";
mes "2nd Quiz Revolution - " + quiz2 + "/200"; mes "2nd Quiz Revolution - " + $quiz2 + "/200";
mes "3rd Quiz Revolution - " + quiz3 + "/200"; mes "3rd Quiz Revolution - " + $quiz3 + "/200";
mes "4th Quiz Revolution - " + quiz4 + "/200"; mes "4th Quiz Revolution - " + $quiz4 + "/200";
mes "5th Quiz Revolution - " + quiz5 + "/200"; mes "5th Quiz Revolution - " + $quiz5 + "/200";
mes "keep it in your mind."; mes "keep it in your mind.";
close; close;
@ -1719,15 +1719,15 @@ if(quiz_rvl == 20) {
mes "So please make right decision."; mes "So please make right decision.";
next; next;
mes "[Kantryl]"; mes "[Kantryl]";
mes "1st Quiz Revolution - " + quiz1 + "/200"; mes "1st Quiz Revolution - " + $quiz1 + "/200";
mes "2nd Quiz Revolution - " + quiz2 + "/200"; mes "2nd Quiz Revolution - " + $quiz2 + "/200";
mes "3rd Quiz Revolution - " + quiz3 + "/200"; mes "3rd Quiz Revolution - " + $quiz3 + "/200";
mes "4th Quiz Revolution - " + quiz4 + "/200"; mes "4th Quiz Revolution - " + $quiz4 + "/200";
mes "5th Quiz Revolution - " + quiz5 + "/200"; mes "5th Quiz Revolution - " + $quiz5 + "/200";
next; next;
menu "Join 1st round",-,"Join 2nd round",s2nd,"Join 3rd round",s3nd,"Join 4th round",s4nd,"Join 5th round",s5nd; menu "Join 1st round",-,"Join 2nd round",s2nd,"Join 3rd round",s3nd,"Join 4th round",s4nd,"Join 5th round",s5nd;
if(quiz1 > 199){ if($quiz1 > 199){
mes "[Kantryl]"; mes "[Kantryl]";
mes "I'm sorry. We are all full at"; mes "I'm sorry. We are all full at";
mes "1st round of quiz revolution"; mes "1st round of quiz revolution";
@ -1740,7 +1740,7 @@ if(quiz_rvl == 20) {
mes "I have received your application"; mes "I have received your application";
mes "Try hard and study hard."; mes "Try hard and study hard.";
set quiz_rvl,19; set quiz_rvl,19;
set quiz1,quiz1 + 1; set $quiz1,$quiz1 + 1;
getitem 7280,1; //Quiz_Ticket01 getitem 7280,1; //Quiz_Ticket01
close; close;
@ -1748,7 +1748,7 @@ if(quiz_rvl == 20) {
s2nd: s2nd:
if(quiz2 > 199){ if($quiz2 > 199){
mes "[Kantryl]"; mes "[Kantryl]";
mes "I'm sorry. We are all full at"; mes "I'm sorry. We are all full at";
mes "2nd round of quiz revolution"; mes "2nd round of quiz revolution";
@ -1761,14 +1761,14 @@ if(quiz_rvl == 20) {
mes "I have received your application"; mes "I have received your application";
mes "Try hard and study hard."; mes "Try hard and study hard.";
set quiz_rvl,19; set quiz_rvl,19;
set quiz2,quiz2 + 1; set $quiz2,$quiz2 + 1;
getitem 7281,1; //Quiz_Ticket02 getitem 7281,1; //Quiz_Ticket02
close; close;
s3nd: s3nd:
if(quiz3 > 199){ if($quiz3 > 199){
mes "[Kantryl]"; mes "[Kantryl]";
mes "I'm sorry. We are all full at"; mes "I'm sorry. We are all full at";
mes "3rd round of quiz revolution."; mes "3rd round of quiz revolution.";
@ -1782,7 +1782,7 @@ if(quiz_rvl == 20) {
mes "I have received your application."; mes "I have received your application.";
mes "Try hard and study hard."; mes "Try hard and study hard.";
set quiz_rvl,19; set quiz_rvl,19;
set quiz3,quiz3 + 1; set $quiz3,$quiz3 + 1;
getitem 7282,1; //Quiz_Ticket03 getitem 7282,1; //Quiz_Ticket03
close; close;
@ -1790,7 +1790,7 @@ if(quiz_rvl == 20) {
s4nd: s4nd:
if(quiz4 > 199){ if($quiz4 > 199){
mes "[Kantryl]"; mes "[Kantryl]";
mes "I'm sorry. We are all full at"; mes "I'm sorry. We are all full at";
mes "4th round of quiz revolution."; mes "4th round of quiz revolution.";
@ -1803,7 +1803,7 @@ if(quiz_rvl == 20) {
mes "I have received your application."; mes "I have received your application.";
mes "Try hard and study hard."; mes "Try hard and study hard.";
set quiz_rvl,19; set quiz_rvl,19;
set quiz4,quiz4 + 1; set $quiz4,$quiz4 + 1;
getitem 7283,1; //Quiz_Ticket04 getitem 7283,1; //Quiz_Ticket04
close; close;
@ -1811,7 +1811,7 @@ if(quiz_rvl == 20) {
s5nd: s5nd:
if(quiz5 > 199){ if($quiz5 > 199){
mes "[Kantryl]"; mes "[Kantryl]";
mes "I'm sorry. We are all full at"; mes "I'm sorry. We are all full at";
mes "5th round of quiz revolution."; mes "5th round of quiz revolution.";
@ -1824,7 +1824,7 @@ if(quiz_rvl == 20) {
mes "I have received your application."; mes "I have received your application.";
mes "Try hard and study hard."; mes "Try hard and study hard.";
set quiz_rvl,19; set quiz_rvl,19;
set quiz5,quiz5 + 1; set $quiz5,$quiz5 + 1;
getitem 7284,1; //Quiz_Ticket05 getitem 7284,1; //Quiz_Ticket05
close; close;