diff options
| author | Asheraf <acheraf1998@gmail.com> | 2016-08-28 17:03:57 +0100 |
|---|---|---|
| committer | hemagx <ibrahem.h.basyone@gmail.com> | 2016-08-29 01:03:42 +0200 |
| commit | 86977d79269408a371384e61111c3a9cf6e87b0c (patch) | |
| tree | 4f2a9b1f9a3ee6436a0b857d05caa2be7e99a877 /npc/re | |
| parent | 16f998c8a79153ed9f6721c36e129b6080fa59d2 (diff) | |
| download | hercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.gz hercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.bz2 hercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.xz hercules-86977d79269408a371384e61111c3a9cf6e87b0c.zip | |
*strnpcinfo now uses constants
- NPC_NAME for the whole npc name including hidden part
- NPC_NAME_VISIBLE for the visible part of the npc name
- NPC_NAME_HIDDEN for the hidden part of the npc name
- NPC_NAME_UNIQUE for the npc unique name
- NPC_MAP for npc map
Diffstat (limited to 'npc/re')
43 files changed, 794 insertions, 794 deletions
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index ea2a65e1c..f4ac6300a 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -44,7 +44,7 @@ next; mes "[Dolangmal]"; .@s$ = "Why don't you go to ^A2314BMalangdo^000000?"; - switch(atoi(strnpcinfo(2))) { + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { case 1: mes "How is that? The crowded city of Prontera is good, but why don't you go our heaven of the cats, ^A2314BMalangdo^000000?"; break; case 2: mes "Why don't you go to ^A2314BMalangdo^000000? That place is better than Geffen, where there are only crowds of simple honest wizards."; break; case 3: mes "The fresh air of Payon is not bad, but why don't you go better place like the heaven of the cats, ^A2314BMalangdo^000000?"; break; @@ -174,7 +174,7 @@ lighthalzen,254,83,5 duplicate(Dolangmal) Dolangmal#8 4_CAT_DOWN mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 4_CAT_DOWN - script ::Odgnalam FAKE_NPC,{ - mes "This cat is sleeping in the warm "+((strnpcinfo(2) == "albe")?"Alberta":"Izlude")+" sun."; + mes "This cat is sleeping in the warm "+((strnpcinfo(NPC_NAME_HIDDEN) == "albe")?"Alberta":"Izlude")+" sun."; next; if(select("Let him sleep", "Talk to him") == 1) close; mes "[Odgnalam]"; diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index 6d69feefe..c8171b9d6 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -153,7 +153,7 @@ ma_in01,30,94,4 script Inn Keeper#ma 4_F_MALAYA,{ - script Unidentified Creature#i FAKE_NPC,{ end; OnInit: - switch(atoi(strnpcinfo(2))) { + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { case 1: setarray .@npc$,"01","02","03","04"; break; case 5: setarray .@npc$,"05","06","07","08"; break; case 9: setarray .@npc$,"09","10","11"; break; @@ -165,13 +165,13 @@ OnInit: donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable"); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnBingx2: - switch(atoi(strnpcinfo(2))) { + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { case 1: setarray .@npc$,"02","03","04"; break; case 5: setarray .@npc$,"06","07","08"; break; case 9: setarray .@npc$,"10","11"; break; @@ -180,27 +180,27 @@ OnBingx2: .@rand = rand(.@size); for(.@i = 0; .@i<.@size; ++.@i) donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable"); - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; OnTouch: if (getcharid(1)) { if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) { - donpcevent strnpcinfo(0)+"::OnBingx2"; + donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you, blushes and then disappears."; close; } if (rand(1,5)%2) { - switch(atoi(strnpcinfo(2))) { + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { case 1: $ma_name04$ = strcharinfo(0); break; case 5: $ma_name05$ = strcharinfo(0); break; case 9: $ma_name06$ = strcharinfo(0); break; } } - donpcevent strnpcinfo(0)+"::OnBingx2"; + donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you and disappears."; close; } - donpcevent strnpcinfo(0)+"::OnBingx2"; + donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature looks at you and runs away."; close; } @@ -211,13 +211,13 @@ ma_scene01,195,92,4 duplicate(Unidentified Creature#i) Unidentified Creature#09 - script Unidentified Creature#j FAKE_NPC,{ end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnBingx2: - switch(atoi(strnpcinfo(2))) { + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { case 2: setarray .@npc$,"01","03","04"; break; case 3: setarray .@npc$,"01","02","04"; break; case 4: setarray .@npc$,"01","02","03"; break; @@ -231,10 +231,10 @@ OnBingx2: .@rand = rand(.@size); for(.@i = 0; .@i<.@size; ++.@i) donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable"); - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; OnTouch: - .@i = atoi(strnpcinfo(2)); + .@i = atoi(strnpcinfo(NPC_NAME_HIDDEN)); if (.@i%4 == 2) { if (getcharid(0) == getpartyleader(getcharid(1),2)) .@pass = 1; @@ -247,7 +247,7 @@ OnTouch: } if (.@pass) { if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) { - donpcevent strnpcinfo(0)+"::OnBingx2"; + donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you, blushes and then disappears."; close; } @@ -269,11 +269,11 @@ OnTouch: break; } } - donpcevent strnpcinfo(0)+"::OnBingx2"; + donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you and disappears."; close; } - donpcevent strnpcinfo(0)+"::OnBingx2"; + donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature looks at you and runs away."; close; } diff --git a/npc/re/guides/guides_ayothaya.txt b/npc/re/guides/guides_ayothaya.txt index 09dfd70b1..6a4ce5ad2 100644 --- a/npc/re/guides/guides_ayothaya.txt +++ b/npc/re/guides/guides_ayothaya.txt @@ -35,7 +35,7 @@ //========================================================================= ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 4_F_THAIGIRL,{ - if (strnpcinfo(0) == "Ayothaya Guide Noi#01ay") + if (strnpcinfo(NPC_NAME) == "Ayothaya Guide Noi#01ay") .@n$ = "[Noi]"; else .@n$ = "[Noa]"; diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt index a323a8c17..1bdf5a472 100644 --- a/npc/re/guides/guides_izlude.txt +++ b/npc/re/guides/guides_izlude.txt @@ -42,7 +42,7 @@ mes "Do you need help navigating the town?"; F_Navi("[Izlude Guide]"); next; - .@map$ = strnpcinfo(4); + .@map$ = strnpcinfo(NPC_MAP); while (1) { switch(select("[ Main Facilities ]", "[ Merchants & Helpers ]", "Remove Marks from Mini-Map", "Cancel")) { case 1: diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index c6a8ac317..66ed61f8a 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -426,14 +426,14 @@ OnTimer10000: 1@ma_h,46,165,0 script #Ward1 Entry HIDDEN_WARP_NPC,{ //3,3 end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable1: .@map$ = instance_mapname("1@ma_h"); - .@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; - enablenpc instance_npcname(strnpcinfo(0)); + .@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); specialeffect EF_BAT2; - switch(atoi(charat(strnpcinfo(2),4))) { + switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),4))) { case 1: areamonster .@map$,49,171,51,173,"Bangungot's Mangkukulam",2339,1,.@label$; areamonster .@map$,51,171,53,173,"Bangungot's Mangkukulam",2339,1,.@label$; @@ -466,19 +466,19 @@ OnEnable2: end; */ OnEnable3: - .@i = atoi(charat(strnpcinfo(2),4))+1; + .@i = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),4))+1; donpcevent instance_npcname("#Ward"+.@i+" Entry")+"::OnEnable1"; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnMyMobDead: initnpctimer; end; OnTimer1000: .@map$ = instance_mapname("1@ma_h"); - if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) { + if (mobcount(.@map$,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") < 1) { specialeffect EF_BAT2; - donpcevent instance_npcname(strnpcinfo(0))+"::OnEnable3"; - switch(atoi(charat(strnpcinfo(2),4))) { + donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnEnable3"; + switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),4))) { case 1: .@str$ = "Bangungot: I will let you see the pain and the agony actually be real....."; break; case 2: .@str$ = "Bangungot: Diseased spirits are the source of my energy, and my life..."; break; case 3: .@str$ = "Bangungot: Scream more....and more...... your pain..."; break; @@ -925,7 +925,7 @@ OnTimer36000: 1@ma_h,118,171,0 script #Boss Room Entry_a HIDDEN_WARP_NPC,10,10,{ end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: specialeffect EF_GHOST; @@ -984,7 +984,7 @@ OnTimer30000: 1@ma_h,60,87,4 script Screaming Patient#2 4_M_PATIENT,{ end; OnEnable: - switch(atoi(strnpcinfo(2))) { + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { case 2: .@str$ = "Screaming Patient: Aaaaargh!!"; break; case 3: .@str$ = "Patient in Pain: Oooooowwww!! It's killing me!!!"; break; case 4: .@str$ = "Passed Out Patient: ........"; break; diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 03de64375..8d1639ea1 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -337,7 +337,7 @@ OnDisable: 1@ma_c,97,74,0 script #yunobi1 HIDDEN_WARP_NPC,{ end; OnInstanceInit: - hideonnpc instance_npcname(strnpcinfo(0)); + hideonnpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: specialeffect EF_MAPPILLAR2; diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt index e7d603340..9ee105bb9 100644 --- a/npc/re/instances/EclageInterior.txt +++ b/npc/re/instances/EclageInterior.txt @@ -156,11 +156,11 @@ ecl_hub01,130,15,0 script It is closed shut. CLEAR_NPC,{ end; OnInstanceInit: - hideonnpc instance_npcname(strnpcinfo(0)); + hideonnpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - hideoffnpc instance_npcname(strnpcinfo(0)); + hideoffnpc instance_npcname(strnpcinfo(NPC_NAME)); end; } @@ -175,7 +175,7 @@ OnEnable: 1@ecl,42,80,5 script Suspicious Creature#5 MOROCC_2_142,{ end; OnInstanceInit: - hideonnpc instance_npcname(strnpcinfo(0)); + hideonnpc instance_npcname(strnpcinfo(NPC_NAME)); end; } @@ -188,7 +188,7 @@ OnInstanceInit: OnInstanceInit: .mob_summoned = 0; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index 6de94e7ac..c5e37ee3b 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -212,7 +212,7 @@ OnTimer180000: // callfunc "F_Mora_Mist",<warp to enable>,<success message>,<fail message>{,<end flag>} function script F_Mora_Mist { .@map$ = instance_mapname("1@mist"); - if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") == 0) { + if (mobcount(.@map$,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") == 0) { mes "Obviously no one is taking care of it."; mes "It seems like you can chop down the garden tree."; next; @@ -221,7 +221,7 @@ function script F_Mora_Mist { mes "You chop down the tree, which was blocking the path of the maze, "+((getarg(3,0))?"clearing the way out of the forest.":"so now you can continue."); mapannounce .@map$,getarg(1),bc_map,"0xccffcc"; //FW_NORMAL 12 0 0 enablenpc instance_npcname(getarg(0)); - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); close; } else mapannounce .@map$,((getarg(3,0))?getarg(2):getarg(2)+"'s Cry: Huh? Who's doing bad things to my tree?!"),bc_map,"0xccffcc"; //FW_NORMAL 12 0 0 @@ -461,7 +461,7 @@ OnMyMobDead: 1@mist,73,290,0 script Mysterious Flower#1 CLEAR_NPC,{ specialeffect EF_LEVEL99_4; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); getitem Mysterious_Seed,1; end; } diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index 42cf196b9..ff472e23d 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -610,18 +610,18 @@ function script F_mal_missing { case 2: mes "[Missing, the Cleaner]"; mes "Ok! Let's start now!"; - .@i$ = charat(strnpcinfo(2),0); + .@i$ = charat(strnpcinfo(NPC_NAME_HIDDEN),0); enablenpc instance_npcname("Missing, the Cleaner#"+.@i$); donpcevent instance_npcname("Missing, the Cleaner#"+.@i$)+"::OnStart"; disablenpc instance_npcname("Culvert Entrance#"+.@i$); disablenpc instance_npcname("Missing, the Cleaner#"+.@i$+"o"); donpcevent instance_npcname("Monster Hole#"+.@i$)+"::OnClear"; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); close; } close; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; } @@ -710,7 +710,7 @@ OnTimer520000: 1@pump,1,1,4 script Monster Hole#n FAKE_NPC,{ end; OnSpawn: - .@i$ = charat(strnpcinfo(2),0); + .@i$ = charat(strnpcinfo(NPC_NAME_HIDDEN),0); if (.@i$ == "n") .@n = 6; else if (.@i$ == "h") @@ -718,7 +718,7 @@ OnSpawn: donpcevent instance_npcname("#Culvert_"+.@i$+rand(1,.@n))+"::OnEnable"; end; OnClear: - .@i$ = charat(strnpcinfo(2),0); + .@i$ = charat(strnpcinfo(NPC_NAME_HIDDEN),0); if (.@i$ == "n") .@n = 6; else if (.@i$ == "h") @@ -731,16 +731,16 @@ OnClear: 1@pump,36,111,4 script #Culvert_n1 CLEAR_NPC,14,14,{ //temporary workaround for ALL_SAMEMAP progressbar "0xFFFF00",10; stopnpctimer; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); - .@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); + .@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; .@map$ = instance_mapname("1@pump"); - .@index = atoi(charat(strnpcinfo(2),9)); + .@index = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),9)); switch(.@index) { case 1: setarray .@c[0],32,107,40,115; break; case 2: setarray .@c[0],64,120,72,128; break; @@ -772,12 +772,12 @@ OnMyMobDead: end; OnClear: stopnpctimer; - killmonster instance_mapname("1@pump"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + killmonster instance_mapname("1@pump"),instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; end; OnTimer49500: //OnTimer50000 clashes with the timer in "Missing, the Cleaner#h". donpcevent instance_npcname("Missing, the Cleaner#n")+"::OnAddSeaweed"; - donpcevent instance_npcname(strnpcinfo(0))+"::OnClear"; - disablenpc instance_npcname(strnpcinfo(0)); + donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnClear"; + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: specialeffect EF_MAPPILLAR2; @@ -792,48 +792,48 @@ OnTouch: 1@pump,1,1,4 script Boss Creation#n FAKE_NPC,{ end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); initnpctimer; end; OnTimer100: - .@i$ = charat(strnpcinfo(2),0); + .@i$ = charat(strnpcinfo(NPC_NAME_HIDDEN),0); if (.@i$ == "n") mapannounce instance_mapname("1@pump"),"Hmm! That wasn't so bad!",bc_map,"0xff88ff",FW_NORMAL,15; else if (.@i$ == "h") mapannounce instance_mapname("2@pump"),"Hmm! You guys are pretty good!!",bc_map,"0xff88ff",FW_NORMAL,15; end; OnTimer5000: - mapannounce strnpcinfo(4),"Let's pack up and go... WHAT!!?",bc_map,"0xff88ff",FW_NORMAL,15; + mapannounce strnpcinfo(NPC_MAP),"Let's pack up and go... WHAT!!?",bc_map,"0xff88ff",FW_NORMAL,15; end; OnTimer10000: - mapannounce strnpcinfo(4),"I sense something strange!! Don't loosen up-- prepare for a fight!!",bc_map,"0xff88ff",FW_NORMAL,15; + mapannounce strnpcinfo(NPC_MAP),"I sense something strange!! Don't loosen up-- prepare for a fight!!",bc_map,"0xff88ff",FW_NORMAL,15; end; OnTimer20000: stopnpctimer; - .@i$ = charat(strnpcinfo(2),0); - .@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + .@i$ = charat(strnpcinfo(NPC_NAME_HIDDEN),0); + .@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; if (rand(1,100) > 50) { if (.@i$ == "n") monster instance_mapname("1@pump"),0,0,"Weird Coelacanth",2188,1,.@label$; else if (.@i$ == "h") monster instance_mapname("2@pump"),0,0,"Mutant Coelacanth",2189,1,.@label$; - mapannounce strnpcinfo(4),"Something big inside the abyss appears with a huge noise.",bc_map,"0x00ffcc",FW_NORMAL,15; + mapannounce strnpcinfo(NPC_MAP),"Something big inside the abyss appears with a huge noise.",bc_map,"0x00ffcc",FW_NORMAL,15; } else { if (.@i$ == "n") monster instance_mapname("1@pump"),0,0,"Gloomy Coelacanth",2187,1,.@label$; else if (.@i$ == "h") monster instance_mapname("2@pump"),0,0,"Violent Coelacanth",2190,1,.@label$; - mapannounce strnpcinfo(4),"Something savage inside the abyss appears with a huge noise.",bc_map,"0x00ffcc",FW_NORMAL,15; + mapannounce strnpcinfo(NPC_MAP),"Something savage inside the abyss appears with a huge noise.",bc_map,"0x00ffcc",FW_NORMAL,15; } end; OnMyMobDead: - if (mobcount(strnpcinfo(4),instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) { - mapannounce strnpcinfo(4),"You've destroyed all monsters in the culverts. There are trophies lying on the ground, please look for them.",bc_map,"0xffff00",FW_NORMAL,15; - .@i$ = charat(strnpcinfo(2),0); - .@map$ = strnpcinfo(4); + if (mobcount(strnpcinfo(NPC_MAP),instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") < 1) { + mapannounce strnpcinfo(NPC_MAP),"You've destroyed all monsters in the culverts. There are trophies lying on the ground, please look for them.",bc_map,"0xffff00",FW_NORMAL,15; + .@i$ = charat(strnpcinfo(NPC_NAME_HIDDEN),0); + .@map$ = strnpcinfo(NPC_MAP); enablenpc instance_npcname("Culvert Entrance#"+.@i$); enablenpc instance_npcname("Missing, the Cleaner#"+.@i$+"o"); if (.@i$ == "n") { @@ -860,12 +860,12 @@ OnMyMobDead: } } } else - mapannounce strnpcinfo(4),"There are still monsters alive.",bc_map,"0x00ff99",FW_NORMAL,20; + mapannounce strnpcinfo(NPC_MAP),"There are still monsters alive.",bc_map,"0x00ff99",FW_NORMAL,20; end; } 1@pump,84,105,4 script Missing, the Cleaner#no 4_CAT_SAILOR2,{ - .@i$ = charat(strnpcinfo(2),0); + .@i$ = charat(strnpcinfo(NPC_NAME_HIDDEN),0); if (.@i$ == "n") { mes "[Missing, the Cleaner]"; mes "I was very surprised!!"; @@ -894,14 +894,14 @@ OnMyMobDead: mes "If Tomas closes this down, we will lose our jobs!"; close; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; } 1@pump,32,100,0 script Culvert Entrance#n WARPNPC,3,3,{ end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: warp "mal_in01",161,32; @@ -911,7 +911,7 @@ OnTouch: //MD_Putmob "1@pump" 0 0 0 0 20 HYDRA 0 0 2 1@pump,1,1,4 script Hydra#n FAKE_NPC,{ OnInstanceInit: - monster strnpcinfo(4),0,0,"Hydra",1068,20; + monster strnpcinfo(NPC_MAP),0,0,"Hydra",1068,20; end; } @@ -998,16 +998,16 @@ OnTimer425000: 2@pump,53,114,4 script #Culvert_h1 CLEAR_NPC,14,14,{ //temporary workaround for ALL_SAMEMAP progressbar "0xFFFF00",15; stopnpctimer; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); - .@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); + .@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; .@map$ = instance_mapname("2@pump"); - .@index = atoi(substr(strnpcinfo(2),9,getstrlen(strnpcinfo(2))-1)); + .@index = atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),9,getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1)); switch(.@index) { case 1: setarray .@c[0],49,110,57,118; break; case 2: setarray .@c[0],75,105,83,113; break; @@ -1033,12 +1033,12 @@ OnMyMobDead: end; OnClear: stopnpctimer; - killmonster instance_mapname("2@pump"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + killmonster instance_mapname("2@pump"),instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; end; OnTimer39500: //OnTimer40000 clashes with the timer in "Missing, the Cleaner#h". donpcevent instance_npcname("Missing, the Cleaner#h")+"::OnAddSeaweed"; - donpcevent instance_npcname(strnpcinfo(0))+"::OnClear"; - disablenpc instance_npcname(strnpcinfo(0)); + donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnClear"; + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: specialeffect EF_MAPPILLAR2; diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt index 9e62c9b3c..c2087649c 100644 --- a/npc/re/instances/OctopusCave.txt +++ b/npc/re/instances/OctopusCave.txt @@ -252,12 +252,12 @@ OnMyMobDead: 1@cash,20,114,0 script oct_foot1 HIDDEN_WARP_NPC,6,6,{ end; OnInstanceInit: - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; + donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnDisable"; end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); - .@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; - .@i = atoi(charat(strnpcinfo(0),8)); + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); + .@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; + .@i = atoi(charat(strnpcinfo(NPC_NAME),8)); .@map$ = instance_mapname("1@cash"); switch(.@i) { case 1: @@ -315,21 +315,21 @@ OnEnable: } end; OnDisable: - killmonster instance_mapname("1@cash"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; // Not in official script. - disablenpc instance_npcname(strnpcinfo(0)); + killmonster instance_mapname("1@cash"),instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; // Not in official script. + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: - if (getd("."+strnpcinfo(0)+instance_id())) end; - setd "."+strnpcinfo(0)+instance_id(),1; - hideonnpc instance_npcname(strnpcinfo(0)); + if (getd("."+strnpcinfo(NPC_NAME)+instance_id())) end; + setd "."+strnpcinfo(NPC_NAME)+instance_id(),1; + hideonnpc instance_npcname(strnpcinfo(NPC_NAME)); mapannounce instance_mapname("1@cash"),"Come out all my babies and help me out!",bc_map,"0xFFFF00"; initnpctimer; end; OnTimer5000: .@map$ = instance_mapname("1@cash"); mapannounce .@map$,"Let's give them a lesson!",bc_map,"0xFFFF00"; - .@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; - .@i = atoi(charat(strnpcinfo(0),8)); + .@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; + .@i = atoi(charat(strnpcinfo(NPC_NAME),8)); switch(.@i) { case 1: areamonster .@map$,18,112,22,116,"Octopus's Henchman",2192,3,.@label$; @@ -350,21 +350,21 @@ OnTimer5000: } end; OnTimer30000: - setd "."+strnpcinfo(0)+instance_id(),0; + setd "."+strnpcinfo(NPC_NAME)+instance_id(),0; stopnpctimer; - .@i = atoi(charat(strnpcinfo(0),8)); + .@i = atoi(charat(strnpcinfo(NPC_NAME),8)); donpcevent instance_npcname("oct_foot_exit"+.@i)+"::OnEnable"; - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; + donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnDisable"; end; OnMyMobDead: .@map$ = instance_mapname("1@cash"); - if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) { + if (mobcount(.@map$,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") < 1) { mapannounce .@map$,"You hurt my babies!!? You'll have to pay for this!!!",bc_map,"0x00ff99"; - setd "."+strnpcinfo(0)+instance_id(),0; + setd "."+strnpcinfo(NPC_NAME)+instance_id(),0; stopnpctimer; - .@i = atoi(charat(strnpcinfo(0),8)); + .@i = atoi(charat(strnpcinfo(NPC_NAME),8)); donpcevent instance_npcname("oct_foot_exit"+.@i)+"::OnEnable"; - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; + donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnDisable"; end; } end; @@ -376,10 +376,10 @@ OnMyMobDead: 1@cash,16,117,0 script oct_foot_exit1 WARPNPC,2,2,{ end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: warp instance_mapname("1@cash"),198,99; @@ -705,7 +705,7 @@ OnTouch: 1@cash,190,208,0 script oct_exit_1 WARPNPC,2,2,{ end; OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: mes "Do you want to go out from the octopus dungeon?"; diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index bf201d3cd..329bee220 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -231,8 +231,8 @@ OnEnable: } 1@gl_k,145,54,6 script Khalitzburg Knight#1 4_F_KHALITZBURG,{ - mesf("[%s]", strnpcinfo(1)); - switch ((atoi(strnpcinfo(2)) + 1) / 2) { + mesf("[%s]", strnpcinfo(NPC_NAME_VISIBLE)); + switch ((atoi(strnpcinfo(NPC_NAME_HIDDEN)) + 1) / 2) { case 1: mes("Is there something you need?"); break; case 2: mes("What can I do for you?"); break; case 3: mes("..."); break; @@ -247,10 +247,10 @@ OnEnable: } close; OnDisable: - hideonnpc instance_npcname(strnpcinfo(0)); + hideonnpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - hideoffnpc instance_npcname(strnpcinfo(0)); + hideoffnpc instance_npcname(strnpcinfo(NPC_NAME)); end; } @@ -680,11 +680,11 @@ OnMyMobDead: OnInstanceInit: OnDisable: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEffect1: @@ -721,17 +721,17 @@ OnEffect1: OnInstanceInit: OnDisable: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnTouch: .@map1$ = instance_mapname("1@gl_k"); .@map2$ = instance_mapname("2@gl_k"); - switch (atoi(replacestr(strnpcinfo(2), "ghinstancewarp", ""))) { + switch (atoi(replacestr(strnpcinfo(NPC_NAME_HIDDEN), "ghinstancewarp", ""))) { case 1: warp .@map1$,80,80; break; case 2: warp .@map1$,105,80; break; case 3: warp .@map1$,215,79; break; @@ -963,8 +963,8 @@ OnTouch: else .@mobs = 7; getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC); specialeffect EF_VENOMDUST; - monster(.@map$, .@x, .@y, "Maggot", MG_ARCLOUSE, .@mobs, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - disablenpc instance_npcname(strnpcinfo(0)); + monster(.@map$, .@x, .@y, "Maggot", MG_ARCLOUSE, .@mobs, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnMyMobDead: @@ -972,11 +972,11 @@ OnMyMobDead: OnInstanceInit: OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnDisable: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; } diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 3860b35a3..16eaad351 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1669,16 +1669,16 @@ que_lhz,140,231,1 script Human Guinea pig#01 CHEN,{ end; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; OnDisable: specialeffect EF_FLASHER; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; } @@ -2004,17 +2004,17 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ OnEnable: .@map$ = instance_mapname("1@lhz"); mapannounce .@map$,"[Security System] Security system Activated !! Experimental animals are released. The persons concerned have to evacuate.",bc_map,"0xff9977"; - areamonster .@map$,35,159,50,169,"Starving Lab animal",MD_DESERT_WOLF,rand(10,15),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + areamonster .@map$,35,159,50,169,"Starving Lab animal",MD_DESERT_WOLF,rand(10,15),instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; initnpctimer; end; OnDisable: - killmonster instance_mapname("1@lhz"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + killmonster instance_mapname("1@lhz"),instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; end; OnTimer180000: stopnpctimer; - if(mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) { + if(mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") < 1) { donpcevent instance_npcname("Lab1#1_1")+"::OnType_02"; mapannounce instance_mapname("1@lhz"),"[Security System] The Lab No.1's security system has been stopped.",bc_map,"0xff9977"; } else { @@ -2023,7 +2023,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ end; OnMyMobDead: - if(mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) { + if(mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") < 1) { donpcevent instance_npcname("Lab1#1_1")+"::OnType_02"; mapannounce instance_mapname("1@lhz"),"[Security System] The Lab No.1's security system has been stopped.",bc_map,"0xff9977"; stopnpctimer; @@ -2566,7 +2566,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ progressbar "0xffff00", 20; stopnpctimer; donpcevent instance_npcname("Lab2#2_2")+"::OnDisableValve1"; - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; } else { mes "Let your party leader handle the valve."; @@ -2574,16 +2574,16 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ } OnInstanceInit: - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnEnable: - enablenpc instance_npcname(strnpcinfo(0)); + enablenpc instance_npcname(strnpcinfo(NPC_NAME)); initnpctimer; end; OnTimer3000: - specialeffect EF_DRAGONSMOKE,AREA,instance_npcname(strnpcinfo(0)); + specialeffect EF_DRAGONSMOKE,AREA,instance_npcname(strnpcinfo(NPC_NAME)); stopnpctimer; initnpctimer; end; @@ -2987,86 +2987,86 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ OnEnable: .@map$ = instance_mapname("1@lhz"); - .@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; + .@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; specialeffect EF_SUI_EXPLOSION; - if(strnpcinfo(0) == "Seyren Windsor#boss01") { + if(strnpcinfo(NPC_NAME) == "Seyren Windsor#boss01") { monster .@map$,129,154,"Load Knight Seyren",B_SEYREN,1,.@label$; } - if(strnpcinfo(0) == "Cecile Damon#boss02") { + if(strnpcinfo(NPC_NAME) == "Cecile Damon#boss02") { monster .@map$,125,150,"Sniper Cecile",B_SHECIL,1,.@label$; } - if(strnpcinfo(0) == "Gertie Wie#boss03") { + if(strnpcinfo(NPC_NAME) == "Gertie Wie#boss03") { monster .@map$,121,146,"Stalker Gertie",B_GERTIE,1,.@label$; } - if(strnpcinfo(0) == "Eremes Guile#boss04") { + if(strnpcinfo(NPC_NAME) == "Eremes Guile#boss04") { monster .@map$,117,142,"Assassin Cross Eremes",B_EREMES,1,.@label$; } - if(strnpcinfo(0) == "Trentini#boss05") { + if(strnpcinfo(NPC_NAME) == "Trentini#boss05") { monster .@map$,117,125,"Gypsy Trentini",B_TRENTINI,1,.@label$; } - if(strnpcinfo(0) == "Chen Liu#boss06") { + if(strnpcinfo(NPC_NAME) == "Chen Liu#boss06") { monster .@map$,121,121,"Champion Chen",B_CHEN,1,.@label$; } - if(strnpcinfo(0) == "Alphochio Basil#boss07") { + if(strnpcinfo(NPC_NAME) == "Alphochio Basil#boss07") { monster .@map$,125,117,"Crown Alphochio",B_ALPHOCCIO,1,.@label$; } - if(strnpcinfo(0) == "Flamel Emul#boss08") { + if(strnpcinfo(NPC_NAME) == "Flamel Emul#boss08") { monster .@map$,129,113,"Creator Flamel",B_FLAMEL,1,.@label$; } - if(strnpcinfo(0) == "Randel Lawrence#boss09") { + if(strnpcinfo(NPC_NAME) == "Randel Lawrence#boss09") { monster .@map$,146,113,"Paladin Randel",B_RANDEL,1,.@label$; } - if(strnpcinfo(0) == "Celia Alde#boss10") { + if(strnpcinfo(NPC_NAME) == "Celia Alde#boss10") { monster .@map$,150,117,"Professor Celia",B_CELIA,1,.@label$; } - if(strnpcinfo(0) == "Kathryne Keyron#boss11") { + if(strnpcinfo(NPC_NAME) == "Kathryne Keyron#boss11") { monster .@map$,154,121,"High Wizard Kathryne",B_KATRINN,1,.@label$; } - if(strnpcinfo(0) == "Margaretha Sorin#boss12") { + if(strnpcinfo(NPC_NAME) == "Margaretha Sorin#boss12") { monster .@map$,158,125,"High Priest Margaretha",B_MAGALETA,1,.@label$; } - if(strnpcinfo(0) == "Howard Alt-Eisen#boss13") { + if(strnpcinfo(NPC_NAME) == "Howard Alt-Eisen#boss13") { monster .@map$,158,142,"White Smith Howard",B_HARWORD,1,.@label$; } - disablenpc instance_npcname(strnpcinfo(0)); + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnDisable: - killmonster instance_mapname("1@lhz"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; - disablenpc instance_npcname(strnpcinfo(0)); + killmonster instance_mapname("1@lhz"),instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"; + disablenpc instance_npcname(strnpcinfo(NPC_NAME)); end; OnMyMobDead: - if (mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) { + if (mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") < 1) { .@map$ = instance_mapname("1@lhz"); - if(strnpcinfo(0) == "Seyren Windsor#boss01") + if(strnpcinfo(NPC_NAME) == "Seyren Windsor#boss01") mapannounce .@map$,"Awww... Where are all my fellows....",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Cecile Damon#boss02") + else if (strnpcinfo(NPC_NAME) == "Cecile Damon#boss02") mapannounce .@map$,"Any..one, please help.. please.....",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Gertie Wie#boss03") + else if (strnpcinfo(NPC_NAME) == "Gertie Wie#boss03") mapannounce .@map$,".. did I act too.. rashly...?",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Eremes Guile#boss04") + else if (strnpcinfo(NPC_NAME) == "Eremes Guile#boss04") mapannounce .@map$,"Ah..... I am absolutely defeated....",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Trentini#boss05") + else if (strnpcinfo(NPC_NAME) == "Trentini#boss05") mapannounce .@map$,"ah.. If I.. ever can ... dance and.... sing...happily....",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Chen Liu#boss06") + else if (strnpcinfo(NPC_NAME) == "Chen Liu#boss06") mapannounce .@map$,"I.... am so .. sorry....",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Alphochio Basil#boss07") + else if (strnpcinfo(NPC_NAME) == "Alphochio Basil#boss07") mapannounce .@map$,"...the new song......was ....for.....her....",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Flamel Emul#boss08") + else if (strnpcinfo(NPC_NAME) == "Flamel Emul#boss08") mapannounce .@map$,"Ha...I wanted to show.... the new potion....",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Randel Lawrence#boss09") + else if (strnpcinfo(NPC_NAME) == "Randel Lawrence#boss09") mapannounce .@map$,"Wooooo.. everyone got defeated.....??",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Celia Alde#boss10") + else if (strnpcinfo(NPC_NAME) == "Celia Alde#boss10") mapannounce .@map$,"No..... this experiment is.....dang...",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Kathryne Keyron#boss11") + else if (strnpcinfo(NPC_NAME) == "Kathryne Keyron#boss11") mapannounce .@map$,"awww.. is everyone Ok....?",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Margaretha Sorin#boss12") + else if (strnpcinfo(NPC_NAME) == "Margaretha Sorin#boss12") mapannounce .@map$,"My good boy.. Don't cry... ah.... our Great Odin.. please save us...",bc_map,"0xFD3B02"; - else if (strnpcinfo(0) == "Howard Alt-Eisen#boss13") + else if (strnpcinfo(NPC_NAME) == "Howard Alt-Eisen#boss13") mapannounce .@map$,"oh...no.... can't breath.... and my sister...?? sister!!",bc_map,"0xFD3B02"; donpcevent instance_npcname("Wolfchev#last")+"::OnEnable"; - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; + donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnDisable"; } end; } diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt index 69ee7dacb..bb7dbdeec 100644 --- a/npc/re/instances/saras_memory.txt +++ b/npc/re/instances/saras_memory.txt @@ -763,77 +763,77 @@ OnTimer5000: end; OnRespawn: .@map$ = instance_mapname("1@sara"); - monster(.@map$, .@x, .@y, "Maggot", MG_ARCLOUSE, .@mobs, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,107,325,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,115,325,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,116,317,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,108,317,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,116,311,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,108,311,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,101,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,105,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,109,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,113,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,117,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,122,227,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,122,225,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,122,223,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,122,221,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,122,219,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,122,217,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,227,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,225,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,223,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,221,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,219,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,217,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,151,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,153,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,155,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,157,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,159,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,161,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,187,215,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,187,217,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,187,219,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,187,221,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,187,223,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,187,225,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,188,215,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,188,217,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,188,219,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,188,221,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,188,223,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,188,225,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,192,250,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,194,250,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,196,250,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,198,250,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,196,254,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,196,256,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,196,258,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,199,254,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,199,256,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,199,258,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,204,246,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,204,248,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,204,250,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,204,252,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,204,254,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,206,251,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$, .@x, .@y, "Maggot", MG_ARCLOUSE, .@mobs, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,107,325,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,115,325,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,116,317,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,108,317,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,116,311,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,108,311,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,101,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,105,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,109,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,113,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,117,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,295,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,122,227,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,122,225,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,122,223,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,122,221,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,122,219,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,122,217,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,227,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,225,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,223,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,221,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,219,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,217,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,151,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,153,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,155,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,157,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,159,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,161,231,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,187,215,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,187,217,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,187,219,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,187,221,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,187,223,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,187,225,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,188,215,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,188,217,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,188,219,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,188,221,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,188,223,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,188,225,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,192,250,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,194,250,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,196,250,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,198,250,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,196,254,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,196,256,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,196,258,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,199,254,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,199,256,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,199,258,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,204,246,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,204,248,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,204,250,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,204,252,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,204,254,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,206,251,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); end; OnMyMobDead: .@callnum = 58; .@map$ = instance_mapname("1@sara"); - .@a_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + .@a_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); .@mob_dead_num = .@callnum - .@a_mob_num; if (.@mob_dead_num > 57) { viewpoint 1, 209, 250, 1, C_GREEN; @@ -860,32 +860,32 @@ OnDisable: end; OnRespawn: .@map$ = instance_mapname("1@sara"); - monster(.@map$,228,312,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,227,312,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,229,315,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,228,312,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,227,312,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,229,315,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); - monster(.@map$,247,290,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,248,290,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,249,290,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,247,290,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,248,290,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,249,290,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); - monster(.@map$,223,264,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,230,248,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,227,248,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,223,264,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,230,248,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,227,248,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); - monster(.@map$,238,229,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,225,220,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,228,220,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,238,229,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,225,220,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,228,220,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); - monster(.@map$,220,212,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,223,212,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,220,212,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,223,212,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); - monster(.@map$,219,203,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,222,203,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,219,203,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,222,203,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); end; OnMyMobDead: .@callnum = 16; .@map$ = instance_mapname("1@sara"); - .@b_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + .@b_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); .@mob_dead_num = .@callnum - .@b_mob_num; if (.@mob_dead_num > 15) { viewpoint 1, 226, 190, 1, C_GREEN; @@ -912,64 +912,64 @@ OnDisable: end; OnRespawn: .@map$ = instance_mapname("1@sara"); - monster(.@map$, 255,91,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$, 255,92,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$, 255,93,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$, 255,94,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,254,91,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,254,92,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,254,93,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,254,94,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,228,65,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,228,64,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,228,63,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,228,62,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,198,62,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,195,56,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,195,60,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,195,62,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,192,56,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,192,60,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,192,62,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,187,68,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,188,63,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,120,39,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,39,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,121,39,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,93,64,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,93,68,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,93,72,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,93,76,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,90,64,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,90,68,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,90,72,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,90,76,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,87,67,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,87,63,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,87,59,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,87,55,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,84,67,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,84,63,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,84,59,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,84,55,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,81,67,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,81,63,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,81,59,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,81,55,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,81,51,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$, 255,91,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$, 255,92,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$, 255,93,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$, 255,94,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,254,91,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,254,92,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,254,93,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,254,94,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,228,65,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,228,64,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,228,63,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,228,62,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,198,62,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,195,56,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,195,60,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,195,62,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,192,56,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,192,60,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,192,62,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,187,68,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,188,63,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,120,39,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,39,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,121,39,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,93,64,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,93,68,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,93,72,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,93,76,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,90,64,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,90,68,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,90,72,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,90,76,"A Gentle Guard Dog",2545,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,87,67,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,87,63,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,87,59,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,87,55,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,84,67,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,84,63,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,84,59,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,84,55,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,81,67,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,81,63,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,81,59,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,81,55,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,81,51,"A Fierce Guard Dog",2546,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); end; OnMyMobDead: .@callnum = 45; .@map$ = instance_mapname("1@sara"); - .@c_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + .@c_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); .@mob_dead_num = .@callnum - .@c_mob_num; if (.@mob_dead_num > 44) { viewpoint 1, 166, 67, 1, C_GREEN; @@ -996,63 +996,63 @@ OnDisable: end; OnRespawn: .@map$ = instance_mapname("1@sara"); - monster(.@map$,155,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,157,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,159,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,161,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,201,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,204,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,207,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,210,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,213,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,201,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,204,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,207,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,210,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,213,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,223,152,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,223,148,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,223,144,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,221,152,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,221,148,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,221,144,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,151,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,153,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,155,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,157,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,159,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,151,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,153,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,155,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,157,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,159,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,151,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,153,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,155,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,157,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,159,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,173,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,170,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,167,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,164,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - - monster(.@map$,173,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,170,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,167,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); - monster(.@map$,164,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,155,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,157,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,159,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,161,97,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,201,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,204,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,207,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,210,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,213,113,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,201,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,204,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,207,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,210,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,213,117,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,223,152,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,223,148,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,223,144,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,221,152,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,221,148,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,221,144,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,151,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,153,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,155,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,157,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,159,174,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,151,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,153,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,155,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,157,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,159,177,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,151,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,153,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,155,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,157,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,159,180,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,173,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,170,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,167,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,164,139,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + + monster(.@map$,173,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,170,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,167,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); + monster(.@map$,164,137,"Payon Town Guard",2543,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); end; OnMyMobDead: .@callnum = 43; .@map$ = instance_mapname("1@sara"); - .@d_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + .@d_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); .@mob_dead_num = .@callnum - .@d_mob_num; if (.@mob_dead_num > 42) { viewpoint 1, 155, 180, 1, C_GREEN; @@ -1161,27 +1161,27 @@ OnDisable: end; OnRespawn: .@map$ = instance_mapname("1@sara"); - monster(.@map$,150,232,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,150,232,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("I am getting too old for this sh-")); - monster(.@map$,150,227,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,150,227,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("For Payon!!")); - monster(.@map$,150,222,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,150,222,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("For Payon!!")); - monster(.@map$,150,217,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,150,217,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("For Payon!!")); - monster(.@map$,161,232,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,161,232,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("For Payon!!")); - monster(.@map$,161,227,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,161,227,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("For Payon!!")); - monster(.@map$,161,222,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,161,222,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("For Payon!!")); - monster(.@map$,161,217,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,161,217,"Payon Town Guard",2544,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("For Payon!!")); end; OnMyMobDead: .@callnum = 8; .@map$ = instance_mapname("1@sara"); - .@f_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + .@f_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); .@mob_dead_num = .@callnum - .@f_mob_num; if (.@mob_dead_num > 7) { mapannounce(instance_mapname("1@sara"),_("<SYSTEM> Doyen Irene draws his blade!"), bc_map, C_YELLOW); @@ -1205,13 +1205,13 @@ OnDisable: end; OnRespawn: .@map$ = instance_mapname("1@sara"); - monster(.@map$,155,226,"Doyen Irene",2542,1,instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + monster(.@map$,155,226,"Doyen Irene",2542,1,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); unittalk($@mobid[0], _("I will have revenge for Sara's Mom!")); end; OnMyMobDead: .@callnum = 1; .@map$ = instance_mapname("1@sara"); - .@g_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead"); + .@g_mob_num = mobcount(.@map$, instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead"); .@mob_dead_num = .@callnum - .@g_mob_num; if (.@mob_dead_num > 0) { mapannounce(instance_mapname("1@sara"), _("<SYSTEM> Doyen Irene has fallen."), bc_map, C_YELLOW); diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index 7d166b75a..c239e4a0e 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -1140,12 +1140,12 @@ function script F_KO_Survival_rps { //- Templates - - script Sight#ko_trap FAKE_NPC,{ - callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); + callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); end; OnTouch: mes "There are tiny letters on the sign."; next; - switch (atoi(substr(strnpcinfo(2),3,4))) { + switch (atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4))) { case 2: set .@id,0; break; case 7: set .@id,5; break; case 11: set .@id,9; break; @@ -1161,10 +1161,10 @@ OnTouch: } - script Sight#ko_trap2 FAKE_NPC,{ - callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); + callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); end; OnTouch: - set .@id, atoi(substr(strnpcinfo(2),3,4)); + set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); switch (.@id) { case 10: set .@var$, "$20110808_vko01"; break; case 28: set .@var$, "$20110808_vko03"; break; @@ -1206,10 +1206,10 @@ OnTouch: } - script Sight#ko_heal FAKE_NPC,{ - callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); + callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); end; OnTouch: - set .@id, atoi(substr(strnpcinfo(2),3,4)); + set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); mes "There are tiny letters on the sign."; next; mes "This block is blessed."; @@ -1224,10 +1224,10 @@ OnTouch: } - script Sight#ko_curse FAKE_NPC,{ - callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); + callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); end; OnTouch: - set .@id, atoi(substr(strnpcinfo(2),3,4)); + set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); set .@playtime, questprogress(5141,PLAYTIME); if (!.@playtime) { mes "There are tiny letters on the sign."; @@ -1269,10 +1269,10 @@ OnTouch: } - script Sight#ko_gravity FAKE_NPC,{ - callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); + callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); end; OnTouch: - set .@id, atoi(substr(strnpcinfo(2),3,4)); + set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4)); mes "There are tiny letters on the sign."; next; mes "Area cursed with 10 times the normal gravity. You will need 10 ^FD0260LP^000000 to roll the dice."; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index addcc0346..9caa1f538 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -1007,7 +1007,7 @@ OnTouch: delitem ValkyrieA_Scroll,1; // fall through } else if (getmercinfo(1) == 2037) { - if (strnpcinfo(0) == "#arch_1_10") + if (strnpcinfo(NPC_NAME) == "#arch_1_10") viewpoint 1,113,327,1,0xFF9900; .@randht = rand(1,10); if (.@randht < 8) diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index a29961eca..3f34e03f7 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -3062,10 +3062,10 @@ OnTimer5000: end; OnInit: OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; } @@ -3386,17 +3386,17 @@ OnMyMobDead: job3_guil03,2,2,0 script #3rdgc_sunchal_kill01 CLEAR_NPC,{ end; OnEnable: - .@i = atoi(charat(strnpcinfo(0),20)); + .@i = atoi(charat(strnpcinfo(NPC_NAME),20)); setarray .@x[1],74,124,103; setarray .@y[1],63, 78, 24; - monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(0)+"::OnMyMobDead"; + monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; end; OnStop: mapannounce "job3_guil03","Guard : Am I imagining things? I just heard something...",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0 stopnpctimer; end; OnReset: - killmonster "job3_guil03",strnpcinfo(0)+"::OnMyMobDead"; + killmonster "job3_guil03",strnpcinfo(NPC_NAME)+"::OnMyMobDead"; end; OnMyMobDead: initnpctimer; @@ -3419,32 +3419,32 @@ job3_guil03,2,4,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill03 CLEAR_N job3_guil03,64,68,3 script #3rdgc_gojung_kill01 4_M_DSTMAN,7,7,{ end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnStop: mapannounce "job3_guil03","Guard : Am I imagining things? I just heard something.",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0 stopnpctimer; end; OnReset: - killmonster "job3_guil03",strnpcinfo(0)+"::OnMyMobDead"; + killmonster "job3_guil03",strnpcinfo(NPC_NAME)+"::OnMyMobDead"; end; OnTouch: - .@i = atoi(charat(strnpcinfo(0),19)); + .@i = atoi(charat(strnpcinfo(NPC_NAME),19)); setarray .@x[1],64,86,83; setarray .@y[1],68,63,36; mapannounce "job3_guil03","Guard : Who are you?!",bc_map,"0x7b68ee"; //FW_NORMAL 12 0 0 - disablenpc strnpcinfo(0); - monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(0)+"::OnMyMobDead"; + disablenpc strnpcinfo(NPC_NAME); + monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; initnpctimer; end; OnMyMobDead: stopnpctimer; end; OnTimer5000: - if (strnpcinfo(0) == "#3rdgc_gojung_kill03") end; + if (strnpcinfo(NPC_NAME) == "#3rdgc_gojung_kill03") end; OnTimer10000: mapannounce "job3_guil03","Guard : I need support! Take caution!",bc_map,"0x7b68ee"; //FW_NORMAL 12 0 0 donpcevent "#3rdgc_guard::OnEnable"; @@ -3458,7 +3458,7 @@ job3_guil03,88,71,0 script #3rdgc_safezone01 HIDDEN_WARP_NPC,1,1,{ end; OnTouch: mes "It's a good bush to hide yourself."; - donpcevent strnpcinfo(0)+"::OnTimer"; + donpcevent strnpcinfo(NPC_NAME)+"::OnTimer"; close; OnTimer: //FIXME: This is a workaround for... @@ -3491,7 +3491,7 @@ job3_guil03,111,51,7 script Priest from Rachel 4_M_MIDDLE1,{ next; mes "[Priest from Rachel]"; mes "Because of you, you ruined everything!"; - setnpcdisplay(strnpcinfo(0), HIDEN_PRIEST); + setnpcdisplay(strnpcinfo(NPC_NAME), HIDEN_PRIEST); next; mes "[Priest from Rachel]"; mes "You want to destroy us forever!"; diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 1e7b40c98..91adb9b49 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -1584,14 +1584,14 @@ OnTimer133000: - script Egg Bomb#0 FAKE_NPC,{ OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); initnpctimer; getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC); - monster "job3_rang02",.@x,.@y,"Egg Bomb",1047,1,strnpcinfo(0)+"::OnMyMobDead"; - switch(atoi(strnpcinfo(2))%3) { + monster "job3_rang02",.@x,.@y,"Egg Bomb",1047,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))%3) { case 0: .@str$ = "Hey, I am going to explode. What are you going to do?"; break; case 1: .@str$ = "I... no, I can't stand anymore!!"; break; case 2: .@str$ = "I am almost done now... Don't stop me."; break; @@ -1600,22 +1600,22 @@ OnEnable: end; OnDisable: stopnpctimer; - killmonster "job3_rang02",strnpcinfo(0)+"::OnMyMobDead"; - disablenpc strnpcinfo(0); + killmonster "job3_rang02",strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + disablenpc strnpcinfo(NPC_NAME); end; OnMyMobDead: ++$@job_rang_point03; - switch(atoi(strnpcinfo(2))%3) { + switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))%3) { case 0: .@str$ = "The world is meaningless and my dream is so far away..."; break; case 1: .@str$ = "Don't be relieved. Misery always comes from carelessness."; break; case 2: .@str$ = "Alas, it was only a dream for a short time..."; break; } mapannounce "job3_rang02","Egg Bomb : "+.@str$,bc_map,"0x87ceeb"; //FW_NORMAL 12 0 0 - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; OnTimer10000: mapannounce "job3_rang02","Egg Bomb : Ughhhhhhhhhhhhhh!!! So what did I say!!",bc_map,"0xFF9900"; //FW_NORMAL 12 0 0 - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } job3_rang02,246,42,0 duplicate(Egg Bomb#0) Egg Bomb#14 HIDDEN_WARP_NPC diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index 237c1f33e..fb875278d 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -1236,13 +1236,13 @@ mid_camp,13,138,3 script Dispatched Rune Knight#1 4_M_01,2,2,{ mes "I've been waiting for you Rune Knight candidate. I'm helping the candidates as a favor to Ms. Serpeone."; next; mes "[Dispatched Rune Knight]"; - if (strnpcinfo(0) == "Dispatched Rune Knight#1") { + if (strnpcinfo(NPC_NAME) == "Dispatched Rune Knight#1") { mes "Do you want to go out to the Splendide field?"; next; if(select("Move to Splendide field", "Cancel.") == 1) warp "spl_fild01",355,325; close; - } else if (strnpcinfo(0) == "Dispatched Rune Knight#2") { + } else if (strnpcinfo(NPC_NAME) == "Dispatched Rune Knight#2") { mes "Do you want to go back to the expeditionary team's post?"; next; if(select("Yes please.", "Not yet.") == 1) diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index adbdf2d6a..137eefd40 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -40,7 +40,7 @@ OnTouch: if (job_wl > 1) { mes " - There is a strange distortion here - "; - if (strnpcinfo(0) == "#distorted_space_1" && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) { + if (strnpcinfo(NPC_NAME) == "#distorted_space_1" && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) { close2; if (countitem(Special_Exchange_Coupon) > 0) warp "spl_in02",79,102; @@ -58,7 +58,7 @@ OnTouch: close; } } - if (BaseLevel > 94 && (strnpcinfo(0) == "#distorted_space_2" || BaseJob == Job_Wizard)) { + if (BaseLevel > 94 && (strnpcinfo(NPC_NAME) == "#distorted_space_2" || BaseJob == Job_Wizard)) { mes " - There is a strange distortion here - "; next; switch(select("Search the area.", "Ignore it.")) { @@ -801,36 +801,36 @@ OnDisable: - script The chamber of magic#2 FAKE_NPC,{ OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); - monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(0)+"::OnMyMobDead"; - monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(0)+"::OnMyMobDead"; - monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(0)+"::OnMyMobDead"; - monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(0)+"::OnMyMobDead"; - monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(0)+"::OnMyMobDead"; - monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(0)+"::OnMyMobDead"; - monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(0)+"::OnMyMobDead"; - monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(0)+"::OnMyMobDead"; + enablenpc strnpcinfo(NPC_NAME); + monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; + monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead"; initnpctimer; end; OnReset: - killmonster "job3_war02",strnpcinfo(0)+"::OnMyMobDead"; + killmonster "job3_war02",strnpcinfo(NPC_NAME)+"::OnMyMobDead"; end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnMyMobDead: - if (mobcount("job3_war02",strnpcinfo(0)+"::OnMyMobDead") < 1) { + if (mobcount("job3_war02",strnpcinfo(NPC_NAME)+"::OnMyMobDead") < 1) { stopnpctimer; mapannounce "job3_war02","The Monster Invasion has been stopped.",bc_map; - .@str$ = "The chamber of magic#"+((strnpcinfo(0) == "The chamber of magic#2")?"3":"4"); + .@str$ = "The chamber of magic#"+((strnpcinfo(NPC_NAME) == "The chamber of magic#2")?"3":"4"); donpcevent .@str$+"::OnEnable"; } end; OnTimer3000: - if (strnpcinfo(0) != "The chamber of magic#2") end; + if (strnpcinfo(NPC_NAME) != "The chamber of magic#2") end; mapannounce "job3_war02","A Magical Power fragment has been created in the Magic Chamber Room.",bc_map; end; OnTimer4000: diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index f2c1ded47..ea926b0b1 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -970,7 +970,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{ mes "- You found a little metal fragment. -"; job_gen = job_gen+1; specialeffect EF_BASH; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); initnpctimer; close; } else if (job_gen == 74) { @@ -979,7 +979,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{ } end; OnTimer7000: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; } diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index a8cb2d61d..ca5b7e261 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -828,18 +828,18 @@ OnTimer300000: yuno,146,168,0 script Karian#cmd2 4_M_BARD,{ end; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; OnTimer100000: - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; stopnpctimer; end; } diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index a1dff376d..0d87db5d2 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -465,7 +465,7 @@ gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{ getitem Stone,1; else { mes "While investigating, the topography breaks. It would be better to dig other places for a while."; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); initnpctimer; close; } @@ -473,7 +473,7 @@ gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{ mes "There is a trace that someone has already dug here."; close; OnTimer60000: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); stopnpctimer; OnTimer1000: OnTimer20000: diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index ff9faf500..a75480f24 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -392,10 +392,10 @@ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{ } - script Spirit Detecting Staff#0 FAKE_NPC,{ - if (strnpcinfo(4) == "thor_v01") setarray .@id[0],990,994,6276,6278; - else if (strnpcinfo(4) == "ice_dun01") setarray .@id[0],991,995,6278,6276; - else if (strnpcinfo(4) == "mjo_dun03") setarray .@id[0],993,997,6277,6276; - else if (strnpcinfo(4) == "gon_dun02") setarray .@id[0],992,996,6277,6278; + if (strnpcinfo(NPC_MAP) == "thor_v01") setarray .@id[0],990,994,6276,6278; + else if (strnpcinfo(NPC_MAP) == "ice_dun01") setarray .@id[0],991,995,6278,6276; + else if (strnpcinfo(NPC_MAP) == "mjo_dun03") setarray .@id[0],993,997,6277,6276; + else if (strnpcinfo(NPC_MAP) == "gon_dun02") setarray .@id[0],992,996,6277,6278; if (job_soc == 4 && countitem(.@id[0]) > 2) { progressbar "ffff00",5; diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index b28cb6fdd..f1353e282 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -166,7 +166,7 @@ ve_in,237,125,0 script King Crab#job_shu 1_M_PAY_ELDER,{ setquest 11155; close; } else { - if (strnpcinfo(0) == "King Crab#job_shu") { + if (strnpcinfo(NPC_NAME) == "King Crab#job_shu") { mes "[King Crab]"; mes "How come a little rookie knocked me out! Me! The great King Crab..."; } else { diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index baad4b65a..6f131f2bc 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -102,7 +102,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{ close; } } else if (job_wan == 1) { - if (strnpcinfo(0) == "Aspiring Wanderer, Soy") { + if (strnpcinfo(NPC_NAME) == "Aspiring Wanderer, Soy") { mes "[Soy]"; mes "The performance will be held in front of the Christmas tree here in Lutie."; mes "I can't wait! Ah~ I'm losing my senses, Mimi."; @@ -120,7 +120,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{ mes "<Nollio> is the best!!"; close; } else { - if (strnpcinfo(0) == "Aspiring Wanderer, Soy") { + if (strnpcinfo(NPC_NAME) == "Aspiring Wanderer, Soy") { mes "[Soy]"; mes "I want to become an famous Wanderer too, Mimi."; } else { @@ -1044,7 +1044,7 @@ OnInit: - script #wander_xmas FAKE_NPC,{ end; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; } xmas,149,135,3 duplicate(#wander_xmas) Guitar Song#xmas 4_M_MINSTREL diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 4b970a86c..0d8f3a7e2 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -776,7 +776,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>."; mes "Anybody can enroll, so take advantage of it."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dff if you need location info, please ask me.^000000"; @@ -798,7 +798,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "If there are more adventurers like you, the future will be brighter."; mes "Hahahaha."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dff if you need location info, please ask me.^000000"; @@ -817,7 +817,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>."; mes "What is well, is well- isn't it?"; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Information Staff]"; mes "You are correct."; mes "Preperation is the key."; @@ -852,7 +852,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>."; mes "Anybody can enroll, so take advantage of it."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dff if you need location info, please ask me.^000000"; @@ -874,7 +874,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "If there are more adventurers like you, the future will be brighter."; mes "Hahahaha."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dff if you need location info, please ask me.^000000"; @@ -893,7 +893,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>."; mes "What is well, is well- isn't it?"; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Information Staff]"; mes "You are correct."; mes "Preperation is the key."; @@ -2108,19 +2108,19 @@ izlude,141,251,0 script Cultivated Red Plant#0 RED_PLANT,3,3,{ OnTouch: if (questprogress(7478) == 1 && !questprogress(7479)) - donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable"; + donpcevent "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable"; end; OnDisable: specialeffect EF_STEAL; - disablenpc "Cultivated Red Plant#"+strnpcinfo(2); + disablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN); emotion e_gasp, 1; - emotion e_heh, 0, "Academy Student#"+strnpcinfo(2); + emotion e_heh, 0, "Academy Student#"+strnpcinfo(NPC_NAME_HIDDEN); initnpctimer; end; OnTimer30000: - enablenpc "Cultivated Red Plant#"+strnpcinfo(2); + enablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN); stopnpctimer; end; } @@ -2138,8 +2138,8 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{ close; } if (questprogress(7478) == 1 && !questprogress(7479)) { - specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(2); - donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable"; + specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN); + donpcevent "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable"; emotion e_gasp, 1; emotion e_heh; mes "[Lumin]"; @@ -2200,7 +2200,7 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{ next; mes "[Lumin]"; mes "Ah... see it's growing back."; - enablenpc "Cultivated Red Plant#"+strnpcinfo(2); + enablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN); close2; } else { if (Class == Job_Novice) { @@ -3738,11 +3738,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000."; next; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Eclaire]"; mes "And we are also club members of Sir Orleans' ^0000cdfan club- Loverleans^000000."; next; - emotion e_lv,"Mille Feuille#"+strnpcinfo(2); + emotion e_lv,"Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Mille Feuille]"; mes "Orlean belongs to all of us!"; next; @@ -3765,7 +3765,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Eclaire]"; mes "You, do you want to know more about cooking?"; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Mille Feuille]"; mes "Will you exeprience the various spectrums of cooking?"; next; @@ -3784,11 +3784,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "Ok, we will be kind guides to the journey of cooking!!"; next; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Eclaire]"; mes "It's ok with me, asking me everthing you want to know."; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Mille Feuille]"; mes "Kindness is our spice~"; next; @@ -3848,18 +3848,18 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "Right, cooking needs some preparation. This can also be divided into two catagories."; next; - emotion e_gasp,"Dacquoise#"+strnpcinfo(2); + emotion e_gasp,"Dacquoise#"+strnpcinfo(NPC_NAME_HIDDEN); break; case 3: emotion e_an; mes "[Dacquoise]"; mes "What is this? What a waste of time!"; next; - emotion e_ag, 0, "Eclaire#"+strnpcinfo(2); + emotion e_ag, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Eclaire]"; mes "I thought we were going to get more members!"; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Mille Feuille]"; mes "Never show up again!!"; close; @@ -3924,11 +3924,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ next; mes "[Eclaire]"; mes "You have insulted us!"; - emotion e_ag, 0, "Eclaire#"+strnpcinfo(2); + emotion e_ag, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); next; mes "[Mille Feuille]"; mes "Come back again, if you want to learn later~ I guess..."; - emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); close2; if(questprogress(14154) == 1) erasequest 14154; @@ -3951,12 +3951,12 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ next; mes "[Eclaire]"; mes "Go hunting after eating this. You will feel your power enhanced."; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); next; mes "[Mille Feuille]"; mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!!"; mes "Kya... Sir Orleans!!"; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); close2; delitem Clover, 1; // Clover delitem Green_Herb, 1; // Green_Herb @@ -3973,11 +3973,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ next; mes "[Eclaire]"; mes "Try this. It will make you run like you are a flying bee."; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); next; mes "[Mille Feuille]"; mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!"; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); close2; delitem Apple, 1; // Apple delitem Carrot, 2; // Carrot @@ -3993,11 +3993,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ next; mes "[Eclaire]"; mes "Can you feel unknown power coursing through your veins? You're eating it!"; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); next; mes "[Mille Feuille]"; mes "If you are really curious about the cooking, go seek Sir. Charles Orleans at the basement of Prontera Castle."; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); close2; delitem Jellopy, 1; // Jellopy delitem Fluff, 1; // Fluff @@ -4015,12 +4015,12 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Eclaire]"; mes "If you eat this. You will never miss your target!"; mes "In fact, never miss the target for level 1!"; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); next; mes "[Mille Feuille]"; mes "Go and see Sir. Charles Orleans at the basement of Prontera castle!!"; mes "You can learn real cooking from him!"; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); close2; delitem Apple, 1; // Apple delitem Clover, 1; // Clover @@ -4056,14 +4056,14 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "Why are you saying you will make them?"; next; - emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Mille Feuille]"; mes "Ah, Why not?"; next; mes "[Dacquoise]"; mes "I am the leader of this flame cooking trio chefs!"; next; - emotion e_omg, 0, "Eclaire#"+strnpcinfo(2); + emotion e_omg, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Eclaire]"; mes "What?!! When was that decided?"; next; @@ -4071,11 +4071,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "Is there anyone who is older than me?"; next; - emotion e_omg, 0, "Eclaire#"+strnpcinfo(2); + emotion e_omg, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Eclaire]"; mes "Age! There is nothing I can do with it."; next; - emotion e_ok,"Mille Feuille#"+strnpcinfo(2); + emotion e_ok,"Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Mille Feuille]"; mes "Just because you're one year older, you want to automatically be rejected. Anyone have an objection?"; next; @@ -4202,11 +4202,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000."; next; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Eclaire]"; mes "Steaks not only increase stats but also recover both your HP and SP."; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Mille Feuille]"; mes "If you really want to cook, go and see^0000cd Sir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!"; close; @@ -4474,7 +4474,7 @@ iz_ac01,59,83,3 script Battle Instructor#08 4_M_NOV_HUNT,{ mes "Ok, I'll send you to the West field of Izlude."; mes "Be sure you know how to get back."; close2; - warp "prt_fild"+strnpcinfo(2), 344, 213; + warp "prt_fild"+strnpcinfo(NPC_NAME_HIDDEN), 344, 213; end; case 3: mes "[Battle Instructor Subino]"; @@ -5484,15 +5484,15 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{ mes "[Mom]"; mes "^0000cd[Come to me, honey~]^000000"; next; - enablenpc "Etinifni#"+strnpcinfo(2); - specialeffect EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(2); + enablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN); + specialeffect EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Etinifni]"; mes "What's up? Where am I?"; next; mes "[Mom]"; mes "Here!"; next; - emotion e_ag, 0, "Etinifni#"+strnpcinfo(2); + emotion e_ag, 0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Etinifni]"; mes "Ah... Again!! I have been out hunting Orcs."; next; @@ -5505,12 +5505,12 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{ mes "[Mom]"; mes "What? This moron?!"; next; - emotion e_sigh, 0, "Etinifni#"+strnpcinfo(2); + emotion e_sigh, 0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Etinifni]"; mes "OK. I will do it."; next; - disablenpc "Etinifni#"+strnpcinfo(2); - emotion e_sob, 0, "Dad#"+strnpcinfo(2); + disablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN); + emotion e_sob, 0, "Dad#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Dad]"; mes "I am sorry... Dad has no power over your mom."; close; @@ -5549,7 +5549,7 @@ izlude,97,144,1 script Etinifni#iz 4_M_DEWBOY,{ close; OnInit: - disablenpc "Etinifni#"+strnpcinfo(2); + disablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN); end; } @@ -5571,8 +5571,8 @@ izlude,99,138,3 script Romantic Male#iz 4_M_SITDOWN,{ mes "[Romantic Male]"; mes "Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?"; next; - specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2); - emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2); + specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN); + emotion e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Romantic Male]"; mes "Honey~~ I love you!! Sweetheart~"; next; @@ -5592,7 +5592,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{ mes "[Romantic Female]"; mes "Shout like this when I miss you, honey!!"; next; - emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2); + emotion e_lv, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Romantic Female]"; mes "^0000cd[I miss you.]^000000"; next; @@ -5605,20 +5605,20 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{ mes "[Romantic Female]"; mes "You are tired of sitting, aren't you?"; next; - specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2); - emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2); + specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN); + emotion e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Romantic Female]"; mes "My sweetheart!!! I love you!!!"; next; mes "[Romantic Male]"; mes "Yes, thank you for sharing your SP! You are also tired, aren't you?"; next; - specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(2); - emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(2); + specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN); + emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Romantic Male]"; mes "My sweetheart!! I love you!!!"; next; - emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2); + emotion e_lv, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Romantic Female]"; mes "Kia~ You are Coolest!!!"; close; @@ -6151,7 +6151,7 @@ iz_ac01,159,32,3 script Hungry Trainee#ac 4_M_SIT_NOVICE,{ mes "Wonder when my order will get taken... it's already been an hour..."; mes "Look at the helpers lingering on the side..."; next; - emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(2); + emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(NPC_NAME_HIDDEN); mes "[Scholarship Trainee]"; mes "Ugh... this guy..."; mes "I already told you eight hundred times! It's buffet style! Ah!"; @@ -11750,7 +11750,7 @@ iz_ac02,62,139,3 script Lumin#ac 4_M_NOV_RUMIN,{ mes "Lumin changing clothes piece by piece."; specialeffect2 EF_SPHERE; specialeffect2 EF_SPHERE; - classchange "Lumin#"+strnpcinfo(2), 4_M_THIEF_RUMIN; + classchange "Lumin#"+strnpcinfo(NPC_NAME_HIDDEN), 4_M_THIEF_RUMIN; next; cutin "thf_lumin01.bmp", 2; mes "[Lumin]"; @@ -11764,7 +11764,7 @@ iz_ac02,62,139,3 script Lumin#ac 4_M_NOV_RUMIN,{ close2; specialeffect2 EF_SPHERE; specialeffect2 EF_SPHERE; - classchange "Lumin#"+strnpcinfo(2), 4_M_NOV_RUMIN; + classchange "Lumin#"+strnpcinfo(NPC_NAME_HIDDEN), 4_M_NOV_RUMIN; cutin "", 255; end; } @@ -11786,25 +11786,25 @@ iz_ac02,1,1,0 script #nbacStone01 CLEAR_NPC,{ end; OnInit: - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnReset: - killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead"; - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnMyMobDead: - .@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead"); + .@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"); if (.@dead_num < 1) - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnSpawn: - monster strnpcinfo(4),59,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),60,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),61,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),62,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),59,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),60,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),61,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),62,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; end; } @@ -11818,25 +11818,25 @@ iz_ac02,1,1,0 script #nbacStone02 CLEAR_NPC,{ end; OnInit: - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnReset: - killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead"; - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnMyMobDead: - .@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead"); + .@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"); if (.@dead_num < 1) - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnSpawn: - monster strnpcinfo(4),59,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),60,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),61,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),62,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),59,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),60,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),61,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),62,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; end; } @@ -11850,25 +11850,25 @@ iz_ac02,1,1,0 script #nbacStone03 CLEAR_NPC,{ end; OnInit: - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnReset: - killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead"; - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnMyMobDead: - .@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead"); + .@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"); if (.@dead_num < 1) - donpcevent "#"+strnpcinfo(2)+"::OnSpawn"; + donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn"; end; OnSpawn: - monster strnpcinfo(4),59,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),60,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),61,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; - monster strnpcinfo(4),62,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),59,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),60,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),61,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; + monster strnpcinfo(NPC_MAP),62,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead"; end; } @@ -12008,7 +12008,7 @@ iz_ac02,156,169,5 script Acolyte Leader Alice#2 4_F_ACOLYTE,{ mes "[Alice Yisha]"; mes "Ask ^ff0000if you want to experience skills of an Acolyte, ask the sister next to you^000000."; mes "Now I am reading an introductory skill."; - emotion e_omg, 0, "A Nun#"+strnpcinfo(2); + emotion e_omg, 0, "A Nun#"+strnpcinfo(NPC_NAME_HIDDEN); close2; cutin "", 255; end; @@ -14080,15 +14080,15 @@ new_1-1,53,114,3 script Training Instructor#1a 4_F_03,{ mes "I will send you to Izlude."; close2; erasequest 7117, 7127; - if (strnpcinfo(4) == "new_1-1" || strnpcinfo(4) == "new_1-2" || strnpcinfo(4) == "new_1-3" || strnpcinfo(4) == "new_1-4") { + if (strnpcinfo(NPC_MAP) == "new_1-1" || strnpcinfo(NPC_MAP) == "new_1-2" || strnpcinfo(NPC_MAP) == "new_1-3" || strnpcinfo(NPC_MAP) == "new_1-4") { .@warp$ = "iz_int"; - } else if (strnpcinfo(4) == "new_2-1" || strnpcinfo(4) == "new_2-2" || strnpcinfo(4) == "new_2-3" || strnpcinfo(4) == "new_2-4") { + } else if (strnpcinfo(NPC_MAP) == "new_2-1" || strnpcinfo(NPC_MAP) == "new_2-2" || strnpcinfo(NPC_MAP) == "new_2-3" || strnpcinfo(NPC_MAP) == "new_2-4") { .@warp$ = "iz_int01"; - } else if (strnpcinfo(4) == "new_3-1" || strnpcinfo(4) == "new_3-2" || strnpcinfo(4) == "new_3-3" || strnpcinfo(4) == "new_3-4") { + } else if (strnpcinfo(NPC_MAP) == "new_3-1" || strnpcinfo(NPC_MAP) == "new_3-2" || strnpcinfo(NPC_MAP) == "new_3-3" || strnpcinfo(NPC_MAP) == "new_3-4") { .@warp$ = "iz_int02"; - } else if (strnpcinfo(4) == "new_4-1" || strnpcinfo(4) == "new_4-2" || strnpcinfo(4) == "new_4-3" || strnpcinfo(4) == "new_4-4") { + } else if (strnpcinfo(NPC_MAP) == "new_4-1" || strnpcinfo(NPC_MAP) == "new_4-2" || strnpcinfo(NPC_MAP) == "new_4-3" || strnpcinfo(NPC_MAP) == "new_4-4") { .@warp$ = "iz_int03"; - } else if (strnpcinfo(4) == "new_5-1" || strnpcinfo(4) == "new_5-2" || strnpcinfo(4) == "new_5-3" || strnpcinfo(4) == "new_5-4") { + } else if (strnpcinfo(NPC_MAP) == "new_5-1" || strnpcinfo(NPC_MAP) == "new_5-2" || strnpcinfo(NPC_MAP) == "new_5-3" || strnpcinfo(NPC_MAP) == "new_5-4") { .@warp$ = "iz_int04"; } savepoint .@warp$, 98, 88; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index fff0dbb13..a20bb81f8 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -163,8 +163,8 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01 mes "^4d4dff- You received a quest 'Novice Training Ground -1' from Sprakki."; mes "Please check the Quest Info Window. -^000000"; close2; - savepoint strnpcinfo(4),100,100; - warp strnpcinfo(4),100,100; + savepoint strnpcinfo(NPC_MAP),100,100; + warp strnpcinfo(NPC_MAP),100,100; end; case 2: nov_1st_cos = 0; @@ -218,8 +218,8 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01 mes "These are the Novice Training Grounds."; mes "I will guide you to the Novice Training Center."; close2; - savepoint strnpcinfo(4),100,100; - warp strnpcinfo(4),100,100; + savepoint strnpcinfo(NPC_MAP),100,100; + warp strnpcinfo(NPC_MAP),100,100; end; } } @@ -466,7 +466,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01 mes "I think it's better than seeing you lost and wandering about."; mes "Hahahaha..."; close2; - warp strnpcinfo(4),41,172; + warp strnpcinfo(NPC_MAP),41,172; end; } } else { @@ -480,7 +480,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01 mes "Sure."; mes "Be careful not to be lost again."; close2; - warp "new_"+charat(strnpcinfo(4),4)+"-3",96,21; + warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3",96,21; end; case 2: mes "[Instructor Brade]"; @@ -488,7 +488,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01 mes "In that case, I will send you to where the Kafra Employee is at."; mes "Use ^4d4dffKafra's Warp Service^000000 to go to town."; close2; - warp strnpcinfo(4),41,172; + warp strnpcinfo(NPC_MAP),41,172; end; } } @@ -508,7 +508,7 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1 mes "[Jinha]"; mes "You have to see Instructor Brade first before me. I will send you to Instructor Brade."; close2; - warp strnpcinfo(4),100,100; + warp strnpcinfo(NPC_MAP),100,100; end; } else if (job_novice_q == 5) { if (getskilllv("NV_FIRSTAID") > 0) { @@ -577,7 +577,7 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1 mes "[Jinha]"; mes "I will send you to Instructor Brade."; close2; - warp strnpcinfo(4),100,100; + warp strnpcinfo(NPC_MAP),100,100; end; } } else { @@ -622,7 +622,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01 mes "I will send you to Instructor Brade."; mes "Instructor Brade will start your basic training."; close2; - warp strnpcinfo(4),100,100; + warp strnpcinfo(NPC_MAP),100,100; end; case 2: mes "[Chocolat]"; @@ -664,7 +664,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01 mes "Sure."; mes "I will see you later."; close2; - warp strnpcinfo(4),100,100; + warp strnpcinfo(NPC_MAP),100,100; end; } } @@ -746,7 +746,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01 mes "Real Combat Training will be given by Instructor Brade. You met him earlier."; mes "I will send you to the Real Combat Training Field."; close2; - .@map$ = "new_"+charat(strnpcinfo(4),4)+"-3"; + .@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3"; savepoint .@map$,96,21; warp .@map$,96,21; end; @@ -764,7 +764,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01 mes "[Chocolat]"; mes "I will send you to the Real Combat Training Field."; close2; - .@map$ = "new_"+charat(strnpcinfo(4),4)+"-3"; + .@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3"; savepoint .@map$,96,21; warp .@map$,96,21; end; @@ -1132,7 +1132,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER mes "[Brade]"; mes "Ok. I'll send you to the basic course."; close2; - warp "new_"+charat(strnpcinfo(4),4)+"-2",100,100; + warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",100,100; end; case 2: mes "[Brade]"; @@ -1151,7 +1151,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER mes "[Brade]"; mes "Ok. I'll send you to Chocolat."; close2; - warp "new_"+charat(strnpcinfo(4),4)+"-2",41,172; + warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",41,172; end; case 2: mes "[Brade]"; @@ -1184,7 +1184,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER job_novice_q = 13; setquest 7122; getitem Novice_Potion,100; - savepoint strnpcinfo(4),96,21; + savepoint strnpcinfo(NPC_MAP),96,21; next; mes "^4d4dff- You've received a quest from Instructor Brade."; mes "Please check the quest information window. -^000000"; @@ -2308,7 +2308,7 @@ new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 4_F_NOVICE,5,5 mes "I see, then let me guide you to another level. Which level do you want to go to?"; next; for(.@i = 1; .@i<6; ++.@i) { - if (!compare(strnpcinfo(2),"nv"+.@i)) + if (!compare(strnpcinfo(NPC_NAME_HIDDEN),"nv"+.@i)) .@menu$ += "Send me to Level "+.@i; .@menu$ += ":"; } @@ -2439,8 +2439,8 @@ new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 8W_SOLDIER mes "Well, I will let you out of here."; mes "Go find the instructor, Brade."; close2; - savepoint strnpcinfo(4),100,100; - warp strnpcinfo(4),100,100; + savepoint strnpcinfo(NPC_MAP),100,100; + warp strnpcinfo(NPC_MAP),100,100; end; } new_1-2,161,182,5 duplicate(NvEdwin) Instructor#nv1 4_F_03 diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt index 8c62b3e80..0e5b31ea2 100644 --- a/npc/re/merchants/card_separation.txt +++ b/npc/re/merchants/card_separation.txt @@ -43,7 +43,7 @@ mes "Can't continue because you have too many heavy objects. Let's try to continue after reducing the weight."; close; } - if (strnpcinfo(1) == "Jeremy") { + if (strnpcinfo(NPC_NAME_VISIBLE) == "Jeremy") { .@Jeremy = 1; .@n$ = "[Jeremy]"; setarray .@equip_name$[0], "Armor", "Shoes", "Garment", "Upper Hat"; diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt index 7ec6e6c49..3243a6e04 100644 --- a/npc/re/mobs/dungeons/lhz_dun.txt +++ b/npc/re/mobs/dungeons/lhz_dun.txt @@ -94,7 +94,7 @@ OnInit: case 6: .@x = 175; .@y = 137; break; } .@mob = rand(1646,1651); - monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead"; + monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMyMVPDead"; // Select Coordinates to summon a random 99 on switch(rand(1,6)) { @@ -106,11 +106,11 @@ OnInit: case 6: .@x2 = 139; .@y2 = 259; break; } .@mob2 = rand(1640,1645); - monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead"; + monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead"; end; OnMyMVPDead: - killmonster "lhz_dun03",strnpcinfo(3)+"::OnMy99Dead"; + killmonster "lhz_dun03",strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead"; initnpctimer; OnMy99Dead: end; @@ -148,7 +148,7 @@ OnInit: case 7: .@x = 149; .@y = 151; break; } .@mob = rand(2235,2241); - monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead"; + monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMyMVPDead"; // Select Coordinates to summon a random 99 on switch(rand(1,7)) { @@ -161,11 +161,11 @@ OnInit: case 7: .@x2 = 149; .@y2 = 151; break; } .@mob2 = rand(2228,2234); - monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead"; + monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead"; end; OnMyMVPDead: - killmonster "lhz_dun04",strnpcinfo(3)+"::OnMy99Dead"; + killmonster "lhz_dun04",strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead"; initnpctimer; OnMy99Dead: end; diff --git a/npc/re/mobs/fields/niflheim.txt b/npc/re/mobs/fields/niflheim.txt index d47248a8c..c42aba3d9 100644 --- a/npc/re/mobs/fields/niflheim.txt +++ b/npc/re/mobs/fields/niflheim.txt @@ -66,120 +66,120 @@ OnTimer7980000: // delay1 = 7980000 ms (133 min) OnInit: switch(rand(6)) { case 0: - monster "niflheim",327,193,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead"; - monster "niflheim",330,193,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",324,193,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",327,196,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",327,190,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",324,190,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",330,190,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",324,196,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",330,196,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",327,193,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead"; + monster "niflheim",330,193,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",324,193,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",327,196,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",327,190,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",324,190,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",330,190,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",324,196,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",330,196,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; break; case 1: - monster "niflheim",337,252,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead"; - monster "niflheim",337,255,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",337,249,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",334,252,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",340,252,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",334,249,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",340,255,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",340,249,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",334,255,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",337,252,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead"; + monster "niflheim",337,255,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",337,249,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",334,252,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",340,252,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",334,249,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",340,255,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",340,249,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",334,255,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; break; case 2: - monster "niflheim",190,185,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead"; - monster "niflheim",190,188,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",190,182,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",193,185,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",187,185,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",187,182,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",193,182,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",193,188,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",187,188,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",190,185,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead"; + monster "niflheim",190,188,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",190,182,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",193,185,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",187,185,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",187,182,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",193,182,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",193,188,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",187,188,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; break; case 3: - monster "niflheim",131,138,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead"; - monster "niflheim",131,141,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",131,135,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",128,138,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",134,138,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",134,141,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",128,141,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",134,135,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",128,135,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",131,138,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead"; + monster "niflheim",131,141,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",131,135,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",128,138,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",134,138,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",134,141,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",128,141,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",134,135,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",128,135,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; break; case 4: - monster "niflheim",311,64,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead"; - monster "niflheim",311,67,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",311,61,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",308,64,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",314,64,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",314,61,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",314,67,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",308,67,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",308,61,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",311,64,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead"; + monster "niflheim",311,67,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",311,61,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",308,64,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",314,64,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",314,61,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",314,67,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",308,67,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",308,61,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; break; case 5: - monster "niflheim",238,131,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead"; - monster "niflheim",238,134,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",238,128,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",235,131,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",241,131,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",235,128,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",235,134,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",241,128,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",241,134,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",238,131,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead"; + monster "niflheim",238,134,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",238,128,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",235,131,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",241,131,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",235,128,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",235,134,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",241,128,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",241,134,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; break; case 6: - monster "niflheim",86,219,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead"; - monster "niflheim",86,222,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",86,216,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",89,219,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",83,219,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",89,222,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",89,216,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",83,222,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",83,216,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",86,219,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead"; + monster "niflheim",86,222,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",86,216,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",89,219,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",83,219,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",89,222,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",89,216,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",83,222,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",83,216,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; break; } - monster "niflheim",154,95,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",115,65,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",330,195,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",151,83,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",285,245,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",235,135,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",265,48,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",186,139,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",166,267,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",82,202,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",219,44,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",287,44,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",275,165,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",138,204,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",299,39,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",31,154,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",154,96,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",116,65,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",151,84,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",286,245,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",330,196,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",236,135,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",165,49,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",167,267,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",82,203,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",220,44,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",287,45,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",287,44,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",276,166,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",139,205,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",300,39,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; - monster "niflheim",31,155,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters"; + monster "niflheim",154,95,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",115,65,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",330,195,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",151,83,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",285,245,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",235,135,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",265,48,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",186,139,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",166,267,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",82,202,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",219,44,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",287,44,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",275,165,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",138,204,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",299,39,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",31,154,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",154,96,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",116,65,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",151,84,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",286,245,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",330,196,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",236,135,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",165,49,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",167,267,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",82,203,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",220,44,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",287,45,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",287,44,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",276,166,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",139,205,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",300,39,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; + monster "niflheim",31,155,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; end; OnLoDDead: - killmonster "niflheim",strnpcinfo(3)+"::OnInvasionMonsters"; + killmonster "niflheim",strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters"; initnpctimer; OnInvasionMonsters: end; diff --git a/npc/re/quests/eden/121-130.txt b/npc/re/quests/eden/121-130.txt index 77b7c26b2..32fbdeb26 100644 --- a/npc/re/quests/eden/121-130.txt +++ b/npc/re/quests/eden/121-130.txt @@ -779,8 +779,8 @@ S_Erasequest2: } - script Trace of an adventurer FAKE_NPC,{ - .@quest = 13106 + atoi(strnpcinfo(2)); - .@delay = 13110 + atoi(strnpcinfo(2)); + .@quest = 13106 + atoi(strnpcinfo(NPC_NAME_HIDDEN)); + .@delay = 13110 + atoi(strnpcinfo(NPC_NAME_HIDDEN)); if (questprogress(.@quest) == 1) { mes "I found traces of someone who was here but I cannot find a clue. Lets go back and report to Aigu."; erasequest .@quest; diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 9100e74bc..2e37eeb6f 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -218,7 +218,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ case 1: mes "[Eden Teleport Officer]"; mes "Let's go to our secret base!"; - nak_warp = strnpcinfo(2); + nak_warp = strnpcinfo(NPC_NAME_HIDDEN); close2; warp "moc_para01",31,14; end; diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index d44b4e2fe..9c414a6c9 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -124,11 +124,11 @@ OnGo: mes "Ah... who's a good puppy?"; mes "Ok, where are the others?"; } - if (compare(strnpcinfo(2),"1")) setarray .@i[0],2,3; - else if (compare(strnpcinfo(2),"2")) setarray .@i[0],1,3; + if (compare(strnpcinfo(NPC_NAME_UNIQUE),"1")) setarray .@i[0],2,3; + else if (compare(strnpcinfo(NPC_NAME_UNIQUE),"2")) setarray .@i[0],1,3; else setarray .@i[0],1,2; - donpcevent "Puppy#"+charat(strnpcinfo(2),0)+.@i[rand(2)]+"::OnEnable"; - hideonnpc strnpcinfo(0); + donpcevent "Puppy#"+charat(strnpcinfo(NPC_NAME_UNIQUE),0)+.@i[rand(2)]+"::OnEnable"; + hideonnpc strnpcinfo(NPC_NAME); close; } } @@ -137,15 +137,15 @@ OnGo: close; OnInit: - if (!compare(strnpcinfo(2),"1")) hideonnpc strnpcinfo(0); + if (!compare(strnpcinfo(NPC_NAME_UNIQUE),"1")) hideonnpc strnpcinfo(NPC_NAME); end; OnEnable: - hideoffnpc strnpcinfo(0); + hideoffnpc strnpcinfo(NPC_NAME); end; OnDisable: - hideonnpc strnpcinfo(0); + hideonnpc strnpcinfo(NPC_NAME); end; } diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index a78427f12..19b4a197d 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -1596,7 +1596,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ mes "something smashes down on your head, right where that soft spot is, $#*@! that's a one in a million shot."; percentheal -30,0; close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; warp "dew_fild01",371,211; end; } @@ -1619,14 +1619,14 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ break; } close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnTimer60000: @@ -1634,10 +1634,10 @@ OnTimer180000: OnTimer120000: OnTimer240000: if(rand(2)) - donpcevent strnpcinfo(0)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnEnable"; end; OnTimer300000: - donpcevent strnpcinfo(0)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnEnable"; end; } dew_fild01,247,62,0 duplicate(DewataPalm) Palm Tree#drink01 CLEAR_NPC diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index d52de0f70..c615a16ef 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -204,7 +204,7 @@ sec_in02,16,43,5 script Scaraba Dungeon Entrance 4_MAN_BENKUNI,{ //== Vigilantes ============================================ - script Vigilante#main FAKE_NPC,{ - if (compare(strnpcinfo(0),"ep133_26")) { + if (compare(strnpcinfo(NPC_NAME),"ep133_26")) { if (!isequipped(2782)) { mes "[Vigilante]"; mes sprintf("¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?"); @@ -348,11 +348,11 @@ OnTouch: mid_camp,218,250,3 script Suspicious Guy#ep133_ 4_M_ROKI,{ mes "[Suspicious Guy]"; mes "....."; - hideonnpc strnpcinfo(0); + hideonnpc strnpcinfo(NPC_NAME); close; OnInit: OnDisable: - hideonnpc strnpcinfo(0); + hideonnpc strnpcinfo(NPC_NAME); OnEnable: hideoffnpc "Suspicious Guy#ep133_"; end; @@ -413,7 +413,7 @@ OnEnable: end; } mes "[Capital City Guard]"; - mes "Unknown situation occurred. Case " + strnpcinfo(2); + mes "Unknown situation occurred. Case " + strnpcinfo(NPC_NAME_HIDDEN); mes "Please inquiry with a GM."; close; } @@ -4798,7 +4798,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ mes "- You can too many items to proceed with the quest. -"; close; } - .@n$ = strnpcinfo(1); + .@n$ = strnpcinfo(NPC_NAME_VISIBLE); setarray .@npc$, "Rock Pile", "Dirt Pile", "Split Earth"; setarray .@item, 6307, 6306, 6305; .@size = getarraysize(.@npc$); @@ -4825,7 +4825,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ if (.@npc$[.@type] == "Rock Pile") mes "Knock down the pebbles that make up the pile of rocks and spread them out."; else if (.@npc$[.@type] == "Dirt Pile") mes "You step on the dug up dirt pile and make the ground flat."; else if (.@npc$[.@type] == "Split Earth") mes "You step on the dry, split surface and make the ground flat."; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; close; } if (.@npc$[.@type] == "Rock Pile") { @@ -4849,7 +4849,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ getitem .@item[.@type], 1; erasequest 7193; setquest 7194; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; next; mes "[" + strcharinfo(0) + "]"; mes "Hmm.. I may need to discuss these with Shay."; @@ -4882,7 +4882,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ mes "There is something stuck by the frost on the sharp, crack surface."; } getitem .@item[.@type], 1; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; next; if (.@npc$[.@type] == "Rock Pile") mes "You collect stone fragments."; else if (.@npc$[.@type] == "Dirt Pile") mes "Collect bloodstains."; @@ -4911,7 +4911,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ else if (.@npc$[.@type] == "Dirt Pile") mes "You collect another clotted bloodstain from a dirt pile."; else if (.@npc$[.@type] == "Split Earth") mes "You collect another piece of skin frozen in the frost in the crack of the split earth."; getitem .@item[.@type], 1; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; close; } mes "No need to collect more."; @@ -4931,7 +4931,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ mes "You collect the frozen piece of skin and then step on the ground to leave no trace."; } getitem .@item[.@type], 1; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; close; } setarray .@str$, "stone fragments","bloodstains","pieces of skin"; @@ -4942,14 +4942,14 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ mes "Was arranged neatly."; close; OnEnable: - hideoffnpc strnpcinfo(0); + hideoffnpc strnpcinfo(NPC_NAME); end; OnDisable: - hideonnpc strnpcinfo(0); + hideonnpc strnpcinfo(NPC_NAME); initnpctimer; end; OnReset: - hideoffnpc strnpcinfo(0); + hideoffnpc strnpcinfo(NPC_NAME); stopnpctimer; end; OnTimer60000: @@ -4957,13 +4957,13 @@ OnTimer120000: OnTimer180000: OnTimer240000: if (!rand(2)) { - hideoffnpc strnpcinfo(0); + hideoffnpc strnpcinfo(NPC_NAME); stopnpctimer; } end; OnTimer300000: - hideoffnpc strnpcinfo(0); + hideoffnpc strnpcinfo(NPC_NAME); stopnpctimer; end; } @@ -6105,7 +6105,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ //== Sapha's Visit ========================================= - script Expedition#ep133_is FAKE_NPC,{ if (ep13_3_invite) { - if (compare(strnpcinfo(1),"Maha")) { + if (compare(strnpcinfo(NPC_NAME_VISIBLE),"Maha")) { mes "[Maha]"; mes "But I do think the Sapha race is overly kind, almost unnaturally."; mes "Guess it'll be fine."; @@ -6667,7 +6667,7 @@ mid_campin,165,127,5 script Hibba Agip#ep133_is07 4_M_REDSWORD,{ mes "I should go now."; close2; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; } @@ -6951,7 +6951,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ } //== Enchantment NPCs ====================================== - script dic_enc#main FAKE_NPC,{ - .@re$ = strnpcinfo(1); + .@re$ = strnpcinfo(NPC_NAME_VISIBLE); .@n$ = "["+.@re$+"]"; if (!checkweight (1201,1)) { mes "You have too many kinds of items. Let's try again after you reduce the number of items."; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 58082684d..f1abf56aa 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -42,8 +42,8 @@ ecl_fild01,118,311,4 script Teleport Cat No.1#1 4_M_BOSSCAT,{ mes "[Teleport Cat]"; mes "We provide teleport service between various regions based on our accumulated knowledge. We accept Malangdo Canned Specialties or Zeny, so you can pay however you like it~"; next; - .@index[0] = .index[(atoi(strnpcinfo(2))*2-2)]; - .@index[1] = .index[(atoi(strnpcinfo(2))*2-1)]; + .@index[0] = .index[(atoi(strnpcinfo(NPC_NAME_HIDDEN))*2-2)]; + .@index[1] = .index[(atoi(strnpcinfo(NPC_NAME_HIDDEN))*2-1)]; .@menu$ = "Forget it:"; for (.@i=0; .@i < getarraysize(.maps$); .@i++){ for (.@j=0; .@j<2; .@j++){ @@ -12838,8 +12838,8 @@ ecl_tdun02,99,63,5 script Rosi#No.1 4_F_HUWOMAN,1,1,{ end; OnInit: - if (atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ) > 1){ - disablenpc strnpcinfo(0); + if (atoi( charat( strnpcinfo(NPC_NAME), getstrlen(strnpcinfo(NPC_NAME))-1 ) ) > 1){ + disablenpc strnpcinfo(NPC_NAME); } end; @@ -12856,7 +12856,7 @@ OnTouch: close; } if ((questprogress(13055) == 1) && (questprogress(13056) == 1)) { - .@npc_uin = atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ); + .@npc_uin = atoi( charat( strnpcinfo(NPC_NAME), getstrlen(strnpcinfo(NPC_NAME))-1 ) ); mes "[Rosi]"; mes "It's you again! Oh, is it because I'm a woman? Let me make it clear here. I'm going nowhere until I get a news item."; erasequest 13056; @@ -12881,7 +12881,7 @@ OnTouch: } else if (ep14_2_nines == 2) { if ((questprogress(13055) == 1) && (questprogress(13056) == 1)) { - .@npc_uin = atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ); + .@npc_uin = atoi( charat( strnpcinfo(NPC_NAME), getstrlen(strnpcinfo(NPC_NAME))-1 ) ); mes "[Rosi]"; mes "Oh my gosh! You scared me! What are you doing here?"; next; @@ -12929,8 +12929,8 @@ ecl_tdun01,11,62,5 script Euncheong#No.1 4_M_HUBOY,1,1,{ end; OnInit: - if (atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ) > 1){ - disablenpc strnpcinfo(0); + if (atoi( charat( strnpcinfo(NPC_NAME), getstrlen(strnpcinfo(NPC_NAME))-1 ) ) > 1){ + disablenpc strnpcinfo(NPC_NAME); } end; @@ -12947,7 +12947,7 @@ OnTouch: close; } if ((questprogress(13055) == 1) && (questprogress(13057) == 1)) { - .@npc_uin = atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ); + .@npc_uin = atoi( charat( strnpcinfo(NPC_NAME), getstrlen(strnpcinfo(NPC_NAME))-1 ) ); mes "[Euncheong]"; mes "You really shouldn't worry about me. I'll go out when I'm done exploring...Tell him I'm doing okay."; next; @@ -12975,7 +12975,7 @@ OnTouch: } else if (ep14_2_nines == 2) { if ((questprogress(13055) == 1) && (questprogress(13057) == 1)){ - .@npc_uin = atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ); + .@npc_uin = atoi( charat( strnpcinfo(NPC_NAME), getstrlen(strnpcinfo(NPC_NAME))-1 ) ); mes "[Euncheong]"; mes "Are you an adventurer, too? Don't you dare cut in here. I was here first."; next; @@ -19386,7 +19386,7 @@ OnTimer8000: que_avan01,22,40,3 script Avant's Summon#tlact01 DARK_PRIEST,{ end; OnInit: - hideonnpc strnpcinfo(0); + hideonnpc strnpcinfo(NPC_NAME); end; } diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 9a3a3284f..4a5f5fab8 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -1335,7 +1335,7 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ mes "- Ground is a bit cracked. -"; mes "- Used a stapler. -"; .off = 1; - donpcevent "Crackt"+substr(strnpcinfo(2),3,getstrlen(strnpcinfo(2))-1)+"#mal::OnEnable"; + donpcevent "Crackt"+substr(strnpcinfo(NPC_NAME_HIDDEN),3,getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1)+"#mal::OnEnable"; close; } else if (.@ma_cr1 == 7) { mes "- With the crack opening -"; @@ -1388,7 +1388,7 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ mes "- the other cracks. -"; } .off = 1; - donpcevent "Crackt"+substr(strnpcinfo(2),3,getstrlen(strnpcinfo(2))-1)+"#mal::OnEnable"; + donpcevent "Crackt"+substr(strnpcinfo(NPC_NAME_HIDDEN),3,getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1)+"#mal::OnEnable"; close; } } @@ -1399,11 +1399,11 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ mes "- not enough supporters yet. -"; close; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; OnDisable: .off = 0; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; } malangdo,114,157,0 duplicate(Crack#mal0) Crack#mal1 4_CRACK @@ -1420,22 +1420,22 @@ malangdo,162,183,0 duplicate(Crack#mal0) Crack#mal10 4_CRACK - script Crackt0#mal FAKE_NPC,{ end; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnDisable: stopnpctimer; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnTimer1000: - donpcevent "Crack#mal"+substr(strnpcinfo(1),6,getstrlen(strnpcinfo(1))-1)+"::OnDisable"; + donpcevent "Crack#mal"+substr(strnpcinfo(NPC_NAME_VISIBLE),6,getstrlen(strnpcinfo(NPC_NAME_VISIBLE))-1)+"::OnDisable"; end; OnTimer30000: - donpcevent "Crack#mal"+substr(strnpcinfo(1),6,getstrlen(strnpcinfo(1))-1)+"::OnEnable"; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent "Crack#mal"+substr(strnpcinfo(NPC_NAME_VISIBLE),6,getstrlen(strnpcinfo(NPC_NAME_VISIBLE))-1)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } - duplicate(Crackt0#mal) Crackt1#mal FAKE_NPC @@ -1930,18 +1930,18 @@ mal_in01,116,168,0 script Dry Machine#mal 2_SLOT_MACHINE,{ emotion e_omg,1; } .off = 1; - donpcevent "Water Sand"+strnpcinfo(2)+"#mal::OnEnable"; + donpcevent "Water Sand"+strnpcinfo(NPC_NAME_HIDDEN)+"#mal::OnEnable"; close; } mes "- Seeems suspicious. -"; mes "- But it's just sand... -"; close; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; OnDisable: .off = 0; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; } malangdo,221,139,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#1 4_SOIL @@ -1957,22 +1957,22 @@ malangdo,242,175,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#10 4_S - script Water Sand0#mal FAKE_NPC,{ OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnDisable: stopnpctimer; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnTimer1000: - donpcevent "Suspicious Sand Pile#"+substr(strnpcinfo(1),10,getstrlen(strnpcinfo(1))-1)+"::OnDisable"; + donpcevent "Suspicious Sand Pile#"+substr(strnpcinfo(NPC_NAME_VISIBLE),10,getstrlen(strnpcinfo(NPC_NAME_VISIBLE))-1)+"::OnDisable"; end; OnTimer30000: - donpcevent "Suspicious Sand Pile#"+substr(strnpcinfo(1),10,getstrlen(strnpcinfo(1))-1)+"::OnEnable"; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent "Suspicious Sand Pile#"+substr(strnpcinfo(NPC_NAME_VISIBLE),10,getstrlen(strnpcinfo(NPC_NAME_VISIBLE))-1)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } - duplicate(Water Sand0#mal) Water Sand1#mal FAKE_NPC @@ -2604,7 +2604,7 @@ mal_dun01,133,125,5 script Star Candy#mal 4_F_STARFISHGIRL,{ } - script #skin_mal FAKE_NPC,{ - .@index = atoi(strnpcinfo(2)); + .@index = atoi(strnpcinfo(NPC_NAME_HIDDEN)); switch(.@index) { case 29: .@str$ = "dry"; break; case 30: .@str$ = "prickly"; break; @@ -4175,7 +4175,7 @@ malangdo,133,134,0 script Strange Pile of Sand#7 4_SOIL,{ close; } if (questprogress(7268)) { - .@quest = (strnpcinfo(0) == "Strange Pile of Sand#7")?7270:7275; + .@quest = (strnpcinfo(NPC_NAME) == "Strange Pile of Sand#7")?7270:7275; if (!questprogress(.@quest)) { mes "The pile of sand is billowed like a grave. Should be something in there."; mes "According to rumors, cats have a habit to bury with sand after stool..."; @@ -5488,7 +5488,7 @@ L_Viewpoint: mes "This is the Duruduru compass from the Meow Bravery Team."; close; } - .@index = atoi(strnpcinfo(2)); + .@index = atoi(strnpcinfo(NPC_NAME_HIDDEN)); switch(.@index) { case 1: setarray .@var[0],11,25; @@ -5511,7 +5511,7 @@ L_Viewpoint: .@color$ = "white"; break; } - mes "Delicate "+.@color$+" lights surround the "+strnpcinfo(1)+"."; + mes "Delicate "+.@color$+" lights surround the "+strnpcinfo(NPC_NAME_VISIBLE)+"."; if (nyadven02 < 11) { mes "After inserting the card and pressing the button, characters appear on the screen."; next; @@ -5560,7 +5560,7 @@ L_Viewpoint: input .@input; if (.@input == .@nori_c) { mes "The card slides out with a sound after entering the number."; - mes "^4d4dffYou have passed the "+strnpcinfo(1)+"! Run to the next destination!^000000"; + mes "^4d4dffYou have passed the "+strnpcinfo(NPC_NAME_VISIBLE)+"! Run to the next destination!^000000"; mes "You should run for the next destination."; ++nyadven02; close; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index fa19f3be9..950398355 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -1487,7 +1487,7 @@ malaya,62,274,0 script Sand Trap#malaya 4_SOIL,{ mes "someone scattered on the sea water."; close2; progressbar "0xffff00", 5; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); initnpctimer; getitem Salt_Bag, 1; // Salt_Bag mes "[" + strcharinfo(0) + "]"; @@ -1495,7 +1495,7 @@ malaya,62,274,0 script Sand Trap#malaya 4_SOIL,{ close; OnTimer30000: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; } @@ -1519,7 +1519,7 @@ ma_fild01,178,206,0 script Black Bamboo#malaya CLEAR_NPC,4,4,{ mes "If some of it is cut off and sharpened, I think it will suffice for the Sharpened Bamboo Imelda wanted."; close2; progressbar "0xffff00", 3; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); initnpctimer; getitem Sharp_Bamboo, 1; mes "[" + strcharinfo(0) + "]"; @@ -1531,7 +1531,7 @@ OnTouch: } end; OnTimer30000: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; } @@ -3150,10 +3150,10 @@ ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ setquest 7389; erasequest 7388; close2; - disablenpc strnpcinfo(0); - if (strnpcinfo(0) == "Lost Child#malaya01") { + disablenpc strnpcinfo(NPC_NAME); + if (strnpcinfo(NPC_NAME) == "Lost Child#malaya01") { enablenpc "Lost Child#malaya02"; - } else if (strnpcinfo(0) == "Lost Child#malaya01") { + } else if (strnpcinfo(NPC_NAME) == "Lost Child#malaya01") { enablenpc "Lost Child#malaya03"; } else { enablenpc "Lost Child#malaya01"; @@ -3183,8 +3183,8 @@ ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ end; OnInit: - if (strnpcinfo(0) != "Lost Child#malaya01") - disablenpc strnpcinfo(0); + if (strnpcinfo(NPC_NAME) != "Lost Child#malaya01") + disablenpc strnpcinfo(NPC_NAME); } ma_fild01,114,141,3 duplicate(Lost Child#malaya01) Lost Child#malaya02 4_F_BARYO_GIRL ma_fild01,130,314,3 duplicate(Lost Child#malaya01) Lost Child#malaya03 4_F_BARYO_GIRL @@ -4561,13 +4561,13 @@ OnInit: mes "[" + strcharinfo(0) + "]"; mes "It's warm as a mother's bosom."; getitem Collected_Sample,1; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); initnpctimer; close; } end; OnTimer20000: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; } @@ -7951,18 +7951,18 @@ malaya,53,68,4 script Bushes#ma CLEAR_NPC,{ malaya_bang = 15; changequest 11295,11296; getitem Lesser_Agimat,1; - donpcevent "Tent"+replacestr(strnpcinfo(3),"MalayaStick","")+"#ma::OnEnable"; + donpcevent "Tent"+replacestr(strnpcinfo(NPC_NAME_UNIQUE),"MalayaStick","")+"#ma::OnEnable"; next; mes "Better show Las the talisman."; close; } else { getitem Lesser_Agimat,1; - donpcevent "Tent"+replacestr(strnpcinfo(3),"MalayaStick","")+"#ma::OnEnable"; + donpcevent "Tent"+replacestr(strnpcinfo(NPC_NAME_UNIQUE),"MalayaStick","")+"#ma::OnEnable"; close; } } else { mes "After pulling out the deeply planted stick, an uneasy feeling washes over."; - donpcevent "Tent"+replacestr(strnpcinfo(3),"MalayaStick","")+"#ma::OnEnable"; + donpcevent "Tent"+replacestr(strnpcinfo(NPC_NAME_UNIQUE),"MalayaStick","")+"#ma::OnEnable"; close; } case 2: @@ -7975,10 +7975,10 @@ malaya,53,68,4 script Bushes#ma CLEAR_NPC,{ } end; OnEnable: - enablenpc strnpcinfo(3); // NPC name is too long for strnpcinfo(0). + enablenpc strnpcinfo(NPC_NAME_UNIQUE); // NPC name is too long for strnpcinfo(NPC_NAME). end; OnDisable: - disablenpc strnpcinfo(3); + disablenpc strnpcinfo(NPC_NAME_UNIQUE); end; } malaya,40,52,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick1 4_BULLETIN_BOARD2 @@ -7995,22 +7995,22 @@ malaya,59,84,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick10 4_B - script Tent#ma FAKE_NPC,{ //557 end; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnDisable: stopnpctimer; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnTimer1000: - donpcevent "MalayaStick"+replacestr(strnpcinfo(1),"Tent","")+"::OnDisable"; + donpcevent "MalayaStick"+replacestr(strnpcinfo(NPC_NAME_VISIBLE),"Tent","")+"::OnDisable"; end; OnTimer30000: - donpcevent "MalayaStick"+replacestr(strnpcinfo(1),"Tent","")+"::OnEnable"; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent "MalayaStick"+replacestr(strnpcinfo(NPC_NAME_VISIBLE),"Tent","")+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } - duplicate(Tent#ma) Tent1#ma FAKE_NPC @@ -9156,13 +9156,13 @@ ma_fild01,164,231,6 script Beat Catching Boy#pin10 4_M_BARYO_BOY,{ close; OnInit: if (!$malaya_pintados_00) - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; } ma_fild01,170,228,4 duplicate(Beat Catching Boy#pin10) Beat Catching Boy#pin11 4_M_BARYO_BOY diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 34999bbd8..5c570ffc0 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -382,7 +382,7 @@ OnTouch: mes "- It's just an ordinary bush. -"; close; } - .@i = atoi(charat(strnpcinfo(2),9)); + .@i = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),9)); .@rand = rand(1,3); mes "[Unarmed Laphine]"; mes "Aaaarrrrrggggghhhhh!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; @@ -401,18 +401,18 @@ OnTouch: donpcevent "Bush"+.@i+"Timer::OnEnable"; close; OnEnable: - enablenpc strnpcinfo(0); - donpcevent "Bush"+charat(strnpcinfo(2),9)+"Timer::OnDisable"; + enablenpc strnpcinfo(NPC_NAME); + donpcevent "Bush"+charat(strnpcinfo(NPC_NAME_HIDDEN),9)+"Timer::OnDisable"; end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; } - script #mora_pouch FAKE_NPC,{ end; OnTouch: - .@i = atoi(charat(strnpcinfo(2),9)); + .@i = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),9)); if (ep14_1_bs == .@i+3) { if (countitem(Small_Pocket) == 0) { if (checkweight(Knife,1) == 0) { @@ -452,18 +452,18 @@ OnTouch: - script #mora_fairy FAKE_NPC,{ end; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; OnTimer5000: - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; stopnpctimer; end; } @@ -507,22 +507,22 @@ spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd63 4_F_FAIRYKID4 - script #mora_bush_timer FAKE_NPC,{ end; OnInit: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnDisable: stopnpctimer; - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); end; OnTimer1000: - donpcevent "Bush#ep14_1_bs"+charat(strnpcinfo(0),4)+"::OnDisable"; + donpcevent "Bush#ep14_1_bs"+charat(strnpcinfo(NPC_NAME),4)+"::OnDisable"; end; OnTimer600000: - donpcevent "Bush#ep14_1_bs"+charat(strnpcinfo(0),4)+"::OnEnable"; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent "Bush#ep14_1_bs"+charat(strnpcinfo(NPC_NAME),4)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } spl_fild02,180,1,0 duplicate(#mora_bush_timer) Bush1Timer 4_F_FAIRYKID5 @@ -4102,19 +4102,19 @@ OnFullon: mes "What will you do?"; next; if(select("Collect samples.", "Leave.") == 2) { - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } if (countitem(Bathtub_R_Sample) >= 10) { mes "You will not need additional samples."; close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } if (countitem(Empty_Cylinder) == 0) { mes "To obtain a sample, you need a sample tube."; close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } mes "Collecting samples."; @@ -4126,7 +4126,7 @@ OnFullon: mes "that it is difficult to collect samples."; mes "You will have to lighten your load and come back."; close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } mes "Bath water sample collection complete."; @@ -4137,7 +4137,7 @@ OnFullon: percentheal 5,5; } close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } else if (questprogress(5021) || questprogress(5022)) { if (questprogress(5021)) { @@ -4152,13 +4152,13 @@ OnFullon: mes "What do you want to do?"; next; if(select("Look further.", "Leave.") == 2) { - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } if (countitem(.@item) >= 10) { mes "You will not need additional samples."; close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } progressbar "ffff00",3; @@ -4175,7 +4175,7 @@ OnFullon: } else mes "You thought you saw it on the ground, but it was an illusion."; close2; - donpcevent strnpcinfo(0)+"::OnDisable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; } else { mes "???"; @@ -4186,16 +4186,16 @@ OnFullon: } end; OnEnable: - enablenpc strnpcinfo(0); + enablenpc strnpcinfo(NPC_NAME); stopnpctimer; end; OnDisable: - disablenpc strnpcinfo(0); + disablenpc strnpcinfo(NPC_NAME); initnpctimer; end; OnReset: if (rand(2)) - donpcevent strnpcinfo(0)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnEnable"; else initnpctimer; end; @@ -4205,10 +4205,10 @@ OnTimer30000: OnTimer40000: OnTimer50000: if (rand(2)) - donpcevent strnpcinfo(0)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnEnable"; end; OnTimer60000: - donpcevent strnpcinfo(0)+"::OnEnable"; + donpcevent strnpcinfo(NPC_NAME)+"::OnEnable"; end; OnTouch: if (questprogress(5034) == 2 || ep14_1_muk == 0 || rand(5)) { @@ -4238,7 +4238,7 @@ mora,116,81,0 duplicate(???#mora) ???#ep14_muk04 CLEAR_NPC,2,2 mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 - script #mora_puddle FAKE_NPC,{ - .@i = atoi(charat(strnpcinfo(2),9)); + .@i = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),9)); // This script has a lot of checks, // so arrays are only set when used. diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index e9b90614c..862765d9a 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -66,7 +66,7 @@ dic_in01,242,182,0 script #eldicastes0016 CLEAR_NPC,{ // Elevators - script Elevator#main FAKE_NPC,{ - .@n = atoi(strnpcinfo(2)); + .@n = atoi(strnpcinfo(NPC_NAME_HIDDEN)); .@eq = (isequipped(2782))?1:0; if (.@n <= 4) { .@m$ = (.@eq)?"Civil Services:Archive Room:Situation Room:Administrative Office":"¢³¡ð¡Ð:¡ñ¡ñ¡ò:¡ø¡ø¡ð:¡÷¡ú¡ð"; diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index a6229d25b..a8062d578 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -87,7 +87,7 @@ iz_int,96,73,0 script iz_int_iz WARPNPC,2,2,{ OnTouch: savepoint "izlude", 128, 98; - warp "izlude"+strnpcinfo(2)+"", 195, 209; + warp "izlude"+strnpcinfo(NPC_NAME_HIDDEN)+"", 195, 209; end; } diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index 2122ae15f..68e3f4f7a 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -47,7 +47,7 @@ mora,56,25,0 warp bifrost_field0005 1,1,bif_fild02,176,162 mes "When you knock on the door-like thing just for fun,"; mes "the door clicks open and you feel some mysterious force pulling you inside."; close2; - switch(atoi(charat(strnpcinfo(2),9))) { + switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),9))) { case 1: warp "mora",179,74; end; case 2: warp "mora",22,157; end; case 3: warp "mora",58,27; end; diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index 0097b1b3c..012a96afe 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -707,22 +707,22 @@ OnAgitInvest: //== Realms - Merchant Guilds, Gate Managers, Status Boards = - script Cat Paw Merchant Guild FAKE_NPC,{ - if (compare(strnpcinfo(4),"alde")) { + if (compare(strnpcinfo(NPC_MAP),"alde")) { .@npc$ = "alde"; .@name$ = "Megrez"; .@realm$ = "Luina"; .@intro$ = "Luina Branch Manager in Al De Baran"; - } else if (compare(strnpcinfo(4),"gef")) { + } else if (compare(strnpcinfo(NPC_MAP),"gef")) { .@npc$ = "gef"; .@name$ = "Meraq"; .@realm$ = "Britoniah"; .@intro$ = "Britoniah Branch Manager"; - } else if (compare(strnpcinfo(4),"pay")) { + } else if (compare(strnpcinfo(NPC_MAP),"pay")) { .@npc$ = "pay"; .@name$ = "Phecda"; .@realm$ = "Greenwood Lake"; .@intro$ = "Payon Greenwood Lake Branch Manager"; - } else if (compare(strnpcinfo(4),"prt")) { + } else if (compare(strnpcinfo(NPC_MAP),"prt")) { .@npc$ = "prt"; .@name$ = "Dubae"; .@realm$ = "Valkyrie Realm"; @@ -949,22 +949,22 @@ OnAgitInvest: - script Gate Manager#realm FAKE_NPC,{ - if (compare(strnpcinfo(4),"alde")) { + if (compare(strnpcinfo(NPC_MAP),"alde")) { .@npc$ = "alde"; .@name$ = "Alkor"; .@gate$ = "Hero's Tears"; .@realm$ = "Luina"; - } else if (compare(strnpcinfo(4),"gef")) { + } else if (compare(strnpcinfo(NPC_MAP),"gef")) { .@npc$ = "gef"; .@name$ = "Mizar"; .@gate$ = "Hill of the Dead"; .@realm$ = "Britoniah"; - } else if (compare(strnpcinfo(4),"pay")) { + } else if (compare(strnpcinfo(NPC_MAP),"pay")) { .@npc$ = "pay"; .@name$ = "Alkaid"; .@gate$ = "Winds of the Ancient"; .@realm$ = "Greenwood Lake"; - } else if (compare(strnpcinfo(4),"prt")) { + } else if (compare(strnpcinfo(NPC_MAP),"prt")) { .@npc$ = "prt"; .@name$ = "Arios"; .@gate$ = "Way of the Warrior"; @@ -1005,13 +1005,13 @@ OnAgitInvest: Zeny -= 10000; setd "$fund_"+.@npc$+"_extra", getd("$fund_"+.@npc$+"_extra") + 1; close2; - if (compare(strnpcinfo(2),"alde")) + if (compare(strnpcinfo(NPC_NAME_HIDDEN),"alde")) warp "gld_dun02"+((.@i == 2)?"_2":""),32,122; - else if (compare(strnpcinfo(2),"gef")) + else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"gef")) warp "gld_dun04"+((.@i == 2)?"_2":""),39,258; - else if (compare(strnpcinfo(2),"pay")) + else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"pay")) warp "gld_dun01"+((.@i == 2)?"_2":""),186,165; - else if (compare(strnpcinfo(2),"prt")) + else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"prt")) warp "gld_dun03"+((.@i == 2)?"_2":""),164,268; end; } else if (.@status == 2) { @@ -1031,16 +1031,16 @@ OnAgitInvest: - script Investment Status Board FAKE_NPC,{ .@invest_status = callfunc("F_Invest_Status"); if (.@invest_status == 1) { - if (compare(strnpcinfo(4),"alde")) { + if (compare(strnpcinfo(NPC_MAP),"alde")) { .@npc$ = "alde"; .@realm$ = "Luina"; - } else if (compare(strnpcinfo(4),"gef")) { + } else if (compare(strnpcinfo(NPC_MAP),"gef")) { .@npc$ = "gef"; .@realm$ = "Britoniah"; - } else if (compare(strnpcinfo(4),"pay")) { + } else if (compare(strnpcinfo(NPC_MAP),"pay")) { .@npc$ = "pay"; .@realm$ = "Greenwood Lake"; - } else if (compare(strnpcinfo(4),"prt")) { + } else if (compare(strnpcinfo(NPC_MAP),"prt")) { .@npc$ = "prt"; .@realm$ = "Valkyrie Realm"; } @@ -1098,22 +1098,22 @@ OnAgitInvest: //== Inside Castles - Gate Managers ======================== - script Gate Manager#castle FAKE_NPC,{ - .@id = atoi(charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1)); - if (compare(strnpcinfo(2),"alde")) { + .@id = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1)); + if (compare(strnpcinfo(NPC_NAME_HIDDEN),"alde")) { .@npc$ = "alde"; .@realm$ = "Luina"; - } else if (compare(strnpcinfo(2),"gef")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"gef")) { .@npc$ = "gef"; .@realm$ = "Britoniah"; - } else if (compare(strnpcinfo(2),"pay")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"pay")) { .@npc$ = "pay"; .@realm$ = "Greenwood Lake"; - } else if (compare(strnpcinfo(2),"prt")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"prt")) { .@npc$ = "prt"; .@realm$ = "Valkyrie Realm"; } - .@GID = getcastledata(strnpcinfo(4),1); + .@GID = getcastledata(strnpcinfo(NPC_MAP),1); if (getcharid(2) != .@GID) { mes "[Gate Manager]"; mes "You don't seem to be the member of guild owning this castle."; @@ -1161,7 +1161,7 @@ OnAgitInvest: mes "You are interested in exploring the "+.@realm$+" Guild Dungeon Deepest Layer (2F)."; mes "Let me guide you. Good luck."; close2; - if (compare(strnpcinfo(2),"alde")) { + if (compare(strnpcinfo(NPC_NAME_HIDDEN),"alde")) { switch(.@id) { case 1: warp "gld_dun02_2",32,122; end; case 2: warp "gld_dun02_2",79,30; end; @@ -1169,7 +1169,7 @@ OnAgitInvest: case 4: warp "gld_dun02_2",160,148; end; case 5: warp "gld_dun02_2",103,169; end; } - } else if (compare(strnpcinfo(2),"gef")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"gef")) { switch(.@id) { case 1: warp "gld_dun04_2",39,258; end; case 2: warp "gld_dun04_2",125,270; end; @@ -1177,7 +1177,7 @@ OnAgitInvest: case 4: warp "gld_dun04_2",268,108; end; case 5: warp "gld_dun04_2",230,35; end; } - } else if (compare(strnpcinfo(2),"pay")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"pay")) { switch(.@id) { case 1: warp "gld_dun01_2",186,165; end; case 2: warp "gld_dun01_2",54,165; end; @@ -1185,7 +1185,7 @@ OnAgitInvest: case 4: warp "gld_dun01_2",186,39; end; case 5: warp "gld_dun01_2",223,202; end; } - } else if (compare(strnpcinfo(2),"prt")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"prt")) { switch(.@id) { case 1: warp "gld_dun03_2",28,251; end; case 2: warp "gld_dun03_2",164,268; end; @@ -1200,7 +1200,7 @@ OnAgitInvest: mes "[Gate Manager]"; mes "Let me guide you to the Abyss Gap connected with "+.@realm$+", the Abyss Gate 'Way of the Warrior'."; close2; - if (compare(strnpcinfo(2),"alde")) { + if (compare(strnpcinfo(NPC_NAME_HIDDEN),"alde")) { switch(.@id) { case 1: warp "gld2_ald",175,41; end; case 2: warp "gld2_ald",77,64; end; @@ -1208,7 +1208,7 @@ OnAgitInvest: case 4: warp "gld2_ald",104,246; end; case 5: warp "gld2_ald",241,156; end; } - } else if (compare(strnpcinfo(2),"gef")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"gef")) { switch(.@id) { case 1: warp "gld2_gef",28,199; end; case 2: warp "gld2_gef",217,46; end; @@ -1216,7 +1216,7 @@ OnAgitInvest: case 4: warp "gld2_gef",30,67; end; case 5: warp "gld2_gef",115,40; end; } - } else if (compare(strnpcinfo(2),"pay")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"pay")) { switch(.@id) { case 1: warp "gld2_pay",33,112; end; case 2: warp "gld2_pay",119,27; end; @@ -1224,7 +1224,7 @@ OnAgitInvest: case 4: warp "gld2_pay",175,221; end; case 5: warp "gld2_pay",61,221; end; } - } else if (compare(strnpcinfo(2),"prt")) { + } else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"prt")) { switch(.@id) { case 1: warp "gld2_prt",10,27; end; case 2: warp "gld2_prt",14,247; end; |