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/airports/izlude.txt | 2 +- npc/pre-re/cities/alberta.txt | 16 +++---- npc/pre-re/cities/izlude.txt | 18 +++---- npc/pre-re/cities/jawaii.txt | 2 +- npc/pre-re/cities/yuno.txt | 14 +++--- npc/pre-re/guides/guides_alberta.txt | 4 +- npc/pre-re/guides/guides_aldebaran.txt | 4 +- npc/pre-re/guides/guides_amatsu.txt | 4 +- npc/pre-re/guides/guides_ayothaya.txt | 2 +- npc/pre-re/guides/guides_comodo.txt | 6 +-- npc/pre-re/guides/guides_einbroch.txt | 10 ++-- npc/pre-re/guides/guides_geffen.txt | 4 +- npc/pre-re/guides/guides_gonryun.txt | 2 +- npc/pre-re/guides/guides_hugel.txt | 2 +- npc/pre-re/guides/guides_izlude.txt | 2 +- npc/pre-re/guides/guides_juno.txt | 2 +- npc/pre-re/guides/guides_lighthalzen.txt | 8 ++-- npc/pre-re/guides/guides_louyang.txt | 6 +-- npc/pre-re/guides/guides_morroc.txt | 4 +- npc/pre-re/guides/guides_moscovia.txt | 2 +- npc/pre-re/guides/guides_niflheim.txt | 2 +- npc/pre-re/guides/guides_payon.txt | 4 +- npc/pre-re/guides/guides_prontera.txt | 10 ++-- npc/pre-re/guides/guides_rachel.txt | 2 +- npc/pre-re/guides/guides_umbala.txt | 2 +- npc/pre-re/guides/guides_veins.txt | 4 +- 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 +-- npc/pre-re/jobs/novice/novice.txt | 56 +++++++++++----------- npc/pre-re/kafras/kafras.txt | 2 +- npc/pre-re/merchants/ammo_boxes.txt | 2 +- npc/pre-re/merchants/ammo_dealer.txt | 2 +- npc/pre-re/merchants/shops.txt | 12 ++--- npc/pre-re/other/bulletin_boards.txt | 2 +- npc/pre-re/other/mercenary_rent.txt | 4 +- npc/pre-re/other/msg_boards.txt | 4 +- npc/pre-re/other/pvp.txt | 4 +- npc/pre-re/other/resetskill.txt | 2 +- npc/pre-re/other/turbo_track.txt | 2 +- npc/pre-re/quests/collection/quest_alligator.txt | 2 +- npc/pre-re/quests/collection/quest_caramel.txt | 2 +- npc/pre-re/quests/collection/quest_coco.txt | 2 +- npc/pre-re/quests/collection/quest_creamy.txt | 2 +- npc/pre-re/quests/collection/quest_demonpungus.txt | 2 +- .../quests/collection/quest_disguiseloliruri.txt | 2 +- npc/pre-re/quests/collection/quest_dokebi.txt | 2 +- npc/pre-re/quests/collection/quest_dryad.txt | 2 +- npc/pre-re/quests/collection/quest_fabre.txt | 2 +- npc/pre-re/quests/collection/quest_frilldora.txt | 2 +- npc/pre-re/quests/collection/quest_goat.txt | 2 +- npc/pre-re/quests/collection/quest_golem.txt | 2 +- npc/pre-re/quests/collection/quest_hode.txt | 2 +- npc/pre-re/quests/collection/quest_leafcat.txt | 2 +- npc/pre-re/quests/collection/quest_mantis.txt | 2 +- npc/pre-re/quests/collection/quest_pecopeco.txt | 2 +- npc/pre-re/quests/collection/quest_pupa.txt | 2 +- npc/pre-re/quests/collection/quest_zhupolong.txt | 2 +- npc/pre-re/quests/first_class/tu_archer.txt | 2 +- npc/pre-re/quests/monstertamers.txt | 2 +- npc/pre-re/quests/mrsmile.txt | 2 +- npc/pre-re/quests/quests_13_1.txt | 2 +- npc/pre-re/quests/quests_izlude.txt | 2 +- npc/pre-re/quests/quests_lighthalzen.txt | 2 +- npc/pre-re/quests/quests_nameless.txt | 2 +- npc/pre-re/quests/quests_veins.txt | 2 +- npc/pre-re/warps/fields/morroc_fild.txt | 4 +- npc/pre-re/warps/fields/veins_fild.txt | 2 +- 71 files changed, 178 insertions(+), 178 deletions(-) (limited to 'npc/pre-re') diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt index 29e07da86..b581c283e 100644 --- a/npc/pre-re/airports/izlude.txt +++ b/npc/pre-re/airports/izlude.txt @@ -8,4 +8,4 @@ //= Official NPCs. //============================================================ -izlude,206,55,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90 +izlude,206,55,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 4_F_01 diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt index 20efaad81..4ba223b6e 100644 --- a/npc/pre-re/cities/alberta.txt +++ b/npc/pre-re/cities/alberta.txt @@ -13,29 +13,29 @@ // cities/amatsu.txt //============================================================ -alberta,245,93,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 709 +alberta,245,93,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 4_M_SEAMAN // cities/ayothaya.txt //============================================================ -alberta,247,42,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 843 +alberta,247,42,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 4_M_THAIONGBAK // cities/gonryun.txt //============================================================ -alberta,245,69,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 776 +alberta,245,69,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 4_M_TWMIDMAN // cities/louyang.txt //============================================================ -alberta,245,45,3 duplicate(Girl_louyang) Girl#0lou 815 +alberta,245,45,3 duplicate(Girl_louyang) Girl#0lou 4_F_CHNDRESS1 // cities/moscovia.txt //============================================================ -alberta,245,66,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 960 +alberta,245,66,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 4_F_RUSWOMAN2 // quests/quests_alberta.txt //============================================================ -alberta,247,122,4 duplicate(Sailor_alberta) Sailor#tur 709 -alberta,248,89,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 121 +alberta,247,122,4 duplicate(Sailor_alberta) Sailor#tur 4_M_SEAMAN +alberta,248,89,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 2_M_MOLGENSTEIN // quests/skills/merchant_skills.txt //============================================================ -alberta,232,106,6 duplicate(Gershaun_alberta) Gershaun 57 +alberta,232,106,6 duplicate(Gershaun_alberta) Gershaun 1_M_LIBRARYMASTER diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt index 531d8a40c..dfd4d3114 100644 --- a/npc/pre-re/cities/izlude.txt +++ b/npc/pre-re/cities/izlude.txt @@ -11,12 +11,12 @@ //= 1.0 First Version. //============================================================ -izlude,201,181,2 duplicate(Sailor_izlude) Sailor#izlude 100 -izlude,55,74,2 duplicate(Bonne_izlude) Bonne#izlude 90 -izlude,135,78,2 duplicate(Charfri_izlude) Charfri#izlude 91 -izlude,119,121,2 duplicate(Cuskoal_izlude) Cuskoal#izlude 124 -izlude,150,118,2 duplicate(Dega_izlude) Dega#izlude 84 -izlude,150,143,2 duplicate(Kylick_izlude) Kylick#izlude 97 -izlude,56,126,2 duplicate(Red_izlude) Red#izlude 85 -izlude,58,126,2 duplicate(Cebalis_izlude) Cebalis#izlude 98 -izlude,124,178,2 duplicate(Soldier_izlude) Soldier#izlude 105 +izlude,201,181,2 duplicate(Sailor_izlude) Sailor#izlude 4W_SAILOR +izlude,55,74,2 duplicate(Bonne_izlude) Bonne#izlude 4_F_01 +izlude,135,78,2 duplicate(Charfri_izlude) Charfri#izlude 4_F_02 +izlude,119,121,2 duplicate(Cuskoal_izlude) Cuskoal#izlude 4_F_TELEPORTER +izlude,150,118,2 duplicate(Dega_izlude) Dega#izlude 4_M_02 +izlude,150,143,2 duplicate(Kylick_izlude) Kylick#izlude 4W_M_01 +izlude,56,126,2 duplicate(Red_izlude) Red#izlude 4_M_03 +izlude,58,126,2 duplicate(Cebalis_izlude) Cebalis#izlude 4W_M_02 +izlude,124,178,2 duplicate(Soldier_izlude) Soldier#izlude 8W_SOLDIER diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt index 764612d7c..52527e372 100644 --- a/npc/pre-re/cities/jawaii.txt +++ b/npc/pre-re/cities/jawaii.txt @@ -11,4 +11,4 @@ //= 1.0 First Version. //============================================================ -izlude,171,185,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 +izlude,171,185,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 1_F_LIBRARYGIRL diff --git a/npc/pre-re/cities/yuno.txt b/npc/pre-re/cities/yuno.txt index 944c0e72f..db9617882 100644 --- a/npc/pre-re/cities/yuno.txt +++ b/npc/pre-re/cities/yuno.txt @@ -11,10 +11,10 @@ //= 1.0 First version. //============================================================ -yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 105 -yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 105 -yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 105 -yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 105 -yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 105 -yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 105 -yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 105 +yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 8W_SOLDIER +yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 8W_SOLDIER +yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 8W_SOLDIER +yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 8W_SOLDIER +yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 8W_SOLDIER +yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 8W_SOLDIER +yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 8W_SOLDIER diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt index 6cdcc77ab..ebdc144e9 100644 --- a/npc/pre-re/guides/guides_alberta.txt +++ b/npc/pre-re/guides/guides_alberta.txt @@ -19,7 +19,7 @@ // -Thanks to $ephiroth. //============================================================ -alberta,23,238,4 script Guide#alb::AlbGuide 105,{ +alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Alberta Guide]"; mes "Welcome to Alberta,"; @@ -154,4 +154,4 @@ alberta,23,238,4 script Guide#alb::AlbGuide 105,{ end; } -alberta,120,60,3 duplicate(AlbGuide) Guide#2alb 105 \ No newline at end of file +alberta,120,60,3 duplicate(AlbGuide) Guide#2alb 8W_SOLDIER \ No newline at end of file diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt index 8c68f6b7a..6abac6474 100644 --- a/npc/pre-re/guides/guides_aldebaran.txt +++ b/npc/pre-re/guides/guides_aldebaran.txt @@ -19,7 +19,7 @@ //= 1.7 Fixed viewpoint coordinates [Playtester] //============================================================ -aldebaran,139,63,4 script Soldier#alde 105,{ +aldebaran,139,63,4 script Soldier#alde 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Al De Baran Guard]"; mes "I'm just an ordinary guard"; @@ -54,7 +54,7 @@ aldebaran,139,63,4 script Soldier#alde 105,{ end; } -aldebaran,133,108,4 script Soldier#2alde 105,{ +aldebaran,133,108,4 script Soldier#2alde 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Al De Baran Guard]"; mes "I'm just an"; diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt index 15129e4ad..85bd79047 100644 --- a/npc/pre-re/guides/guides_amatsu.txt +++ b/npc/pre-re/guides/guides_amatsu.txt @@ -13,7 +13,7 @@ //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -amatsu,207,89,3 script Amatsu Guide#ama 758,{ +amatsu,207,89,3 script Amatsu Guide#ama 4_F_JPN,{ mes "[Amachang]"; mes "Welcome to Amatsu,"; mes "the town of kind towners"; @@ -67,7 +67,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 758,{ } } -amatsu,251,283,4 script Guide Man#2ama 767,{ +amatsu,251,283,4 script Guide Man#2ama 8_M_JPNSOLDIER,{ mes "[Guide Man]"; mes "Welcome, tourist from Rune-Midgard."; mes "I'm the guide of"; diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt index b8220873c..d13aa93e9 100644 --- a/npc/pre-re/guides/guides_ayothaya.txt +++ b/npc/pre-re/guides/guides_ayothaya.txt @@ -11,7 +11,7 @@ //= 1.0 First version [L0ne_W0lf] //============================================================ -ayothaya,203,169,3 script Noi#ayo 839,{ +ayothaya,203,169,3 script Noi#ayo 4_F_THAIGIRL,{ mes "[Noi]"; mes "Welcome to Ayotaya."; mes "Our beautiful village is built"; diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt index f9e068dec..de803a9c5 100644 --- a/npc/pre-re/guides/guides_comodo.txt +++ b/npc/pre-re/guides/guides_comodo.txt @@ -17,15 +17,15 @@ //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -comodo,322,178,4 script Comodo Guide#cmd::CmdGuide 700,{ +comodo,322,178,4 script Comodo Guide#cmd::CmdGuide 8_F_GIRL,{ callfunc "F_CmdGuide","Native Kokomo"; } -comodo,176,350,4 script Comodo Guide#2cmd 700,{ +comodo,176,350,4 script Comodo Guide#2cmd 8_F_GIRL,{ callfunc "F_CmdGuide","Native Nutcoco"; } -comodo,37,219,4 script Guide#2cmd 700,{ +comodo,37,219,4 script Guide#2cmd 8_F_GIRL,{ callfunc "F_CmdGuide","Native Papaya"; } diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt index bd4ec75f6..9eefe2535 100644 --- a/npc/pre-re/guides/guides_einbroch.txt +++ b/npc/pre-re/guides/guides_einbroch.txt @@ -16,7 +16,7 @@ //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -einbroch,72,202,4 script Guide#ein::EinGuide 852,{ +einbroch,72,202,4 script Guide#ein::EinGuide 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Einbroch Guide]"; mes "Welcome"; @@ -201,10 +201,10 @@ einbroch,72,202,4 script Guide#ein::EinGuide 852,{ end; } -einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 852 -einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 852 +einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 4_M_EIN_SOLDIER +einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 4_M_EIN_SOLDIER -einbech,67,37,4 script Guide#4ein::EinGuide2 852,{ +einbech,67,37,4 script Guide#4ein::EinGuide2 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Einbech Guide]"; mes "Welcome to Einbech,"; @@ -346,4 +346,4 @@ einbech,67,37,4 script Guide#4ein::EinGuide2 852,{ end; } -einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 852 +einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 4_M_EIN_SOLDIER diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt index e691f9e53..46d7e9007 100644 --- a/npc/pre-re/guides/guides_geffen.txt +++ b/npc/pre-re/guides/guides_geffen.txt @@ -18,7 +18,7 @@ //= Thanks to $ephiroth. //============================================================ -geffen,203,116,0 script Guide#gef::GefGuide 705,{ +geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{ cutin "gef_soldier",2; mes "[Geffen Guide]"; mes "Welcome to Geffen,"; @@ -169,4 +169,4 @@ geffen,203,116,0 script Guide#gef::GefGuide 705,{ end; } -geffen,118,62,0 duplicate(GefGuide) Guide#2gef 705 +geffen,118,62,0 duplicate(GefGuide) Guide#2gef 4_M_GEF_SOLDIER diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt index 3c8c3ac83..de9b2d599 100644 --- a/npc/pre-re/guides/guides_gonryun.txt +++ b/npc/pre-re/guides/guides_gonryun.txt @@ -11,7 +11,7 @@ //= 1.0 First version [L0ne_W0lf] //============================================================ -gonryun,163,60,4 script Kunlun Guide#gon 780,{ +gonryun,163,60,4 script Kunlun Guide#gon 8_M_TWSOLDIER,{ mes "[He Yuen Zhe]"; mes "Ni Hao!"; mes "Welcome to Kunlun~"; diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt index b1d64970f..b8a9711b1 100644 --- a/npc/pre-re/guides/guides_hugel.txt +++ b/npc/pre-re/guides/guides_hugel.txt @@ -13,7 +13,7 @@ //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -hugel,98,56,3 script Hugel Guide Granny#huge 863,0,0,{ +hugel,98,56,3 script Hugel Guide Granny#huge 4_F_LGTGRAND,0,0,{ mes "[Hugel Guide Granny]"; mes "Oh, hello~ you are one energetic adventurer."; mes "Welcome to Hugel. I was honored to guide you to this beautiful village."; diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt index 241d5ce40..ef84be488 100644 --- a/npc/pre-re/guides/guides_izlude.txt +++ b/npc/pre-re/guides/guides_izlude.txt @@ -17,7 +17,7 @@ // -Thanks to $ephiroth. //============================================================ -izlude,121,87,6 script Guide#iz 105,{ +izlude,121,87,6 script Guide#iz 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Izlude Guide]"; mes "Welcome to Izlude,"; diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt index 9475cb0e2..c1a847717 100644 --- a/npc/pre-re/guides/guides_juno.txt +++ b/npc/pre-re/guides/guides_juno.txt @@ -19,7 +19,7 @@ //= 1.7 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -yuno,153,47,4 script Juno Guide#yuno 700,{ +yuno,153,47,4 script Juno Guide#yuno 8_F_GIRL,{ mes "[Ms. Yoon]"; mes "A place that takes the vision of the future, and gives it form in the present. Welcome to"; mes "the city of Juno!"; diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt index 1d57d5b10..b194c546c 100644 --- a/npc/pre-re/guides/guides_lighthalzen.txt +++ b/npc/pre-re/guides/guides_lighthalzen.txt @@ -13,7 +13,7 @@ //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{ +lighthalzen,207,310,5 script Guide#lhz::LhzGuide 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Lighthalzen Guide]"; mes "Welcome to Lighthalzen,"; @@ -218,8 +218,8 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{ end; } -lighthalzen,220,311,3 duplicate(LhzGuide) Guide#2lhz 852 +lighthalzen,220,311,3 duplicate(LhzGuide) Guide#2lhz 4_M_EIN_SOLDIER -lighthalzen,154,100,5 duplicate(LhzGuide) Guide#3lhz 852 +lighthalzen,154,100,5 duplicate(LhzGuide) Guide#3lhz 4_M_EIN_SOLDIER -lighthalzen,307,224,3 duplicate(LhzGuide) Guide#4lhz 852 +lighthalzen,307,224,3 duplicate(LhzGuide) Guide#4lhz 4_M_EIN_SOLDIER diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt index 52e83c4ed..8b5b14c8b 100644 --- a/npc/pre-re/guides/guides_louyang.txt +++ b/npc/pre-re/guides/guides_louyang.txt @@ -13,7 +13,7 @@ //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -louyang,213,213,3 script Soldier#BA::LouGuide 825,{ +louyang,213,213,3 script Soldier#BA::LouGuide 4_M_CHNSOLDIER,{ mes "[Soldier]"; mes "Welcome to Louyang,"; mes "a city with a long"; @@ -123,9 +123,9 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ close; } -louyang,160,175,3 duplicate(LouGuide) Soldier#BB 825 +louyang,160,175,3 duplicate(LouGuide) Soldier#BB 4_M_CHNSOLDIER -louyang,224,104,3 script Representative#lou 818,{ +louyang,224,104,3 script Representative#lou 4_F_CHNWOMAN,{ mes "[Representative]"; mes "Welcome to Louyang,"; mes "an ancient land with"; diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt index 52dd77cac..d4b136094 100644 --- a/npc/pre-re/guides/guides_morroc.txt +++ b/npc/pre-re/guides/guides_morroc.txt @@ -16,7 +16,7 @@ // -Thanks to $ephiroth. //============================================================ -morocc,153,286,6 script Guide#moc::MocGuide 707,{ +morocc,153,286,6 script Guide#moc::MocGuide 4_M_MOC_SOLDIER,{ cutin "moc_soldier",2; mes "[Morroc Guide]"; mes "Welcome to Morroc,"; @@ -159,4 +159,4 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ end; } -morocc,54,97,0 duplicate(MocGuide) Guide#2moc 707 +morocc,54,97,0 duplicate(MocGuide) Guide#2moc 4_M_MOC_SOLDIER diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt index a06e1d8fa..b71f35006 100644 --- a/npc/pre-re/guides/guides_moscovia.txt +++ b/npc/pre-re/guides/guides_moscovia.txt @@ -11,7 +11,7 @@ //= 1.0 First Version. [Kisuka] //============================================================ -moscovia,161,76,4 script Moscovia Guide#mosk 959,{ +moscovia,161,76,4 script Moscovia Guide#mosk 4_F_RUSWOMAN1,{ mes "[Moscovia Guide]"; mes "Welcome to Moscovia"; mes "Here is the paradise spreading on"; diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt index 4eb165199..4c7a9b586 100644 --- a/npc/pre-re/guides/guides_niflheim.txt +++ b/npc/pre-re/guides/guides_niflheim.txt @@ -13,7 +13,7 @@ //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -niflheim,107,156,6 script Roaming Man#nif 798,{ +niflheim,107,156,6 script Roaming Man#nif 4_M_NFMAN,{ mes "[Ricael]"; mes "You must be lost..."; mes "Why would anyone come"; diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt index 5244fb3b7..4efc96737 100644 --- a/npc/pre-re/guides/guides_payon.txt +++ b/npc/pre-re/guides/guides_payon.txt @@ -19,7 +19,7 @@ //= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -payon,162,67,4 script Guide#pay 708,{ +payon,162,67,4 script Guide#pay 4_M_PAY_SOLDIER,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to the"; @@ -188,7 +188,7 @@ payon,162,67,4 script Guide#pay 708,{ end; } -pay_arche,85,30,2 script Guide#2pay 708,{ +pay_arche,85,30,2 script Guide#2pay 4_M_PAY_SOLDIER,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to the"; diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt index 68be56b2e..7a97a764c 100644 --- a/npc/pre-re/guides/guides_prontera.txt +++ b/npc/pre-re/guides/guides_prontera.txt @@ -21,7 +21,7 @@ // -Thanks to Brainstorm. //============================================================ -prontera,154,187,4 script Guide#prt::PrtGuide 105,{ +prontera,154,187,4 script Guide#prt::PrtGuide 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Prontera Guide]"; mes "Welcome to Prontera,"; @@ -231,10 +231,10 @@ prontera,154,187,4 script Guide#prt::PrtGuide 105,{ end; } -prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 105 +prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 8W_SOLDIER -prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 105 +prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 8W_SOLDIER -prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 105 +prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 8W_SOLDIER -prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 105 +prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 8W_SOLDIER diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt index c78068071..2380a465a 100644 --- a/npc/pre-re/guides/guides_rachel.txt +++ b/npc/pre-re/guides/guides_rachel.txt @@ -17,7 +17,7 @@ //= 1.2b Deleted a unnecessary "end". [Samuray22] //============================================================ -rachel,138,146,5 script Rachel Guide 934,{ +rachel,138,146,5 script Rachel Guide 4_M_RASWORD,{ mes "[Rachel Guide]"; mes "Welcome to the capital of"; mes "Arunafeltz, Rachel where a warm"; diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt index dee3cf27a..23ce98c29 100644 --- a/npc/pre-re/guides/guides_umbala.txt +++ b/npc/pre-re/guides/guides_umbala.txt @@ -15,7 +15,7 @@ //= 1.6 Corrected activating ontouch. [L0ne_W0lf] //============================================================ -umbala,128,94,4 script Adventurer#um 702,{ +umbala,128,94,4 script Adventurer#um 4_F_GON,{ mes "[Adventurer]"; mes "This is a very strange place..."; mes "It's underdeveloped, and there"; diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt index 5d448c635..99df4106e 100644 --- a/npc/pre-re/guides/guides_veins.txt +++ b/npc/pre-re/guides/guides_veins.txt @@ -13,7 +13,7 @@ //= 1.2 Fixed a few small typos. [L0ne_W0lf] //============================================================ -veins,210,345,5 script Veins Guide#1::ve_guide 934,{ +veins,210,345,5 script Veins Guide#1::ve_guide 4_M_RASWORD,{ mes "[Veins Guide]"; mes "Desert City Veins welcomes adventurers seeking shelter from harsh sandstorms."; mes "If this is the first time for you to use the guide services, why don't you check the..."; @@ -124,4 +124,4 @@ veins,210,345,5 script Veins Guide#1::ve_guide 934,{ close; } -veins,189,101,5 duplicate(ve_guide) Veins Guide#2 934 +veins,189,101,5 duplicate(ve_guide) Veins Guide#2 4_M_RASWORD 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."; diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index 909ba2d88..2f15fa995 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -24,21 +24,21 @@ //============================================================ // Bulletin Board -new_1-1,66,114,4 script Bulletin Board#nv 111,{ +new_1-1,66,114,4 script Bulletin Board#nv HIDDEN_NPC,{ mes "^FF0000=================================^000000"; mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000"; mes "^FF0000=================================^000000"; close; } -new_1-1,144,116,2 script Guard#nv1 105,{ +new_1-1,144,116,2 script Guard#nv1 8W_SOLDIER,{ mes "[Training Grounds Guard]"; mes "Welcome to the Training Grounds."; mes "You are now in the outer court yard. Please go inside the castle to begin your training."; close; } -new_1-1,144,107,2 script Guard#nv2 105,{ +new_1-1,144,107,2 script Guard#nv2 8W_SOLDIER,{ mes "[Training Grounds Guard]"; if(rand(2)) { mes "Come in!"; @@ -60,7 +60,7 @@ new_1-1,144,107,2 script Guard#nv2 105,{ } // Receptionist -new_1-2,100,29,4 script Receptionist#nv1 86,{ +new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{ mes "[Training Grounds Receptionist]"; mes "Hello, you look to be new here."; mes "What is your name?"; @@ -177,7 +177,7 @@ new_1-2,100,29,4 script Receptionist#nv1 86,{ } } -new_1-1,53,114,4 script Shion#nv1 727,{ +new_1-1,53,114,4 script Shion#nv1 4_F_JOB_HUNTER,{ if (nov_get_item04 > 9 || nov_get_item05 > 9) { mes "[Shion]"; mes "Hm...?"; @@ -349,7 +349,7 @@ new_1-1,53,114,4 script Shion#nv1 727,{ } // Interfaces Tutor -new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{ +new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) { mes "[Kris]"; mes "You've completed all the essential courses. Have you spoken to the assistant tutors already? The field combat training will be your next course. Would you like to proceed?"; @@ -626,7 +626,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{ } } -new_1-2,83,111,3 script Skill Tutor#nv 753,{ +new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{ if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) { mes "[Cecil]"; mes "Huh...?"; @@ -883,7 +883,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{ } } -new_1-2,115,111,3 script Item Tutor#nv 726,{ +new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) { mes "[Alice]"; mes "Huh...?"; @@ -1231,7 +1231,7 @@ new_1-2,115,111,3 script Item Tutor#nv 726,{ } } -new_1-2,118,108,3 script Kafra Employee#nv1 117,{ +new_1-2,118,108,3 script Kafra Employee#nv1 4_F_KAFRA1,{ mes "[Kafra Employee]"; mes "Welcome to"; mes "Kafra Corporation."; @@ -1530,7 +1530,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ } //Interface Assistant -new_1-2,161,182,5 script Instructor#nv 92,{ +new_1-2,161,182,5 script Instructor#nv 4_F_03,{ mes "[Edwin]"; mes "Welcome to my class."; mes "Choose the subject you"; @@ -1699,7 +1699,7 @@ new_1-2,161,182,5 script Instructor#nv 92,{ } } -new_1-2,182,182,3 script Somatology Instructor 754,{ +new_1-2,182,182,3 script Somatology Instructor 4_M_SAGE_A,{ mes "[Jare Riotte]"; mes "Welcome, new adventurer."; mes "I, Jare Riotte will help you to learn about the fundamental"; @@ -1890,7 +1890,7 @@ new_1-2,182,182,3 script Somatology Instructor 754,{ } } -new_1-2,184,172,1 script Understandings of Skills 47,{ +new_1-2,184,172,1 script Understandings of Skills 1_M_01,{ mes "[Leo Handerson]"; mes "Welcome~"; mes "Oh look at this"; @@ -2150,7 +2150,7 @@ new_1-2,184,172,1 script Understandings of Skills 47,{ } } -new_1-2,121,101,2 script Guide Soldier#nv1 105,{ +new_1-2,121,101,2 script Guide Soldier#nv1 8W_SOLDIER,{ mes "[Guide Soldier]"; mes "We Guide Soldiers provide location information at the entrance of every town. You can easily find us by our special uniforms."; next; @@ -2163,7 +2163,7 @@ new_1-2,121,101,2 script Guide Soldier#nv1 105,{ close; } -new_1-2,17,182,5 script Helper#nv 84,{ +new_1-2,17,182,5 script Helper#nv 4_M_02,{ if (nov_2nd_cos < 11) { mes "[Elmeen]"; mes "Congratulations!"; @@ -2449,7 +2449,7 @@ new_1-2,17,182,5 script Helper#nv 84,{ } } -new_1-2,38,182,3 script Entrance Guard#nv 92,{ +new_1-2,38,182,3 script Entrance Guard#nv 4_F_03,{ if (nov_2nd_cos == 0) { mes "[Muriel]"; mes "I'm sorry, but I can't let anybody who hasn't been instructed on fighting enter the Field Combat Training Grounds."; @@ -2617,7 +2617,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 92,{ } //Teleport NPC -new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{ +new_1-3,95,30,4 script Trainer#nv1::NovHoffman 4_M_02,{ mes "[Hoffman]"; mes "Hey there~"; mes "I'm here to provide"; @@ -2690,12 +2690,12 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{ } } -new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 84 -new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 84 -new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 84 -new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 84 +new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 4_M_02 +new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 4_M_02 +new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 4_M_02 +new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 4_M_02 -new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{ +new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 4_M_03,{ mes "[Keyman]"; mes "Good!!"; mes "Now you know how to fight"; @@ -2721,15 +2721,15 @@ new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{ } } -new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 85 -new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 85 -new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 85 -new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 85 +new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 4_M_03 +new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 4_M_03 +new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 4_M_03 +new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 4_M_03 //Potato Merchant -new_1-2,28,185,4 shop Potato Merchant 90,516:15 +new_1-2,28,185,4 shop Potato Merchant 4_F_01,516:15 -new_1-4,100,29,1 script Hanson#nv 46,{ +new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ if (checkweight(909,400) == 0) { mes "[Hanson]"; mes "All of the items you are carrying must be quite a burden. Where did you get so much things? Please lighten your weight by getting rid of things you don't need."; @@ -3961,7 +3961,7 @@ S_UserJobchoice: } //Novice Instructor -new_1-4,91,22,4 script Bruce#nv 57,{ +new_1-4,91,22,4 script Bruce#nv 1_M_LIBRARYMASTER,{ if (Class == Job_Novice) { if (nov_3_swordman == 20) { mes "[Bruce]"; diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt index b5fbbd31e..e900a0fa6 100644 --- a/npc/pre-re/kafras/kafras.txt +++ b/npc/pre-re/kafras/kafras.txt @@ -19,4 +19,4 @@ // Izlude //============================================================ -izlude,134,87,3 duplicate(kaf_izlude) Kafra Employee#iz 117 +izlude,134,87,3 duplicate(kaf_izlude) Kafra Employee#iz 4_F_KAFRA1 diff --git a/npc/pre-re/merchants/ammo_boxes.txt b/npc/pre-re/merchants/ammo_boxes.txt index 28b220e17..a78adaca6 100644 --- a/npc/pre-re/merchants/ammo_boxes.txt +++ b/npc/pre-re/merchants/ammo_boxes.txt @@ -10,4 +10,4 @@ //= 1.0 First version, Pre-Renewal duplicates. //============================================================ -izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny#iz 83 +izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01 diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt index 4286121b2..8cf77542b 100644 --- a/npc/pre-re/merchants/ammo_dealer.txt +++ b/npc/pre-re/merchants/ammo_dealer.txt @@ -10,4 +10,4 @@ //= 1.0 First version, Pre-Renewal duplicates. //============================================================ -izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 86 +izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index 60864123d..d303f35b4 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -14,9 +14,9 @@ //======================================================= // Izlude //======================================================= -izlude,105,99,0 shop Butcher#iz 54,517:-1 -izlude,94,98,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1 -izlude,105,92,7 shop Vendor from Milk Ranch#i 90,519:-1 -izlude,164,138,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 -izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 -izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 +izlude,105,99,0 shop Butcher#iz 1_M_JOBGUIDER,517:-1 +izlude,94,98,4 shop Fruit Gardener#iz 1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1 +izlude,105,92,7 shop Vendor from Milk Ranch#i 4_F_01,519:-1 +izlude,164,138,4 shop Pet Groomer#iz 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +izlude_in,115,61,0 shop Tool Dealer#iz 1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 +izlude_in,121,64,3 shop Trading Merchant#iz 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt index d4a50491f..ed2b210c0 100644 --- a/npc/pre-re/other/bulletin_boards.txt +++ b/npc/pre-re/other/bulletin_boards.txt @@ -10,7 +10,7 @@ //= 1.0 Moved Izlude NPCs to Pre-RE/RE paths. //============================================================ -izlude,131,116,4 script Bulletin Board#5 837,{ +izlude,131,116,4 script Bulletin Board#5 2_BULLETIN_BOARD,{ mes "[Izlude: The Satellite City]"; mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population."; next; diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt index 938c3dfa7..5c382a0e0 100644 --- a/npc/pre-re/other/mercenary_rent.txt +++ b/npc/pre-re/other/mercenary_rent.txt @@ -11,5 +11,5 @@ //= 1.0 First version. [Daegaladh] //============================================================ -izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 734 -izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892 +izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 4_M_JOB_KNIGHT2 +izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUGRANMA diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt index 01c10e265..60c7133f0 100644 --- a/npc/pre-re/other/msg_boards.txt +++ b/npc/pre-re/other/msg_boards.txt @@ -13,13 +13,13 @@ // Izlude //============================================================ -izlude,54,139,1 script Sign#Iz1 111,{ +izlude,54,139,1 script Sign#Iz1 HIDDEN_NPC,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome to the Swordsman Academy."; close; } -izlude,144,148,1 script Sign#Iz2 111,{ +izlude,144,148,1 script Sign#Iz2 HIDDEN_NPC,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome."; close; diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt index de49cfdc3..55d6bae79 100644 --- a/npc/pre-re/other/pvp.txt +++ b/npc/pre-re/other/pvp.txt @@ -13,7 +13,7 @@ // PVP Warpers //============================================================ -pvp_y_room,86,85,4 script Fight Square Reception#8 105,{ +pvp_y_room,86,85,4 script Fight Square Reception#8 8W_SOLDIER,{ callfunc "F_PVP_FSRS"; end; @@ -22,7 +22,7 @@ OnInit: end; } -pvp_n_room,30,85,4 script Fight Square Reception#n 105,{ +pvp_n_room,30,85,4 script Fight Square Reception#n 8W_SOLDIER,{ callfunc "F_PVP_FSRS"; end; diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt index 698b89e51..b7af66906 100644 --- a/npc/pre-re/other/resetskill.txt +++ b/npc/pre-re/other/resetskill.txt @@ -13,7 +13,7 @@ //= 1.0 First version. [L0ne_W0lf] //============================================================ -prontera,146,232,4 script Hypnotist#2 124,{ +prontera,146,232,4 script Hypnotist#2 4_F_TELEPORTER,{ mes "[Hypnotist]"; mes "Greetings, adventurer."; mes "I'm a member of the Hypnotist"; diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt index 24ebea721..ec670fbad 100644 --- a/npc/pre-re/other/turbo_track.txt +++ b/npc/pre-re/other/turbo_track.txt @@ -11,4 +11,4 @@ //= 1.0 Split Peco Peco Manager NPC. //============================================================ -alde_gld,181,199,5 duplicate(MountManager_turbo) Peco Peco Manager 845 +alde_gld,181,199,5 duplicate(MountManager_turbo) Peco Peco Manager 4_F_RACING diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt index 678d93ee3..79c121ba5 100644 --- a/npc/pre-re/quests/collection/quest_alligator.txt +++ b/npc/pre-re/quests/collection/quest_alligator.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -cmd_fild01,362,256,3 script Cuir#Gator_Hunt 106,{ +cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ if (checkquest(60119) != -1) { if (checkquest(60119,HUNTING) != 2 ) { mes "[Cuir]"; diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt index 10020be11..6815c62e1 100644 --- a/npc/pre-re/quests/collection/quest_caramel.txt +++ b/npc/pre-re/quests/collection/quest_caramel.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 95,{ +mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ if (checkquest(60116) != -1) { if (checkquest(60116,HUNTING) != 2 ) { mes "[Yullo]"; diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt index e30ea5a6a..7ba4cab02 100644 --- a/npc/pre-re/quests/collection/quest_coco.txt +++ b/npc/pre-re/quests/collection/quest_coco.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -mjolnir_01,293,20,3 script Nutters#Coco_Hunt 779,{ +mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ if (checkquest(60113) != -1) { if (checkquest(60113,HUNTING) != 2 ) { mes "[Nutters]"; diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt index de9cb68c7..ecdb6b0fb 100644 --- a/npc/pre-re/quests/collection/quest_creamy.txt +++ b/npc/pre-re/quests/collection/quest_creamy.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -prt_fild04,356,148,3 script Laertes#Creamy_Hunt 798,{ +prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ if (checkquest(60122) != -1) { if (checkquest(60122,HUNTING) != 2 ) { mes "[Laertes]"; diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt index 1742d9618..242e7bca2 100644 --- a/npc/pre-re/quests/collection/quest_demonpungus.txt +++ b/npc/pre-re/quests/collection/quest_demonpungus.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -ein_fild01,43,249,0 script Local Villager#hunt 898,{ +ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ if (checkquest(60125) != -1) { if (checkquest(60125,HUNTING) != 2 ) { mes "[Local Villager]"; diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt index 1b6f37e28..35d48aef7 100644 --- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt +++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt @@ -11,7 +11,7 @@ //= 1.0 First version. //============================================================ -nif_fild02,332,327,4 script Deadman 795,{ +nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{ if (checkquest(60173) != -1) { if (checkquest(60173,HUNTING) != 2 ) { diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt index 8648d6c8c..62f0ed45d 100644 --- a/npc/pre-re/quests/collection/quest_dokebi.txt +++ b/npc/pre-re/quests/collection/quest_dokebi.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -pay_fild10,108,357,5 script Li#Dokebi_Hunt 90,{ +pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ if (checkquest(60128) != -1) { if (checkquest(60128,HUNTING) != 2 ) { mes "[Li]"; diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt index fe46a3118..552a1096f 100644 --- a/npc/pre-re/quests/collection/quest_dryad.txt +++ b/npc/pre-re/quests/collection/quest_dryad.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -um_fild01,34,281,5 script Lilla#Dryad_Hunt 724,{ +um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ if (checkquest(60131) != -1) { if (checkquest(60131,HUNTING) != 2 ) { mes "[Lilla]"; diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt index 8687872ad..bd11cf8ae 100644 --- a/npc/pre-re/quests/collection/quest_fabre.txt +++ b/npc/pre-re/quests/collection/quest_fabre.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -gef_fild07,321,193,4 script Langry#Fabre_Hunt 754,{ +gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ if (checkquest(60107) != -1) { if (checkquest(60107,HUNTING) != 2 ) { mes "[Langry]"; diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt index 8acaee3ae..5c9321aa6 100644 --- a/npc/pre-re/quests/collection/quest_frilldora.txt +++ b/npc/pre-re/quests/collection/quest_frilldora.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 725,{ +moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ if (checkquest(60134) != -1) { if (checkquest(60134,HUNTING) != 2 ) { mes "[Lemly]"; diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt index 628b3e26f..292a38459 100644 --- a/npc/pre-re/quests/collection/quest_goat.txt +++ b/npc/pre-re/quests/collection/quest_goat.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -ein_fild06,82,171,0 script Vegetable Farmer#Goat 919,{ +ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ if (checkquest(60137) != -1) { if (checkquest(60137,HUNTING) != 2 ) { mes "[Vegetable Farmer]"; diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt index 41142aaaf..2c927ea40 100644 --- a/npc/pre-re/quests/collection/quest_golem.txt +++ b/npc/pre-re/quests/collection/quest_golem.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -moc_fild11,57,138,0 script Private Jeremy#hunt 707,{ +moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ if (checkquest(60140) != -1) { if (checkquest(60140,HUNTING) != 2 ) { mes "[Private Jeremy]"; diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt index 6b5a25050..c534448d4 100644 --- a/npc/pre-re/quests/collection/quest_hode.txt +++ b/npc/pre-re/quests/collection/quest_hode.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -moc_fild17,208,346,5 script Shone#Hode_Hunt 707,{ +moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ if (checkquest(60104) != -1) { if (checkquest(60104,HUNTING) != 2 ) { mes "[Shone]"; diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt index 72e17f4f0..185ff2067 100644 --- a/npc/pre-re/quests/collection/quest_leafcat.txt +++ b/npc/pre-re/quests/collection/quest_leafcat.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 877,{ +ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ if (checkquest(60143) != -1) { if (checkquest(60143,HUNTING) != 2 ) { mes "[Lella]"; diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt index ab540e005..3eb18ca4f 100644 --- a/npc/pre-re/quests/collection/quest_mantis.txt +++ b/npc/pre-re/quests/collection/quest_mantis.txt @@ -11,7 +11,7 @@ //= 1.0 First version. //============================================================ -lou_fild01,240,354,4 script Mantis Researcher 878,{ +lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{ if (checkquest(60179) != -1) { if (checkquest(60179,HUNTING) != 2 ) { diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt index 6befd6076..3460320ce 100644 --- a/npc/pre-re/quests/collection/quest_pecopeco.txt +++ b/npc/pre-re/quests/collection/quest_pecopeco.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 97,{ +moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ if (checkquest(60101) != -1) { if (checkquest(60101,HUNTING) != 2 ) { mes "[Gregor]"; diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt index 607137cfe..64aafe42f 100644 --- a/npc/pre-re/quests/collection/quest_pupa.txt +++ b/npc/pre-re/quests/collection/quest_pupa.txt @@ -12,7 +12,7 @@ //= 1.0 First version. //============================================================ -gef_fild04,191,54,3 script Halgus#Pupa_Hunt 123,{ +gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ if (checkquest(60110) != -1) { if (checkquest(60110,HUNTING) != 2 ) { mes "[Halgus]"; diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt index b5a6360bf..a167ec3e5 100644 --- a/npc/pre-re/quests/collection/quest_zhupolong.txt +++ b/npc/pre-re/quests/collection/quest_zhupolong.txt @@ -11,7 +11,7 @@ //= 1.0 First version. //============================================================ -lou_dun02,161,264,4 script Dragon Hunter 732,{ +lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{ if (checkquest(60182) != -1) { if (checkquest(60182,HUNTING) != 2 ) { diff --git a/npc/pre-re/quests/first_class/tu_archer.txt b/npc/pre-re/quests/first_class/tu_archer.txt index 8686b5483..5f53d0385 100644 --- a/npc/pre-re/quests/first_class/tu_archer.txt +++ b/npc/pre-re/quests/first_class/tu_archer.txt @@ -11,4 +11,4 @@ //= 1.0 First version. [Euphy] //============================================================ -mjolnir_11,27,223,3 duplicate(Acolyte_Tu) Acolyte#tu 95 +mjolnir_11,27,223,3 duplicate(Acolyte_Tu) Acolyte#tu 4_F_SISTER diff --git a/npc/pre-re/quests/monstertamers.txt b/npc/pre-re/quests/monstertamers.txt index 594a8ed8e..6d998fdbf 100644 --- a/npc/pre-re/quests/monstertamers.txt +++ b/npc/pre-re/quests/monstertamers.txt @@ -10,4 +10,4 @@ //= 1.0 Moved Izlude NPC to pre-re/re paths. //============================================================ -izlude_in,129,64,4 duplicate(MonsterTamer_izlude) Monster Tamer#izu 125 +izlude_in,129,64,4 duplicate(MonsterTamer_izlude) Monster Tamer#izu 4_M_TELEPORTER diff --git a/npc/pre-re/quests/mrsmile.txt b/npc/pre-re/quests/mrsmile.txt index 8b304070d..525221af9 100644 --- a/npc/pre-re/quests/mrsmile.txt +++ b/npc/pre-re/quests/mrsmile.txt @@ -11,4 +11,4 @@ //= 1.0 First version. //============================================================ -izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 92 +izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 4_F_03 diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt index 8effb510b..ec291e16e 100644 --- a/npc/pre-re/quests/quests_13_1.txt +++ b/npc/pre-re/quests/quests_13_1.txt @@ -10,4 +10,4 @@ //= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] //============================================================ -izlude,101,173,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 100 +izlude,101,173,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 4W_SAILOR diff --git a/npc/pre-re/quests/quests_izlude.txt b/npc/pre-re/quests/quests_izlude.txt index 2b12066db..aac9f5467 100644 --- a/npc/pre-re/quests/quests_izlude.txt +++ b/npc/pre-re/quests/quests_izlude.txt @@ -10,4 +10,4 @@ //= 1.0 First version. //============================================================ -izlude,182,186,2 duplicate(Edgar_izlude) Edgar#izlude 49 +izlude,182,186,2 duplicate(Edgar_izlude) Edgar#izlude 1_M_03 diff --git a/npc/pre-re/quests/quests_lighthalzen.txt b/npc/pre-re/quests/quests_lighthalzen.txt index 708045ab1..c9365857a 100644 --- a/npc/pre-re/quests/quests_lighthalzen.txt +++ b/npc/pre-re/quests/quests_lighthalzen.txt @@ -10,4 +10,4 @@ //= 1.0 First version. //============================================================ -izlude,186,57,5 duplicate(Scamp) Scamp#iz 853 +izlude,186,57,5 duplicate(Scamp) Scamp#iz 4_M_YURI diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt index fa56dfbd2..77654e084 100644 --- a/npc/pre-re/quests/quests_nameless.txt +++ b/npc/pre-re/quests/quests_nameless.txt @@ -12,4 +12,4 @@ //= 1.0 Moved Dorian to pre-re/re paths. //============================================================ -izlude_in,110,64,3 duplicate(Dorian_izlude) Dorian 878,2,2 +izlude_in,110,64,3 duplicate(Dorian_izlude) Dorian 4_M_OILMAN,2,2 diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt index 64c4cd3b3..23262d482 100644 --- a/npc/pre-re/quests/quests_veins.txt +++ b/npc/pre-re/quests/quests_veins.txt @@ -10,4 +10,4 @@ //= 1.0 First version. //============================================================ -ve_fild05,257,130,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945 +ve_fild05,257,130,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 4_M_DST_GRAND diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt index 1e8fa0fa5..c79538814 100644 --- a/npc/pre-re/warps/fields/morroc_fild.txt +++ b/npc/pre-re/warps/fields/morroc_fild.txt @@ -41,7 +41,7 @@ moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23 //moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119 //moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380 //moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208 -//moc_fild04,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01",35,262; } +//moc_fild04,219,327,0 script mocf016 WARPNPC,3,4,{ set @anthell,0; warp "anthell01",35,262; } //moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25 //moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25 //moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25 @@ -94,7 +94,7 @@ moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37 //moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19 //moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380 //moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23 -//moc_fild15,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01",35,262; } +//moc_fild15,258,253,0 script mocf017 WARPNPC,3,3,{ set @anthell,1; warp "anthell01",35,262; } //moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379 //moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278 //moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197 diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt index ca93a2266..0bb03797b 100644 --- a/npc/pre-re/warps/fields/veins_fild.txt +++ b/npc/pre-re/warps/fields/veins_fild.txt @@ -28,7 +28,7 @@ ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183 ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355 -ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ +ve_fild06,81,177,0 script ve_fild6-2 WARPNPC,1,1,{ if (rand(2)) warp "ve_fild04",115,55; else -- cgit v1.2.3-60-g2f50