diff options
| -rw-r--r-- | db/item_db.txt | 3 | ||||
| -rw-r--r-- | npc/jobs/novice/novice.txt | 20 |
2 files changed, 7 insertions, 16 deletions
diff --git a/db/item_db.txt b/db/item_db.txt index cbc12bab4..89b2e92e7 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -2360,7 +2360,8 @@ //5414,Camp_Fire_Hat,Camp Fire Hat,5,20,,300,,2,,0,0xFFFFFFFF,7,2,256,,0,1,416,{ bonus4 bAutoSpellWhenHit,"MG_FIREBALL",5,100,1; bonus2 bSubEle,Ele_Fire,10; },{},{} //5415,Poring_Cake_Hat,Poring Cake Hat,5,20,,1000,,5,,0,0xFFFFFFFF,7,2,256,,40,1,417,{ bonus bMdef,5; bonus bCritical,5; bonus bFlee,5; bonus bFlee2,5; bonus bAspdRate,5; bonus bCastrate,-5; bonus bDelayRate,-5; },{},{} //5416,Beer_Hat,Beer Hat,5,20,,600,,2,,0,0xFFFFFFFE,7,2,256,,18,1,418,{ bonus bFlee2,5; skill "SM_RECOVERY",3; skill "MG_SRECOVERY",3; },{},{} -//5417-5418 +5417,Crown_Parrots,Crown Parrots,5,20,,200,,1,,1,0xFFFFFFFF,7,2,256,,0,0,419,{ bonus2 bResEff,Eff_Silence,10000; bonus3 bAutoSpell,"DC_SCREAM",1,50; bonus bInt,1; },{},{} +5418,Legionnaire_Hat,Legionnaire Hat,5,20,,400,,4,,1,0xFFFFFFFF,7,2,256,,0,1,420,{ bonus bStr,1; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; },{},{} //5419,Leaves_Of_Grass,Leaves Of Grass,5,,,100,,0,,0,0xFFFFFFFF,7,2,1,,0,0,57,{ bonus bVit,1; bonus2 bSubRace,RC_Plant,5; },{},{} //5420,Mask_Of_Ifrit,Mask Of Ifrit,5,,,0,,8,,0,0xFFFFFFFE,7,2,769,,70,0,421,{ bonus bStr,1; bonus bInt,1; bonus bMdef,5; bonus2 bSubEle,Ele_Fire,10; },{},{} //5421,Ears_Of_Ifrit,Ears Of Ifrit,5,,,0,,0,,0,0xFFFFFFFE,7,2,512,,70,0,422,{ bonus bStr,1; bonus bMdef,3; bonus2 bSkillAtk,"MG_FIREBOLT",2; bonus2 bSkillAtk,"WZ_FIREPILLAR",2; bonus2 bSkillAtk,"WZ_METEOR",2; bonus2 bSkillAtk,"SM_BASH",2; bonus2 bSkillAtk,"SM_MAGNUM",2; bonus2 bSkillAtk,"KN_PIERCE",2; bonus2 bSubEle,Ele_Fire,5; },{},{} diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt index 9d81f2ef3..dcd6bcd0b 100644 --- a/npc/jobs/novice/novice.txt +++ b/npc/jobs/novice/novice.txt @@ -3840,20 +3840,10 @@ S_UserJobchoice: mes "I see. It's your choice."; mes "There is no obligation to change to the job we recommend. Please choose the job you wish to become."; next; - setarray .@JOBS$[0],"Swordsman","Mage","Merchant","Thief","Archer","Acolyte"; - - for( set .@i,0; .@i < getarraysize(.@JOBS$); set .@i,.@i+1 ) - { - if(.@JOBS$[.@i] == getarg(0)) set .@menu$,.@menu$+":"; - else set .@menu$,.@menu$+.@JOBS$[.@i]+":"; - } - set .@menu, select(.@menu$) -1; - if( .@JOBS$[.@menu] == "Swordsman" ) set @menu,1; - else if( .@JOBS$[.@menu] == "Mage" ) set @menu,2; - else if( .@JOBS$[.@menu] == "Merchant" ) set @menu,3; - else if( .@JOBS$[.@menu] == "Thief" ) set @menu,4; - else if( .@JOBS$[.@menu] == "Archer" ) set @menu,5; - else if( .@JOBS$[.@menu] == "Acolyte" ) set @menu,6; + select( "Swordsman:Mage:Merchant:Thief:Archer:Acolyte" ); + // @menu is already set by Core. + setarray .@Jobs$[1],"Swordsman","Mage","Merchant","Thief","Archer","Acolyte"; + mes "[Hanson]"; mes "You have chosen"; if (@menu == 1) { @@ -3929,7 +3919,7 @@ S_UserJobchoice: mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. The 'Adventurer's Suit' will come in handy once you become a "+@menu+"."; + mes "'Zeny' is the currency of Rune-Midgard. The 'Adventurer's Suit' will come in handy once you become a " + .@Jobs$[@menu] + "."; next; mes "[Hanson]"; mes "You will now"; |