From 8605b217a7e1c6ed424a8cdf6a987502e4cd6917 Mon Sep 17 00:00:00 2001 From: shadow Date: Fri, 13 Jun 2008 10:13:14 +0000 Subject: Converted skill commands integers to strings. Follow up on r12814 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12819 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/skills/acolyte_skills.txt | 2 +- npc/quests/skills/archer_skills.txt | 4 ++-- npc/quests/skills/assassin_skills.txt | 16 ++++++++-------- npc/quests/skills/bard_skills.txt | 6 +++--- npc/quests/skills/blacksmith_skills.txt | 12 ++++++------ npc/quests/skills/crusader_skills.txt | 10 +++++----- npc/quests/skills/dancer_skills.txt | 8 ++++---- npc/quests/skills/hunter_skills.txt | 4 ++-- npc/quests/skills/knight_skills.txt | 6 +++--- npc/quests/skills/mage_skills.txt | 4 ++-- npc/quests/skills/merchant_skills.txt | 12 ++++++------ npc/quests/skills/monk_skills.txt | 10 +++++----- npc/quests/skills/priest_skills.txt | 12 ++++++------ npc/quests/skills/sage_skills.txt | 15 ++++++++------- npc/quests/skills/swordman_skills.txt | 14 +++++++------- npc/quests/skills/wizard_skills.txt | 6 +++--- 16 files changed, 71 insertions(+), 70 deletions(-) (limited to 'npc/quests/skills') diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt index 9ab02151a..cb4b55607 100644 --- a/npc/quests/skills/acolyte_skills.txt +++ b/npc/quests/skills/acolyte_skills.txt @@ -57,7 +57,7 @@ prt_church,173,23,4 script Cleric#qsk_al 79,{ mes "job level."; close; case 2: - if (getskilllv(156) == 1) { + if (getskilllv("AL_HOLYLIGHT") == 1) { mes "[Acolyte Klift]"; mes "Brother, you already possess"; mes "the skill of ` Holy Light '."; diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index d4fcded27..97ee79a88 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -15,7 +15,7 @@ morocc,121,109,5 script Roberto#qsk_ac 88,{ if (BaseClass == Job_Archer) { - if (getskilllv(147) == 1) { + if (getskilllv("AC_MAKINGARROW") == 1) { mes "[Roberto]"; mes "Ooh, you're from my home town!"; mes "Nice to see you!"; @@ -149,7 +149,7 @@ morocc,121,109,5 script Roberto#qsk_ac 88,{ payon,103,63,3 script Jason#qsk_ac 88,3,3,{ if (BaseClass == Job_Archer) { - if (getskilllv(148) == 1) { + if (getskilllv("AC_CHARGEARROW") == 1) { mes "[Jason]"; mes "Eh, we meet again."; mes "Ehhhh so weird."; diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index 229253973..bef886b26 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -15,7 +15,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{ if (BaseJob == Job_Assassin && ASSN_SK2 == 1) { - if (getskilllv(1004) == 0) { + if (getskilllv("AS_VENOMKNIFE") == 0) { mes "[Killtin]"; mes "Ah yes, that's why you"; mes "look so familiar. You're"; @@ -63,7 +63,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{ mes "skill. Leave me now, and"; mes "always fight for the honor"; mes "of the Assassin Guild!"; - skill 1004,1,0; + skill "AS_VENOMKNIFE",1,0; close; } else { @@ -233,7 +233,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{ mes "Knife pretty easily in battle."; set ASSN_SK2,1; set ASSN_SK,1; - skill 1004,1,0; + skill "AS_VENOMKNIFE",1,0; next; mes "[Killtin]"; mes "Well, that's all I can"; @@ -287,7 +287,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{ in_moc_16,23,27,5 script Assassin#realgirl 885,{ if (BaseJob == Job_Assassin && ASSN_SK == 7) { - if (getskilllv(1003) == 0) { + if (getskilllv("AS_SONICACCEL") == 0) { mes "[Esmille]"; mes "Mm? Ah, you've transcended"; mes "and become an Assassin Cross"; @@ -302,7 +302,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{ mes "sympathize, and am willing"; mes "to teach it to you again."; next; - if (getskilllv(136) == 0) { + if (getskilllv("AS_SONICBLOW") == 0) { mes "[Esmille]"; mes "First, go and learn the"; mes "Sonic Blow skill. The skill"; @@ -357,7 +357,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{ mes "Yes, that's it...!"; mes "Very well executed."; mes "Good work, "+ strcharinfo(0) +"."; - skill 1003,1,0; + skill "AS_SONICACCEL",1,0; set ASSN_SK,7; next; mes "[Esmille]"; @@ -454,7 +454,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{ mes "Yes, that's it...!"; mes "Very well executed."; mes "Good work, "+ strcharinfo(0) +"."; - skill 1003,1,0; + skill "AS_SONICACCEL",1,0; set ASSN_SK,7; next; mes "[Esmille]"; @@ -643,7 +643,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{ mes "But first, there we need to"; mes "take care of the prerequisites... ^FFFFFF ^000000"; next; - if (getskilllv(136) == 0) { + if (getskilllv("AS_SONICBLOW") == 0) { mes "[Esmille]"; mes "First, go and learn the"; mes "Sonic Blow skill. The skill"; diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index 14ee07108..91f62cc2a 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -381,7 +381,7 @@ OnTouch: morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{ if (BaseJob == Job_Bard) { if (Class == Job_Clown && qskill_bard == 9) { - if (getskilllv(1010) != 0) { + if (getskilllv("BA_PANGVOICE") != 0) { mes "[Riott]"; mes "Geh heh heh~"; mes "Been making good use of"; @@ -435,7 +435,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{ mes "confuse people and disrupt"; mes "control of their bodies. It's not^FFFFFF ^000000 a fatal skill, but it is effective"; mes "in mentally upsetting your enemy. Make very wise use of this skill."; - skill 1010,1,0; + skill "BA_PANGVOICE",1,0; close; } } @@ -488,7 +488,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{ mes "spinning, head spinning...!''"; specialeffect2 295; // EF_TALK_FROSTJOKE delitem 7277,1; //Munak_Doll - skill 1010,1,0; + skill "BA_PANGVOICE",1,0; set qskill_bard,9; next; mes "[Riott]"; diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index b4a79938b..422e54132 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -15,7 +15,7 @@ geffen,178,72,3 script Akkie#qsk_bs 726,{ if (BaseJob == Job_Blacksmith) { - if (BLACK_SK == 7 && getskilllv(1012) == 0) { + if (BLACK_SK == 7 && getskilllv("BS_UNFAIRLYTRICK") == 0) { mes "[Akkie]"; mes "I see that you've"; mes "transcended since the"; @@ -31,7 +31,7 @@ geffen,178,72,3 script Akkie#qsk_bs 726,{ mes "Dubious Salesmanship? You"; mes "should be able to use it now..."; set BLACK_SK,8; - skill 1012,1,0; + skill "BS_UNFAIRLYTRICK",1,0; close; } else if (BLACK_SK == 8) { @@ -371,7 +371,7 @@ geffen,178,72,3 script Akkie#qsk_bs 726,{ mes "this... Isn't it easy? Of course, you can only use this in battle to"; mes "reduce Mammonite's zeny cost..."; set BLACK_SK,7; - skill 1012,1,0; + skill "BS_UNFAIRLYTRICK",1,0; next; mes "[Akkie]"; mes "Also, 90% of the cost of"; @@ -475,7 +475,7 @@ geffen,178,72,3 script Akkie#qsk_bs 726,{ geffen,172,52,1 script Goodman#qsk_bs 826,{ if (BaseJob == Job_Blacksmith) { - if (BLACK_SK2 == 2 && Upper == 1 && getskilllv(1013) == 0) { + if (BLACK_SK2 == 2 && Upper == 1 && getskilllv("BS_GREED") == 0) { mes "[Goodman]"; mes "Ah, I see that you have"; mes "transcended. It gladdens me"; @@ -490,7 +490,7 @@ geffen,172,52,1 script Goodman#qsk_bs 826,{ mes "just looking at me should"; mes "jog the memories you require"; mes "to use this skill once again~"; - skill 1013,1,0; + skill "BS_GREED",1,0; set BLACK_SK2,3; close; } @@ -609,7 +609,7 @@ geffen,172,52,1 script Goodman#qsk_bs 826,{ mes "is different than its name."; mes "Don't forget that, and I hope"; mes "you craft true masterpieces."; - skill 1013,1,0; + skill "BS_GREED",1,0; set BLACK_SK2,2; close; } diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt index 89f8e93f4..c70d1532e 100644 --- a/npc/quests/skills/crusader_skills.txt +++ b/npc/quests/skills/crusader_skills.txt @@ -15,7 +15,7 @@ geffen,110,117,3 script Ford#11 752,{ if (BaseJob == Job_Crusader) { - if (CRUS_SK == 8 && getskilllv(1002) == 0) { + if (CRUS_SK == 8 && getskilllv("CR_SHRINK") == 0) { mes "[Ford]"; mes "Hey, it's been a while~"; mes "And you even managed to"; @@ -24,7 +24,7 @@ geffen,110,117,3 script Ford#11 752,{ mes "the Shrink skill, so I'll teach"; mes "it to you real quick... There!"; set CRUS_SK,10; - skill 1002,1,0; + skill "CR_SHRINK",1,0; close; } @@ -279,7 +279,7 @@ geffen,110,117,3 script Ford#11 752,{ gef_fild13,297,242,3 script Soldier#277 751,{ if (BaseJob == Job_Crusader) { - if (Upper == 1 && getskilllv(1002)) { + if (Upper == 1 && getskilllv("CR_SHRINK")) { if (CRUS_SK == 8) { mes "[Sloutii]"; mes "Hey pal, it's been"; @@ -519,7 +519,7 @@ gef_fild13,297,242,3 script Soldier#277 751,{ mes "and protect the weak. Ah, and"; mes "if I learn any new skills, I'll be sure to teach you right away."; set CRUS_SK,8; - skill 1002,1,0; + skill "CR_SHRINK",1,0; close; } mes "^3355FFYou carefully pour the"; @@ -580,7 +580,7 @@ gef_fild13,297,242,3 script Soldier#277 751,{ prt_church,87,127,3 script Pastor#1011 755,{ if (BaseJob == Job_Crusader) { - if (Upper == 1 && getskilllv(1002)) { + if (Upper == 1 && getskilllv("CR_SHRINK")) { if (CRUS_SK == 8) { mes "[Father Arthur]"; mes "Oh, a Paladin now,"; diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt index dff750206..f25744c9d 100644 --- a/npc/quests/skills/dancer_skills.txt +++ b/npc/quests/skills/dancer_skills.txt @@ -315,11 +315,11 @@ comodo,204,127,5 script Canell#qsk_dan01 724,{ mes "the Charming Wink skill.^000000"; set DANCER_SK,9; specialeffect2 253; // EF_ABSORBSPIRITS - skill 1011,1,0; + skill "DC_WINKCHARM",1,0; close; } } - else if (DANCER_SK > 8 && getskilllv(1011)) { + else if (DANCER_SK > 8 && getskilllv("DC_WINKCHARM")) { mes "[Canell]"; mes "Hm...?"; mes "Is there anything"; @@ -338,7 +338,7 @@ comodo,204,127,5 script Canell#qsk_dan01 724,{ close; } - else if (DANCER_SK == 9 && getskilllv(1011) == 0) { + else if (DANCER_SK == 9 && getskilllv("DC_WINKCHARM") == 0) { mes "[Canell]"; mes "Hm? Oh, I remember you!"; mes "A Gypsy now, I see~ That"; @@ -358,7 +358,7 @@ comodo,204,127,5 script Canell#qsk_dan01 724,{ mes "^3355FFYou have learned the"; mes "Charming Wink skill.^000000"; specialeffect2 253; // EF_ABSORBSPIRITS - skill 1011,1,0; + skill "DC_WINKCHARM",1,0; close; } } diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt index 11935c4b4..d9a137a52 100644 --- a/npc/quests/skills/hunter_skills.txt +++ b/npc/quests/skills/hunter_skills.txt @@ -29,7 +29,7 @@ payon_in02,54,13,7 script Albest 55,{ mes "[Albest]"; if(BaseJob!=Job_Hunter) goto L_hunterno; - if(getskilllv(1009)) goto L_alreadyhave; + if(getskilllv("HT_PHANTASMIC")) goto L_alreadyhave; if(JobLevel<40) goto L_nojob; mes "I can teach you a secret"; @@ -59,7 +59,7 @@ payon_in02,54,13,7 script Albest 55,{ mes "[Albest]"; mes "I see you have what you need,"; mes "so I'll teach you my talent."; - skill 1009,1,0; + skill "HT_PHANTASMIC",1,0; close; L_noitems: diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt index 61fdf8d42..05af1638a 100644 --- a/npc/quests/skills/knight_skills.txt +++ b/npc/quests/skills/knight_skills.txt @@ -32,7 +32,7 @@ prt_in,85,99,3 script Knight#kabuto 734,{ mes "me your own stories of bravery."; close; } - if (KNGT_SK == 9 && getskilllv(1001) == 0) { + if (KNGT_SK == 9 && getskilllv("KN_CHARGEATK") == 0) { mes "[Essofeit]"; mes "Ah, I see that you've"; mes "made tremendous progress"; @@ -62,7 +62,7 @@ prt_in,85,99,3 script Knight#kabuto 734,{ mes "is greater risk to yourself."; mes "For now, it would be best to practice this skill on your own."; set KNGT_SK,10; - skill 1001,1,0; + skill "KN_CHARGEATK",1,0; next; mes "[Essofeit]"; mes "Good luck on your"; @@ -112,7 +112,7 @@ prt_in,85,99,3 script Knight#kabuto 734,{ mes "is greater risk to yourself."; mes "For now, it would be best to practice this skill on your own."; set KNGT_SK,9; - skill 1001,1,0; + skill "KN_CHARGEATK",1,0; next; mes "[Essofeit]"; mes "I hope you make good"; diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt index 2c4752826..5e0ba131e 100644 --- a/npc/quests/skills/mage_skills.txt +++ b/npc/quests/skills/mage_skills.txt @@ -82,7 +82,7 @@ geffen_in,151,119,4 script Great Wizard#qsk_mg 64,{ mes "There is nothing more to say, are you interested?"; close; case 2: - if (getskilllv(157) == 1) { + if (getskilllv("MG_ENERGYCOAT") == 1) { mes "[BLIZZARDRISS]"; mes "It seems that you have "; mes "already mastered this skill."; @@ -120,7 +120,7 @@ geffen_in,151,119,4 script Great Wizard#qsk_mg 64,{ delitem 730,1; //Crystal_Jewel delitem 935,5; //Shell delitem 943,1; //Solid_Shell - skill 157,1,0; + skill "MG_ENERGYCOAT",1,0; mes "[BLIZZARDRISS]"; mes ". . . . ."; mes "It is done. . ."; diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index 36b8bfe61..b867c41e4 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -16,7 +16,7 @@ alberta,83,96,5 script Necko#qsk_mc 98,7,7,{ if (BaseClass == Job_Merchant) { - if (getskilllv(155) == 1) { + if (getskilllv("MC_LOUD") == 1) { mes "[Necko]"; mes "I'm sorry. Necko's store is..."; mes "Oh? Who's this?"; @@ -78,7 +78,7 @@ alberta,83,96,5 script Necko#qsk_mc 98,7,7,{ delitem 722,7; //Scarlet_Jewel delitem 532,1; //Banana_Juice delitem 921,50; //Mushroom_Spore - skill 155,1,0; + skill "MC_LOUD",1,0; mes "[Necko]"; mes "You have learned Crazy Uproar!!"; mes "Shout as much as you wish!"; @@ -183,7 +183,7 @@ OnTouch: alberta,119,221,6 script Charlron#qsk_mc 107,{ if (BaseClass == Job_Merchant) { - if (getskilllv(154) == 1) { + if (getskilllv("MC_CHANGECART") == 1) { mes "[Charlron]"; mes "Mmm? I was wondering who was making all"; mes "the raucus carrying around a cart."; @@ -225,7 +225,7 @@ alberta,119,221,6 script Charlron#qsk_mc 107,{ delitem 1019,50; //Wooden_Block delitem 998,10; //Iron delitem 919,20; //Animal's_Skin - skill 154,1,0; + skill "MC_CHANGECART",1,0; mes "[Charlron]"; mes "Congratulations."; mes "You can choose a cart"; @@ -342,7 +342,7 @@ alberta,119,221,6 script Charlron#qsk_mc 107,{ alberta,232,106,6 script Gershaun#qsk_mc 57,{ if (BaseClass == Job_Merchant) { - if (getskilllv(153) == 1) { + if (getskilllv("MC_CARTREVOLUTION") == 1) { mes "[Gershaun]"; mes "Ah, long time no see!"; mes "Ohh, the red marks on your cart."; @@ -387,7 +387,7 @@ alberta,232,106,6 script Gershaun#qsk_mc 57,{ delitem 938,.@Quantity[2]; //Sticky_Mucus delitem 601,.@Quantity[3]; //Wing_Of_Fly delitem 962,.@Quantity[4]; //Tentacle - skill 153,1,0; + skill "MC_CARTREVOLUTION",1,0; mes "[Gershaun]"; mes "Now you can use Cart Revolution"; mes "I expect you to make merchants"; diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt index 6a915efe5..281889344 100644 --- a/npc/quests/skills/monk_skills.txt +++ b/npc/quests/skills/monk_skills.txt @@ -25,7 +25,7 @@ prt_monk,270,198,3 script Apprentice Monk#qsk_mo 753,{ mes "to the end you wish to achieve."; close; } - if (MONK_SK == 6 && getskilllv(1015) == 0) { + if (MONK_SK == 6 && getskilllv("MO_KITRANSLATION") == 0) { mes "[Monk]"; mes "You've forgotten the"; mes "basics behind performing"; @@ -59,8 +59,8 @@ prt_monk,270,198,3 script Apprentice Monk#qsk_mo 753,{ mes "tap-tap-tap-tap-tap-tap-tap-tap- tap-tap-tap-tap-tap-tap-tap-tap-"; mes "tap-tap-tap-tap-tap-tap* *POKE*^000000"; set MONK_SK,7; - skill 1015,1,0; - skill 1016,1,0; + skill "MO_KITRANSLATION",1,0; + skill "MO_BALKYOUNG",1,0; next; mes "[Monk]"; mes "It is done. Please"; @@ -147,7 +147,7 @@ prt_monk,270,198,3 script Apprentice Monk#qsk_mo 753,{ mes "times, but it is a means to an"; mes "end, and not an end in itself."; set MONK_SK,3; - skill 1015,1,0; + skill "MO_KITRANSLATION",1,0; next; mes "[Monk]"; mes "Our skills should not be"; @@ -252,7 +252,7 @@ monk_test,316,69,5 script Monk#qsk_mo 823,{ mes "to do it since you've learned"; mes "Spiritual Endowment."; set MONK_SK,6; - skill 1016,1,0; + skill "MO_BALKYOUNG",1,0; next; mes "[Monk]"; mes "Well, we've completed"; diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt index 0f79bb51d..2e4a42fe7 100644 --- a/npc/quests/skills/priest_skills.txt +++ b/npc/quests/skills/priest_skills.txt @@ -16,7 +16,7 @@ prt_church,111,112,1 script Sister Linus 79,{ if (BaseJob == Job_Priest) { if (PRIEST_SK == 100) { - if (getskilllv(1014) == 0) { + if (getskilllv("PR_REDEMPTIO") == 0) { mes "[Sister Linus]"; mes "Hm? We've met before,"; mes "haven't we? Then again,"; @@ -39,7 +39,7 @@ prt_church,111,112,1 script Sister Linus 79,{ mes "with your light. Give us the"; mes "strength to walk the path of"; mes "love and sacrifice. Redemptio!^000000"; - skill 1014,1,0; + skill "PR_REDEMPTIO",1,0; next; mes "[Sister Linus]"; mes "There..."; @@ -61,7 +61,7 @@ prt_church,111,112,1 script Sister Linus 79,{ } else if (PRIEST_SK == 0) { set redemp,1014; - if (getskilllv(1014)) { + if (getskilllv("PR_REDEMPTIO")) { mes "[Sister Linus]"; mes "I'll always be praying"; mes "for your safety. Be careful,"; @@ -260,7 +260,7 @@ prt_church,111,112,1 script Sister Linus 79,{ close; } else if (PRIEST_SK == 2) { - if (getskilllv(54) > 0) { + if (getskilllv("ALL_RESURRECTION") > 0) { if (countitem(523) > 29 && countitem(717) > 19) { mes "[Sister Linus]"; mes "Ooh, it seems like you've"; @@ -284,7 +284,7 @@ prt_church,111,112,1 script Sister Linus 79,{ mes "strength to walk the path of"; mes "love and sacrifice. Redemptio!^000000"; next; - set .@redem_s,JobLevel+getskilllv(54); + set .@redem_s,JobLevel+getskilllv("ALL_RESURRECTION"); set .@red_suc,rand(1,100); if( .@redem_s < 31 ) { if( .@red_suc > 20 && .@red_suc < 41 ) @@ -309,7 +309,7 @@ prt_church,111,112,1 script Sister Linus 79,{ delitem 717,20; //Blue_Gemstone delitem 523,30; //Holy_Water set PRIEST_SK,100; - skill 1014,1,0; + skill "PR_REDEMPTIO",1,0; close; } else { diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt index 6baab8050..04cef2937 100644 --- a/npc/quests/skills/sage_skills.txt +++ b/npc/quests/skills/sage_skills.txt @@ -28,7 +28,7 @@ yuno_in03,176,24,3 script Mischna 755,{ mes "[Mischna]"; if(BaseJob!=Job_Sage) goto L_sageno; - if(getskilllv(1007)) goto L_elemental; + if(getskilllv("SA_CREATECON")) goto L_elemental; mes "I can teach you a new skill"; mes "that I discovered, but you"; @@ -61,7 +61,7 @@ yuno_in03,176,24,3 script Mischna 755,{ mes "I see you have what we need,"; mes "so I'll teach you this new"; mes "talent of mine!"; - skill 1007,1,0; + skill "SA_CREATECON",1,0; next; mes "[Mischna]"; @@ -99,7 +99,8 @@ L_alreadyhave: close; L_elemental: - if(getskilllv(1008) || getskilllv(1017) || getskilllv(1018) || getskilllv(1019)) goto L_alreadyhave; + if(getskilllv("SA_ELEMENTWATER") || getskilllv("SA_ELEMENTGROUND") + || getskilllv("SA_ELEMENTFIRE") || getskilllv("SA_ELEMENTWIND")) goto L_alreadyhave; mes "I have one more skill that"; mes "I can teach you, but you"; @@ -125,24 +126,24 @@ L_elemental: sage_1: if(countitem(991)<20)goto L_sagefail;//Items: Crystal_Blue, delitem 991, 20; //Items: Crystal_Blue, - skill 1008,1,0; + skill "SA_ELEMENTWATER",1,0; goto L_alreadyhave; sage_2: if(countitem(993)<20)goto L_sagefail;//Items: Green_Live, delitem 993, 20;//Items: Green_Live, - skill 1017,1,0; + skill "SA_ELEMENTGROUND",1,0; goto L_alreadyhave; sage_3: if(countitem(990)<20)goto L_sagefail;//Items: Red_Blood, delitem 990, 20;//Items: Red_Blood, - skill 1018,1,0; + skill "SA_ELEMENTFIRE",1,0; goto L_alreadyhave; sage_4: if(countitem(992)<20)goto L_sagefail;//Items: Wind_of_Verdure, delitem 992, 20;//Items: Wind_of_Verdure, - skill 1019,1,0; + skill "SA_ELEMENTWIND",1,0; goto L_alreadyhave; } diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt index 7a4673543..ba3a74558 100644 --- a/npc/quests/skills/swordman_skills.txt +++ b/npc/quests/skills/swordman_skills.txt @@ -16,7 +16,7 @@ izlude_in,175,130,2 script Knight De Thomas#qsk_sm 98,{ if (BaseClass == Job_Swordman) { - if (SWORD_SK < 1 && getskilllv(144) == 0) { + if (SWORD_SK < 1 && getskilllv("SM_MOVINGRECOVERY") == 0) { mes "[De Thomas]"; mes "Oh, no! You must have been hurt! Are you ok?"; mes "You must have fought hard to get such serious injuries.."; @@ -71,7 +71,7 @@ izlude_in,175,130,2 script Knight De Thomas#qsk_sm 98,{ mes "..."; close; } - else if (SWORD_SK == 1 && getskilllv(144) == 0) { + else if (SWORD_SK == 1 && getskilllv("SM_MOVINGRECOVERY") == 0) { mes "[De Thomas]"; mes "Welcome back..."; mes "are you ready to learn Body Movin'?"; @@ -88,7 +88,7 @@ izlude_in,175,130,2 script Knight De Thomas#qsk_sm 98,{ next; delitem 713,200; //Empty_Bottle delitem 1058,1; //Wing_Of_Moth - skill 144,1,0; + skill "SM_MOVINGRECOVERY",1,0; set SWORD_SK,0; mes "[De Thomas]"; mes "There you go!"; @@ -152,7 +152,7 @@ izlude_in,175,130,2 script Knight De Thomas#qsk_sm 98,{ prt_in,75,88,5 script Leon Von Frich#qsk_sm 85,3,3,{ if ((BaseJob == Job_Swordman && JobLevel >= 25) || BaseJob == Job_Knight || BaseJob == Job_Crusader) { - if (getskilllv(145) == 1) { + if (getskilllv("SM_FATALBLOW") == 1) { mes "[Leon]"; mes "Eh?"; mes "I was wondering who that was!"; @@ -177,7 +177,7 @@ prt_in,75,88,5 script Leon Von Frich#qsk_sm 85,3,3,{ delitem 532,1; //Banana_Juice delitem 962,30; //Tentacle delitem 526,5; //Royal_Jelly - skill 145,1,0; + skill "SM_FATALBLOW",1,0; mes "[Leon]"; mes "Success!"; mes "Go use your new skill to its full potential."; @@ -312,7 +312,7 @@ OnTouch: prt_in,94,57,3 script Juan#qsk_sm 85,{ if (BaseClass == Job_Swordman) { - if (getskilllv(146) == 1) { + if (getskilllv("SM_AUTOBERSERK") == 1) { mes "[Juan]"; mes "Mmm? Long time no see!"; mes "How are you?"; @@ -351,7 +351,7 @@ prt_in,94,57,3 script Juan#qsk_sm 85,{ delitem 958,10; //Horrendous_Mouth delitem 957,10; //Decayed_Nail delitem 518,10; //Honey - skill 146,1,0; + skill "SM_AUTOBERSERK",1,0; mes "[Juan]"; mes "You have just become a swordsman"; mes "that can use Auto Berserk."; diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt index 8cb69aa31..2b190e063 100644 --- a/npc/quests/skills/wizard_skills.txt +++ b/npc/quests/skills/wizard_skills.txt @@ -16,7 +16,7 @@ gef_tower,115,36,4 script Meow#q_wiz 876,{ if (BaseJob == Job_Wizard) { if (WIZ_SK == 100) { - if (getskilllv(1006) == 0) { + if (getskilllv("WZ_SIGHTBLASTER") == 0) { mes "[Meow]"; mes "What...?! You forgot the"; mes "awesome skill I taught you?"; @@ -41,7 +41,7 @@ gef_tower,115,36,4 script Meow#q_wiz 876,{ mes "Meow can administer another"; mes "vicious beating to you."; specialeffect2 253; // EF_ABSORBSPIRITS - skill 1006,1,0; + skill "WZ_SIGHTBLASTER",1,0; next; mes "[Meow]"; mes "Remember now?"; @@ -294,7 +294,7 @@ gef_tower,115,36,4 script Meow#q_wiz 876,{ delitem 990,10; //Boody_Red delitem 992,10; //Wind_Of_Verdure set WIZ_SK,100; - skill 1006,1,0; + skill "WZ_SIGHTBLASTER",1,0; next; mes "[Meow]"; mes "I'm so tired from all of"; -- cgit v1.2.3-70-g09d2