summaryrefslogtreecommitdiff
path: root/npc/quests/skills
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests/skills')
-rw-r--r--npc/quests/skills/acolyte_skills.txt2
-rw-r--r--npc/quests/skills/alchemist_skills.txt24
-rw-r--r--npc/quests/skills/archer_skills.txt4
-rw-r--r--npc/quests/skills/assassin_skills.txt4
-rw-r--r--npc/quests/skills/bard_skills.txt20
-rw-r--r--npc/quests/skills/blacksmith_skills.txt4
-rw-r--r--npc/quests/skills/crusader_skills.txt6
-rw-r--r--npc/quests/skills/dancer_skills.txt4
-rw-r--r--npc/quests/skills/hunter_skills.txt2
-rw-r--r--npc/quests/skills/knight_skills.txt14
-rw-r--r--npc/quests/skills/mage_skills.txt2
-rw-r--r--npc/quests/skills/merchant_skills.txt4
-rw-r--r--npc/quests/skills/monk_skills.txt4
-rw-r--r--npc/quests/skills/novice_skills.txt6
-rw-r--r--npc/quests/skills/priest_skills.txt2
-rw-r--r--npc/quests/skills/rogue_skills.txt28
-rw-r--r--npc/quests/skills/sage_skills.txt2
-rw-r--r--npc/quests/skills/swordman_skills.txt6
-rw-r--r--npc/quests/skills/thief_skills.txt4
-rw-r--r--npc/quests/skills/wizard_skills.txt4
20 files changed, 73 insertions, 73 deletions
diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 113104401..d5db475f8 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Fixed JobLevel requirements. [Euphy]
//============================================================
-prt_church,173,23,4 script Cleric 79,{
+prt_church,173,23,4 script Cleric 1_F_PRIEST,{
mes "[Acolyte Klift]";
mes "Ahh . Brothers ! Does the task of";
mes "caring for out lost sheep burden";
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index 678c2696b..d735220b3 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -16,7 +16,7 @@
//= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-yuno_in04,33,108,4 script Pisruik#qsk_al 883,{
+yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
if (BaseJob == Job_Alchemist) {
if (JobLevel < 40) {
mes "[Pisruik]";
@@ -1101,7 +1101,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 883,{
}
}
-yuno_in04,22,107,5 script Irache#qsk_al 740,{
+yuno_in04,22,107,5 script Irache#qsk_al 2_M_ALCHE,{
mes "[Irache]";
mes "Heh heh heh...!";
mes "It's done! With this";
@@ -1119,7 +1119,7 @@ yuno_in04,22,107,5 script Irache#qsk_al 740,{
close;
}
-yuno_in04,27,107,4 script Degas#qsk_al 748,{
+yuno_in04,27,107,4 script Degas#qsk_al 4_M_ALCHE_A,{
mes "[Degas]";
mes "It's such a pain working";
mes "so close to these other";
@@ -1137,7 +1137,7 @@ yuno_in04,27,107,4 script Degas#qsk_al 748,{
close;
}
-yuno_in04,33,106,4 script Pile of Books#qsk_al 111,{
+yuno_in04,33,106,4 script Pile of Books#qsk_al HIDDEN_NPC,{
mes "^3355FFIt's simply a pile";
mes "of scattered documents.";
mes "Although it seems unorganized,";
@@ -1147,7 +1147,7 @@ yuno_in04,33,106,4 script Pile of Books#qsk_al 111,{
}
// Start Bioethics quest
-lhz_in01,224,140,3 script Kellasus#qsk_al 57,{
+lhz_in01,224,140,3 script Kellasus#qsk_al 1_M_LIBRARYMASTER,{
if (BaseJob == Job_Alchemist && bioeth == 13) {
mes "[Kellasus]";
mes "Keep up the";
@@ -1740,7 +1740,7 @@ lhz_in01,224,140,3 script Kellasus#qsk_al 57,{
close;
}
-lhz_in01,225,122,5 script Skrajjad#qsk_al 754,{
+lhz_in01,225,122,5 script Skrajjad#qsk_al 4_M_SAGE_A,{
if (BaseJob == Job_Alchemist && bioeth > 4) {
mes "[Skrajjad]";
mes "I've taught you everything";
@@ -1854,7 +1854,7 @@ lhz_in01,225,122,5 script Skrajjad#qsk_al 754,{
close;
}
-lhz_in01,204,138,5 script Keshibien#qsk_al 750,{
+lhz_in01,204,138,5 script Keshibien#qsk_al 4_M_ALCHE_C,{
if (BaseJob == Job_Alchemist && bioeth > 5) {
mes "[Keshibien]";
mes "I hope that you";
@@ -1966,7 +1966,7 @@ lhz_in01,204,138,5 script Keshibien#qsk_al 750,{
close;
}
-lhz_in02,278,273,3 script Broncher#qsk_al 709,{
+lhz_in02,278,273,3 script Broncher#qsk_al 4_M_SEAMAN,{
if (BaseJob == Job_Alchemist && bioeth > 6) {
mes "[Broncher]";
mes "You again? Didn't I already";
@@ -2058,7 +2058,7 @@ lhz_in02,278,273,3 script Broncher#qsk_al 709,{
close;
}
-lhz_in03,106,34,3 script Koring#qsk_al 706,{
+lhz_in03,106,34,3 script Koring#qsk_al 4_M_KID1,{
if (BaseJob == Job_Alchemist && bioeth == 8 || bioeth == 9) {
mes "[Koring]";
mes "My daddy is the bestest";
@@ -2104,7 +2104,7 @@ lhz_in03,106,34,3 script Koring#qsk_al 706,{
close;
}
-lhz_in03,109,31,5 script Beninne#qsk_al 90,{
+lhz_in03,109,31,5 script Beninne#qsk_al 4_F_01,{
if (BaseJob == Job_Alchemist && bioeth == 8 || bioeth == 9) {
mes "[Beninne]";
mes "You've met my husband,";
@@ -2148,7 +2148,7 @@ lhz_in03,109,31,5 script Beninne#qsk_al 90,{
close;
}
-lighthalzen,226,210,3 script Nannan#qsk_al 86,{
+lighthalzen,226,210,3 script Nannan#qsk_al 4_M_04,{
mes "[Nannan]";
mes "You know, I always thought^FFFFFF ^000000 that all Alchemists were bookish,";
mes "scholarly types, their faces always buried in books and studying. But";
@@ -2170,7 +2170,7 @@ lighthalzen,226,210,3 script Nannan#qsk_al 86,{
close;
}
-lhz_in01,218,141,7 script Alchemist#qsk_al 98,{
+lhz_in01,218,141,7 script Alchemist#qsk_al 4W_M_02,{
mes "[Alchemist]";
mes "Out of all humans,";
mes "I believe Kellasus is";
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 63a465e25..b97fb260b 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -13,7 +13,7 @@
//= 1.7 Fixed JobLevel requirements. [Euphy]
//============================================================
-moc_ruins,118,99,5 script Roberto 88,{
+moc_ruins,118,99,5 script Roberto 4_M_ORIENT01,{
if (BaseClass == Job_Archer) {
if (getskilllv("AC_MAKINGARROW") == 1) {
mes "[Roberto]";
@@ -139,7 +139,7 @@ moc_ruins,118,99,5 script Roberto 88,{
close;
}
-payon,103,63,3 script Jason 88,3,3,{
+payon,103,63,3 script Jason 4_M_ORIENT01,3,3,{
if (BaseClass == Job_Archer) {
if (getskilllv("AC_CHARGEARROW") == 1) {
mes "[Jason]";
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 568d0c369..8ff7da04c 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-in_moc_16,14,27,5 script Assassin#realman 884,{
+in_moc_16,14,27,5 script Assassin#realman 4_M_ACROSS,{
if (BaseJob == Job_Assassin && ASSN_SK2 == 1) {
if (getskilllv("AS_VENOMKNIFE") == 0) {
mes "[Killtin]";
@@ -284,7 +284,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{
}
}
-in_moc_16,23,27,5 script Assassin#realgirl 885,{
+in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
if (BaseJob == Job_Assassin && ASSN_SK == 7) {
if (getskilllv("AS_SONICACCEL") == 0) {
mes "[Esmille]";
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index d64281100..0074a5a79 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -25,7 +25,7 @@
//= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-prontera,174,328,3 script Young Man#bard_q1 89,3,3,{
+prontera,174,328,3 script Young Man#bard_q1 4_M_ORIENT02,3,3,{
if (BaseJob == Job_Bard) {
emotion e_omg;
mes "[Timid Young Man]";
@@ -377,7 +377,7 @@ OnTouch:
end;
}
-morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{
+morocc_in,169,72,7 script Spiteful-Looking Bard#bs 2_M_BARD_ORIENT,3,3,{
if (BaseJob == Job_Bard) {
if (Class == Job_Clown && qskill_bard == 9) {
if (getskilllv("BA_PANGVOICE") != 0) {
@@ -902,7 +902,7 @@ OnTouch:
// Yhelle the Chicken
//============================================================
-niflheim,239,70,1 script Yhelle#bard_chick1 800,3,3,{
+niflheim,239,70,1 script Yhelle#bard_chick1 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -935,7 +935,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",1,2; close;
}
-niflheim,185,205,3 script Yhelle#bard_chick2 800,3,3,{
+niflheim,185,205,3 script Yhelle#bard_chick2 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -961,7 +961,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",2,3; close;
}
-niflheim,85,203,5 script Yhelle#bard_chick3 800,3,3,{
+niflheim,85,203,5 script Yhelle#bard_chick3 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -987,7 +987,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",3,4; close;
}
-niflheim,149,81,7 script Yhelle#bard_chick4 800,3,3,{
+niflheim,149,81,7 script Yhelle#bard_chick4 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -1013,7 +1013,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",4,5; close;
}
-niflheim,209,144,3 script Yhelle#bard_chick5 800,3,3,{
+niflheim,209,144,3 script Yhelle#bard_chick5 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -1041,7 +1041,7 @@ OnTouch:
// Drunken Men
//============================================================
-morocc_in,178,73,3 script Customer#bard_skill01 54,{
+morocc_in,178,73,3 script Customer#bard_skill01 1_M_JOBGUIDER,{
mes "[Little Bit Drunken Guy]";
mes "What do you think";
mes "is the best drink in";
@@ -1101,7 +1101,7 @@ morocc_in,178,73,3 script Customer#bard_skill01 54,{
close;
}
-morocc_in,175,70,7 script Customer#bard_skill02 50,{
+morocc_in,175,70,7 script Customer#bard_skill02 1_M_04,{
mes "[Little Bit Drunken Guy]";
mes "What do you think";
mes "is the best drink in";
@@ -1163,7 +1163,7 @@ morocc_in,175,70,7 script Customer#bard_skill02 50,{
// Bartender
//============================================================
-morocc_in,166,76,7 script Bartender#bard_qskill 46,{
+morocc_in,166,76,7 script Bartender#bard_qskill 1_ETC_01,{
if (checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index 8764c3e01..ba7bf82cf 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -11,7 +11,7 @@
//= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-geffen,178,72,3 script Akkie#qsk_bs 726,{
+geffen,178,72,3 script Akkie#qsk_bs 4_F_JOB_BLACKSMITH,{
if (BaseJob == Job_Blacksmith) {
if (BLACK_SK == 7 && getskilllv("BS_UNFAIRLYTRICK") == 0) {
mes "[Akkie]";
@@ -471,7 +471,7 @@ geffen,178,72,3 script Akkie#qsk_bs 726,{
}
}
-geffen,172,52,1 script Goodman#qsk_bs 826,{
+geffen,172,52,1 script Goodman#qsk_bs 4_M_DWARF,{
if (BaseJob == Job_Blacksmith) {
if (BLACK_SK2 == 2 && Upper == 1 && getskilllv("BS_GREED") == 0) {
mes "[Goodman]";
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt
index 144ab44cf..46e294197 100644
--- a/npc/quests/skills/crusader_skills.txt
+++ b/npc/quests/skills/crusader_skills.txt
@@ -11,7 +11,7 @@
//= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-geffen,110,117,3 script Ford#11 752,{
+geffen,110,117,3 script Ford#11 4_M_CRU_OLD,{
if (BaseJob == Job_Crusader) {
if (CRUS_SK == 8 && getskilllv("CR_SHRINK") == 0) {
mes "[Ford]";
@@ -275,7 +275,7 @@ geffen,110,117,3 script Ford#11 752,{
}
}
-gef_fild13,297,242,3 script Soldier#277 751,{
+gef_fild13,297,242,3 script Soldier#277 4_M_CRU,{
if (BaseJob == Job_Crusader) {
if (Upper == 1 && getskilllv("CR_SHRINK")) {
if (CRUS_SK == 8) {
@@ -576,7 +576,7 @@ gef_fild13,297,242,3 script Soldier#277 751,{
}
}
-prt_church,87,127,3 script Pastor#1011 755,{
+prt_church,87,127,3 script Pastor#1011 4_M_SAGE_C,{
if (BaseJob == Job_Crusader) {
if (Upper == 1 && getskilllv("CR_SHRINK")) {
if (CRUS_SK == 8) {
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 3c7efd345..6a6c802f6 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -13,7 +13,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-comodo,204,172,5 script Canell#qsk_dan01 724,{
+comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
if (BaseJob == Job_Dancer && JobLevel > 39) {
if (DANCER_SK == 0) {
mes "[Canell]";
@@ -398,7 +398,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
}
}
-prontera,183,333,1 script Aelle#qsk_dan02 79,{
+prontera,183,333,1 script Aelle#qsk_dan02 1_F_PRIEST,{
if (BaseJob == Job_Dancer) {
if (DANCER_SK == 3) {
mes "[Aelle]";
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index 5178d622f..eca408915 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -22,7 +22,7 @@
//= 1.4 Moved Arpesto from tu_archer and added his script. [Kisuka]
//============================================================
-pay_arche,109,169,3 script Arpesto 712,{
+pay_arche,109,169,3 script Arpesto 4_M_05,{
if (BaseJob == Job_Hunter) {
if (qskill_hunter == 100) {
if (getskilllv("HT_PHANTASMIC")) {
diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index 9d3358975..818303c68 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -11,7 +11,7 @@
//= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-prt_in,85,99,3 script Knight#kabuto 734,{
+prt_in,85,99,3 script Knight#kabuto 4_M_JOB_KNIGHT2,{
if (BaseJob == Job_Knight) {
if (KNGT_SK == 10) {
mes "[Essofeit]";
@@ -306,7 +306,7 @@ prt_in,85,99,3 script Knight#kabuto 734,{
close;
}
-prontera,69,351,0 script #tour 111,5,5,{
+prontera,69,351,0 script #tour HIDDEN_NPC,5,5,{
//OnTouch2:
OnTouch:
if (KNGT_SK > 2)
@@ -339,7 +339,7 @@ OnTouch:
close;
}
-prontera,72,352,7 script Grand Master 733,{
+prontera,72,352,7 script Grand Master 4_M_JOB_KNIGHT1,{
mes "[Grand Master]";
if (KNGT_SK == 2 || KNGT_SK == 3) {
mes "Alright men, you don't";
@@ -372,7 +372,7 @@ prontera,72,352,7 script Grand Master 733,{
close;
}
-prontera,78,354,3 script Knight#zabii 734,{
+prontera,78,354,3 script Knight#zabii 4_M_JOB_KNIGHT2,{
if (KNGT_SK == 3 || KNGT_SK == 4) {
mes "[Zabi]";
mes "I guess we're more like";
@@ -410,7 +410,7 @@ prontera,78,354,3 script Knight#zabii 734,{
close;
}
-prontera,73,357,5 script Knight#drake 734,{
+prontera,73,357,5 script Knight#drake 4_M_JOB_KNIGHT2,{
if (KNGT_SK == 4 || KNGT_SK == 5) {
mes "[Gon]";
mes "What'll I get with";
@@ -444,7 +444,7 @@ prontera,73,357,5 script Knight#drake 734,{
close;
}
-prontera,78,357,3 script Knight#sasword 734,{
+prontera,78,357,3 script Knight#sasword 4_M_JOB_KNIGHT2,{
mes "[Jiya]";
if (KNGT_SK == 5 || KNGT_SK == 6) {
mes "Man, this division of";
@@ -471,7 +471,7 @@ prontera,78,357,3 script Knight#sasword 734,{
close;
}
-prontera,66,358,5 script Knight#gattack 733,{
+prontera,66,358,5 script Knight#gattack 4_M_JOB_KNIGHT1,{
mes "[Gatack]";
if (KNGT_SK == 7) {
mes "Wait, where's";
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 374330778..3b250b647 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Fixed JobLevel requirements. [Euphy]
//============================================================
-geffen_in,151,119,4 script Great Wizard 64,{
+geffen_in,151,119,4 script Great Wizard 1_M_WIZARD,{
mes "[BLIZZARDRISS]";
mes "Hey ! My friend !";
mes "I see that you are a mage.";
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 55bc11381..592c6b9dd 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Moved Alberta NPC to pre-re/re paths. [Euphy]
//============================================================
-alberta,83,96,5 script Necko 98,7,7,{
+alberta,83,96,5 script Necko 4W_M_02,7,7,{
if (BaseClass == Job_Merchant) {
if (getskilllv("MC_LOUD") == 1) {
mes "[Necko]";
@@ -177,7 +177,7 @@ OnTouch:
close;
}
-alberta,119,221,6 script Charlron 107,{
+alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{
if (BaseClass == Job_Merchant) {
if (getskilllv("MC_CHANGECART") == 1) {
mes "[Charlron]";
diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt
index 920827f51..1522dec86 100644
--- a/npc/quests/skills/monk_skills.txt
+++ b/npc/quests/skills/monk_skills.txt
@@ -11,7 +11,7 @@
//= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-prt_monk,270,198,3 script Apprentice Monk#qsk_mo 753,{
+prt_monk,270,198,3 script Apprentice Monk#qsk_mo 4_M_MONK,{
if (BaseJob == Job_Monk) {
if (MONK_SK == 7) {
mes "[Monk]";
@@ -209,7 +209,7 @@ prt_monk,270,198,3 script Apprentice Monk#qsk_mo 753,{
close;
}
-monk_test,316,69,5 script Monk#qsk_mo 823,{
+monk_test,316,69,5 script Monk#qsk_mo 4_M_CHNMONK,{
if (BaseJob == Job_Monk) {
if (MONK_SK == 6) {
mes "[Monk]";
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index a3028bc93..c7512b38b 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Added Baby support. [Zopokx]
//============================================================
-prt_in,234,133,4 script Nami 66,{
+prt_in,234,133,4 script Nami 1_F_01,{
if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 3 || BaseLevel > 11) && (skill_nov < 3)) {
mes "[Nami]";
mes "Hello!";
@@ -187,7 +187,7 @@ prt_in,234,133,4 script Nami 66,{
close;
}
-prt_in,73,87,4 script Chivalry Member 65,{
+prt_in,73,87,4 script Chivalry Member 1_M_YOUNGKNIGHT,{
if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 6) && ((skill_nov >= 3) && (skill_nov <= 5))) {
mes "[Bulma]";
mes "Yeah. . . I look great. . .";
@@ -355,7 +355,7 @@ prt_in,73,87,4 script Chivalry Member 65,{
close;
}
-prt_castle,175,146,4 script Nursing Instructor 50,{
+prt_castle,175,146,4 script Nursing Instructor 1_M_04,{
mes "[Dread Lord]";
mes ". . . . . . . . . .";
mes ". . . . . . . . . .";
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 5cb0f7ba8..ebed55087 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-prt_church,111,112,1 script Sister Linus 79,{
+prt_church,111,112,1 script Sister Linus 1_F_PRIEST,{
if (BaseJob == Job_Priest) {
if (PRIEST_SK == 100) {
if (getskilllv("PR_REDEMPTIO") == 0) {
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 6d9034627..7f12d3d2e 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -46,7 +46,7 @@ OnTimer150000:
end;
}
-in_rogue,357,174,2 script Killer#Rogueguild 705,1,1,{
+in_rogue,357,174,2 script Killer#Rogueguild 4_M_GEF_SOLDIER,1,1,{
OnInit:
disablenpc "Killer#Rogueguild";
end;
@@ -129,7 +129,7 @@ OnTouch:
end;
}
-in_rogue,355,179,0 script Haijara Greg#rogueguild 46,{
+in_rogue,355,179,0 script Haijara Greg#rogueguild 1_ETC_01,{
if (BaseJob == Job_Rogue) {
if (ROG_SK == 12 && Upper == 1) {
mes "[Haijara Greg]";
@@ -539,7 +539,7 @@ in_rogue,355,179,0 script Haijara Greg#rogueguild 46,{
}
}
-in_rogue,152,29,0 script Louis Greg#rogueguild 84,{
+in_rogue,152,29,0 script Louis Greg#rogueguild 4_M_02,{
if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
if (ROG_SK < 1) {
mes "[Louis Greg]";
@@ -694,7 +694,7 @@ in_rogue,152,29,0 script Louis Greg#rogueguild 84,{
close;
}
-in_rogue,268,125,2 script Thor Greg#rogueguild 86,{
+in_rogue,268,125,2 script Thor Greg#rogueguild 4_M_04,{
if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
if (ROG_SK < 1) {
mes "[Thor Greg]";
@@ -886,7 +886,7 @@ in_rogue,268,125,2 script Thor Greg#rogueguild 86,{
close;
}
-in_rogue,181,114,3 script Jay Greg#rogueguild 85,{
+in_rogue,181,114,3 script Jay Greg#rogueguild 4_M_03,{
if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
if (ROG_SK < 1) {
mes "[Jay Greg]";
@@ -1151,19 +1151,19 @@ OnDisable:
end;
}
-prt_are01,149,162,0 script Kienna#1st 700,1,1,{
+prt_are01,149,162,0 script Kienna#1st 8_F_GIRL,1,1,{
end;
OnTouch:
callfunc "F_Kienna",strnpcinfo(2);
end;
}
-prt_are01,136,150,0 duplicate(Kienna#1st) Kienna#2nd 700,1,1
-prt_are01,150,138,0 duplicate(Kienna#1st) Kienna#3rd 700,1,1
-prt_are01,163,147,0 duplicate(Kienna#1st) Kienna#4th 700,1,1
-prt_are01,134,140,0 duplicate(Kienna#1st) Kienna#5th 700,1,1
-prt_are01,161,140,0 duplicate(Kienna#1st) Kienna#6th 700,1,1
-prt_are01,161,160,0 duplicate(Kienna#1st) Kienna#7th 700,1,1
-prt_are01,138,159,0 duplicate(Kienna#1st) Kienna#8th 700,1,1
+prt_are01,136,150,0 duplicate(Kienna#1st) Kienna#2nd 8_F_GIRL,1,1
+prt_are01,150,138,0 duplicate(Kienna#1st) Kienna#3rd 8_F_GIRL,1,1
+prt_are01,163,147,0 duplicate(Kienna#1st) Kienna#4th 8_F_GIRL,1,1
+prt_are01,134,140,0 duplicate(Kienna#1st) Kienna#5th 8_F_GIRL,1,1
+prt_are01,161,140,0 duplicate(Kienna#1st) Kienna#6th 8_F_GIRL,1,1
+prt_are01,161,160,0 duplicate(Kienna#1st) Kienna#7th 8_F_GIRL,1,1
+prt_are01,138,159,0 duplicate(Kienna#1st) Kienna#8th 8_F_GIRL,1,1
function script F_Kienna {
if (ROG_SK == 6) {
@@ -1336,7 +1336,7 @@ OnInit:
end;
}
-in_rogue,88,119,3 script Waiting Room#rogue10 828,{
+in_rogue,88,119,3 script Waiting Room#rogue10 4_M_ROGUE,{
OnEnable:
enablenpc "Waiting Room#rogue10";
enablewaitingroomevent "Waiting Room#rogue10";
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index c66978a85..5fdc38741 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Optimized. [Euphy]
//============================================================
-yuno_in03,176,24,3 script Mischna 755,{
+yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
if(BaseJob != Job_Sage) {
mes "[Mishuna]";
mes "Good day, I'm Mishuna, one";
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 7441d5caf..4e152c780 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Fixed JobLevel requirements. [Euphy]
//============================================================
-izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
+izlude_in,175,130,2 script Knight De Thomas 4W_M_02,4,4,{
if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
mes "[De Thomas]";
mes "Oh, no! You must have been hurt! Are you ok?";
@@ -147,7 +147,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
close;
}
-prt_in,75,88,5 script Leon Von Frich 85,3,3,{
+prt_in,75,88,5 script Leon Von Frich 4_M_03,3,3,{
if ((BaseClass == Job_Swordman) && (JobLevel >= 25 || (BaseJob == Job_Knight || BaseJob == Job_Crusader))) {
if (getskilllv("SM_FATALBLOW") == 1) {
@@ -301,7 +301,7 @@ OnTouch:
close;
}
-prt_in,94,57,3 script Juan 85,4,4,{
+prt_in,94,57,3 script Juan 4_M_03,4,4,{
if (BaseClass == Job_Swordman) {
if (getskilllv("SM_AUTOBERSERK") == 1) {
mes "[Juan]";
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 329209c57..c0f97859b 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -14,7 +14,7 @@
//= 1.8 Fixed JobLevel requirement for Assassins and Rogues. [Joseph]
//============================================================
-moc_prydb1,154,128,4 script Alcouskou 118,{
+moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{
if (BaseClass == Job_Thief) {
mes "[Alcouskou]";
mes "As you live life you will encounter";
@@ -429,7 +429,7 @@ moc_prydb1,154,128,4 script Alcouskou 118,{
close;
}
-payon,91,77,3 script Bag Seller 99,{
+payon,91,77,3 script Bag Seller 4W_M_03,{
mes "[RuRumuni]";
mes "I am a humble merchant here";
mes "in Payon. I buy the leather";
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index 663c6e01e..4cab1ffe6 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-gef_tower,115,36,4 script Meow#q_wiz 876,{
+gef_tower,115,36,4 script Meow#q_wiz 4_CAT,{
if (BaseJob == Job_Wizard) {
if (WIZ_SK == 100) {
if (getskilllv("WZ_SIGHTBLASTER") == 0) {
@@ -351,7 +351,7 @@ gef_tower,115,36,4 script Meow#q_wiz 876,{
}
}
-prt_in,82,98,3 script Simon Mayace#q_wiz 46,{
+prt_in,82,98,3 script Simon Mayace#q_wiz 1_ETC_01,{
if (WIZ_SK == 1) {
mes "[Simon]";
mes "Ah, you must be a skilled";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 00:30:44 +0000