From 13132344467b3f5e2c968bb7cfaec8eaf269280e Mon Sep 17 00:00:00 2001 From: masao87 Date: Tue, 29 May 2012 12:08:59 +0000 Subject: - Added BaseClass explanation to script_commands.txt . - Some updates to the custom folder / the old eAAC Scripts which are now in there. - Fixed custom/warper.txt prontera location to not collide with Ash Vacuum warper. bugreport:5857 - Fixed Platinum Skill Quests properly checking for BaseClass now. bugreport:5853 - Fixed some typos in Ranger Job change Quest & Eden Paradise. bugreport:5858 - Fixed a typo in scripts_athena.conf . bugreport:5852 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16165 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/3-1/ranger.txt | 1 + npc/jobs/3-1/rune_knight.txt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'npc/jobs') diff --git a/npc/jobs/3-1/ranger.txt b/npc/jobs/3-1/ranger.txt index 63df1b7f7..84e453e35 100644 --- a/npc/jobs/3-1/ranger.txt +++ b/npc/jobs/3-1/ranger.txt @@ -98,6 +98,7 @@ tur_dun01,156,36,5 script Survival Instructor#jr01 59,{ mes "[Survival Instructor, Rescue]"; mes "All right."; mes "You are ready then."; + next; break; } mes "[Survival Instructor, Rescue]"; diff --git a/npc/jobs/3-1/rune_knight.txt b/npc/jobs/3-1/rune_knight.txt index 566513ad2..5eccceeba 100644 --- a/npc/jobs/3-1/rune_knight.txt +++ b/npc/jobs/3-1/rune_knight.txt @@ -361,7 +361,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{ mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight."; close; } - if (BaseJob == Job_Swordman) { + if (BaseClass == Job_Swordman) { if (job_rune_edq == 23) { mes "[Captain Tigris]"; mes "Oh, I see... Please wait a moment."; @@ -621,7 +621,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{ close; } else { - if ((BaseJob != Job_Knight) && (JobLevel < 50) && (SkillPoint) && (BaseLevel < 99)) { + if (Class != Job_Knight || Class != Job_Lord_Knight || Class != Job_Baby_Knight && ((JobLevel < 50) && (SkillPoint) && (BaseLevel < 99))) { // custom translation mes "[Captain Tigris]"; mes "You seem to be missing something?"; @@ -673,7 +673,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{ } job3_rune01,90,50,3 script Rune Knight Lunarea 469,{ - if (BaseJob != Job_Swordman) { + if (BaseClass != Job_Swordman) { mes "She holds up her chin quietly, nods lightly and notices me."; next; mes "Then after a moment she puts her face down and seems absorbed with other thoughts."; @@ -2323,7 +2323,7 @@ job3_rune01,50,36,1 script Runes, Make & Use 844,{ } mid_camp,238,250,3 script Rune Knight Sage Guard 468,{ - if (BaseJob != Job_Swordman) { + if (BaseClass != Job_Swordman) { mes "[Rune Knight Sage Guard]"; mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights."; next; -- cgit v1.2.3-60-g2f50