summaryrefslogtreecommitdiff
path: root/npc/jobs/novice
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-19 05:12:30 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-19 05:12:30 +0000
commit6de5cb578078dfafbf1da489712304f43144bd7d (patch)
tree0b311cd7242f2317fd771de21a52e066c449fc8c /npc/jobs/novice
parentc116ea51790a6d42280cf599192614dc373cf91d (diff)
downloadhercules-6de5cb578078dfafbf1da489712304f43144bd7d.tar.gz
hercules-6de5cb578078dfafbf1da489712304f43144bd7d.tar.bz2
hercules-6de5cb578078dfafbf1da489712304f43144bd7d.tar.xz
hercules-6de5cb578078dfafbf1da489712304f43144bd7d.zip
Applied security patches. PLEASE CHECK THEM ALL.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9260 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs/novice')
-rw-r--r--npc/jobs/novice/novice.txt127
1 files changed, 96 insertions, 31 deletions
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 90267adfc..625bb6c50 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -132,6 +132,8 @@ new_zone01.gat,53,114,4 script Shion 727,{
mes "I feel so bad.";
set NEW_MES_FLAG0,2;
close;
+ default:
+ end;
}
case 1: mes "[Shion]";
mes "Huh...?";
@@ -327,6 +329,8 @@ L_loop:
mes "I understand.";
mes "Please, take your time.";
close;
+ default:
+ end;
}
goto L_loop;
@@ -417,6 +421,8 @@ new_zone02.gat,99,105,4 script Interfaces Instructor 751,{
end;
case 3: emotion e_swt2;
close;
+ default:
+ end;
}
}
if (!(NEW_MES_FLAG2)) {
@@ -450,7 +456,7 @@ new_zone02.gat,99,105,4 script Interfaces Instructor 751,{
warp "new_zone02.gat",28,178;
end;
}
- case 3: emotion e_swt2;
+ default: emotion e_swt2;
close;
}
}
@@ -486,7 +492,7 @@ new_zone02.gat,99,105,4 script Interfaces Instructor 751,{
warp "new_zone02.gat",28,178;
end;
}
- case 3: emotion e_swt2;
+ default:emotion e_swt2;
close;
}
}
@@ -535,6 +541,8 @@ new_zone02.gat,99,105,4 script Interfaces Instructor 751,{
mes "I hope that you are blessed wherever you go.";
mes "Good luck.";
close;
+ default:
+ end;
}
}
@@ -623,6 +631,8 @@ new_zone02.gat,83,111,4 script Skill Instructor 753,{
close;
case 2: goto L_battle;
case 3: emotion e_omg;
+ default:
+ end;
}
close;
}
@@ -644,6 +654,8 @@ new_zone02.gat,83,111,4 script Skill Instructor 753,{
close;
case 2: goto L_battle;
case 3: emotion e_omg;
+ default:
+ end;
}
close;
}
@@ -666,6 +678,8 @@ new_zone02.gat,83,111,4 script Skill Instructor 753,{
break;
case 2: goto L_battle;
case 3: emotion e_omg;
+ default:
+ end;
}
close;
}
@@ -720,6 +734,8 @@ new_zone02.gat,83,111,4 script Skill Instructor 753,{
mes "Why don't you hurry up to meet";
mes "her?";
close;
+ default:
+ end;
}
end;
L_battle:
@@ -993,6 +1009,7 @@ new_zone02.gat,118,108,4 script Kafra Employee 94,{
warp "new_zone02.gat",28,178;
end;
}
+ if(@menu > 6 || @menu == 0) end;
set @menu,@menu-1;
} else {
menu "Prontera",-,"Morroc",-,"Payon",-,"Alberta",-,"Geffen",-;
@@ -1047,8 +1064,11 @@ new_zone02.gat,118,108,4 script Kafra Employee 94,{
savepoint "geffen.gat",118,37;
warp "geffen.gat",121,65;
end;
+ default:
+ end;
}
} else {
+ if(@menu > 2) end;
mes "[Kafra Employee]";
mes "Let me introduce you";
mes "to the Kafra Services.";
@@ -1139,6 +1159,8 @@ L_loop:
mes "I hope you are satisfied with my";
mes "explanation about the Kafra corporation.";
close;
+ default:
+ end;
}
goto L_loop;
}
@@ -1319,6 +1341,8 @@ L_loop:
case 6: mes "[Edwin]";
mes "Feel free to ask me anytime.";
close;
+ default:
+ end;
}
goto L_loop;
}
@@ -1563,6 +1587,8 @@ L_loop:
mes "I hope my class was helpful to you.";
mes "I really hope so.";
close;
+ default:
+ end;
}
goto L_loop;
}
@@ -1869,6 +1895,9 @@ L_loop1:
next;
mes "[Pitch Judas]";
mes "Do you wish to learn about a different subject?";
+ break;
+ default:
+ end;
}
if ( @menu != 5 ) goto L_loop1;
break;
@@ -2101,6 +2130,8 @@ new_zone02.gat,17,182,6 script Helper#2 84,{
case 4: mes "[Elmeen]";
mes "Feel free to ask me if you have any questions.";
close;
+ default:
+ end;
}
goto L_loop;
} else {
@@ -2124,6 +2155,8 @@ L_loop1:
break;
case 5: callsub L_equip;
close;
+ default:
+ end;
}
goto L_loop1;
end;
@@ -2595,6 +2628,8 @@ L_loop:
mes "Hanson is waitinging for you now,";
mes "good luck out there.";
close;
+ default:
+ end;
}
set NEW_MES_FLAG6,1;
goto L_loop;
@@ -2709,6 +2744,7 @@ L_cancel:
}
end;
}
+ if(@menu > 2 || @menu < 1) end;
mes "[Hanson]";
mes "Excellent choice! You're";
mes "You're supposed to take every";
@@ -2742,32 +2778,38 @@ L_cancel:
case 2: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;
set NOV_3_THIEF,NOV_3_THIEF+1;break;
case 3: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
- case 4: set NOV_3_THIEF,NOV_3_THIEF+1;
+ case 4: set NOV_3_THIEF,NOV_3_THIEF+1;break;
+ default: end;
}
switch ( select("Change","Conserve") ) {
case 1: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
- case 2: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;
+ case 2: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
+ default: end;
}
switch ( select("Consumer","Seller","Producer") ) {
case 1: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;
set NOV_3_THIEF,NOV_3_THIEF+1;
set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
case 2: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
- case 3: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
+ case 3: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
+ default: end;
}
switch ( select("Celebrity","Prudence") ) {
case 1: set NOV_3_THIEF,NOV_3_THIEF+1;break;
- case 2: set NOV_3_ARCHER,NOV_3_ARCHER+1;
+ case 2: set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
+ default: end;
}
switch ( select("Theory","Experience") ) {
case 1: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
- case 2: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;
+ case 2: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
+ default: end;
}
switch ( select("The past","The reality","The future") ) {
case 1: set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
case 2: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;
set NOV_3_THIEF,NOV_3_THIEF+1;break;
- case 3: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
+ case 3: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "Please answer with 'yes' or 'no' to";
@@ -2779,7 +2821,8 @@ L_cancel:
switch ( select("Yes.","No") ) {
case 1: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
case 2: set NOV_3_THIEF,NOV_3_THIEF+1;
- set NOV_3_MERCHANT,NOV_3_MERCHANT+1;
+ set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You are often upset to see someone";
@@ -2787,7 +2830,8 @@ L_cancel:
next;
switch ( select("Yes","No") ) {
case 1: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
- case 2:set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;
+ case 2:set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You don't mind exploring dangerous";
@@ -2795,14 +2839,16 @@ L_cancel:
next;
switch ( select("Yes","No") ) {
case 1: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
- case 2: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
+ case 2: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You are a leader-type person.";
next;
switch ( select("Yes","No") ) {
case 1: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
- case 2: set NOV_3_ARCHER,NOV_3_ARCHER+1;
+ case 2: set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
+ default: end;
}
mes "[Hanson]";
mes "While exploring a dungeon, you";
@@ -2818,7 +2864,8 @@ L_cancel:
next;
switch ( select("Yes","No") ) {
case 1: set NOV_3_THIEF,NOV_3_THIEF+1;break;
- case 2: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;
+ case 2: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You often see things that don't";
@@ -2826,7 +2873,8 @@ L_cancel:
next;
switch ( select("Yes","No") ) {
case 1: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
- case 2: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
+ case 2: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You feel you can fly";
@@ -2834,14 +2882,16 @@ L_cancel:
next;
switch ( select("Yes","No") ) {
case 1: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
- case 2: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
+ case 2: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "Money talks. I can buy even human being if I want.";
next;
switch ( select("Yes","No") ) {
case 1: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
- case 2: set NOV_3_ARCHER,NOV_3_ARCHER+1;
+ case 2: set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
+ default: end;
}
mes "[Hanson]";
mes "Now, let me give you some different";
@@ -2860,7 +2910,8 @@ L_cancel:
case 2: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
case 3: set NOV_3_ARCHER,NOV_3_ARCHER+1;
- set NOV_3_MERCHANT,NOV_3_MERCHANT+1;
+ set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
+ default: end;
}
mes "[Hanson]";
mes "During window shopping, you found a";
@@ -2873,7 +2924,8 @@ L_cancel:
switch ( select("Think about if you need it.","Check the price.","Buy it without thinking twice...!") ) {
case 1: set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
case 2: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
- case 3: set NOV_3_THIEF,NOV_3_THIEF+1;
+ case 3: set NOV_3_THIEF,NOV_3_THIEF+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You (____Fill in blank___) to compete";
@@ -2883,7 +2935,8 @@ L_cancel:
case 1: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
case 2: set NOV_3_THIEF,NOV_3_THIEF+1;break;
case 3: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;
- set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;
+ set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You're responsible for a task that";
@@ -2898,7 +2951,8 @@ L_cancel:
next;
switch ( select("Handle it by myself even if it's hard.","Ask friends to help.") ) {
case 1: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
- case 2: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;
+ case 2: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You happened to find a girl who";
@@ -2911,7 +2965,8 @@ L_cancel:
set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
case 3: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
set NOV_3_THIEF,NOV_3_THIEF+1;
- set NOV_3_MERCHAN,NOV_3_MERCHAN+1;
+ set NOV_3_MERCHAN,NOV_3_MERCHAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You happened to pick up";
@@ -2922,7 +2977,8 @@ L_cancel:
case 1: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
case 2: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
case 3: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
- case 4: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
+ case 4: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
+ default: end;
}
mes "[Hanson]";
mes "You happened to slip your tongue in";
@@ -2933,7 +2989,8 @@ L_cancel:
case 1: set NOV_3_THIEF,NOV_3_THIEF+1;break;
case 2: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
case 3: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;break;
- case 4: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;
+ case 4: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;break;
+ default: end;
}
mes "[Hanson]";
switch (Sex) {
@@ -2953,7 +3010,8 @@ L_cancel:
switch ( select("Buy the item for her/him.","Say 'no'.","Promise to buy it next time.") ) {
case 1: set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
case 2: set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
- case 3: set NOV_3_THIEF,NOV_3_THIEF+1;
+ case 3: set NOV_3_THIEF,NOV_3_THIEF+1;break;
+ default: end;
}
mes "[Hanson]";
mes "Ok!! That's all for the test.";
@@ -3116,7 +3174,8 @@ L_loop2:
getitem 1504,1;
break;
case 5: mes "1 Battle Axe";
- getitem 1351,1;
+ getitem 1351,1;break;
+ default: end;
}
if( @JOB_NUMBER_CHK == 5 ){
mes "^0000304 Free Tickets for Kafra Storage";
@@ -3196,7 +3255,8 @@ L_loop2:
set @JOB_NAME$,"Archer";
break;
case 5: set @JOB_NUMBER_CHK,4;
- set @JOB_NAME$,"Acolyte";
+ set @JOB_NAME$,"Acolyte";break;
+ default: end;
}
break;
case 1: switch( select("Swordsman","Mage","Merchant","Thief","Acolyte") ) {
@@ -3213,7 +3273,8 @@ L_loop2:
set @JOB_NAME$,"Thief";
break;
case 5: set @JOB_NUMBER_CHK,4;
- set @JOB_NAME$,"Acolyte";
+ set @JOB_NAME$,"Acolyte";break;
+ default: end;
}
break;
case 2: switch( select("Swordsman","Mage","Merchant","Archer","Acolyte") ) {
@@ -3230,7 +3291,8 @@ L_loop2:
set @JOB_NAME$,"Archer";
break;
case 5: set @JOB_NUMBER_CHK,4;
- set @JOB_NAME$,"Acolyte";
+ set @JOB_NAME$,"Acolyte";break;
+ default: end;
}
break;
case 3: switch( select("Swordsman","Merchant","Thief","Archer","Acolyte") ) {
@@ -3247,7 +3309,8 @@ L_loop2:
set @JOB_NAME$,"Archer";
break;
case 5: set @JOB_NUMBER_CHK,4;
- set @JOB_NAME$,"Acolyte";
+ set @JOB_NAME$,"Acolyte";break;
+ default: end;
}
break;
case 4: switch( select("Swordsman","Mage","Merchant","Thief","Archer") ) {
@@ -3264,7 +3327,8 @@ L_loop2:
set @JOB_NAME$,"Thief";
break;
case 5: set @JOB_NUMBER_CHK,1;
- set @JOB_NAME$,"Archer";
+ set @JOB_NAME$,"Archer";break;
+ default: end;
}
break;
case 5: switch( select("Swordsman","Mage","Thief","Archer","Acolyte") ) {
@@ -3281,7 +3345,8 @@ L_loop2:
set @JOB_NAME$,"Archer";
break;
case 5: set @JOB_NUMBER_CHK,4;
- set @JOB_NAME$,"Acolyte";
+ set @JOB_NAME$,"Acolyte";break;
+ default: end;
}
}
mes "[Hanson]";