From 7853b6d1b84d3783a7f513ea877b4c52b120fc28 Mon Sep 17 00:00:00 2001 From: masao87 Date: Tue, 24 Apr 2012 20:30:24 +0000 Subject: - Some more 1st Class Platinum Skill NPC optimizations. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15958 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/skills/archer_skills.txt | 2 +- npc/quests/skills/merchant_skills.txt | 10 +++++----- npc/quests/skills/swordman_skills.txt | 8 ++++---- npc/quests/skills/thief_skills.txt | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index b7044e029..bc1fdf670 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -158,7 +158,7 @@ payon,103,63,3 script Jason 88,3,3,{ mes "Ehhhh... don't come any more ehh..."; close; } - else if ((Class == Job_Archer) && (JobLevel >= 35)) { + else if (JobLevel >= 35) { mes "[Jason]"; mes "Darn... my wound isn't healing."; mes "Bleh.. I was too careless... "; diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index e70ab887e..55239bbe3 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -40,7 +40,7 @@ alberta,83,96,5 script Necko 98,7,7,{ mes "Ppyakikakikakakakakakakaka!!"; close; } - else if ((Class == Job_Merchant) && (JobLevel < 15)) { + else if (JobLevel < 15) { mes "[Necko]"; mes "Oh, did you come because"; mes "you are infatuated with my voice?"; @@ -61,7 +61,7 @@ alberta,83,96,5 script Necko 98,7,7,{ mes "Kyukwakakakakakakakakakaka!"; close; } - else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (BaseJob == Job_Merchant) & (JobLevel >= 15)) { + else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (JobLevel >= 15)) { mes "[Necko]"; mes "Oh! You!"; mes "You are qualified to learn how to shout!"; @@ -178,7 +178,7 @@ OnTouch: close; } -alberta,119,221,6 script Charlron 107,5,5,{ +alberta,119,221,6 script Charlron 107,{ if (BaseJob == Job_Merchant) { if (getskilllv("MC_CHANGECART") == 1) { mes "[Charlron]"; @@ -200,7 +200,7 @@ alberta,119,221,6 script Charlron 107,5,5,{ mes "Be healthy~"; close; } - else if ((BaseJob == Job_Merchant) && (JobLevel >= 30)) { + else if (JobLevel >= 30) { mes "[Charlron]"; mes "Nice to see you fellow merchant"; mes "If I remember correctly,"; @@ -331,7 +331,7 @@ alberta,119,221,6 script Charlron 107,5,5,{ close; } -alberta,232,106,6 script Gershaun 57,5,5,{ +alberta,232,106,6 script Gershaun 57,{ if (BaseJob == Job_Merchant) { if (getskilllv("MC_CARTREVOLUTION") == 1) { mes "[Gershaun]"; diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt index 1ce5fca87..2c991d792 100644 --- a/npc/quests/skills/swordman_skills.txt +++ b/npc/quests/skills/swordman_skills.txt @@ -160,7 +160,7 @@ prt_in,75,88,5 script Leon Von Frich 85,3,3,{ mes "Be careful! Hahaha!"; close; } - else if ((countitem(1752) > 9) && (countitem(1751) > 9) && (countitem(532) > 0) && (countitem(962) > 29) && (countitem(526) > 4) && (BaseJob == Job_Swordman) && (JobLevel >= 25)) { + else if ((countitem(1752) > 9) && (countitem(1751) > 9) && (countitem(532) > 0) && (countitem(962) > 29) && (countitem(526) > 4)) { mes "[Leon]"; mes "Ooh! You are more than ready"; mes "to learn Fatal Blow!"; @@ -313,7 +313,7 @@ prt_in,94,57,3 script Juan 85,4,4,{ mes "You can do it."; close; } - else if ((BaseJob == Job_Swordman) && (JobLevel < 10)) { + else if (JobLevel < 10) { mes "[?]"; mes "What are you?"; mes "Eh, still a beginner."; @@ -321,13 +321,13 @@ prt_in,94,57,3 script Juan 85,4,4,{ mes "before coming back."; close; } - else if ((BaseJob == Job_Swordman) && ((JobLevel > 10) && (JobLevel < 30))) { + else if ((JobLevel > 10) && (JobLevel < 30)) { mes "[Juan]"; mes "Oh, nice to meet you."; mes "You can be on your way. (smiley~)"; close; } - else if ((countitem(924) > 34) && (countitem(958) > 9) && (countitem(957) > 9) && (countitem(518) > 9) && (BaseJob == Job_Swordman) && (JobLevel >= 30)) { + else if ((countitem(924) > 34) && (countitem(958) > 9) && (countitem(957) > 9) && (countitem(518) > 9) && (JobLevel >= 30)) { mes "[Juan]"; mes "Ooh. Young swordsman!"; mes "You are ready to learn the"; diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index 676536ee8..81004cce9 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -29,7 +29,7 @@ moc_prydb1,154,128,4 script Alcouskou 118,{ case 1: switch (skill_thief_1) { case 0: - if ((countitem(7041) > 4) && (BaseJob == Job_Thief) && (JobLevel > 24)) { + if ((countitem(7041) > 4) && (JobLevel > 24)) { mes "[Alcouskou]"; mes "Luckily, you have brought some"; mes "sand with you. It is very important"; @@ -151,7 +151,7 @@ moc_prydb1,154,128,4 script Alcouskou 118,{ close; } case 2: - if ((countitem(940) > 19) && (BaseJob == Job_Thief) && (JobLevel > 34)) { + if ((countitem(940) > 19) && (JobLevel > 34)) { mes "[Alcouskou]"; mes "Okay! Let's practice!"; next; @@ -228,7 +228,7 @@ moc_prydb1,154,128,4 script Alcouskou 118,{ mes "If not, I cannot teach you."; close; case 3: - if ((countitem(912) > 0) && (countitem(948) > 0) && (countitem(908) > 4) && (BaseJob == Job_Thief) && (JobLevel > 19)) { + if ((countitem(912) > 0) && (countitem(948) > 0) && (countitem(908) > 4) && (JobLevel > 19)) { mes "[Alcouskou]"; mes "Wow, you have already prepared?"; mes "Great, I see promise in you. -"; @@ -318,7 +318,7 @@ moc_prydb1,154,128,4 script Alcouskou 118,{ mes "Retrieve these items by any means you see fit."; close; case 4: - if ((countitem(910) > 1) && (countitem(911) > 1) && (BaseJob == Job_Thief) & (JobLevel > 14)) { + if ((countitem(910) > 1) && (countitem(911) > 1) && (JobLevel > 14)) { mes "[Alcouskou]"; mes "Wow! Have you already gathered the items!"; mes "Very well, do you wish to begin?"; -- cgit v1.2.3-60-g2f50