From 124ab2a1cdb344f24170a4d91f7000ebabf39b40 Mon Sep 17 00:00:00 2001 From: Kisuka Date: Mon, 28 Oct 2013 00:42:23 -0700 Subject: Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this. --- npc/pre-re/jobs/1-1/acolyte.txt | 8 ++++---- npc/pre-re/jobs/1-1/archer.txt | 2 +- npc/pre-re/jobs/1-1/mage.txt | 10 +++++----- npc/pre-re/jobs/1-1/merchant.txt | 12 ++++++------ npc/pre-re/jobs/1-1/swordman.txt | 30 +++++++++++++++--------------- npc/pre-re/jobs/1-1/thief.txt | 6 +++--- 6 files changed, 34 insertions(+), 34 deletions(-) (limited to 'npc/pre-re/jobs/1-1') diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index f69d4556a..2faef7c87 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -28,7 +28,7 @@ //= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka] //============================================================ -prt_church,184,41,4 script Cleric#aco 60,{ +prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{ if (Upper == 1) { if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) { if (Class == Job_Novice_High) { @@ -245,7 +245,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ } } -prt_fild03,365,255,2 script Ascetic#aco 89,{ +prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{ mes "[Father Rubalkabara]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 6) { @@ -322,7 +322,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{ } } -moc_fild07,41,355,4 script Ascetic#2aco 95,{ +moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{ mes "[Mother Mathilda]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 7) { @@ -391,7 +391,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{ } } -prt_fild00,208,218,6 script Ascetic#3aco 98,{ +prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{ mes "[Father Yosuke]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 8) { diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index 1b928ff13..d8bb041f9 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -22,7 +22,7 @@ //= 1.9 Added Quest Log commands. [L0ne_W0lf] //============================================================ -payon_in02,64,71,4 script Archer Guildsman#archer 85,{ +payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) { mes "[Archer Guildsman]"; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index df53e3440..e5f80bd3d 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -23,7 +23,7 @@ //= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy] //============================================================ -geffen_in,164,124,4 script Mage Guildsman 123,{ +geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ if (Upper == 1) { if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) { if (Class == Job_Novice_High) { @@ -285,7 +285,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ } } -geffen_in,164,112,4 script Mixing Machine 111,{ +geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes."; next; @@ -599,10 +599,10 @@ geffen_in,164,112,4 script Mixing Machine 111,{ // are also used in the Sage skill quests, and have // been moved to npc/quests/mage_solution.txt. // -// pay_arche,122,100,0 script Dollshoi 88,{} -// moc_ruins,91,150,0 script Ponka-Hontas 93,{} +// pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{} +// moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{} -geffen_in,177,112,4 script Bookshelf 111,{ +geffen_in,177,112,4 script Bookshelf HIDDEN_NPC,{ mes "[Guide Book]"; mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care."; next; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 531c47df3..631e29516 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -28,7 +28,7 @@ //= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka] //============================================================ -alberta_in,53,43,6 script Merchant#mer 86,{ +alberta_in,53,43,6 script Merchant#mer 4_M_04,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) { mes "[Chief Mahnsoo]"; @@ -509,7 +509,7 @@ S_GiveSerial: return; } -alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ +alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ if (BaseJob == Job_Merchant) { mes "[Union Staff Kay]"; mes "Heya pal."; @@ -786,7 +786,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ } } -morocc_in,140,102,4 script Student#mer 86,{ +morocc_in,140,102,4 script Student#mer 4_M_04,{ if ((job_merchant_q == 4) || (job_merchant_q == 3)) { mes "[Dyer's Student]"; mes "You're from"; @@ -871,7 +871,7 @@ morocc_in,140,102,4 script Student#mer 86,{ } } -geffen_in,155,122,4 script Guild Staff#mer 47,{ +geffen_in,155,122,4 script Guild Staff#mer 1_M_01,{ if (job_merchant_q == 4 || job_merchant_q == 3) { mes "[Guild Staff]"; mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!"; @@ -952,7 +952,7 @@ geffen_in,155,122,4 script Guild Staff#mer 47,{ } } -prontera,248,42,0 script Kafra Employee#mer 116,{ +prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{ cutin "kafra_02",2; if (job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 2 || job_merchant_q2 == 1) { mes "[Kafra Employee]"; @@ -1070,7 +1070,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{ } } -//izlu2dun,106,58,4 script Kafra Employee#mer 116,{ +//izlu2dun,106,58,4 script Kafra Employee#mer 4_F_KAFRA2,{ function script F_MercKafra { if ((job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 8 || job_merchant_q2 == 7)) { mes "[Kafra Employee]"; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index 0887b2027..8b4a9f974 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -35,7 +35,7 @@ //= 2.3 Added Quest Log commands. [L0ne_W0lf] //============================================================ -izlude_in,74,172,4 script Swordman#swd_1 119,{ +izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) { mes "[Swordman]"; @@ -201,7 +201,7 @@ izlude_in,74,172,4 script Swordman#swd_1 119,{ } } -izlude_in,62,170,6 script Swordman#swd_2 85,{ +izlude_in,62,170,6 script Swordman#swd_2 4_M_03,{ mes "[Swordman]"; if (BaseJob == Job_Swordman) { mes "Sorry guy, but I can only allow Novices to enter the Test Hall."; @@ -233,7 +233,7 @@ izlude_in,62,170,6 script Swordman#swd_2 85,{ } } -izlude_in,30,175,4 script Swordman#swd_3 92,{ +izlude_in,30,175,4 script Swordman#swd_3 4_F_03,{ mes "[Swordman]"; mes "I will tell you about the Test! Listen carefully, I won't repeat myself."; next; @@ -260,7 +260,7 @@ izlude_in,30,175,4 script Swordman#swd_3 92,{ close; } -izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ +izlude_in,30,163,0 script Test Hall Staff#swd_1 8W_SOLDIER,{ 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,19 +296,19 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ // Examination Courses NPCs //============================================================ // 1-1 -job_sword1,230,245,2 script Medic#swd_1 105,{ +job_sword1,230,245,2 script Medic#swd_1 8W_SOLDIER,{ callfunc "F_JobSwdMedic","1st"; } -job_sword1,230,242,2 script Test Hall Staff#swd_2 105,{ +job_sword1,230,242,2 script Test Hall Staff#swd_2 8W_SOLDIER,{ callfunc "F_JobSwdStaff",1; } -job_sword1,230,207,2 script Medic#2swd_2 105,{ +job_sword1,230,207,2 script Medic#2swd_2 8W_SOLDIER,{ callfunc "F_JobSwdMedic","2nd"; } -job_sword1,230,204,2 script Test Hall Staff#2swd_3 105,{ +job_sword1,230,204,2 script Test Hall Staff#2swd_3 8W_SOLDIER,{ callfunc "F_JobSwdStaff",1; } -job_sword1,223,167,2 script Mae#swd_1_success 92,{ +job_sword1,223,167,2 script Mae#swd_1_success 4_F_03,{ mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map; set job_sword_q,4; mes "[Mae]"; @@ -368,28 +368,28 @@ OnTouch: 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#swd_4 45,1,3,{ +job_sword1,7,245,0 script Test Hall Staff#swd_4 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff",10,245; } -job_sword1,8,207,0 script Test Hall Staff#swd_5 45,1,6,{ +job_sword1,8,207,0 script Test Hall Staff#swd_5 WARPNPC,1,6,{ callfunc "F_JobSwdTestStaff",11,207; } -job_sword1,8,169,0 script Test Hall Staff#swd_6 45,1,6,{ +job_sword1,8,169,0 script Test Hall Staff#swd_6 WARPNPC,1,6,{ callfunc "F_JobSwdTestStaff",11,169; } -job_sword1,192,244,0 script Test Hall Staff#swd_7 45,1,3,{ +job_sword1,192,244,0 script Test Hall Staff#swd_7 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff2","1st",215,244; } -job_sword1,193,207,0 script Test Hall Staff#swd_8 45,1,3,{ +job_sword1,193,207,0 script Test Hall Staff#swd_8 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff2","2nd",215,205; warp "job_sword1",215,205; } -job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{ +job_sword1,193,168,0 script Test Hall Staff#swd_9 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff2","3rd",215,167; } diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index e1e34b144..389c257f5 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -20,7 +20,7 @@ //= 1.8 Added Quest Log commands. [L0ne_W0lf] //============================================================ -moc_prydb1,39,129,2 script Thief Guide 69,{ +moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ if (Upper == 1) { if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) { if (Class == Job_Novice_High) { @@ -346,7 +346,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ close; } -moc_prydb1,42,133,2 script Comrade 118,{ +moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{ if (BaseJob == Job_Thief) { mes "[Brad]"; mes "We don't have any special events yet. Come some other time when there's news, alright?"; @@ -448,7 +448,7 @@ moc_prydb1,42,133,2 script Comrade 118,{ } } -moc_ruins,141,125,3 script Mr. Irrelevant 83,{ +moc_ruins,141,125,3 script Mr. Irrelevant 4_M_01,{ if (BaseJob == Job_Thief) { mes "[Mr. Irrelevant]"; mes "Ah, I see that you are now a Thief. I always knew you'd join us."; -- cgit v1.2.3-60-g2f50