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 +++++++++++++++++++------------------ npc/jobs/1-1e/ninja.txt | 2 +- npc/jobs/2-1/assassin.txt | 11 +---------- npc/jobs/2-1/hunter.txt | 5 +++-- npc/jobs/2-2/monk.txt | 7 ++++--- npc/jobs/2-2/sage.txt | 10 ++++++---- npc/jobs/novice/novice.txt | 2 +- npc/jobs/valkyrie.txt | 7 ++++--- 8 files changed, 39 insertions(+), 42 deletions(-) (limited to 'npc/jobs') 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 diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt index 4fe0a6150..ff4ed9c37 100644 --- a/npc/jobs/1-1e/ninja.txt +++ b/npc/jobs/1-1e/ninja.txt @@ -447,7 +447,7 @@ que_ng,30,65,3 script Cougar Gai 730,{ } } -einbroch,184,194,3 script Suspicious Guy 881,{ +einbroch,184,194,3 script Suspicious Guy#nin 881,{ if(Class == Job_Ninja) { diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 47fd7f866..ab6c3cbc4 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -34,6 +34,7 @@ //= 2.5 Fixed a Rogue exploit [Lupus] //= 2.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.7 Several bugfixes with the help of Samuray22 and Barron-Monster. [L0ne_W0lf] +//= 2.8 Removed duplicate warps. [L0ne_W0lf] //============================================================ in_moc_16,19,33,1 script Guildsman#asn 55,{ @@ -1170,16 +1171,6 @@ OnTouch: } } -in_moc_16,18,8,0 script guild_to_16 45,1,1,{ -OnTouch: - warp "moc_fild16",205,291; -} - -moc_fild16,205,296,0 script 16_to_guild 45,1,1,{ -OnTouch: - warp "in_moc_16",18,11; -} - in_moc_16,1,1,0 script Beholder#ASNTEST -1,{ OnInit: disablenpc "Beholder#ASNTEST"; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 3a98889ba..6f5491115 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.8 +//= 2.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -40,6 +40,7 @@ // -Thanks to ultradamage. //= 2.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.8 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf] +//= 2.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Notices in the old Hunter Guild. @@ -61,7 +62,7 @@ in_hunter,99,99,4 script Hunter Info#hnt::HntNotice 727,{ close; } -pay_fild10,148,252,3 duplicate(HntNotice) Job Change Location Change Notice#hugel 857 +pay_fild10,148,252,3 duplicate(HntNotice) Job Change Location#hu 857 // Actual Job quest start //============================================================ diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 177b6e484..47bd038eb 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dino9021, Edited / Translated by Celest //===== Current Version: ===================================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 2.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" +//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{ @@ -2200,7 +2201,7 @@ job_monk,225,180,1 script Hyunmoo#mk 89,{ } } -prt_monk,225,180,1 script Hyunmoo#mk 89,{ +prt_monk,225,180,1 script Hyunmoo#mk2 89,{ if (MONK_Q < 25) { mes "[Hyunmoo]"; mes "As I see vegetables growing, I feel myself growing within."; @@ -2417,7 +2418,7 @@ OnTouch: end; } -monk_test,88,91,1 script Proctor#mk 52,{ +monk_test,88,91,1 script Proctor#mk2 52,{ mes "[Proctor]"; mes "So, are you ready to undergo this spiritual training?"; next; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 960b16ee7..b2dcd0f95 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -5,7 +5,7 @@ //= Unknown Translator (1.0) //= Darkchild (1.2) //===== Current Version: ===================================== -//= 2.2b +//= 2.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -15,7 +15,8 @@ //= 2.1 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 2.2 Small bug fix (== -> !=) thanks to Saithis. [L0ne_W0lf] -//= 2.2b ANotehr smakk bugfix, pointed out by Cara. [L0ne_W0lf] +//= 2.2b ANotehr smaLL bugfix, pointed out by Cara. [L0ne_W0lf] +//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{ @@ -604,7 +605,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{ } } -yuno_in03,105,177,5 script Written Test Professor#sa 754,{ +yuno_in03,105,177,5 script Written Test Professor#s 754,{ mes "[Claytos Verdo]"; if (BaseJob != Job_Mage) { if (BaseJob == Job_Sage) { @@ -1022,7 +1023,8 @@ L_AskQuestions: } } -yuno_in03,169,180,3 script Practical Examination Professor 755,{ +//Practical Examination Professer +yuno_in03,169,180,3 script Practical Examination P 755,{ mes "[Hermes Tris]"; if (BaseJob != Job_Mage) { if (BaseJob == Job_Sage) { diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt index f9b81dd19..cd9007e54 100644 --- a/npc/jobs/novice/novice.txt +++ b/npc/jobs/novice/novice.txt @@ -2354,7 +2354,7 @@ L_equip: } //Training Center Employee -new_zone03,95,30,4 script Training Center Employee#1 84,{ +new_zone03,95,30,4 script Training Center Employee 84,{ mes "[Hoffman]"; mes "Hey there~"; mes "I'm here to provide"; diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index f3af075d9..83071ac34 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -5,7 +5,7 @@ //= finished, optimized and tested by Lupus //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.7 +//= 2.8 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -33,6 +33,7 @@ //= 2.7a Added Function "F_BlockHigh" back in until rewriteing of the 2-x [L0ne_W0lf] //= scripts are comepleted. //= 2.7b Removed function "F_BlockHigh" as it's no longer used. [L0ne_W0lf] +//= 2.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ valkyrie,48,86,4 script Valkyrie# 811,{ @@ -386,6 +387,6 @@ S_WarpChar: // Warps //============================================================ -valkyrie,48,73,0 warp valk01 1,1,valkyrie,48,64 -valkyrie,48,66,0 warp valk01 1,1,valkyrie,48,75 +valkyrie,48,73,0 warp valk01#1 1,1,valkyrie,48,64 +valkyrie,48,66,0 warp valk01#2 1,1,valkyrie,48,75 -- cgit v1.2.3-60-g2f50