From ac9ba3147b30c5af55884c135e552d61bcc042c3 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 18 Oct 2007 22:04:47 +0000 Subject: Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/1-1/swordman.txt | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'npc/jobs/1-1') diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index d66971121..11390c6de 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.9b +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -32,9 +32,10 @@ //= No longer uses function "F_ToHigh" //= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf] //= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage] +//= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] //============================================================ -izlude_in,74,172,4 script Swordman 119,{ +izlude_in,74,172,4 script Swordman#swd_1 119,{ if (Upper == 1) { if (Class == Job_Novice_High && ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin) { mes "[Swordman]"; @@ -198,7 +199,7 @@ izlude_in,74,172,4 script Swordman 119,{ } } -izlude_in,62,170,6 script Swordman 85,{ +izlude_in,62,170,6 script Swordman#swd_2 85,{ mes "[Swordman]"; if (BaseJob == Job_Swordman) { mes "Sorry guy, but I can only allow Novices to enter the Test Hall."; @@ -230,7 +231,7 @@ izlude_in,62,170,6 script Swordman 85,{ } } -izlude_in,30,175,4 script Swordman 92,{ +izlude_in,30,175,4 script Swordman#swd_3 92,{ mes "[Swordman]"; mes "I will tell you about the Test! Listen carefully, I won't repeat myself."; next; @@ -257,7 +258,7 @@ izlude_in,30,175,4 script Swordman 92,{ close; } -izlude_in,30,163,0 script Test Hall Staff 105,{ +izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ mes "[Test Hall Staff]"; if (BaseJob == Job_Swordman) { mes "Hm? How did you get inside? You're not supposed to be in here, so please leave now."; @@ -296,13 +297,13 @@ izlude_in,30,163,0 script Test Hall Staff 105,{ job_sword1,230,245,2 script Medic#swd_1 105,{ callfunc "F_JobSwdMedic","1st"; } -job_sword1,230,242,2 script Test Hall Staff#swd_1 105,{ +job_sword1,230,242,2 script Test Hall Staff#swd_2 105,{ callfunc "F_JobSwdStaff",1; } -job_sword1,230,207,2 script Medic#2swd_1 105,{ +job_sword1,230,207,2 script Medic#2swd_2 105,{ callfunc "F_JobSwdMedic","2nd"; } -job_sword1,230,204,2 script Test Hall Staff#2swd_1 105,{ +job_sword1,230,204,2 script Test Hall Staff#2swd_3 105,{ callfunc "F_JobSwdStaff",1; } job_sword1,223,167,2 script Mae#swd_1_success 92,{ @@ -362,38 +363,38 @@ OnTouch: // Examination Course 1 //============================================================ -job_sword1,223,243,0 warp checkp1-2 1,1,job_sword1,11,206; -job_sword1,223,205,0 warp checkp2-3 1,1,job_sword1,11,168; +job_sword1,223,243,0 warp checkp1-2#swd_1 1,1,job_sword1,11,206; +job_sword1,223,205,0 warp checkp2-3#swd_1 1,1,job_sword1,11,168; -job_sword1,7,245,0 script Test Hall Staff 45,1,3,{ +job_sword1,7,245,0 script Test Hall Staff#swd_4 45,1,3,{ callfunc "F_JobSwdTestStaff",10,245; } -job_sword1,8,207,0 script Test Hall Staff 45,1,6,{ +job_sword1,8,207,0 script Test Hall Staff#swd_5 45,1,6,{ callfunc "F_JobSwdTestStaff",11,207; } -job_sword1,8,169,0 script Test Hall Staff 45,1,6,{ +job_sword1,8,169,0 script Test Hall Staff#swd_6 45,1,6,{ callfunc "F_JobSwdTestStaff",11,169; } -job_sword1,192,244,0 script Test Hall Staff 45,1,3,{ +job_sword1,192,244,0 script Test Hall Staff#swd_7 45,1,3,{ callfunc "F_JobSwdTestStaff2","1st",215,244; } -job_sword1,193,207,0 script Test Hall Staff 45,1,3,{ +job_sword1,193,207,0 script Test Hall Staff#swd_8 45,1,3,{ callfunc "F_JobSwdTestStaff2","2nd",215,205; warp "job_sword1",215,205; } -job_sword1,193,168,0 script Test Hall Staff 45,1,3,{ +job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{ callfunc "F_JobSwdTestStaff2","3rd",215,167; } // Pitfalls (Set 1) //============================================================ job_sword1,65,117,0 warp 함정01-01 1,1,job_sword1,10,245; -job_sword1,98,27,0 warp 함정02-01 1,1,job_sword1,11,207; +job_sword1,98,27,0 warp 함정02-01 1,1,job_sword1,11,207; job_sword1,161,27,0 warp 함정02-02 1,1,job_sword1,11,207; job_sword1,239,117,0 warp 함정03-01 1,1,job_sword1,11,169; @@ -523,7 +524,7 @@ job_sword1,26,168,0 duplicate(SwdTrap3) 3_blank_3_d -1,0,2 job_sword1,36,169,0 duplicate(SwdTrap3) 3_blank_4_a -1,0,0 job_sword1,37,169,0 duplicate(SwdTrap3) 3_blank_4_b -1,0,0 job_sword1,37,168,0 duplicate(SwdTrap3) 3_blank_4_c -1,0,0 -job_sword1,36,168,0 duplicate(SwdTrap3) 3_blank_4_c -1,0,0 +job_sword1,36,168,0 duplicate(SwdTrap3) 3_blank_4_c2 -1,0,0 job_sword1,40,175,0 duplicate(SwdTrap3) 3_blank_5_a -1,0,1 job_sword1,41,175,0 duplicate(SwdTrap3) 3_blank_5_b -1,0,1 job_sword1,41,171,0 duplicate(SwdTrap3) 3_blank_6_a -1,1,0 -- cgit v1.2.3-60-g2f50