From 86977d79269408a371384e61111c3a9cf6e87b0c Mon Sep 17 00:00:00 2001 From: Asheraf Date: Sun, 28 Aug 2016 17:03:57 +0100 Subject: *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 --- npc/re/quests/eden/121-130.txt | 4 +-- npc/re/quests/eden/eden_common.txt | 2 +- npc/re/quests/quests_brasilis.txt | 14 ++++----- npc/re/quests/quests_dewata.txt | 12 ++++---- npc/re/quests/quests_dicastes.txt | 36 +++++++++++------------ npc/re/quests/quests_eclage.txt | 22 +++++++-------- npc/re/quests/quests_malangdo.txt | 48 +++++++++++++++---------------- npc/re/quests/quests_malaya.txt | 50 ++++++++++++++++---------------- npc/re/quests/quests_mora.txt | 58 +++++++++++++++++++------------------- 9 files changed, 123 insertions(+), 123 deletions(-) (limited to 'npc/re/quests') 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. -- cgit v1.2.3-70-g09d2