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/quests/first_class/tu_acolyte.txt | 28 ++++++++++++++-------------- npc/quests/first_class/tu_archer.txt | 26 +++++++++++++------------- npc/quests/first_class/tu_ma_th01.txt | 32 ++++++++++++++++---------------- npc/quests/first_class/tu_magician01.txt | 4 ++-- npc/quests/first_class/tu_merchant.txt | 12 ++++++------ npc/quests/first_class/tu_sword.txt | 12 ++++++------ npc/quests/first_class/tu_thief01.txt | 2 +- 7 files changed, 58 insertions(+), 58 deletions(-) (limited to 'npc/quests/first_class') diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index 3f845faaf..fde13dbae 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/npc/quests/first_class/tu_acolyte.txt @@ -23,7 +23,7 @@ // Priest Praupin //============================================================ -prt_church,179,15,1 script Priest Praupin 110,{ +prt_church,179,15,1 script Priest Praupin 4_M_MINISTER,{ mes "[Priest Praupin]"; if(BaseJob != Job_Acolyte){ if(tu_acolyte01 == 25){ @@ -174,7 +174,7 @@ prt_church,179,15,1 script Priest Praupin 110,{ // Asthe //============================================================ -prt_monk,230,106,3 script Asthe#tu 79,{ +prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{ mes "[Asthe]"; switch(tu_acolyte01){ case 1: @@ -800,7 +800,7 @@ prt_monk,230,106,3 script Asthe#tu 79,{ // Priest Gardron //============================================================ -monk_in,18,38,6 script Priest Gardron#tu 110,{ +monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{ mes "[Priest Gardron]"; if(tu_acolyte01 == 7){ if(countitem(7148) >= 1){ @@ -952,7 +952,7 @@ monk_in,18,38,6 script Priest Gardron#tu 110,{ // Dog //============================================================ -prt_monk,235,245,5 script Dog#tu 81,{ +prt_monk,235,245,5 script Dog#tu 4_DOG01,{ mes "[Dog]"; mes "^CDB79EBark bark!"; mes "Woof woof!^000000"; @@ -999,7 +999,7 @@ prt_monk,235,245,5 script Dog#tu 81,{ // Boy //============================================================ -prt_monk,243,238,5 script Boy#boy_voi 139,5,5,{ +prt_monk,243,238,5 script Boy#boy_voi HIDDEN_WARP_NPC,5,5,{ OnTouch_: if(tu_acolyte01 != 10)end; mes "[??]"; @@ -1010,7 +1010,7 @@ OnTouch_: // Ill Girl //============================================================ -prt_monk,226,257,6 script Ill Girl#tu 93,{ +prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ mes "[Angelic]"; if(tu_acolyte01 > 12){ mes "Thanks for helping me."; @@ -1212,7 +1212,7 @@ prt_monk,226,257,6 script Ill Girl#tu 93,{ // Veiner //============================================================ -prt_monk,197,228,3 script Veiner 89,{ +prt_monk,197,228,3 script Veiner 4_M_ORIENT02,{ mes "[Veiner]"; if(countitem(1081) && tu_acolyte01 == 18){ mes "So very exhausted..."; @@ -1256,7 +1256,7 @@ prt_monk,197,228,3 script Veiner 89,{ // Hedrick //============================================================ -prt_monk,28,260,5 script Hedrick 50,{ +prt_monk,28,260,5 script Hedrick 1_M_04,{ mes "[Hedrick]"; mes "^333333*Whew!*^000000"; mes "Man I worked hard today!"; @@ -1292,7 +1292,7 @@ prt_monk,28,260,5 script Hedrick 50,{ // Weapon Merchant //============================================================ -prt_monk,136,261,0 script Weapon Merchant#tu 139,9,9,{ +prt_monk,136,261,0 script Weapon Merchant#tu HIDDEN_WARP_NPC,9,9,{ OnTouch: if(tu_acolyte01 != 20 || countitem(1081)==0) end; mes "[Weapon Merchant]"; @@ -1310,7 +1310,7 @@ OnTouch: // Karven //============================================================ -monk_in,103,176,7 script Karven 60,{ +monk_in,103,176,7 script Karven 1_M_PASTOR,{ mes "[Karven]"; mes "May you rest"; if(tu_acolyte01 == 21 && countitem(7183)){ @@ -1344,7 +1344,7 @@ monk_in,103,176,7 script Karven 60,{ // Gloria //============================================================ -prt_monk,219,164,3 script Gloria#tu 95,{ +prt_monk,219,164,3 script Gloria#tu 4_F_SISTER,{ mes "[Gloria]"; if(BaseJob != Job_Acolyte){ mes "Hi, hi~"; @@ -1417,7 +1417,7 @@ prt_monk,219,164,3 script Gloria#tu 95,{ // Cleope Verce //============================================================ -prt_monk,153,210,3 script Cleope Verce 95,{ +prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{ mes "[Cleope Verce]"; if(BaseJob != Job_Acolyte){ if (JobLevel < 40) { @@ -1591,7 +1591,7 @@ prt_monk,153,210,3 script Cleope Verce 95,{ } // Range NPC //============================================================ -prt_monk,217,123,0 script #tu_monk 139,10,10,{ +prt_monk,217,123,0 script #tu_monk HIDDEN_WARP_NPC,10,10,{ OnTouch_: if(BaseJob == Job_Acolyte){ switch(tu_acolyte01){ @@ -1612,7 +1612,7 @@ OnTouch_: // Eavesdrop //============================================================ -prt_monk,223,123,3 script Eavesdrop#tu 111,{ +prt_monk,223,123,3 script Eavesdrop#tu HIDDEN_NPC,{ if(BaseJob != Job_Acolyte){ mes "^3355FFThere's nothing here.^000000"; close; diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index b965ae05d..247aa0329 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -26,7 +26,7 @@ // Bard Jet //============================================================ -payon_in02,67,65,3 script Bard Jet#tu 51,{ +payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{ mes "[Jet]"; mes "Every god never grows old"; mes "Because of beautiful"; @@ -162,7 +162,7 @@ payon_in02,67,65,3 script Bard Jet#tu 51,{ // Sign //============================================================ -pay_arche,127,154,4 script Sign#arc 835,{ +pay_arche,127,154,4 script Sign#arc 2_BOARD1,{ mes " "; mes " Archer Job Change Office ---> "; mes " <--- Icarus "; @@ -172,7 +172,7 @@ pay_arche,127,154,4 script Sign#arc 835,{ // Master Kavaruk //============================================================ -payon_in02,54,13,3 script Master Kavaruk 55,{ +payon_in02,54,13,3 script Master Kavaruk 1_M_JOBTESTER,{ mes "[Master Kavaruk]"; mes "Hello, young one."; mes "I am Master Kavaruk"; @@ -418,7 +418,7 @@ payon_in02,54,13,3 script Master Kavaruk 55,{ // Reidin Corse //============================================================ -pay_arche,103,165,5 script Reidin Corse#tu 832,{ +pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ mes "[Reidin Corse]"; if(MaxWeight - Weight < 2000){ mes "Hey, you're carrying an"; @@ -1187,7 +1187,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 832,{ // Seisner //============================================================ -pay_arche,84,139,3 script Seisner 727,{ +pay_arche,84,139,3 script Seisner 4_F_JOB_HUNTER,{ specialeffect EF_HIT2,"#Target"; mes "[Seisner]"; mes "Aaaah!"; @@ -1393,7 +1393,7 @@ pay_arche,84,139,3 script Seisner 727,{ // Target //============================================================ -pay_arche,76,135,3 script #Target 111,{ end; } +pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; } // Acolyte //============================================================ @@ -1551,7 +1551,7 @@ pay_arche,76,135,3 script #Target 111,{ end; } // Alchemist Guildmember //============================================================ -pay_arche,130,113,3 script Alchemist Guildmember#tu 740,{ +pay_arche,130,113,3 script Alchemist Guildmember#tu 2_M_ALCHE,{ mes "[Alchemist Guildmember]"; if(tu_archer02 > 0){ if((countitem(1032) > 0) || (countitem(905) > 0 )){ // Blossom_Of_Maneater & Stem @@ -1625,7 +1625,7 @@ pay_arche,130,113,3 script Alchemist Guildmember#tu 740,{ // Arthail //============================================================ -prontera,126,335,5 script Arthail 51,{ +prontera,126,335,5 script Arthail 1_M_BARD,{ mes "[Arthail]"; if(tu_archer02 < 3){ mes "I am the Bard"; @@ -1806,7 +1806,7 @@ prontera,126,335,5 script Arthail 51,{ // New Guild Master //============================================================ -prontera,167,281,3 script New Guild Master#tu 753,{ +prontera,167,281,3 script New Guild Master#tu 4_M_MONK,{ mes "[New Guild Master]"; mes "Hearken, all"; mes "of you who seek"; @@ -1829,7 +1829,7 @@ prontera,167,281,3 script New Guild Master#tu 753,{ // Mage //============================================================ -prontera,144,301,5 script Mage#tu 123,{ +prontera,144,301,5 script Mage#tu 2_F_MAGICMASTER,{ mes "[Mage]"; mes "Did you see that"; mes "new guild master?"; @@ -1857,7 +1857,7 @@ prontera,144,301,5 script Mage#tu 123,{ // Minister //============================================================ -prt_castle,76,165,6 script Minister#tu 55,{ +prt_castle,76,165,6 script Minister#tu 1_M_JOBTESTER,{ mes "[Minister]"; mes "The royal family"; mes "is extremely busy"; @@ -1917,7 +1917,7 @@ prt_castle,76,165,6 script Minister#tu 55,{ // Range NPC //============================================================ -prt_castle,94,150,4 script #sound_tu 139,6,6,{ +prt_castle,94,150,4 script #sound_tu HIDDEN_WARP_NPC,6,6,{ OnTouch_: if(tu_archer02 == 6) { mes "[Minister]"; @@ -1932,7 +1932,7 @@ OnTouch_: // Bishop Maugins //============================================================ -monk_in,19,43,1 script Bishop Maugins 60,{ +monk_in,19,43,1 script Bishop Maugins 1_M_PASTOR,{ mes "[Bishop Maugins]"; if(tu_archer02 == 7){ mes "Greetings."; diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt index 6bbe5c456..a80f424b0 100644 --- a/npc/quests/first_class/tu_ma_th01.txt +++ b/npc/quests/first_class/tu_ma_th01.txt @@ -16,7 +16,7 @@ // Battle Traces 1 //============================================================ -moc_fild12,166,369,0 script Trace of Battle#1 844,{ +moc_fild12,166,369,0 script Trace of Battle#1 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 5){ mes "^3355FFYou find traces of poison"; @@ -107,7 +107,7 @@ moc_fild12,166,369,0 script Trace of Battle#1 844,{ // Battle Traces 2 //============================================================ -moc_fild12,173,215,0 script Trace of Battle#2 844,{ +moc_fild12,173,215,0 script Trace of Battle#2 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 9){ mes "^3355FFThere are signs"; @@ -157,7 +157,7 @@ moc_fild12,173,215,0 script Trace of Battle#2 844,{ // Battle Traces 3 //============================================================ -moc_fild12,276,165,0 script Trace of Battle#3 844,{ +moc_fild12,276,165,0 script Trace of Battle#3 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 10){ mes "^3355FFThere are signs"; @@ -210,7 +210,7 @@ moc_fild12,276,165,0 script Trace of Battle#3 844,{ // Battle Traces 4 //============================================================ -moc_fild11,39,163,0 script Trace of Battle#4 844,{ +moc_fild11,39,163,0 script Trace of Battle#4 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 11){ mes "^3355FFThere are signs"; @@ -270,7 +270,7 @@ moc_fild11,39,163,0 script Trace of Battle#4 844,{ // Battle Traces 5 //============================================================ -moc_fild11,205,52,0 script Trace of Battle#5 844,{ +moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 12){ mes "^3355FFThere are signs"; @@ -419,7 +419,7 @@ moc_fild11,205,52,0 script Trace of Battle#5 844,{ // Battle Traces 6 //============================================================ -moc_fild11,226,235,0 script Trace of Battle#6 844,{ +moc_fild11,226,235,0 script Trace of Battle#6 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 13){ mes "^3355FFThere are signs"; @@ -462,7 +462,7 @@ moc_fild11,226,235,0 script Trace of Battle#6 844,{ // Battle Traces 7 //============================================================ -moc_fild11,184,342,0 script Trace of Battle#7 844,{ +moc_fild11,184,342,0 script Trace of Battle#7 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 13){ mes "^3355FFThere are signs"; @@ -503,7 +503,7 @@ moc_fild11,184,342,0 script Trace of Battle#7 844,{ // Battle Traces 8 //============================================================ -moc_fild17,213,358,0 script Trace of Battle#8 844,{ +moc_fild17,213,358,0 script Trace of Battle#8 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 13){ mes "^3355FFThere are two"; @@ -564,7 +564,7 @@ moc_fild17,213,358,0 script Trace of Battle#8 844,{ // Battle Traces 9 //============================================================ -moc_fild17,228,274,0 script Trace of Battle#9 844,{ +moc_fild17,228,274,0 script Trace of Battle#9 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 14){ mes "^3355FFTraces of some"; @@ -659,7 +659,7 @@ moc_fild17,228,274,0 script Trace of Battle#9 844,{ // Battle Traces 10 //============================================================ -moc_fild17,34,292,0 script Trace of Battle#10 844,{ +moc_fild17,34,292,0 script Trace of Battle#10 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 16){ mes "^3355FFThere are signs"; @@ -712,7 +712,7 @@ moc_fild17,34,292,0 script Trace of Battle#10 844,{ // Battle Traces 11 //============================================================ -moc_fild18,346,296,0 script Trace of Battle#11 844,{ +moc_fild18,346,296,0 script Trace of Battle#11 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 17){ mes "^3355FFThere are signs"; @@ -769,7 +769,7 @@ moc_fild18,346,296,0 script Trace of Battle#11 844,{ // Battle Traces 12 //============================================================ -moc_fild18,309,257,0 script Trace of Battle#12 844,{ +moc_fild18,309,257,0 script Trace of Battle#12 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 18){ mes "^3355FFThere are signs"; @@ -822,7 +822,7 @@ moc_fild18,309,257,0 script Trace of Battle#12 844,{ // Battle Traces 13 //============================================================ -moc_fild18,177,333,0 script Trace of Battle#13 844,{ +moc_fild18,177,333,0 script Trace of Battle#13 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 19){ mes "^3355FFThere are signs"; @@ -876,7 +876,7 @@ moc_fild18,177,333,0 script Trace of Battle#13 844,{ // Battle Traces 14 //============================================================ -moc_fild18,111,303,0 script Trace of Battle#14 844,{ +moc_fild18,111,303,0 script Trace of Battle#14 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 20){ mes "^3355FFThere are signs"; @@ -929,7 +929,7 @@ moc_fild18,111,303,0 script Trace of Battle#14 844,{ // Battle Traces 15 //============================================================ -moc_fild18,109,197,0 script Trace of Battle#15 844,{ +moc_fild18,109,197,0 script Trace of Battle#15 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 21){ mes "^3355FFThere are signs"; @@ -1252,7 +1252,7 @@ moc_fild18,109,197,0 script Trace of Battle#15 844,{ // Battle Traces 16 //============================================================ -moc_fild18,156,96,0 script Trace of Battle#16 844,{ +moc_fild18,156,96,0 script Trace of Battle#16 CLEAR_NPC,{ if(BaseClass == Job_Thief){ if(tu_thief01 < 25){ mes "^3355FFThere are signs"; diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt index a616c2f0d..97ac69dcb 100644 --- a/npc/quests/first_class/tu_magician01.txt +++ b/npc/quests/first_class/tu_magician01.txt @@ -17,14 +17,14 @@ // Sign //============================================================ -geffen,61,174,4 script Sign#M 111,{ +geffen,61,174,4 script Sign#M HIDDEN_NPC,{ mes "- Mage Job Change -"; close; } // New Mage Manager //============================================================ -geffen,67,180,4 script New Mage Manager#M 102,{ +geffen,67,180,4 script New Mage Manager#M 8_F,{ mes "[Mana]"; if(Class == Job_Novice){ mes "[Mana]"; diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index 2e838e4da..8636810bd 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -17,7 +17,7 @@ // Guarnien //============================================================ -alberta_in,70,51,5 script Guarnien 98,{ +alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; if(Class != Job_Merchant && Class != Job_Baby_Merchant){ mes "Hello stranger."; @@ -676,7 +676,7 @@ alberta_in,70,51,5 script Guarnien 98,{ // Sagle //============================================================ -prontera,66,111,3 script Sagle 82,{ +prontera,66,111,3 script Sagle 4_KID01,{ mes "[Sagle]"; if(tu_merchant == 8){ mes "Hello, hello~"; @@ -835,7 +835,7 @@ prontera,66,111,3 script Sagle 82,{ // Kellion //============================================================ -prontera,93,330,3 script Kellion 97,{ +prontera,93,330,3 script Kellion 4W_M_01,{ mes "[Kellion]"; if(tu_merchant == 8){ mes "I'm selling sets of"; @@ -969,7 +969,7 @@ prontera,93,330,3 script Kellion 97,{ // Aigie //============================================================ -prt_in,169,11,3 script Aigie 92,{ +prt_in,169,11,3 script Aigie 4_F_03,{ if(tu_merchant == 8){ mes "[Aigie]"; mes "Welcome to my shop."; @@ -1115,7 +1115,7 @@ prt_in,169,11,3 script Aigie 92,{ // Jayon //============================================================ -prontera,247,129,3 script Jayon 85,{ +prontera,247,129,3 script Jayon 4_M_03,{ if(tu_merchant == 8){ mes "[Jayon]"; mes "If you've checked out the market for Red Potions, you know that my price is the best. I'm offering 10 Red Potions for only 410 Zeny!"; @@ -1267,7 +1267,7 @@ prontera,247,129,3 script Jayon 85,{ // Maos //============================================================ -prt_in,251,129,3 script Maos 709,{ +prt_in,251,129,3 script Maos 4_M_SEAMAN,{ if(tu_merchant == 8){ mes "[Maos]"; mes "Don't say anything."; diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index 57e3fa447..66962d97f 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -19,7 +19,7 @@ // Shurank //============================================================ -izlude_in,82,163,3 script Shurank 733,{ +izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; if(Class == Job_Novice || Class == Job_Baby){ mes "Still wondering"; @@ -991,7 +991,7 @@ izlude_in,82,163,3 script Shurank 733,{ // Daqu'ee //============================================================ -geffen,154,143,3 script Dequ'ee 734,{ +geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ if(BaseJob == Job_Novice){ mes "[Dequ'ee]"; mes "Hey there."; @@ -2255,7 +2255,7 @@ geffen,154,143,3 script Dequ'ee 734,{ // Geil //============================================================ -morocc_in,51,101,3 script Geil 89,{ +morocc_in,51,101,3 script Geil 4_M_ORIENT02,{ mes "[Geil]"; if(tu_swordman == 15){ mes "Were you sent by the authorities? Quit giving me such a hard time! I'm not the murderer! I don't even know who was killed. I'm not the one you're looking for!"; @@ -2306,7 +2306,7 @@ morocc_in,51,101,3 script Geil 89,{ // Meutro //============================================================ -morocc,82,292,5 script Muetro 84,{ +morocc,82,292,5 script Muetro 4_M_02,{ mes "[Muetro]"; if(tu_swordman == 15){ mes "You're just"; @@ -2347,7 +2347,7 @@ morocc,82,292,5 script Muetro 84,{ // Hans //============================================================ -morocc,240,72,3 script Hans 86,{ +morocc,240,72,3 script Hans 4_M_04,{ mes "[Hans]"; if(tu_swordman == 15){ mes "Help me!"; @@ -2405,7 +2405,7 @@ morocc,240,72,3 script Hans 86,{ // Bankley //============================================================ -morocc_in,12,156,3 script Bankley 97,{ +morocc_in,12,156,3 script Bankley 4W_M_01,{ if(tu_swordman > 19){ mes "^3355FFBankley had a pitiable"; mes "expression on his face.^000000"; diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt index fc86e52c0..0c431951f 100644 --- a/npc/quests/first_class/tu_thief01.txt +++ b/npc/quests/first_class/tu_thief01.txt @@ -18,7 +18,7 @@ // Thief Trainer //============================================================ -moc_ruins,66,164,4 script Thief Trainer#T 84,{ +moc_ruins,66,164,4 script Thief Trainer#T 4_M_02,{ mes "[Yierhan]"; if(Class == Job_Novice){ mes "Eh...?"; -- cgit v1.2.3-60-g2f50