*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

1 files changed, 18 insertions, 18 deletions

diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index 920c8b8ce..a9772ed5a 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -36,14 +36,14 @@
 //=========================================================================
 
 function	script	F_Okolnir	{
-	if (compare(strnpcinfo(0),"main")) end;
-	.@sub$ = (compare(strnpcinfo(4),"cas"))?(substr(strnpcinfo(4),0,2))+(substr(strnpcinfo(4),8,9)):substr(strnpcinfo(4),5,9);
+	if (compare(strnpcinfo(NPC_NAME),"main")) end;
+	.@sub$ = (compare(strnpcinfo(NPC_MAP),"cas"))?(substr(strnpcinfo(NPC_MAP),0,2))+(substr(strnpcinfo(NPC_MAP),8,9)):substr(strnpcinfo(NPC_MAP),5,9);
 	return .@sub$;
 }
 
 -	script	Guide#gq_main	FAKE_NPC,{
 	.@sub$ = callfunc("F_Okolnir");
-	.@GID = getcastledata(strnpcinfo(4),1);
+	.@GID = getcastledata(strnpcinfo(NPC_MAP),1);
 	if (getcharid(2) == .@GID) {
 		if (getd("$siz_"+.@sub$+"_on") == 0) {
 			mes "[Guide]";
@@ -80,8 +80,8 @@ function	script	F_Okolnir	{
 				mes "Would you like to try to enter here?";
 				close;
 			case 2:
-				.@defence = getcastledata(strnpcinfo(4),3);
-				.@Economy = getcastledata(strnpcinfo(4),2);
+				.@defence = getcastledata(strnpcinfo(NPC_MAP),3);
+				.@Economy = getcastledata(strnpcinfo(NPC_MAP),2);
 				if ((.@Economy > 64) && (.@defence > 29)) {
 					mes "[Guide]";
 					mes "Great! Economy and Defense are OK.";
@@ -190,7 +190,7 @@ que_qsch05,345,23,0	warp	Gate02#gq_sch05	1,1,schg_cas05,369,306
 
 -	script	Wish Maiden#gq_main	FAKE_NPC,{
 	.@sub$ = callfunc("F_Okolnir");
-	.@t$ = ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
+	.@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1));
 	.@GID = getcastledata(.@t$,1);
 	if (getcharid(2) == .@GID) {
 		cutin "wish_maiden31",1;
@@ -735,7 +735,7 @@ OnTimer3610000:
 	setd "$@gqse_"+.@sub$+"_pcc",0;
 	setd "$@gqse_"+.@sub$+"_gd",0;
 	setd "$@gqse_"+.@sub$+"_nm",0;
-	mapwarp "que_q"+.@sub$,strnpcinfo(4),157,369;
+	mapwarp "que_q"+.@sub$,strnpcinfo(NPC_MAP),157,369;
 	end;
 
 OnTimer3611000:
@@ -1283,14 +1283,14 @@ que_qsch05,1,4,0	duplicate(#piamette_main)	#piamette_sch05	CLEAR_NPC
 
 OnEnable:
 	.@sub$ = callfunc("F_Okolnir");
-	.@c = charat(strnpcinfo(2),9);
+	.@c = charat(strnpcinfo(NPC_NAME_HIDDEN),9);
 	enablenpc "#getspell0"+.@c+"_"+.@sub$;
 	specialeffect EF_LOCKON;
 	end;
 
 OnDisable:
 	.@sub$ = callfunc("F_Okolnir");
-	.@c = charat(strnpcinfo(2),9);
+	.@c = charat(strnpcinfo(NPC_NAME_HIDDEN),9);
 	disablenpc "#getspell0"+.@c+"_"+.@sub$;
 	end;
 
@@ -1533,7 +1533,7 @@ que_qsch05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch05_mobctrl	CLEAR_NPC
 
 OnTouch:
 	.@sub$ = callfunc("F_Okolnir");
-	if (compare(strnpcinfo(0),"windpath03")) {
+	if (compare(strnpcinfo(NPC_NAME),"windpath03")) {
 		warp "que_q"+.@sub$,119,103;
 	} else {
 		warp "que_q"+.@sub$,146,109;
@@ -1904,7 +1904,7 @@ que_qsch05,2,10,0	duplicate(#main_stone03)	#sch05_stone03	CLEAR_NPC
 	end;
 OnTouch:
 	.@sub$ = callfunc("F_Okolnir");
-	.@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+	.@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
 	disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
 	switch (.@in) {
 		case 1: setarray .@n, 234,284,235,285,236,286; break;
@@ -1918,7 +1918,7 @@ OnTouch:
 
 OnDisable:
 	.@sub$ = callfunc("F_Okolnir");
-	.@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+	.@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
 	killmonster "que_q"+.@sub$,"Guard of Shadow#"+.@sub$+"_0"+.@in+"::OnMyMobDead";
 	disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
 	end;
@@ -1978,7 +1978,7 @@ que_qsch05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_0
 
 OnTouch:
 	.@sub$ = callfunc("F_Okolnir");
-	.@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+	.@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
 	disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
 	switch (.@in) {
 		case 1: setarray .@n, 265,297,266,296,267,295;
@@ -1992,7 +1992,7 @@ OnTouch:
 
 OnDisable:
 	.@sub$ = callfunc("F_Okolnir");
-	.@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+	.@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
 	killmonster "que_q"+.@sub$,"Bloody Hunter#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
 	disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
 	end;
@@ -2052,7 +2052,7 @@ que_qsch05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac04
 
 OnTouch:
 	.@sub$ = callfunc("F_Okolnir");
-	.@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+	.@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
 	disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
 	switch (.@in) {
 		case 1: setarray .@n, 246,330,247,330,248,330; break;
@@ -2064,7 +2064,7 @@ OnTouch:
 
 OnDisable:
 	.@sub$ = callfunc("F_Okolnir");
-	.@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+	.@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
 	killmonster "que_q"+.@sub$,"Temple Keeper#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
 	disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
 	end;
@@ -2159,7 +2159,7 @@ que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	WIS
 
 -	script	Wish Maiden#main_gift	FAKE_NPC,{
 	.@sub$ = callfunc("F_Okolnir");
-	.@t$ = ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
+	.@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1));
 	.@GID = getcastledata(.@t$,1);
 	if (getcharid(2) == .@GID) {
 		if (strcharinfo(0) == getguildmaster(.@GID)) {
@@ -2290,7 +2290,7 @@ que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	4_F
 	end;
 
 OnTouch:
-	.@t$ = ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
+	.@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1));
 	warp .@t$,157,369;
 	end;