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/events/MemorialDay_2008.txt | 6 +- npc/events/RWC_2011.txt | 2 +- npc/events/RWC_2012.txt | 4 +- npc/events/StPatrick_2008.txt | 2 +- npc/events/bossnia.txt | 12 +-- npc/events/children_week.txt | 2 +- npc/events/christmas_2005.txt | 60 ++++++------ npc/events/christmas_2008.txt | 16 ++-- npc/events/dumplingfestival.txt | 2 +- npc/events/easter_2008.txt | 42 ++++---- npc/events/easter_2010.txt | 16 ++-- npc/events/event_skill_reset.txt | 2 +- npc/events/gdevent_aru.txt | 148 ++++++++++++++--------------- npc/events/gdevent_sch.txt | 148 ++++++++++++++--------------- npc/events/god_se_festival.txt | 8 +- npc/events/halloween_2006.txt | 174 +++++++++++++++++----------------- npc/events/halloween_2008.txt | 8 +- npc/events/halloween_2009.txt | 32 +++---- npc/events/idul_fitri.txt | 2 +- npc/events/lunar_2008.txt | 8 +- npc/events/nguild/nguild_dunsw.txt | 8 +- npc/events/nguild/nguild_flags.txt | 86 ++++++++--------- npc/events/nguild/nguild_kafras.txt | 10 +- npc/events/nguild/nguild_managers.txt | 8 +- npc/events/nguild/nguild_treas.txt | 8 +- npc/events/nguild/nguild_warper.txt | 4 +- npc/events/twintowers.txt | 16 ++-- npc/events/valentinesday.txt | 6 +- npc/events/valentinesday_2009.txt | 10 +- npc/events/valentinesday_2012.txt | 4 +- npc/events/whiteday.txt | 2 +- npc/events/xmas.txt | 2 +- 32 files changed, 429 insertions(+), 429 deletions(-) (limited to 'npc/events') diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index 684649917..2b60a8a82 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -14,7 +14,7 @@ // Lauds //============================================================ -prontera,182,214,4 script Lauds#Memorial 58,{ +prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ if (Memorial08 < 1) { mes "[Mad Sago Lauds]"; mes "Hey, yo!"; @@ -194,7 +194,7 @@ prontera,182,214,4 script Lauds#Memorial 58,{ // Memorial Plaque //============================================================ -prontera,153,286,4 script Memorial Plaque#Memorial 857,{ +prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ if (Memorial08 < 8) { mes "[" + strcharinfo(0) + "]"; mes "- It's a dusty old plaque.-"; @@ -251,7 +251,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 857,{ // Grast //============================================================ -prontera,150,270,4 script Grast#Memorial 900,{ +prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ if (Memorial08 < 3) { mes "[Grast]"; mes "Memorial Day is a sad and yet glorious day."; diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt index 4f46020a8..992bd7bd3 100644 --- a/npc/events/RWC_2011.txt +++ b/npc/events/RWC_2011.txt @@ -12,7 +12,7 @@ //= 1.0 First Version. [Euphy] //============================================================ -prontera,114,81,5 script RWC2011 Agent#2 407,{ +prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) { mes "[New Agent]"; mes "You have too many items. Please make room in your inventory and come back."; diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt index 3c2fdfe8f..33e3cec84 100644 --- a/npc/events/RWC_2012.txt +++ b/npc/events/RWC_2012.txt @@ -11,7 +11,7 @@ //= 1.0 First Version. [Euphy] //============================================================ -prontera,147,61,3 script Driller#pron 87,{ +prontera,147,61,3 script Driller#pron 4_M_BARBER,{ disable_items; if (checkweight(1201,1) == 0) { mes "You're carrying too many items in your inventory. Visit Kafra storage and try again."; @@ -80,7 +80,7 @@ prontera,147,61,3 script Driller#pron 87,{ } } -prontera,147,59,3 script Goldberg#pron 878,{ +prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{ disable_items; if (checkweight(1201,1) == 0) { mes "You are carrying too many items. Come back after you have organized your inventory."; diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt index 02e583ee6..92408c54a 100644 --- a/npc/events/StPatrick_2008.txt +++ b/npc/events/StPatrick_2008.txt @@ -30,7 +30,7 @@ //= 1.5 Revamped the script. [Kisuka] //============================================================ -prt_fild05,170,286,4 script Anxious Leprechaun#8pday 954,{ +prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{ if (StPatrick2008 < 1) { mes "[O'Riley the Leprechaun]"; mes "Hmm..."; diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index 7211ebaa1..70f4fc21c 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -14,7 +14,7 @@ // Entrance NPCs //============================================================ -prontera,132,125,4 script Bossnia Staff#1 908,{ +prontera,132,125,4 script Bossnia Staff#1 4_M_PHILMAN,{ mes "[Riss]"; mes "Hello?"; mes "I found some beautiful places"; @@ -81,11 +81,11 @@ prontera,132,125,4 script Bossnia Staff#1 908,{ mes "Come back when you have at least 5,000 zeny."; close; } -geffen,124,169,4 duplicate(Bossnia Staff#1) Bossnia Staff#2 908 -payon,165,150,4 duplicate(Bossnia Staff#1) Bossnia Staff#3 908 -morocc,142,100,4 duplicate(Bossnia Staff#1) Bossnia Staff#4 908 -lighthalzen,203,140,4 duplicate(Bossnia Staff#1) Bossnia Staff#5 908 -rachel,132,144,4 duplicate(Bossnia Staff#1) Bossnia Staff#6 908 +geffen,124,169,4 duplicate(Bossnia Staff#1) Bossnia Staff#2 4_M_PHILMAN +payon,165,150,4 duplicate(Bossnia Staff#1) Bossnia Staff#3 4_M_PHILMAN +morocc,142,100,4 duplicate(Bossnia Staff#1) Bossnia Staff#4 4_M_PHILMAN +lighthalzen,203,140,4 duplicate(Bossnia Staff#1) Bossnia Staff#5 4_M_PHILMAN +rachel,132,144,4 duplicate(Bossnia Staff#1) Bossnia Staff#6 4_M_PHILMAN // Warp Portals //============================================================ diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt index ab834da51..48e9231d6 100644 --- a/npc/events/children_week.txt +++ b/npc/events/children_week.txt @@ -11,7 +11,7 @@ //= 1.1 First Beta. [Samuray22] //============================================================ -prontera,146,91,5 script Pandit chacha#child07 61,{ +prontera,146,91,5 script Pandit chacha#child07 1_M_PUBMASTER,{ if (BaseLevel > 50) { mes "[Pandit chacha]"; mes "Hahaha~"; diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index 5b8af009b..5236e5a54 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -24,7 +24,7 @@ //============================================================ // Louise's Santa Hat (Event 1) -xmas_in,89,92,5 script Louise Kim#designer 714,{ +xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{ mes "[Designer Louise Kim]"; mes "Cone shaped red Santa hat is too ordinary."; mes "It's old fashioned."; @@ -189,7 +189,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{ } // Enjoy Happymerry Chistmas Event (Event 2) -prontera,155,285,3 script Enjoy#enjoy 753,{ +prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{ if (!christ_solo05){ mes "[Enjoy]"; mes "Oh~~~"; @@ -506,7 +506,7 @@ OnTimer180000: end; } -prontera,150,286,5 script Happymerry#happymerry02 869,{ +prontera,150,286,5 script Happymerry#happymerry02 4_M_LGTMAN,{ end; OnInit: @@ -535,7 +535,7 @@ OnTimer60000: end; } -prontera,161,286,4 script Christ#christ02 875,{ +prontera,161,286,4 script Christ#christ02 4_M_PECOKNIGHT,{ end; OnInit: disablenpc "Christ#christ02"; @@ -552,7 +552,7 @@ OnCommandOff: end; } -prontera,161,281,1 script Mas#mas02 748,{ +prontera,161,281,1 script Mas#mas02 4_M_ALCHE_A,{ end; OnInit: disablenpc "Mas#mas02"; @@ -569,7 +569,7 @@ OnCommandOff: end; } -prontera,150,281,7 script Event#event02 881,{ +prontera,150,281,7 script Event#event02 4_M_SITDOWN,{ end; OnInit: disablenpc "Event#event02"; @@ -586,7 +586,7 @@ OnCommandOff: end; } -prontera,188,177,4 script Happymerry#happymerry 869,{ +prontera,188,177,4 script Happymerry#happymerry 4_M_LGTMAN,{ if (christ_solo05==1) { mes "[Happymerry]"; mes "Holgren~~!!"; @@ -666,7 +666,7 @@ prontera,188,177,4 script Happymerry#happymerry 869,{ } } -prontera,62,339,3 script Christ#christ 875,{ +prontera,62,339,3 script Christ#christ 4_M_PECOKNIGHT,{ if (christ_solo05 == 2) { mes "[Christ]"; mes "Now~finally!!!"; @@ -754,7 +754,7 @@ prontera,62,339,3 script Christ#christ 875,{ } } -prontera,163,66,7 script Mas#mas 748,{ +prontera,163,66,7 script Mas#mas 4_M_ALCHE_A,{ if (christ_solo05 == 3) { mes "[Mas]"; mes "Herds!!!!!How long does it take!"; @@ -836,7 +836,7 @@ prontera,163,66,7 script Mas#mas 748,{ } } -prontera,35,209,5 script Event#event 881,{ +prontera,35,209,5 script Event#event 4_M_SITDOWN,{ if (christ_solo05 == 4) { mes "[Event]"; mes "........................"; @@ -933,7 +933,7 @@ prontera,35,209,5 script Event#event 881,{ } // Oholy (Event 3) -prontera,156,242,0 script Oholy#pron::OholyDup 79,{ +prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ if (!christ_carol05) { mes "[Oholy]"; mes "Joy to the world!"; @@ -1538,7 +1538,7 @@ function script F_carol_devi2 { end; } -prontera,94,297,3 script Deviruchi#pron_01 738,3,3,{ +prontera,94,297,3 script Deviruchi#pron_01 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","prontera",155,230); end; @@ -1547,7 +1547,7 @@ OnTouch: end; } -prontera,205,242,3 script Deviruchi#pron_02 738,3,3,{ +prontera,205,242,3 script Deviruchi#pron_02 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","prontera",155,230); end; @@ -1556,7 +1556,7 @@ OnTouch: end; } -prontera,126,118,3 script Deviruchi#pron_03 738,3,3,{ +prontera,126,118,3 script Deviruchi#pron_03 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","prontera",155,230); end; @@ -1566,8 +1566,8 @@ OnTouch: } // Payon -payon,165,153,3 duplicate(OholyDup) Oholy#payon 79 -payon,142,203,3 script Deviruchi#payon_01 738,3,3,{ +payon,165,153,3 duplicate(OholyDup) Oholy#payon 1_F_PRIEST +payon,142,203,3 script Deviruchi#payon_01 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","payon",166,60); end; @@ -1576,7 +1576,7 @@ OnTouch: end; } -payon,248,239,3 script Deviruchi#payon_02 738,3,3,{ +payon,248,239,3 script Deviruchi#payon_02 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","payon",166,60); end; @@ -1585,7 +1585,7 @@ OnTouch: end; } -payon,140,56,3 script Deviruchi#payon_03 738,3,3,{ +payon,140,56,3 script Deviruchi#payon_03 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","payon",166,60); end; @@ -1594,8 +1594,8 @@ OnTouch: end; } -morocc,161,85,0 duplicate(OholyDup) Oholy#morocc 79 -morocc,52,134,3 script Deviruchi#morocc_01 738,3,3,{ +morocc,161,85,0 duplicate(OholyDup) Oholy#morocc 1_F_PRIEST +morocc,52,134,3 script Deviruchi#morocc_01 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","morocc",160,51); end; @@ -1604,7 +1604,7 @@ OnTouch: end; } -morocc,210,264,3 script Deviruchi#morocc_02 738,3,3,{ +morocc,210,264,3 script Deviruchi#morocc_02 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","morocc",160,51); end; @@ -1613,7 +1613,7 @@ OnTouch: end; } -morocc,223,74,3 script Deviruchi#morocc_03 738,3,3,{ +morocc,223,74,3 script Deviruchi#morocc_03 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","morocc",160,51); end; @@ -1623,8 +1623,8 @@ OnTouch: } // Geffen -geffen,120,188,0 duplicate(OholyDup) Oholy#geffen 79 -geffen,173,163,3 script Deviruchi#geffen_01 738,3,3,{ +geffen,120,188,0 duplicate(OholyDup) Oholy#geffen 1_F_PRIEST +geffen,173,163,3 script Deviruchi#geffen_01 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","geffen",120,34); end; @@ -1633,7 +1633,7 @@ OnTouch: end; } -geffen,49,95,3 script Deviruchi#geffen_02 738,3,3,{ +geffen,49,95,3 script Deviruchi#geffen_02 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","geffen",120,34); end; @@ -1642,7 +1642,7 @@ OnTouch: end; } -geffen,111,101,3 script Deviruchi#geffen_03 738,3,3,{ +geffen,111,101,3 script Deviruchi#geffen_03 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","geffen",120,34); end; @@ -1652,8 +1652,8 @@ OnTouch: } // Alberta -alberta,54,237,0 duplicate(OholyDup) Oholy#alberta 79 -alberta,97,86,3 script Deviruchi#alberta_01 738,3,3,{ +alberta,54,237,0 duplicate(OholyDup) Oholy#alberta 1_F_PRIEST +alberta,97,86,3 script Deviruchi#alberta_01 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","alberta",28,235); end; @@ -1662,7 +1662,7 @@ OnTouch: end; } -alberta,180,48,3 script Deviruchi#alberta_02 738,3,3,{ +alberta,180,48,3 script Deviruchi#alberta_02 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","alberta",28,235); end; @@ -1671,7 +1671,7 @@ OnTouch: end; } -alberta,54,132,3 script Deviruchi#alberta_03 738,3,3,{ +alberta,54,132,3 script Deviruchi#alberta_03 4_DEVIRUCHI,3,3,{ callfunc("F_carol_devi2","alberta",28,235); end; diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 5e9b26e86..11fd1dea1 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -18,7 +18,7 @@ // Caroller - Music Box //============================================================ -prontera,226,306,4 script Caroller#iROxmas08 79,{ +prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ if (iROxmas08carol < 1 || iROxmas08carol == 3) { if (iROxmas08carol == 3) { mes "[Caroller]"; @@ -434,7 +434,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ // Santa Claus - Card Game //============================================================ -- script Santa Claus#iROxmas08::08santa 718,{ +- script Santa Claus#iROxmas08::08santa 4_M_SANTA,{ mes "[Santa Claus]"; mes "Wow! Were you naughty or nice this year?"; mes "All right, what comes to your mind when you think about Christmas?"; @@ -707,15 +707,15 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ } } -payon,171,109,4 duplicate(08santa) Santa Claus#0801 718 -prontera,156,285,4 duplicate(08santa) Santa Claus#0802 718 -alberta,117,66,4 duplicate(08santa) Santa Claus#0803 718 -geffen,119,70,4 duplicate(08santa) Santa Claus#0804 718 -morocc,158,104,4 duplicate(08santa) Santa Claus#0805 718 +payon,171,109,4 duplicate(08santa) Santa Claus#0801 4_M_SANTA +prontera,156,285,4 duplicate(08santa) Santa Claus#0802 4_M_SANTA +alberta,117,66,4 duplicate(08santa) Santa Claus#0803 4_M_SANTA +geffen,119,70,4 duplicate(08santa) Santa Claus#0804 4_M_SANTA +morocc,158,104,4 duplicate(08santa) Santa Claus#0805 4_M_SANTA // Louise Kim - Santa Suit //============================================================ -xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ +xmas_in,89,92,4 script Louise Kim#iROxmas08 4_F_06,{ mes "[Louise Kim]"; mes "I always thought about how boring Santa Claus is wearing a too boring costume."; mes "Too boring!"; diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index 44135389b..1c94548f9 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -11,7 +11,7 @@ //= 1.01 fixed bugs [Lupus] //============================================================ -payon,93,81,4 script Exorcist Master Fahae 834,{ +payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{ mes "[Exorcist Master Fahae]"; mes "Greetings young warrior, I'm the Exorcist Master Fahae."; diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index 92033782d..6b64df494 100644 --- a/npc/events/easter_2008.txt +++ b/npc/events/easter_2008.txt @@ -14,7 +14,7 @@ //============================================================ // Prontera -prontera,111,99,5 script Egg Salesman#prt::EggVendor 98,{ +prontera,111,99,5 script Egg Salesman#prt::EggVendor 4W_M_02,{ mes "[Egg Salesman]"; mes "^FF0000Chicken Eggs^000000! Come and"; mes "buy as many Chicken Eggs"; @@ -138,7 +138,7 @@ prontera,111,99,5 script Egg Salesman#prt::EggVendor 98,{ } } -prontera,113,98,0 script Dowdy Matron#prt::EggMatron 701,{ +prontera,113,98,0 script Dowdy Matron#prt::EggMatron 4_F_GODEMOM,{ mes "[Dowdy Matron]"; mes "This festival is going"; mes "to be so much fun! Ooh!"; @@ -155,7 +155,7 @@ prontera,113,98,0 script Dowdy Matron#prt::EggMatron 701,{ close; } -prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 709,{ +prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 4_M_SEAMAN,{ mes "[Cantankerous Geezer]"; mes ".Hey, do you know how"; mes "Chicken Eggs got to be so"; @@ -179,27 +179,27 @@ prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 709,{ } // Payon -payon,172,173,5 duplicate(EggVendor) Egg Salesman#pay 98 -payon,175,171,1 duplicate(EggMatron) Dowdy Matron#pay 701 -payon,170,171,5 duplicate(EggGeezer) Cantankerous Geezer#pay 709 +payon,172,173,5 duplicate(EggVendor) Egg Salesman#pay 4W_M_02 +payon,175,171,1 duplicate(EggMatron) Dowdy Matron#pay 4_F_GODEMOM +payon,170,171,5 duplicate(EggGeezer) Cantankerous Geezer#pay 4_M_SEAMAN // Geffen -geffen,136,64,5 duplicate(EggVendor) Egg Salesman#gef 98 -geffen,138,63,1 duplicate(EggMatron) Dowdy Matron#gef 701 -geffen,133,63,5 duplicate(EggGeezer) Cantankerous Geezer#gef 709 +geffen,136,64,5 duplicate(EggVendor) Egg Salesman#gef 4W_M_02 +geffen,138,63,1 duplicate(EggMatron) Dowdy Matron#gef 4_F_GODEMOM +geffen,133,63,5 duplicate(EggGeezer) Cantankerous Geezer#gef 4_M_SEAMAN // Al De Baran -aldebaran,133,119,5 duplicate(EggVendor) Egg Salesman#alde 98 -aldebaran,135,117,1 duplicate(EggMatron) Dowdy Matron#ald 701 -aldebaran,132,116,5 duplicate(EggGeezer) Cantankerous Geezer#ald 709 +aldebaran,133,119,5 duplicate(EggVendor) Egg Salesman#alde 4W_M_02 +aldebaran,135,117,1 duplicate(EggMatron) Dowdy Matron#ald 4_F_GODEMOM +aldebaran,132,116,5 duplicate(EggGeezer) Cantankerous Geezer#ald 4_M_SEAMAN // Alberta -alberta,90,55,5 duplicate(EggVendor) Egg Salesman#alb 98 -alberta,92,53,1 duplicate(EggMatron) Dowdy Matron#alb 701 -alberta,88,52,5 duplicate(EggGeezer) Cantankerous Geezer#alb 709 +alberta,90,55,5 duplicate(EggVendor) Egg Salesman#alb 4W_M_02 +alberta,92,53,1 duplicate(EggMatron) Dowdy Matron#alb 4_F_GODEMOM +alberta,88,52,5 duplicate(EggGeezer) Cantankerous Geezer#alb 4_M_SEAMAN // Create Holy Eggs -prontera,230,312,3 script Nerlen#es07 79,{ +prontera,230,312,3 script Nerlen#es07 1_F_PRIEST,{ mes "[Nerlen]"; mes "Hello! If you'd like,"; mes "I can take your Chicken"; @@ -312,7 +312,7 @@ prontera,230,312,3 script Nerlen#es07 79,{ } // Easter Quest -morocc,131,26,5 script Secret Corps#egg 880,{ +morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ if (easter2008 == 1) { mes "[Corps Member]"; mes "How are you doing?"; @@ -626,7 +626,7 @@ morocc,131,26,5 script Secret Corps#egg 880,{ } } -pay_dun00,22,127,0 script Trace#egg1 844,{ +pay_dun00,22,127,0 script Trace#egg1 CLEAR_NPC,{ if (easter2008 == 5) { mes "[" + strcharinfo(0) + "]"; mes "Well..."; @@ -678,7 +678,7 @@ pay_dun00,22,127,0 script Trace#egg1 844,{ } } -iz_dun02,340,346,0 script Trace#egg 844,{ +iz_dun02,340,346,0 script Trace#egg CLEAR_NPC,{ if (easter2008 == 6) { mes "[" + strcharinfo(0) + "]"; mes "Well..."; @@ -730,7 +730,7 @@ iz_dun02,340,346,0 script Trace#egg 844,{ } } -mjo_dun03,308,256,0 script Trace#egg2 844,{ +mjo_dun03,308,256,0 script Trace#egg2 CLEAR_NPC,{ if (easter2008 == 7) { mes "[" + strcharinfo(0) + "]"; mes "Well..."; @@ -782,7 +782,7 @@ mjo_dun03,308,256,0 script Trace#egg2 844,{ } } -gl_prison,157,176,0 script Trace#egg3 844,{ +gl_prison,157,176,0 script Trace#egg3 CLEAR_NPC,{ if (easter2008 == 8) { mes "[" + strcharinfo(0) + "]"; mes "Well..."; diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt index b57963ad6..50a22aec8 100644 --- a/npc/events/easter_2010.txt +++ b/npc/events/easter_2010.txt @@ -10,7 +10,7 @@ //= 1.0 First version. [Euphy] //============================================================ -prontera,202,297,3 script Rina#Easter 727,{ +prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ disable_items; if (BaseLevel < 40) { mes "[Rina]"; @@ -293,7 +293,7 @@ prontera,202,297,3 script Rina#Easter 727,{ } } -geffen,207,114,4 script #Hiddne01Easter 844,{ +geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{ if (oversea_event2 > 519) { OnRelease: specialeffect EF_PATTACK; @@ -313,25 +313,25 @@ geffen,207,114,4 script #Hiddne01Easter 844,{ end; } -xmas,144,52,4 script #Hiddne02Easter 844,{ +xmas,144,52,4 script #Hiddne02Easter CLEAR_NPC,{ if (oversea_event3 > 269) doevent "#Hiddne01Easter::OnRelease"; end; } -yuno,164,46,4 script #Hiddne03Easter 844,{ +yuno,164,46,4 script #Hiddne03Easter CLEAR_NPC,{ if (oversea_event6 > 244) doevent "#Hiddne01Easter::OnRelease"; end; } -rachel,36,132,4 script #Hiddne04Easter 844,{ +rachel,36,132,4 script #Hiddne04Easter CLEAR_NPC,{ if (oversea_event9 > 196) doevent "#Hiddne01Easter::OnRelease"; end; } -prontera,204,297,3 script Rina's Little Friend 463,{ +prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{ disable_items; if (checkquest(9117) == -1) { emotion e_swt2; @@ -527,7 +527,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{ close; } -prontera,116,82,5 script Traveler#01Easter 85,{ +prontera,116,82,5 script Traveler#01Easter 4_M_03,{ mes "[Traveler]"; mes "I'm a traveler"; mes "and I often visit ^8B4513Prontera^000000."; @@ -588,7 +588,7 @@ OnTimer5000: end; } -prontera,163,194,5 script Traveler#02Easter 92,{ +prontera,163,194,5 script Traveler#02Easter 4_F_03,{ mes "[Traveler]"; mes "A while ago,"; mes "I met a lady"; diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 0e2e5da12..7248266ec 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -13,7 +13,7 @@ //= Skill Reset with payment, minimum BaseLv.60 to reset skill. //= Each 1 BaseLv need 20.000 Zeny, so be careful to use skill. //============================================================ -yuno,138,187,4 script Hypnotist Teacher 124,{ +yuno,138,187,4 script Hypnotist Teacher 4_F_TELEPORTER,{ set @npcname$,"[^D5A500Hypnotist^000000]"; mes @npcname$; diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index f1de9e6d9..e0098bf9b 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -13,7 +13,7 @@ //= 1.2 Added GM management function. [Euphy] //============================================================ -arug_dun01,1,1,1 script Monster Controler#aru_gd 81,{ +arug_dun01,1,1,1 script Monster Controler#aru_gd 4_DOG01,{ OnInit: donpcevent "Monster Controler1#aru::OnKill"; initnpctimer; @@ -27,7 +27,7 @@ OnTimer3600000: end; } -arug_dun01,1,2,1 script Monster Controler1#aru 81,{ +arug_dun01,1,2,1 script Monster Controler1#aru 4_DOG01,{ OnEnable: set .@callwhere,rand(1,4); if (.@callwhere == 1) { @@ -57,7 +57,7 @@ OnMyMobDead: end; } -arug_dun01,199,195,5 script Dwarf#aru_gd 826,{ +arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ if (getcharid(2) == 0) { mes "[Dwarf]"; mes "Hey did you see an ugly Goblin come by? He stole something from me!"; @@ -476,7 +476,7 @@ OnEnable: end; } -arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{ +arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ specialeffect EF_POISONHIT; set .@sprchg_gd,rand(1,5); if (.@sprchg_gd == 1) { @@ -1019,7 +1019,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{ } } -arug_que01,10,10,3 script Controller#gdevent_a 81,{ +arug_que01,10,10,3 script Controller#gdevent_a 4_DOG01,{ OnInit: set $@gdeventv_a2,0; end; @@ -1089,7 +1089,7 @@ OnTimer63000: end; } -arug_que01,87,93,0 script paper_sp_1_a 139,{ +arug_que01,87,93,0 script paper_sp_1_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1114,7 +1114,7 @@ OnBingo: end; } -arug_que01,102,93,0 script paper_sp_2_a 139,{ +arug_que01,102,93,0 script paper_sp_2_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1139,7 +1139,7 @@ OnBingo: end; } -arug_que01,117,93,0 script paper_sp_3_a 139,{ +arug_que01,117,93,0 script paper_sp_3_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1164,7 +1164,7 @@ OnBingo: end; } -arug_que01,87,80,0 script paper_sp_4_a 139,{ +arug_que01,87,80,0 script paper_sp_4_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1189,7 +1189,7 @@ OnBingo: end; } -arug_que01,102,80,0 script paper_sp_5_a 139,{ +arug_que01,102,80,0 script paper_sp_5_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1214,7 +1214,7 @@ OnBingo: end; } -arug_que01,117,80,0 script paper_sp_6_a 139,{ +arug_que01,117,80,0 script paper_sp_6_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1239,7 +1239,7 @@ OnBingo: end; } -arug_que01,87,65,0 script paper_sp_7_a 139,{ +arug_que01,87,65,0 script paper_sp_7_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1264,7 +1264,7 @@ OnBingo: end; } -arug_que01,102,65,0 script paper_sp_8_a 139,{ +arug_que01,102,65,0 script paper_sp_8_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1289,7 +1289,7 @@ OnBingo: end; } -arug_que01,117,65,0 script paper_sp_9_a 139,{ +arug_que01,117,65,0 script paper_sp_9_a HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1331,7 +1331,7 @@ OnTouch2: end; } -arug_que01,6,6,1 script eff_mvp#aru_gd 844,{ +arug_que01,6,6,1 script eff_mvp#aru_gd CLEAR_NPC,{ end; Onmvp: @@ -1370,7 +1370,7 @@ OnTimer4000: end; } -arug_que01,100,75,5 script Gergath#aru_gd 412,{ +arug_que01,100,75,5 script Gergath#aru_gd 4_M_OLDFRIAR,{ end; OnInit: @@ -1429,7 +1429,7 @@ OnTimer50000: arug_que01,104,140,0 warp back#aru_gd 1,1,arug_dun01,199,192 /* -arug_que01,104,140,1 script treg#aru_gd 844,{ +arug_que01,104,140,1 script treg#aru_gd CLEAR_NPC,{ end; OnEnable: @@ -1453,66 +1453,66 @@ OnMyMobDead: } */ -arug_que01,98,105,3 script #aru_flower_01::GD_Ev_Flower 978,{ +arug_que01,98,105,3 script #aru_flower_01::GD_Ev_Flower 4_YELL_FLOWER,{ end; } -arug_que01,94,105,3 duplicate(GD_Ev_Flower) #aru_flower_02 977 -arug_que01,90,105,3 duplicate(GD_Ev_Flower) #aru_flower_03 978 -arug_que01,86,105,3 duplicate(GD_Ev_Flower) #aru_flower_04 977 -arug_que01,82,105,3 duplicate(GD_Ev_Flower) #aru_flower_05 978 -arug_que01,79,103,3 duplicate(GD_Ev_Flower) #aru_flower_06 977 -arug_que01,79,100,3 duplicate(GD_Ev_Flower) #aru_flower_07 978 -arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_08 977 -arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_09 978 -arug_que01,79,94,3 duplicate(GD_Ev_Flower) #aru_flower_10 977 -arug_que01,79,91,3 duplicate(GD_Ev_Flower) #aru_flower_11 978 -arug_que01,79,88,3 duplicate(GD_Ev_Flower) #aru_flower_12 977 -arug_que01,79,85,3 duplicate(GD_Ev_Flower) #aru_flower_13 978 -arug_que01,79,82,3 duplicate(GD_Ev_Flower) #aru_flower_14 977 -arug_que01,79,79,3 duplicate(GD_Ev_Flower) #aru_flower_15 978 -arug_que01,79,76,3 duplicate(GD_Ev_Flower) #aru_flower_16 977 -arug_que01,79,73,3 duplicate(GD_Ev_Flower) #aru_flower_17 978 -arug_que01,79,70,3 duplicate(GD_Ev_Flower) #aru_flower_18 977 -arug_que01,79,67,3 duplicate(GD_Ev_Flower) #aru_flower_19 978 -arug_que01,79,64,3 duplicate(GD_Ev_Flower) #aru_flower_20 977 -arug_que01,79,61,3 duplicate(GD_Ev_Flower) #aru_flower_21 978 -arug_que01,79,58,3 duplicate(GD_Ev_Flower) #aru_flower_22 977 -arug_que01,84,58,3 duplicate(GD_Ev_Flower) #aru_flower_23 978 -arug_que01,89,58,3 duplicate(GD_Ev_Flower) #aru_flower_24 977 -arug_que01,94,58,3 duplicate(GD_Ev_Flower) #aru_flower_25 978 -arug_que01,99,58,3 duplicate(GD_Ev_Flower) #aru_flower_26 977 -arug_que01,104,58,3 duplicate(GD_Ev_Flower) #aru_flower_27 978 -arug_que01,109,58,3 duplicate(GD_Ev_Flower) #aru_flower_28 977 -arug_que01,114,58,3 duplicate(GD_Ev_Flower) #aru_flower_29 978 -arug_que01,119,58,3 duplicate(GD_Ev_Flower) #aru_flower_30 977 -arug_que01,124,58,3 duplicate(GD_Ev_Flower) #aru_flower_31 978 -arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_32 977 -arug_que01,129,105,3 duplicate(GD_Ev_Flower) #aru_flower_33 978 -arug_que01,129,103,3 duplicate(GD_Ev_Flower) #aru_flower_34 977 -arug_que01,129,100,3 duplicate(GD_Ev_Flower) #aru_flower_35 978 -arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_36 977 -arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_37 978 -arug_que01,129,94,3 duplicate(GD_Ev_Flower) #aru_flower_38 977 -arug_que01,129,91,3 duplicate(GD_Ev_Flower) #aru_flower_39 978 -arug_que01,129,88,3 duplicate(GD_Ev_Flower) #aru_flower_40 977 -arug_que01,129,85,3 duplicate(GD_Ev_Flower) #aru_flower_41 978 -arug_que01,129,82,3 duplicate(GD_Ev_Flower) #aru_flower_42 977 -arug_que01,129,79,3 duplicate(GD_Ev_Flower) #aru_flower_43 978 -arug_que01,129,76,3 duplicate(GD_Ev_Flower) #aru_flower_44 977 -arug_que01,129,73,3 duplicate(GD_Ev_Flower) #aru_flower_45 978 -arug_que01,129,70,3 duplicate(GD_Ev_Flower) #aru_flower_46 977 -arug_que01,129,67,3 duplicate(GD_Ev_Flower) #aru_flower_47 978 -arug_que01,129,64,3 duplicate(GD_Ev_Flower) #aru_flower_48 977 -arug_que01,129,61,3 duplicate(GD_Ev_Flower) #aru_flower_49 978 -arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_50 977 -arug_que01,124,105,3 duplicate(GD_Ev_Flower) #aru_flower_51 978 -arug_que01,119,105,3 duplicate(GD_Ev_Flower) #aru_flower_52 977 -arug_que01,114,105,3 duplicate(GD_Ev_Flower) #aru_flower_53 978 -arug_que01,109,105,3 duplicate(GD_Ev_Flower) #aru_flower_54 977 -arug_que01,104,105,3 duplicate(GD_Ev_Flower) #aru_flower_55 976 - -arug_dun01,5,5,1 script Event controller#aru_gd 81,{ +arug_que01,94,105,3 duplicate(GD_Ev_Flower) #aru_flower_02 4_RED_FLOWER +arug_que01,90,105,3 duplicate(GD_Ev_Flower) #aru_flower_03 4_YELL_FLOWER +arug_que01,86,105,3 duplicate(GD_Ev_Flower) #aru_flower_04 4_RED_FLOWER +arug_que01,82,105,3 duplicate(GD_Ev_Flower) #aru_flower_05 4_YELL_FLOWER +arug_que01,79,103,3 duplicate(GD_Ev_Flower) #aru_flower_06 4_RED_FLOWER +arug_que01,79,100,3 duplicate(GD_Ev_Flower) #aru_flower_07 4_YELL_FLOWER +arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_08 4_RED_FLOWER +arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_09 4_YELL_FLOWER +arug_que01,79,94,3 duplicate(GD_Ev_Flower) #aru_flower_10 4_RED_FLOWER +arug_que01,79,91,3 duplicate(GD_Ev_Flower) #aru_flower_11 4_YELL_FLOWER +arug_que01,79,88,3 duplicate(GD_Ev_Flower) #aru_flower_12 4_RED_FLOWER +arug_que01,79,85,3 duplicate(GD_Ev_Flower) #aru_flower_13 4_YELL_FLOWER +arug_que01,79,82,3 duplicate(GD_Ev_Flower) #aru_flower_14 4_RED_FLOWER +arug_que01,79,79,3 duplicate(GD_Ev_Flower) #aru_flower_15 4_YELL_FLOWER +arug_que01,79,76,3 duplicate(GD_Ev_Flower) #aru_flower_16 4_RED_FLOWER +arug_que01,79,73,3 duplicate(GD_Ev_Flower) #aru_flower_17 4_YELL_FLOWER +arug_que01,79,70,3 duplicate(GD_Ev_Flower) #aru_flower_18 4_RED_FLOWER +arug_que01,79,67,3 duplicate(GD_Ev_Flower) #aru_flower_19 4_YELL_FLOWER +arug_que01,79,64,3 duplicate(GD_Ev_Flower) #aru_flower_20 4_RED_FLOWER +arug_que01,79,61,3 duplicate(GD_Ev_Flower) #aru_flower_21 4_YELL_FLOWER +arug_que01,79,58,3 duplicate(GD_Ev_Flower) #aru_flower_22 4_RED_FLOWER +arug_que01,84,58,3 duplicate(GD_Ev_Flower) #aru_flower_23 4_YELL_FLOWER +arug_que01,89,58,3 duplicate(GD_Ev_Flower) #aru_flower_24 4_RED_FLOWER +arug_que01,94,58,3 duplicate(GD_Ev_Flower) #aru_flower_25 4_YELL_FLOWER +arug_que01,99,58,3 duplicate(GD_Ev_Flower) #aru_flower_26 4_RED_FLOWER +arug_que01,104,58,3 duplicate(GD_Ev_Flower) #aru_flower_27 4_YELL_FLOWER +arug_que01,109,58,3 duplicate(GD_Ev_Flower) #aru_flower_28 4_RED_FLOWER +arug_que01,114,58,3 duplicate(GD_Ev_Flower) #aru_flower_29 4_YELL_FLOWER +arug_que01,119,58,3 duplicate(GD_Ev_Flower) #aru_flower_30 4_RED_FLOWER +arug_que01,124,58,3 duplicate(GD_Ev_Flower) #aru_flower_31 4_YELL_FLOWER +arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_32 4_RED_FLOWER +arug_que01,129,105,3 duplicate(GD_Ev_Flower) #aru_flower_33 4_YELL_FLOWER +arug_que01,129,103,3 duplicate(GD_Ev_Flower) #aru_flower_34 4_RED_FLOWER +arug_que01,129,100,3 duplicate(GD_Ev_Flower) #aru_flower_35 4_YELL_FLOWER +arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_36 4_RED_FLOWER +arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_37 4_YELL_FLOWER +arug_que01,129,94,3 duplicate(GD_Ev_Flower) #aru_flower_38 4_RED_FLOWER +arug_que01,129,91,3 duplicate(GD_Ev_Flower) #aru_flower_39 4_YELL_FLOWER +arug_que01,129,88,3 duplicate(GD_Ev_Flower) #aru_flower_40 4_RED_FLOWER +arug_que01,129,85,3 duplicate(GD_Ev_Flower) #aru_flower_41 4_YELL_FLOWER +arug_que01,129,82,3 duplicate(GD_Ev_Flower) #aru_flower_42 4_RED_FLOWER +arug_que01,129,79,3 duplicate(GD_Ev_Flower) #aru_flower_43 4_YELL_FLOWER +arug_que01,129,76,3 duplicate(GD_Ev_Flower) #aru_flower_44 4_RED_FLOWER +arug_que01,129,73,3 duplicate(GD_Ev_Flower) #aru_flower_45 4_YELL_FLOWER +arug_que01,129,70,3 duplicate(GD_Ev_Flower) #aru_flower_46 4_RED_FLOWER +arug_que01,129,67,3 duplicate(GD_Ev_Flower) #aru_flower_47 4_YELL_FLOWER +arug_que01,129,64,3 duplicate(GD_Ev_Flower) #aru_flower_48 4_RED_FLOWER +arug_que01,129,61,3 duplicate(GD_Ev_Flower) #aru_flower_49 4_YELL_FLOWER +arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_50 4_RED_FLOWER +arug_que01,124,105,3 duplicate(GD_Ev_Flower) #aru_flower_51 4_YELL_FLOWER +arug_que01,119,105,3 duplicate(GD_Ev_Flower) #aru_flower_52 4_RED_FLOWER +arug_que01,114,105,3 duplicate(GD_Ev_Flower) #aru_flower_53 4_YELL_FLOWER +arug_que01,109,105,3 duplicate(GD_Ev_Flower) #aru_flower_54 4_RED_FLOWER +arug_que01,104,105,3 duplicate(GD_Ev_Flower) #aru_flower_55 4_BLUE_FLOWER + +arug_dun01,5,5,1 script Event controller#aru_gd 4_DOG01,{ if (callfunc("F_GM_NPC",1854,0) < 1) { mes "Incorrect password."; close; diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 5ff30aa67..19ef7b8c3 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -13,7 +13,7 @@ //= 1.2 Added GM management function. [Euphy] //============================================================ -schg_dun01,1,1,1 script Monster Controler#sch_gd 81,{ +schg_dun01,1,1,1 script Monster Controler#sch_gd 4_DOG01,{ OnInit: donpcevent "Monster Controler1#sch::OnKill"; initnpctimer; @@ -27,7 +27,7 @@ OnTimer3600000: end; } -schg_dun01,1,2,1 script Monster Controler1#sch 81,{ +schg_dun01,1,2,1 script Monster Controler1#sch 4_DOG01,{ OnEnable: set .@callwhere,rand(1,4); if (.@callwhere == 1) { @@ -57,7 +57,7 @@ OnMyMobDead: end; } -schg_dun01,194,148,5 script Dwarf#sch_gd 826,{ +schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ if (getcharid(2) == 0) { mes "[Dwarf]"; mes "Hey did you see an ugly Goblin come by? He stole something from me!"; @@ -475,7 +475,7 @@ OnEnable: end; } -schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{ +schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ specialeffect EF_POISONHIT; set .@sprchg_gd,rand(1,5); if (.@sprchg_gd == 1) { @@ -1018,7 +1018,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{ } } -schg_que01,10,10,3 script Controller#gdevent_s 81,{ +schg_que01,10,10,3 script Controller#gdevent_s 4_DOG01,{ OnInit: set $@gdeventv_s2,0; end; @@ -1088,7 +1088,7 @@ OnTimer63000: end; } -schg_que01,87,93,0 script paper_sp_1_s 139,{ +schg_que01,87,93,0 script paper_sp_1_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1113,7 +1113,7 @@ OnBingo: end; } -schg_que01,102,93,0 script paper_sp_2_s 139,{ +schg_que01,102,93,0 script paper_sp_2_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1138,7 +1138,7 @@ OnBingo: end; } -schg_que01,117,93,0 script paper_sp_3_s 139,{ +schg_que01,117,93,0 script paper_sp_3_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1163,7 +1163,7 @@ OnBingo: end; } -schg_que01,87,80,0 script paper_sp_4_s 139,{ +schg_que01,87,80,0 script paper_sp_4_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1188,7 +1188,7 @@ OnBingo: end; } -schg_que01,102,80,0 script paper_sp_5_s 139,{ +schg_que01,102,80,0 script paper_sp_5_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1213,7 +1213,7 @@ OnBingo: end; } -schg_que01,117,80,0 script paper_sp_6_s 139,{ +schg_que01,117,80,0 script paper_sp_6_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1238,7 +1238,7 @@ OnBingo: end; } -schg_que01,87,65,0 script paper_sp_7_s 139,{ +schg_que01,87,65,0 script paper_sp_7_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1263,7 +1263,7 @@ OnBingo: end; } -schg_que01,102,65,0 script paper_sp_8_s 139,{ +schg_que01,102,65,0 script paper_sp_8_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1288,7 +1288,7 @@ OnBingo: end; } -schg_que01,117,65,0 script paper_sp_9_s 139,{ +schg_que01,117,65,0 script paper_sp_9_s HIDDEN_WARP_NPC,{ end; OnEnable: @@ -1330,7 +1330,7 @@ OnTouch2: end; } -schg_que01,6,6,1 script eff_mvp#sch_gd 844,{ +schg_que01,6,6,1 script eff_mvp#sch_gd CLEAR_NPC,{ end; Onmvp: @@ -1369,7 +1369,7 @@ OnTimer4000: end; } -schg_que01,100,75,5 script Gergath#sch_gd 412,{ +schg_que01,100,75,5 script Gergath#sch_gd 4_M_OLDFRIAR,{ end; OnInit: @@ -1428,7 +1428,7 @@ OnTimer50000: schg_que01,104,140,0 warp back#sch_gd 1,1,schg_dun01,199,192 /* -schg_que01,104,140,1 script treg#sch_gd 844,{ +schg_que01,104,140,1 script treg#sch_gd CLEAR_NPC,{ end; OnEnable: @@ -1452,66 +1452,66 @@ OnMyMobDead: } */ -schg_que01,98,105,3 script #sch_flower_01::GD_Ev_Flower2 978,{ +schg_que01,98,105,3 script #sch_flower_01::GD_Ev_Flower2 4_YELL_FLOWER,{ end; } -schg_que01,94,105,3 duplicate(GD_Ev_Flower2) #sch_flower_02 977 -schg_que01,90,105,3 duplicate(GD_Ev_Flower2) #sch_flower_03 978 -schg_que01,86,105,3 duplicate(GD_Ev_Flower2) #sch_flower_04 977 -schg_que01,82,105,3 duplicate(GD_Ev_Flower2) #sch_flower_05 978 -schg_que01,79,103,3 duplicate(GD_Ev_Flower2) #sch_flower_06 977 -schg_que01,79,100,3 duplicate(GD_Ev_Flower2) #sch_flower_07 978 -schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_08 977 -schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_09 978 -schg_que01,79,94,3 duplicate(GD_Ev_Flower2) #sch_flower_10 977 -schg_que01,79,91,3 duplicate(GD_Ev_Flower2) #sch_flower_11 978 -schg_que01,79,88,3 duplicate(GD_Ev_Flower2) #sch_flower_12 977 -schg_que01,79,85,3 duplicate(GD_Ev_Flower2) #sch_flower_13 978 -schg_que01,79,82,3 duplicate(GD_Ev_Flower2) #sch_flower_14 977 -schg_que01,79,79,3 duplicate(GD_Ev_Flower2) #sch_flower_15 978 -schg_que01,79,76,3 duplicate(GD_Ev_Flower2) #sch_flower_16 977 -schg_que01,79,73,3 duplicate(GD_Ev_Flower2) #sch_flower_17 978 -schg_que01,79,70,3 duplicate(GD_Ev_Flower2) #sch_flower_18 977 -schg_que01,79,67,3 duplicate(GD_Ev_Flower2) #sch_flower_19 978 -schg_que01,79,64,3 duplicate(GD_Ev_Flower2) #sch_flower_20 977 -schg_que01,79,61,3 duplicate(GD_Ev_Flower2) #sch_flower_21 978 -schg_que01,79,58,3 duplicate(GD_Ev_Flower2) #sch_flower_22 977 -schg_que01,84,58,3 duplicate(GD_Ev_Flower2) #sch_flower_23 978 -schg_que01,89,58,3 duplicate(GD_Ev_Flower2) #sch_flower_24 977 -schg_que01,94,58,3 duplicate(GD_Ev_Flower2) #sch_flower_25 978 -schg_que01,99,58,3 duplicate(GD_Ev_Flower2) #sch_flower_26 977 -schg_que01,104,58,3 duplicate(GD_Ev_Flower2) #sch_flower_27 978 -schg_que01,109,58,3 duplicate(GD_Ev_Flower2) #sch_flower_28 977 -schg_que01,114,58,3 duplicate(GD_Ev_Flower2) #sch_flower_29 978 -schg_que01,119,58,3 duplicate(GD_Ev_Flower2) #sch_flower_30 977 -schg_que01,124,58,3 duplicate(GD_Ev_Flower2) #sch_flower_31 978 -schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_32 977 -schg_que01,129,105,3 duplicate(GD_Ev_Flower2) #sch_flower_33 978 -schg_que01,129,103,3 duplicate(GD_Ev_Flower2) #sch_flower_34 977 -schg_que01,129,100,3 duplicate(GD_Ev_Flower2) #sch_flower_35 978 -schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_36 977 -schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_37 978 -schg_que01,129,94,3 duplicate(GD_Ev_Flower2) #sch_flower_38 977 -schg_que01,129,91,3 duplicate(GD_Ev_Flower2) #sch_flower_39 978 -schg_que01,129,88,3 duplicate(GD_Ev_Flower2) #sch_flower_40 977 -schg_que01,129,85,3 duplicate(GD_Ev_Flower2) #sch_flower_41 978 -schg_que01,129,82,3 duplicate(GD_Ev_Flower2) #sch_flower_42 977 -schg_que01,129,79,3 duplicate(GD_Ev_Flower2) #sch_flower_43 978 -schg_que01,129,76,3 duplicate(GD_Ev_Flower2) #sch_flower_44 977 -schg_que01,129,73,3 duplicate(GD_Ev_Flower2) #sch_flower_45 978 -schg_que01,129,70,3 duplicate(GD_Ev_Flower2) #sch_flower_46 977 -schg_que01,129,67,3 duplicate(GD_Ev_Flower2) #sch_flower_47 978 -schg_que01,129,64,3 duplicate(GD_Ev_Flower2) #sch_flower_48 977 -schg_que01,129,61,3 duplicate(GD_Ev_Flower2) #sch_flower_49 978 -schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_50 977 -schg_que01,124,105,3 duplicate(GD_Ev_Flower2) #sch_flower_51 978 -schg_que01,119,105,3 duplicate(GD_Ev_Flower2) #sch_flower_52 977 -schg_que01,114,105,3 duplicate(GD_Ev_Flower2) #sch_flower_53 978 -schg_que01,109,105,3 duplicate(GD_Ev_Flower2) #sch_flower_54 977 -schg_que01,104,105,3 duplicate(GD_Ev_Flower2) #sch_flower_55 976 - -schg_dun01,5,5,1 script Event controller#sch_gd 81,{ +schg_que01,94,105,3 duplicate(GD_Ev_Flower2) #sch_flower_02 4_RED_FLOWER +schg_que01,90,105,3 duplicate(GD_Ev_Flower2) #sch_flower_03 4_YELL_FLOWER +schg_que01,86,105,3 duplicate(GD_Ev_Flower2) #sch_flower_04 4_RED_FLOWER +schg_que01,82,105,3 duplicate(GD_Ev_Flower2) #sch_flower_05 4_YELL_FLOWER +schg_que01,79,103,3 duplicate(GD_Ev_Flower2) #sch_flower_06 4_RED_FLOWER +schg_que01,79,100,3 duplicate(GD_Ev_Flower2) #sch_flower_07 4_YELL_FLOWER +schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_08 4_RED_FLOWER +schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_09 4_YELL_FLOWER +schg_que01,79,94,3 duplicate(GD_Ev_Flower2) #sch_flower_10 4_RED_FLOWER +schg_que01,79,91,3 duplicate(GD_Ev_Flower2) #sch_flower_11 4_YELL_FLOWER +schg_que01,79,88,3 duplicate(GD_Ev_Flower2) #sch_flower_12 4_RED_FLOWER +schg_que01,79,85,3 duplicate(GD_Ev_Flower2) #sch_flower_13 4_YELL_FLOWER +schg_que01,79,82,3 duplicate(GD_Ev_Flower2) #sch_flower_14 4_RED_FLOWER +schg_que01,79,79,3 duplicate(GD_Ev_Flower2) #sch_flower_15 4_YELL_FLOWER +schg_que01,79,76,3 duplicate(GD_Ev_Flower2) #sch_flower_16 4_RED_FLOWER +schg_que01,79,73,3 duplicate(GD_Ev_Flower2) #sch_flower_17 4_YELL_FLOWER +schg_que01,79,70,3 duplicate(GD_Ev_Flower2) #sch_flower_18 4_RED_FLOWER +schg_que01,79,67,3 duplicate(GD_Ev_Flower2) #sch_flower_19 4_YELL_FLOWER +schg_que01,79,64,3 duplicate(GD_Ev_Flower2) #sch_flower_20 4_RED_FLOWER +schg_que01,79,61,3 duplicate(GD_Ev_Flower2) #sch_flower_21 4_YELL_FLOWER +schg_que01,79,58,3 duplicate(GD_Ev_Flower2) #sch_flower_22 4_RED_FLOWER +schg_que01,84,58,3 duplicate(GD_Ev_Flower2) #sch_flower_23 4_YELL_FLOWER +schg_que01,89,58,3 duplicate(GD_Ev_Flower2) #sch_flower_24 4_RED_FLOWER +schg_que01,94,58,3 duplicate(GD_Ev_Flower2) #sch_flower_25 4_YELL_FLOWER +schg_que01,99,58,3 duplicate(GD_Ev_Flower2) #sch_flower_26 4_RED_FLOWER +schg_que01,104,58,3 duplicate(GD_Ev_Flower2) #sch_flower_27 4_YELL_FLOWER +schg_que01,109,58,3 duplicate(GD_Ev_Flower2) #sch_flower_28 4_RED_FLOWER +schg_que01,114,58,3 duplicate(GD_Ev_Flower2) #sch_flower_29 4_YELL_FLOWER +schg_que01,119,58,3 duplicate(GD_Ev_Flower2) #sch_flower_30 4_RED_FLOWER +schg_que01,124,58,3 duplicate(GD_Ev_Flower2) #sch_flower_31 4_YELL_FLOWER +schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_32 4_RED_FLOWER +schg_que01,129,105,3 duplicate(GD_Ev_Flower2) #sch_flower_33 4_YELL_FLOWER +schg_que01,129,103,3 duplicate(GD_Ev_Flower2) #sch_flower_34 4_RED_FLOWER +schg_que01,129,100,3 duplicate(GD_Ev_Flower2) #sch_flower_35 4_YELL_FLOWER +schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_36 4_RED_FLOWER +schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_37 4_YELL_FLOWER +schg_que01,129,94,3 duplicate(GD_Ev_Flower2) #sch_flower_38 4_RED_FLOWER +schg_que01,129,91,3 duplicate(GD_Ev_Flower2) #sch_flower_39 4_YELL_FLOWER +schg_que01,129,88,3 duplicate(GD_Ev_Flower2) #sch_flower_40 4_RED_FLOWER +schg_que01,129,85,3 duplicate(GD_Ev_Flower2) #sch_flower_41 4_YELL_FLOWER +schg_que01,129,82,3 duplicate(GD_Ev_Flower2) #sch_flower_42 4_RED_FLOWER +schg_que01,129,79,3 duplicate(GD_Ev_Flower2) #sch_flower_43 4_YELL_FLOWER +schg_que01,129,76,3 duplicate(GD_Ev_Flower2) #sch_flower_44 4_RED_FLOWER +schg_que01,129,73,3 duplicate(GD_Ev_Flower2) #sch_flower_45 4_YELL_FLOWER +schg_que01,129,70,3 duplicate(GD_Ev_Flower2) #sch_flower_46 4_RED_FLOWER +schg_que01,129,67,3 duplicate(GD_Ev_Flower2) #sch_flower_47 4_YELL_FLOWER +schg_que01,129,64,3 duplicate(GD_Ev_Flower2) #sch_flower_48 4_RED_FLOWER +schg_que01,129,61,3 duplicate(GD_Ev_Flower2) #sch_flower_49 4_YELL_FLOWER +schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_50 4_RED_FLOWER +schg_que01,124,105,3 duplicate(GD_Ev_Flower2) #sch_flower_51 4_YELL_FLOWER +schg_que01,119,105,3 duplicate(GD_Ev_Flower2) #sch_flower_52 4_RED_FLOWER +schg_que01,114,105,3 duplicate(GD_Ev_Flower2) #sch_flower_53 4_YELL_FLOWER +schg_que01,109,105,3 duplicate(GD_Ev_Flower2) #sch_flower_54 4_RED_FLOWER +schg_que01,104,105,3 duplicate(GD_Ev_Flower2) #sch_flower_55 4_BLUE_FLOWER + +schg_dun01,5,5,1 script Event controller#sch_gd 4_DOG01,{ if (callfunc("F_GM_NPC",1854,0) < 1) { mes "Incorrect password."; close; diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 3b8e12bf7..c56563c86 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -14,7 +14,7 @@ //============================================================ // Original name: "Festival Manager#god_se_fes00" -yuno,1,1,0 script Festival Manager#gq_fes0 891,{ +yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{ callfunc "F_GM_NPC"; mes "[Festival Manager]"; mes "I am the festival NPC manager for the God SE quest."; @@ -44,7 +44,7 @@ yuno,1,1,0 script Festival Manager#gq_fes0 891,{ } } -yuno,118,192,5 script Rmimi Ravies#gq_fes01 891,{ +yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ set .@GID, getcharid(2); if (countitem(7840) > 0) { mes "[Rmimi Ravies]"; @@ -392,7 +392,7 @@ OnTimer3900000: // Original name: "Festival Manager#god_se_fes02" -rachel,1,1,0 script Festival Manager#gq_fes2 891,{ +rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{ callfunc "F_GM_NPC"; mes "[Festival Manager]"; mes "I am the festival NPC manager for the God SE quest."; @@ -422,7 +422,7 @@ rachel,1,1,0 script Festival Manager#gq_fes2 891,{ } } -rachel,132,117,3 script Rhehe Ravies#gq_fes03 891,{ +rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ set .@GID, getcharid(2); if (countitem(7840) > 0) { mes "[Rhehe Ravies]"; diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 0ffaf959a..ba603b207 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -39,7 +39,7 @@ OnEffect2: end; } -prontera,164,69,3 script Cool Devi#06_hw 738,{ +prontera,164,69,3 script Cool Devi#06_hw 4_DEVIRUCHI,{ if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; @@ -235,7 +235,7 @@ prontera,164,69,3 script Cool Devi#06_hw 738,{ } -geffen,145,132,3 script Hoirin#06_hw 729,{ +geffen,145,132,3 script Hoirin#06_hw 4_F_NOVICE,{ if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; @@ -390,7 +390,7 @@ OnTouch: close; } -nif_in,19,32,3 script Deviruchi#06_hw 738,{ +nif_in,19,32,3 script Deviruchi#06_hw 4_DEVIRUCHI,{ if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; @@ -482,7 +482,7 @@ nif_in,19,32,3 script Deviruchi#06_hw 738,{ // Creation of Pumpkin Pie (Event 2) //============================================================ -nif_fild01,165,115,3 script Chicken Masta#06_hw 794,{ +nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; @@ -641,7 +641,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 794,{ } } -nif_fild01,167,113,3 script Masta's chicken#06_hw01 800,{ +nif_fild01,167,113,3 script Masta's chicken#06_hw01 4_NFCOCK,{ mes "Drowsing chicken."; close; } @@ -715,14 +715,14 @@ OnInit: } -nif_fild01,270,145,3 duplicate(HwChicken) Masta's chicken#06_hw02 800 -nif_fild01,219,267,4 duplicate(HwChicken) Masta's chicken#06_hw03 800 -nif_fild01,199,240,5 duplicate(HwChicken) Masta's chicken#06_hw04 800 -nif_fild01,316,97,6 duplicate(HwChicken) Masta's chicken#06_hw05 800 -nif_fild01,147,343,7 duplicate(HwChicken) Masta's chicken#06_hw06 800 -nif_fild01,185,325,8 duplicate(HwChicken) Masta's chicken#06_hw07 800 -nif_fild01,133,105,1 duplicate(HwChicken) Masta's chicken#06_hw08 800 -nif_fild01,331,329,2 duplicate(HwChicken) Masta's chicken#06_hw09 800 +nif_fild01,270,145,3 duplicate(HwChicken) Masta's chicken#06_hw02 4_NFCOCK +nif_fild01,219,267,4 duplicate(HwChicken) Masta's chicken#06_hw03 4_NFCOCK +nif_fild01,199,240,5 duplicate(HwChicken) Masta's chicken#06_hw04 4_NFCOCK +nif_fild01,316,97,6 duplicate(HwChicken) Masta's chicken#06_hw05 4_NFCOCK +nif_fild01,147,343,7 duplicate(HwChicken) Masta's chicken#06_hw06 4_NFCOCK +nif_fild01,185,325,8 duplicate(HwChicken) Masta's chicken#06_hw07 4_NFCOCK +nif_fild01,133,105,1 duplicate(HwChicken) Masta's chicken#06_hw08 4_NFCOCK +nif_fild01,331,329,2 duplicate(HwChicken) Masta's chicken#06_hw09 4_NFCOCK pay_dun03,1,1,0 script #06_hw_timer01 -1,{ OnInit: @@ -862,47 +862,47 @@ OnTimer4200000: } -pay_dun03,151,138,3 duplicate(HwChicken3) Chicken#06_hw_p01 800 -pay_dun03,151,138,3 duplicate(HwChicken2) Chicken#06_hw_p02 800 -pay_dun03,152,138,3 duplicate(HwChicken2) Chicken#06_hw_p03 800 -pay_dun03,154,138,3 duplicate(HwChicken2) Chicken#06_hw_p04 800 -pay_dun03,155,138,3 duplicate(HwChicken2) Chicken#06_hw_p05 800 -pay_dun03,157,138,3 duplicate(HwChicken2) Chicken#06_hw_p06 800 -pay_dun03,158,138,3 duplicate(HwChicken3) Chicken#06_hw_p07 800 -pay_dun03,150,137,3 duplicate(HwChicken2) Chicken#06_hw_p08 800 -pay_dun03,153,137,3 duplicate(HwChicken2) Chicken#06_hw_p09 800 -pay_dun03,156,137,3 duplicate(HwChicken3) Chicken#06_hw_p10 800 -pay_dun03,159,137,3 duplicate(HwChicken2) Chicken#06_hw_p11 800 -pay_dun03,149,136,3 duplicate(HwChicken2) Chicken#06_hw_p12 800 -pay_dun03,152,136,3 duplicate(HwChicken3) Chicken#06_hw_p13 800 -pay_dun03,157,136,3 duplicate(HwChicken2) Chicken#06_hw_p14 800 -pay_dun03,160,136,3 duplicate(HwChicken2) Chicken#06_hw_p15 800 -pay_dun03,149,135,3 duplicate(HwChicken3) Chicken#06_hw_p16 800 -pay_dun03,151,135,3 duplicate(HwChicken2) Chicken#06_hw_p17 800 -pay_dun03,152,135,3 duplicate(HwChicken2) Chicken#06_hw_p18 800 -pay_dun03,153,135,3 duplicate(HwChicken3) Chicken#06_hw_p19 800 -pay_dun03,156,135,3 duplicate(HwChicken2) Chicken#06_hw_p20 800 -pay_dun03,157,135,3 duplicate(HwChicken2) Chicken#06_hw_p21 800 -pay_dun03,158,135,3 duplicate(HwChicken3) Chicken#06_hw_p22 800 -pay_dun03,160,135,3 duplicate(HwChicken2) Chicken#06_hw_p23 800 -pay_dun03,149,134,3 duplicate(HwChicken2) Chicken#06_hw_p24 800 -pay_dun03,152,134,3 duplicate(HwChicken3) Chicken#06_hw_p25 800 -pay_dun03,157,134,3 duplicate(HwChicken2) Chicken#06_hw_p26 800 -pay_dun03,160,134,3 duplicate(HwChicken2) Chicken#06_hw_p27 800 -pay_dun03,149,133,3 duplicate(HwChicken3) Chicken#06_hw_p28 800 -pay_dun03,160,133,3 duplicate(HwChicken2) Chicken#06_hw_p29 800 -pay_dun03,150,132,3 duplicate(HwChicken2) Chicken#06_hw_p30 800 -pay_dun03,153,132,3 duplicate(HwChicken3) Chicken#06_hw_p31 800 -pay_dun03,156,132,3 duplicate(HwChicken2) Chicken#06_hw_p32 800 -pay_dun03,159,132,3 duplicate(HwChicken2) Chicken#06_hw_p33 800 -pay_dun03,151,131,3 duplicate(HwChicken2) Chicken#06_hw_p34 800 -pay_dun03,152,131,3 duplicate(HwChicken2) Chicken#06_hw_p35 800 -pay_dun03,153,131,3 duplicate(HwChicken3) Chicken#06_hw_p36 800 -pay_dun03,154,131,3 duplicate(HwChicken2) Chicken#06_hw_p37 800 -pay_dun03,155,131,3 duplicate(HwChicken2) Chicken#06_hw_p38 800 -pay_dun03,156,131,3 duplicate(HwChicken3) Chicken#06_hw_p39 800 -pay_dun03,157,131,3 duplicate(HwChicken2) Chicken#06_hw_p40 800 -pay_dun03,158,131,3 duplicate(HwChicken3) Chicken#06_hw_p41 800 +pay_dun03,151,138,3 duplicate(HwChicken3) Chicken#06_hw_p01 4_NFCOCK +pay_dun03,151,138,3 duplicate(HwChicken2) Chicken#06_hw_p02 4_NFCOCK +pay_dun03,152,138,3 duplicate(HwChicken2) Chicken#06_hw_p03 4_NFCOCK +pay_dun03,154,138,3 duplicate(HwChicken2) Chicken#06_hw_p04 4_NFCOCK +pay_dun03,155,138,3 duplicate(HwChicken2) Chicken#06_hw_p05 4_NFCOCK +pay_dun03,157,138,3 duplicate(HwChicken2) Chicken#06_hw_p06 4_NFCOCK +pay_dun03,158,138,3 duplicate(HwChicken3) Chicken#06_hw_p07 4_NFCOCK +pay_dun03,150,137,3 duplicate(HwChicken2) Chicken#06_hw_p08 4_NFCOCK +pay_dun03,153,137,3 duplicate(HwChicken2) Chicken#06_hw_p09 4_NFCOCK +pay_dun03,156,137,3 duplicate(HwChicken3) Chicken#06_hw_p10 4_NFCOCK +pay_dun03,159,137,3 duplicate(HwChicken2) Chicken#06_hw_p11 4_NFCOCK +pay_dun03,149,136,3 duplicate(HwChicken2) Chicken#06_hw_p12 4_NFCOCK +pay_dun03,152,136,3 duplicate(HwChicken3) Chicken#06_hw_p13 4_NFCOCK +pay_dun03,157,136,3 duplicate(HwChicken2) Chicken#06_hw_p14 4_NFCOCK +pay_dun03,160,136,3 duplicate(HwChicken2) Chicken#06_hw_p15 4_NFCOCK +pay_dun03,149,135,3 duplicate(HwChicken3) Chicken#06_hw_p16 4_NFCOCK +pay_dun03,151,135,3 duplicate(HwChicken2) Chicken#06_hw_p17 4_NFCOCK +pay_dun03,152,135,3 duplicate(HwChicken2) Chicken#06_hw_p18 4_NFCOCK +pay_dun03,153,135,3 duplicate(HwChicken3) Chicken#06_hw_p19 4_NFCOCK +pay_dun03,156,135,3 duplicate(HwChicken2) Chicken#06_hw_p20 4_NFCOCK +pay_dun03,157,135,3 duplicate(HwChicken2) Chicken#06_hw_p21 4_NFCOCK +pay_dun03,158,135,3 duplicate(HwChicken3) Chicken#06_hw_p22 4_NFCOCK +pay_dun03,160,135,3 duplicate(HwChicken2) Chicken#06_hw_p23 4_NFCOCK +pay_dun03,149,134,3 duplicate(HwChicken2) Chicken#06_hw_p24 4_NFCOCK +pay_dun03,152,134,3 duplicate(HwChicken3) Chicken#06_hw_p25 4_NFCOCK +pay_dun03,157,134,3 duplicate(HwChicken2) Chicken#06_hw_p26 4_NFCOCK +pay_dun03,160,134,3 duplicate(HwChicken2) Chicken#06_hw_p27 4_NFCOCK +pay_dun03,149,133,3 duplicate(HwChicken3) Chicken#06_hw_p28 4_NFCOCK +pay_dun03,160,133,3 duplicate(HwChicken2) Chicken#06_hw_p29 4_NFCOCK +pay_dun03,150,132,3 duplicate(HwChicken2) Chicken#06_hw_p30 4_NFCOCK +pay_dun03,153,132,3 duplicate(HwChicken3) Chicken#06_hw_p31 4_NFCOCK +pay_dun03,156,132,3 duplicate(HwChicken2) Chicken#06_hw_p32 4_NFCOCK +pay_dun03,159,132,3 duplicate(HwChicken2) Chicken#06_hw_p33 4_NFCOCK +pay_dun03,151,131,3 duplicate(HwChicken2) Chicken#06_hw_p34 4_NFCOCK +pay_dun03,152,131,3 duplicate(HwChicken2) Chicken#06_hw_p35 4_NFCOCK +pay_dun03,153,131,3 duplicate(HwChicken3) Chicken#06_hw_p36 4_NFCOCK +pay_dun03,154,131,3 duplicate(HwChicken2) Chicken#06_hw_p37 4_NFCOCK +pay_dun03,155,131,3 duplicate(HwChicken2) Chicken#06_hw_p38 4_NFCOCK +pay_dun03,156,131,3 duplicate(HwChicken3) Chicken#06_hw_p39 4_NFCOCK +pay_dun03,157,131,3 duplicate(HwChicken2) Chicken#06_hw_p40 4_NFCOCK +pay_dun03,158,131,3 duplicate(HwChicken3) Chicken#06_hw_p41 4_NFCOCK // Payon Field chickens //============================================================ @@ -1001,35 +1001,35 @@ OnTimer6000000: end; } -pay_fild08,147,353,3 duplicate(HwChicken3) Chicken#06_hw_pf01 800 -pay_fild08,147,354,3 duplicate(HwChicken2) Chicken#06_hw_pf02 800 -pay_fild08,147,355,3 duplicate(HwChicken2) Chicken#06_hw_pf03 800 -pay_fild08,148,352,3 duplicate(HwChicken3) Chicken#06_hw_pf04 800 -pay_fild08,148,356,3 duplicate(HwChicken2) Chicken#06_hw_pf05 800 -pay_fild08,149,351,3 duplicate(HwChicken2) Chicken#06_hw_pf06 800 -pay_fild08,149,354,3 duplicate(HwChicken3) Chicken#06_hw_pf07 800 -pay_fild08,149,357,3 duplicate(HwChicken2) Chicken#06_hw_pf08 800 -pay_fild08,150,351,3 duplicate(HwChicken2) Chicken#06_hw_pf09 800 -pay_fild08,150,357,3 duplicate(HwChicken3) Chicken#06_hw_pf10 800 -pay_fild08,151,351,3 duplicate(HwChicken2) Chicken#06_hw_pf11 800 -pay_fild08,151,353,3 duplicate(HwChicken2) Chicken#06_hw_pf12 800 -pay_fild08,151,355,3 duplicate(HwChicken3) Chicken#06_hw_pf13 800 -pay_fild08,151,357,3 duplicate(HwChicken2) Chicken#06_hw_pf14 800 -pay_fild08,152,351,3 duplicate(HwChicken2) Chicken#06_hw_pf15 800 -pay_fild08,152,357,3 duplicate(HwChicken3) Chicken#06_hw_pf16 800 -pay_fild08,153,351,3 duplicate(HwChicken2) Chicken#06_hw_pf17 800 -pay_fild08,153,357,3 duplicate(HwChicken2) Chicken#06_hw_pf18 800 -pay_fild08,154,351,3 duplicate(HwChicken3) Chicken#06_hw_pf19 800 -pay_fild08,154,353,3 duplicate(HwChicken2) Chicken#06_hw_pf20 800 -pay_fild08,154,355,3 duplicate(HwChicken2) Chicken#06_hw_pf21 800 -pay_fild08,154,357,3 duplicate(HwChicken3) Chicken#06_hw_pf22 800 -pay_fild08,155,350,3 duplicate(HwChicken2) Chicken#06_hw_pf23 800 -pay_fild08,155,352,3 duplicate(HwChicken2) Chicken#06_hw_pf24 800 -pay_fild08,155,354,3 duplicate(HwChicken3) Chicken#06_hw_pf25 800 -pay_fild08,155,356,3 duplicate(HwChicken2) Chicken#06_hw_pf26 800 -pay_fild08,155,358,3 duplicate(HwChicken3) Chicken#06_hw_pf27 800 - -prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 799,{ +pay_fild08,147,353,3 duplicate(HwChicken3) Chicken#06_hw_pf01 4_NFCOCK +pay_fild08,147,354,3 duplicate(HwChicken2) Chicken#06_hw_pf02 4_NFCOCK +pay_fild08,147,355,3 duplicate(HwChicken2) Chicken#06_hw_pf03 4_NFCOCK +pay_fild08,148,352,3 duplicate(HwChicken3) Chicken#06_hw_pf04 4_NFCOCK +pay_fild08,148,356,3 duplicate(HwChicken2) Chicken#06_hw_pf05 4_NFCOCK +pay_fild08,149,351,3 duplicate(HwChicken2) Chicken#06_hw_pf06 4_NFCOCK +pay_fild08,149,354,3 duplicate(HwChicken3) Chicken#06_hw_pf07 4_NFCOCK +pay_fild08,149,357,3 duplicate(HwChicken2) Chicken#06_hw_pf08 4_NFCOCK +pay_fild08,150,351,3 duplicate(HwChicken2) Chicken#06_hw_pf09 4_NFCOCK +pay_fild08,150,357,3 duplicate(HwChicken3) Chicken#06_hw_pf10 4_NFCOCK +pay_fild08,151,351,3 duplicate(HwChicken2) Chicken#06_hw_pf11 4_NFCOCK +pay_fild08,151,353,3 duplicate(HwChicken2) Chicken#06_hw_pf12 4_NFCOCK +pay_fild08,151,355,3 duplicate(HwChicken3) Chicken#06_hw_pf13 4_NFCOCK +pay_fild08,151,357,3 duplicate(HwChicken2) Chicken#06_hw_pf14 4_NFCOCK +pay_fild08,152,351,3 duplicate(HwChicken2) Chicken#06_hw_pf15 4_NFCOCK +pay_fild08,152,357,3 duplicate(HwChicken3) Chicken#06_hw_pf16 4_NFCOCK +pay_fild08,153,351,3 duplicate(HwChicken2) Chicken#06_hw_pf17 4_NFCOCK +pay_fild08,153,357,3 duplicate(HwChicken2) Chicken#06_hw_pf18 4_NFCOCK +pay_fild08,154,351,3 duplicate(HwChicken3) Chicken#06_hw_pf19 4_NFCOCK +pay_fild08,154,353,3 duplicate(HwChicken2) Chicken#06_hw_pf20 4_NFCOCK +pay_fild08,154,355,3 duplicate(HwChicken2) Chicken#06_hw_pf21 4_NFCOCK +pay_fild08,154,357,3 duplicate(HwChicken3) Chicken#06_hw_pf22 4_NFCOCK +pay_fild08,155,350,3 duplicate(HwChicken2) Chicken#06_hw_pf23 4_NFCOCK +pay_fild08,155,352,3 duplicate(HwChicken2) Chicken#06_hw_pf24 4_NFCOCK +pay_fild08,155,354,3 duplicate(HwChicken3) Chicken#06_hw_pf25 4_NFCOCK +pay_fild08,155,356,3 duplicate(HwChicken2) Chicken#06_hw_pf26 4_NFCOCK +pay_fild08,155,358,3 duplicate(HwChicken3) Chicken#06_hw_pf27 4_NFCOCK + +prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 4_NFBAT,{ mes "[Familiar]"; mes "Hello."; mes "I'm Loli Ruri's faithful and cute Familiar."; @@ -1072,10 +1072,10 @@ prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 799,{ mes "He likes it."; close; } -payon,156,231,3 duplicate(HWFamiDup) Familiar#06_hw02 799 -morocc,159,143,3 duplicate(HWFamiDup) Familiar#06_hw03 799 -geffen,120,188,3 duplicate(HWFamiDup) Familiar#06_hw04 799 -alberta,80,171,3 duplicate(HWFamiDup) Familiar#06_hw05 799 +payon,156,231,3 duplicate(HWFamiDup) Familiar#06_hw02 4_NFBAT +morocc,159,143,3 duplicate(HWFamiDup) Familiar#06_hw03 4_NFBAT +geffen,120,188,3 duplicate(HWFamiDup) Familiar#06_hw04 4_NFBAT +alberta,80,171,3 duplicate(HWFamiDup) Familiar#06_hw05 4_NFBAT // Event Lude Monster Spawns //============================================================ diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index 8bb8df1fd..6aad72358 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -15,7 +15,7 @@ //= 1.1 Some small changes. [Kisuka] //============================================================ -payon,162,176,4 script Halloween Magician#iRO08 704,{ +payon,162,176,4 script Halloween Magician#iRO08 4_M_BIBI,{ if (Hallow08 < 1) { mes "[Halloween Magician]"; mes "Kkkkkkkkk!"; @@ -232,7 +232,7 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ } } -evt_zombie,16,142,1 script zombiewarp001 45,2,2,{ +evt_zombie,16,142,1 script zombiewarp001 WARPNPC,2,2,{ OnTouch: if (@Hallow08Warp == 1) { set Hallow08Kill,2; @@ -242,7 +242,7 @@ OnTouch: end; } -evt_zombie,122,27,1 script zombiewarp002 45,2,2,{ +evt_zombie,122,27,1 script zombiewarp002 WARPNPC,2,2,{ OnTouch: if (@Hallow08Warp == 2) { set Hallow08Kill,2; @@ -252,7 +252,7 @@ OnTouch: end; } -evt_zombie,267,89,1 script zombiewarp003 45,2,2,{ +evt_zombie,267,89,1 script zombiewarp003 WARPNPC,2,2,{ OnTouch: if (@Hallow08Warp == 3) { set Hallow08Kill,2; diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt index c349dec28..95b3e2a11 100644 --- a/npc/events/halloween_2009.txt +++ b/npc/events/halloween_2009.txt @@ -20,7 +20,7 @@ // Headgear Quest - Pumpkin Hat //============================================================ -prontera,152,192,5 script Pumpkin Hat Researcher 712,{ +prontera,152,192,5 script Pumpkin Hat Researcher 4_M_05,{ if(BaseLevel < 45) { mes "[Pumpkin Hat Researcher]"; mes "Shoo, I don't need a child. Shoo! I don't talk to novices."; @@ -94,7 +94,7 @@ prontera,152,192,5 script Pumpkin Hat Researcher 712,{ // Buffs - Trick or Treaters //============================================================ -- script Trick or Treater::09Treats 706,2,2,{ +- script Trick or Treater::09Treats 4_M_KID1,2,2,{ OnTouch: hideoffnpc strnpcinfo(3); initnpctimer; @@ -209,18 +209,18 @@ OnTimer300000: stopnpctimer; end; } -prontera,151,173,5 duplicate(09Treats) Trick or Treater#iRO1 706,2,2 -prontera,270,350,5 duplicate(09Treats) Trick or Treater#iRO2 706,2,2 -prontera,234,310,5 duplicate(09Treats) Trick or Treater#iRO3 706,2,2 -prontera,156,321,5 duplicate(09Treats) Trick or Treater#iRO4 706,2,2 -prontera,156,283,5 duplicate(09Treats) Trick or Treater#iRO5 706,2,2 -prontera,142,214,5 duplicate(09Treats) Trick or Treater#iRO6 706,2,2 -prontera,134,125,5 duplicate(09Treats) Trick or Treater#iRO7 706,2,2 -prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 706,2,2 +prontera,151,173,5 duplicate(09Treats) Trick or Treater#iRO1 4_M_KID1,2,2 +prontera,270,350,5 duplicate(09Treats) Trick or Treater#iRO2 4_M_KID1,2,2 +prontera,234,310,5 duplicate(09Treats) Trick or Treater#iRO3 4_M_KID1,2,2 +prontera,156,321,5 duplicate(09Treats) Trick or Treater#iRO4 4_M_KID1,2,2 +prontera,156,283,5 duplicate(09Treats) Trick or Treater#iRO5 4_M_KID1,2,2 +prontera,142,214,5 duplicate(09Treats) Trick or Treater#iRO6 4_M_KID1,2,2 +prontera,134,125,5 duplicate(09Treats) Trick or Treater#iRO7 4_M_KID1,2,2 +prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2 // Monster Summoning - Halloween Wizard //============================================================ -- script Halloween Wizard#iRO09::09HallowWiz 737,{ +- script Halloween Wizard#iRO09::09HallowWiz 4_DARKLORD,{ mes "[Halloween Wizard]"; mes "..."; mes "Do you want to play a trick on someone?"; @@ -433,8 +433,8 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 706,2,2 } } } -prontera,156,195,5 duplicate(09HallowWiz) Halloween Wizard#1 737 -geffen,133,122,5 duplicate(09HallowWiz) Halloween Wizard#2 737 -payon,156,196,5 duplicate(09HallowWiz) Halloween Wizard#3 737 -alberta,96,57,5 duplicate(09HallowWiz) Halloween Wizard#4 737 -aldebaran,146,122,5 duplicate(09HallowWiz) Halloween Wizard#5 737 +prontera,156,195,5 duplicate(09HallowWiz) Halloween Wizard#1 4_DARKLORD +geffen,133,122,5 duplicate(09HallowWiz) Halloween Wizard#2 4_DARKLORD +payon,156,196,5 duplicate(09HallowWiz) Halloween Wizard#3 4_DARKLORD +alberta,96,57,5 duplicate(09HallowWiz) Halloween Wizard#4 4_DARKLORD +aldebaran,146,122,5 duplicate(09HallowWiz) Halloween Wizard#5 4_DARKLORD diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index eb41fc9d0..b308335cb 100644 --- a/npc/events/idul_fitri.txt +++ b/npc/events/idul_fitri.txt @@ -10,7 +10,7 @@ //= 1.1 Replaced effect numerics with constants. [Samuray22] //============================================================ -prontera,146,92,3 script Cellerb 58,{ +prontera,146,92,3 script Cellerb 1_M_MERCHANT,{ mes "[Staff Idul Fitri]"; if((gettime(6)==10 && (gettime(5)==24 || gettime(5)==25))==0) { mes "Congratulation! Celebrate Feast Day Of Ramadan Idul Fitri 1427 H."; diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt index 72ebe644b..577869be3 100644 --- a/npc/events/lunar_2008.txt +++ b/npc/events/lunar_2008.txt @@ -22,7 +22,7 @@ //= 1.1 Added missing checkweights. [L0ne_W0lf] //============================================================ -payon_in01,193,30,4 script Rice Mill Grandma#rat 78,{ +payon_in01,193,30,4 script Rice Mill Grandma#rat 1_F_ORIENT_04,{ mes "[Rice Mill Grandma]"; if (!lunar_rat) { mes "Those filthy little"; @@ -170,7 +170,7 @@ payon_in01,193,30,4 script Rice Mill Grandma#rat 78,{ } } -payon,215,127,4 script Rice Mill Man#rat 54,{ +payon,215,127,4 script Rice Mill Man#rat 1_M_JOBGUIDER,{ mes "[Rice Mill Man]"; if (!lunar_rat) { mes "Breaks my heart..."; @@ -223,8 +223,8 @@ payon,215,127,4 script Rice Mill Man#rat 54,{ } } -//payon,126,113,4 script Miss Lunar#rat 862,{ -payon,126,113,4 script Miss Lunar#rat 719,{ +//payon,126,113,4 script Miss Lunar#rat 4_F_LGTGIRL,{ +payon,126,113,4 script Miss Lunar#rat 4_F_NACORURI,{ mes "[Lunar]"; if ((MaxWeight-Weight) < 3000 || checkweight(1201,1) == 0) { mes "Oh, I'm sorry, but we"; diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 7f191290b..2fd6b7594 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -41,25 +41,25 @@ function script F_GldDunSw { } // Castle 1 =============================================== -nguild_alde,212,181,0 script Switch#DunN01 111,{ +nguild_alde,212,181,0 script Switch#DunN01 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_alde","02",32,122; close; } // Castle 2 =============================================== -nguild_gef,78,84,0 script Switch#DunN02 111,{ +nguild_gef,78,84,0 script Switch#DunN02 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_gef","04",39,258; close; } // Castle 3 =============================================== -nguild_pay,101,25,0 script Switch#DunN03 111,{ +nguild_pay,101,25,0 script Switch#DunN03 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_pay","01",186,165; close; } // Castle 4 =============================================== -nguild_prt,94,200,0 script Switch#DunN04 111,{ +nguild_prt,94,200,0 script Switch#DunN04 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_prt","03",28,251; close; } diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index 178125643..17e1db744 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -61,7 +61,7 @@ function script F_Flags { //============================================================================// // Castle 1 //============================================================================// -n_castle,110,96,1 script NGuild Aldebaran#a1-1 722,{ +n_castle,110,96,1 script NGuild Aldebaran#a1-1 GUILD_FLAG,{ callfunc "F_Flags","Al De Baran","nguild_alde",218,170,1,1; close; @@ -70,7 +70,7 @@ OnRecvCastleN01: end; } -nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde 722,{ +nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde GUILD_FLAG,{ callfunc "F_Flags","Al De Baran","nguild_alde",218,170,0,1; close; @@ -79,20 +79,20 @@ OnRecvCastleN01: end; } // In Castle ============================================ -nguild_alde,30,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-7 722 -nguild_alde,37,248,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-8 722 -nguild_alde,37,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-9 722 -nguild_alde,95,80,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-10 722 -nguild_alde,95,59,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-11 722 -nguild_alde,62,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-12 722 -nguild_alde,70,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-13 722 -nguild_alde,74,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-14 722 -nguild_alde,62,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-15 722 -nguild_alde,66,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-16 722 -nguild_alde,70,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-17 722 -nguild_alde,74,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-18 722 -nguild_alde,203,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-19 722 -nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722 +nguild_alde,30,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-7 GUILD_FLAG +nguild_alde,37,248,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-8 GUILD_FLAG +nguild_alde,37,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-9 GUILD_FLAG +nguild_alde,95,80,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-10 GUILD_FLAG +nguild_alde,95,59,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-11 GUILD_FLAG +nguild_alde,62,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-12 GUILD_FLAG +nguild_alde,70,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-13 GUILD_FLAG +nguild_alde,74,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-14 GUILD_FLAG +nguild_alde,62,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-15 GUILD_FLAG +nguild_alde,66,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-16 GUILD_FLAG +nguild_alde,70,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-17 GUILD_FLAG +nguild_alde,74,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-18 GUILD_FLAG +nguild_alde,203,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-19 GUILD_FLAG +nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 GUILD_FLAG @@ -100,7 +100,7 @@ nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722 //============================================================================// // Castle 2 //============================================================================// -n_castle,110,109,3 script NGuild Geffen#g1-1 722,{ +n_castle,110,109,3 script NGuild Geffen#g1-1 GUILD_FLAG,{ callfunc "F_Flags","Geffen","nguild_gef",83,47,1,1; close; @@ -109,7 +109,7 @@ OnRecvCastleN02: end; } -nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef 722,{ +nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef GUILD_FLAG,{ callfunc "F_Flags","Geffen","nguild_gef",83,47,0,1; close; @@ -118,19 +118,19 @@ OnRecvCastleN02: end; } // In Castle ============================================= -nguild_gef,32,157,4 duplicate(NGuildGef) NGuild Geffen#g1-7 722 -nguild_gef,22,156,5 duplicate(NGuildGef) NGuild Geffen#g1-8 722 -nguild_gef,68,185,3 duplicate(NGuildGef) NGuild Geffen#g1-9 722 -nguild_gef,17,171,5 duplicate(NGuildGef) NGuild Geffen#g1-10 722 -nguild_gef,59,16,4 duplicate(NGuildGef) NGuild Geffen#g1-11 722 -nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 722 +nguild_gef,32,157,4 duplicate(NGuildGef) NGuild Geffen#g1-7 GUILD_FLAG +nguild_gef,22,156,5 duplicate(NGuildGef) NGuild Geffen#g1-8 GUILD_FLAG +nguild_gef,68,185,3 duplicate(NGuildGef) NGuild Geffen#g1-9 GUILD_FLAG +nguild_gef,17,171,5 duplicate(NGuildGef) NGuild Geffen#g1-10 GUILD_FLAG +nguild_gef,59,16,4 duplicate(NGuildGef) NGuild Geffen#g1-11 GUILD_FLAG +nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 GUILD_FLAG //============================================================================// // Castle 3 //============================================================================// -n_castle,94,109,5 script NGuild Payon#f1-1 722,{ +n_castle,94,109,5 script NGuild Payon#f1-1 GUILD_FLAG,{ callfunc "F_Flags","Payon","nguild_pay",87,29,1,1; close; @@ -139,7 +139,7 @@ OnRecvCastleN03: end; } -nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay 722,{ +nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay GUILD_FLAG,{ callfunc "F_Flags","Payon","nguild_pay",87,29,0,1; close; @@ -148,12 +148,12 @@ OnRecvCastleN03: end; } // In Castle =============================================== -nguild_pay,238,67,4 duplicate(NGuildPay) NGuild Payon#f1-6 722 -nguild_pay,233,67,4 duplicate(NGuildPay) NGuild Payon#f1-7 722 -nguild_pay,221,123,4 duplicate(NGuildPay) NGuild Payon#f1-8 722 -nguild_pay,221,116,4 duplicate(NGuildPay) NGuild Payon#f1-9 722 -nguild_pay,206,108,4 duplicate(NGuildPay) NGuild Payon#f1-10 722 -nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722 +nguild_pay,238,67,4 duplicate(NGuildPay) NGuild Payon#f1-6 GUILD_FLAG +nguild_pay,233,67,4 duplicate(NGuildPay) NGuild Payon#f1-7 GUILD_FLAG +nguild_pay,221,123,4 duplicate(NGuildPay) NGuild Payon#f1-8 GUILD_FLAG +nguild_pay,221,116,4 duplicate(NGuildPay) NGuild Payon#f1-9 GUILD_FLAG +nguild_pay,206,108,4 duplicate(NGuildPay) NGuild Payon#f1-10 GUILD_FLAG +nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 GUILD_FLAG @@ -161,7 +161,7 @@ nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722 //=============================================================================// // Castle 4 //=============================================================================// -n_castle,94,96,7 script NGuild Prontera#p1-1 722,{ +n_castle,94,96,7 script NGuild Prontera#p1-1 GUILD_FLAG,{ callfunc "F_Flags","Prontera","nguild_prt",97,174,1,1; close; @@ -170,7 +170,7 @@ OnRecvCastleN04: end; } -nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt 722,{ +nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt GUILD_FLAG,{ callfunc "F_Flags","Prontera","nguild_prt",97,174,0,1; close; @@ -179,12 +179,12 @@ OnRecvCastleN04: end; } // In Castle ============================================= -nguild_prt,64,56,4 duplicate(NGuildPrt) NGuild Prontera#p1-8 722 -nguild_prt,76,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-9 722 -nguild_prt,84,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-10 722 -nguild_prt,94,39,4 duplicate(NGuildPrt) NGuild Prontera#p1-11 722 -nguild_prt,94,24,4 duplicate(NGuildPrt) NGuild Prontera#p1-12 722 -nguild_prt,73,14,4 duplicate(NGuildPrt) NGuild Prontera#p1-13 722 -nguild_prt,73,6,4 duplicate(NGuildPrt) NGuild Prontera#p1-14 722 -nguild_prt,55,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-15 722 -nguild_prt,45,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-16 722 +nguild_prt,64,56,4 duplicate(NGuildPrt) NGuild Prontera#p1-8 GUILD_FLAG +nguild_prt,76,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-9 GUILD_FLAG +nguild_prt,84,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-10 GUILD_FLAG +nguild_prt,94,39,4 duplicate(NGuildPrt) NGuild Prontera#p1-11 GUILD_FLAG +nguild_prt,94,24,4 duplicate(NGuildPrt) NGuild Prontera#p1-12 GUILD_FLAG +nguild_prt,73,14,4 duplicate(NGuildPrt) NGuild Prontera#p1-13 GUILD_FLAG +nguild_prt,73,6,4 duplicate(NGuildPrt) NGuild Prontera#p1-14 GUILD_FLAG +nguild_prt,55,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-15 GUILD_FLAG +nguild_prt,45,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-16 GUILD_FLAG diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index 11d748ab4..155c33792 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -32,7 +32,7 @@ L_StartG: } // Castle 1 =============================================== -nguild_alde,218,170,0 script Kafra Service#N01 117,{ +nguild_alde,218,170,0 script Kafra Service#N01 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_alde", "Prontera"; end; OnRecvCastleN01: @@ -41,8 +41,8 @@ OnRecvCastleN01: } // Castle 2 =============================================== -//nguild_gef,96,173,0 script Kafra Service#N02 117,{ -nguild_gef,35,37,0 script Kafra Service#N02 117,{ +//nguild_gef,96,173,0 script Kafra Service#N02 4_F_KAFRA1,{ +nguild_gef,35,37,0 script Kafra Service#N02 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_gef", "Prontera"; end; OnRecvCastleN02: @@ -51,7 +51,7 @@ OnRecvCastleN02: } // Castle 3 =============================================== -nguild_pay,128,58,3 script Kafra Service#N03 117,{ +nguild_pay,128,58,3 script Kafra Service#N03 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_pay", "Prontera"; end; OnRecvCastleN03: @@ -60,7 +60,7 @@ OnRecvCastleN03: } // Castle 4 =============================================== -nguild_prt,96,173,0 script Kafra Service#N04 117,{ +nguild_prt,96,173,0 script Kafra Service#N04 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_prt", "Prontera"; end; OnRecvCastleN04: diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index 0b35108f7..fd5fc6053 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -145,28 +145,28 @@ function script F_GldManager { } // Castle 1 ================================================================================== -nguild_alde,218,175,0 script Frolo 55,{ +nguild_alde,218,175,0 script Frolo 1_M_JOBTESTER,{ callfunc "F_GldManager","Frolo","nguild_alde",119,223,"N01"; close; } // Castle 2 ================================================================================== -nguild_gef,40,48,5 script Leiber 55,{ +nguild_gef,40,48,5 script Leiber 1_M_JOBTESTER,{ callfunc "F_GldManager","Leiber","nguild_gef",155,112,"N02"; close; } // Castle 3 ================================================================================== -nguild_pay,120,58,4 script Dundar 55,{ +nguild_pay,120,58,4 script Dundar 1_M_JOBTESTER,{ callfunc "F_GldManager","Dundar","nguild_pay",290,7,"N03"; close; } // Castle 4 ================================================================================== -nguild_prt,112,181,0 script Thefton 55,{ +nguild_prt,112,181,0 script Thefton 1_M_JOBTESTER,{ callfunc "F_GldManager","Thefton","nguild_prt",15,209,"N04"; close; } diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt index 1c9443225..cc3d7db1e 100644 --- a/npc/events/nguild/nguild_treas.txt +++ b/npc/events/nguild/nguild_treas.txt @@ -83,7 +83,7 @@ OnDied: } // Treasure Room Switch -------------------- -nguild_alde,123,223,0 script Switch#TresN01 111,{ +nguild_alde,123,223,0 script Switch#TresN01 HIDDEN_NPC,{ callfunc "F_GldTreasSw", "nguild_alde",218,176; end; } @@ -109,7 +109,7 @@ OnDied: } // Room Switch --------------------------------------------------------- -nguild_gef,152,117,0 script Switch#TresN02 111,{ +nguild_gef,152,117,0 script Switch#TresN02 HIDDEN_NPC,{ callfunc "F_GldTreasSw","nguild_gef",40,49; end; } @@ -134,7 +134,7 @@ OnDied: } // Treasure Room Switch --------------------------------------------------- -nguild_pay,295,8,0 script Switch#TresN03 111,{ +nguild_pay,295,8,0 script Switch#TresN03 HIDDEN_NPC,{ callfunc "F_GldTreasSw", "nguild_pay",120,59; end; } @@ -159,7 +159,7 @@ OnDied: } // Treasure Room Switch ---------------------------------------------------- -nguild_prt,15,209,0 script Switch#TresN04 111,{ +nguild_prt,15,209,0 script Switch#TresN04 HIDDEN_NPC,{ callfunc "F_GldTreasSw", "nguild_prt",109,179; end; } diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt index ac54c0716..61541d096 100644 --- a/npc/events/nguild/nguild_warper.txt +++ b/npc/events/nguild/nguild_warper.txt @@ -26,7 +26,7 @@ //= TODO: The official entrance is in Izlude. //============================================================ -prontera,146,163,6 script Novice Castles 729,{ +prontera,146,163,6 script Novice Castles 4_F_NOVICE,{ mes "[Cita]"; if (!getcharid(2)) { mes "^FF0000You have to enter a guild to be able to hit Emperium!^000000"; @@ -80,7 +80,7 @@ prontera,146,163,6 script Novice Castles 729,{ close; } -n_castle,102,107,5 script Cita 729,{ +n_castle,102,107,5 script Cita 4_F_NOVICE,{ mes "[Cita]"; mes "Hello, "+ strcharinfo(0) +". Can I help you?"; next; diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index 1e0505ffd..7745adb9b 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -13,7 +13,7 @@ //= 1.6 Fixed wrong sprite id on main npc [ultramage] //============================================================ -prontera,146,92,4 script Twin Towers#tt1::Twin-Towers 812,{ +prontera,146,92,4 script Twin Towers#tt1::Twin-Towers TW_TOWER,{ mes "[Twin Towers]"; mes "How are you? We are the Twin Towers."; mes "It is such a pleasure to be able to meet you here."; @@ -84,10 +84,10 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers 812,{ close; } -morocc,160,97,4 duplicate(Twin-Towers) Twin Towers#tt2 812 -payon,176,226,4 duplicate(Twin-Towers) Twin Towers#tt3 812 -izlude,134,92,4 duplicate(Twin-Towers) Twin Towers#tt4 812 -alberta,25,238,4 duplicate(Twin-Towers) Twin Towers#tt5 812 -geffen,120,60,4 duplicate(Twin-Towers) Twin Towers#tt6 812 -aldebaran,143,116,4 duplicate(Twin-Towers) Twin Towers#tt7 812 -comodo,194,158,4 duplicate(Twin-Towers) Twin Towers#tt8 812 +morocc,160,97,4 duplicate(Twin-Towers) Twin Towers#tt2 TW_TOWER +payon,176,226,4 duplicate(Twin-Towers) Twin Towers#tt3 TW_TOWER +izlude,134,92,4 duplicate(Twin-Towers) Twin Towers#tt4 TW_TOWER +alberta,25,238,4 duplicate(Twin-Towers) Twin Towers#tt5 TW_TOWER +geffen,120,60,4 duplicate(Twin-Towers) Twin Towers#tt6 TW_TOWER +aldebaran,143,116,4 duplicate(Twin-Towers) Twin Towers#tt7 TW_TOWER +comodo,194,158,4 duplicate(Twin-Towers) Twin Towers#tt8 TW_TOWER diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index 8f2bd85d5..e7f144102 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -15,7 +15,7 @@ // Stephen - Valentine Event Chocolate seller //============================================================ -alberta,26,243,4 script Stephen 58,{ +alberta,26,243,4 script Stephen 1_M_MERCHANT,{ mes "[Stephen]"; mes "Guess what I've got?"; mes "A tasty treat not easily found in Rune-Midgard...."; @@ -59,7 +59,7 @@ alberta,26,243,4 script Stephen 58,{ // Jainie -- Gives information about Valentine Event //============================================================ -alberta,29,243,4 script Jainie 53,{ +alberta,29,243,4 script Jainie 1_M_INNKEEPER,{ mes "[Jainie]"; mes "You know what? The chocolate that my boyfriend sells are from me!"; mes "I made them by myself."; @@ -83,7 +83,7 @@ alberta,29,243,4 script Jainie 53,{ // Carl Orleans -- Valentine Event Chocolate maker //============================================================ -prt_castle,54,34,4 script Carl Orleans 47,{ +prt_castle,54,34,4 script Carl Orleans 1_M_01,{ mes "[Carl Orleans]"; mes "Yes?"; next; diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 8c5dd4432..2e02c124c 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -23,7 +23,7 @@ // Marco Bassinio (Chocolate/Chocolate Box maker) //============================================================ -prontera,164,174,4 script Trader#Val09 58,{ +prontera,164,174,4 script Trader#Val09 1_M_MERCHANT,{ mes "[Marco Bassinio]"; mes "Hey, folks! Here's something you don't see everyday!"; mes "Something you can never find in Rune-Midgarts!"; @@ -160,7 +160,7 @@ prontera,164,174,4 script Trader#Val09 58,{ // Packs Trader (Sells Wrapping Paper, Lace, and Box) //============================================================ -prontera,147,171,5 script Packs Trader#Val09 58,{ +prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "[Packs Trader]"; mes "Hello."; mes "I am a Packs Trader, I sell paper boxes and supplies for packing presents."; @@ -304,7 +304,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ // Event Ring Maker (Makes ring for players) //============================================================ -prontera,154,185,5 script Event Ring Maker#Val09 721,{ +prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{ if (BaseLevel < 75) { mes "[Event Ring Maker]"; mes "Hello, I only make the Valentine rings to those experienced adventurer Level 75 or above."; @@ -398,7 +398,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 721,{ // Valentine Vote Manager (Registers votes) //============================================================ -prontera,157,185,4 script Valentine Vote Manager#v 113,{ +prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{ mes "[Valentine Vote Manager]"; mes "Hello, I'm the Valentine's Vote Manager."; mes "I'm in charge of collecting rings for this event!"; @@ -519,7 +519,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ // Charles Orleans (Makes Home-Made Chocolates) //============================================================ -prt_castle,42,35,3 script Dessert Manager#Val09 47,{ +prt_castle,42,35,3 script Dessert Manager#Val09 1_M_01,{ if (Sex) { mes "[Charles Orleans]"; mes "Monsieur~! What brings you to my beautiful atelier?"; diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt index a8597cd22..cf1625891 100644 --- a/npc/events/valentinesday_2012.txt +++ b/npc/events/valentinesday_2012.txt @@ -12,7 +12,7 @@ //= 1.1 Standardized and fixed. [Euphy] //============================================================ -mosk_in,21,246,5 script Pinkamenia 71,{ +mosk_in,21,246,5 script Pinkamenia 1_F_LIBRARYGIRL,{ set .@n$,"^0000FF[Pinkamenia]^000000"; if (#V_QUE12==3) { set .@LFlowerID,7864; @@ -104,7 +104,7 @@ OnInit: end; } -mosk_in,21,244,3 script Baker Extraordinaire 410,{ +mosk_in,21,244,3 script Baker Extraordinaire 4_M_NOVELIST,{ set .@n$,"^0000FF[Baker Extraordinaire]^000000"; if(#V_QUE12==3) { mes .@n$; diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index d0acc8426..7e921ed97 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -11,7 +11,7 @@ //= Converted to rAthena format by Dr.Evil //============================================================ -alberta,188,64,4 script Sugar 91,{ +alberta,188,64,4 script Sugar 4_F_02,{ set @maplenum,0; set @mapleItemID,0; set @maplePrice,0; diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt index 99b3fdec9..37b91e6e0 100644 --- a/npc/events/xmas.txt +++ b/npc/events/xmas.txt @@ -20,7 +20,7 @@ //= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus] //============================================================ -xmas_in,100,96,4 script Father Christmas::Santa2 718,{ +xmas_in,100,96,4 script Father Christmas::Santa2 4_M_SANTA,{ mes "[Santa Claus]"; if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start; -- cgit v1.2.3-60-g2f50