Merge pull request #1472 from Asheraf/getcharid

Change *getcharid to use constants

13 files changed, 86 insertions, 86 deletions

diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index afe816a3e..f18bbd0af 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -183,7 +183,7 @@ OnBingx2:
 	donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
 	end;
 OnTouch:
-	if (getcharid(1)) {
+	if (getcharid(CHAR_ID_PARTY)) {
 		if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) {
 			donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
@@ -236,7 +236,7 @@ OnBingx2:
 OnTouch:
 	.@i = atoi(strnpcinfo(NPC_NAME_HIDDEN));
 	if (.@i%4 == 2) {
-		if (getcharid(0) == getpartyleader(getcharid(1),2))
+		if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2))
 			.@pass = 1;
 	} else if (.@i%4 == 3) {
 		if (questprogress(4229,PLAYTIME) && questprogress(9223,PLAYTIME) && questprogress(12278,PLAYTIME))
diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt
index 8214a3039..5e2ae7f33 100644
--- a/npc/re/instances/BakonawaLake.txt
+++ b/npc/re/instances/BakonawaLake.txt
@@ -56,7 +56,7 @@ ma_scene01,174,179,4	script	Taho	4_M_DEWZATIMAN,{
 		close;
 	}
 
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	.@md_name$ = "Bakonawa Lake";
 
 	.@baku_time = questprogress(12278,PLAYTIME);
@@ -69,7 +69,7 @@ ma_scene01,174,179,4	script	Taho	4_M_DEWZATIMAN,{
 		close;
 	}
 	if (!.@baku_time) {
-		if (getcharid(0) == getpartyleader(.@party_id,2)) {
+		if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) {
 			mes "[Taho]";
 			mes "Are you the leader of the Bakonawa slayers? The road is not well so we have to go down the cliff with a rope, is that OK?";
 			next;
@@ -144,7 +144,7 @@ sec_in02,26,26,4	script	Bakonawa's Rage	4_M_DEWZATIMAN,{
 	mes "[Taho]";
 	mes "Bakonawa becomes invincible at some point. When that time comes, listen to my guides carefully. Just trust me and all will be good.";
 	next;
-	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+	if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) {
 		mes "[Taho]";
 		mes "Now I will make Bakonawa spring out from the lake.";
 		next;
@@ -528,7 +528,7 @@ OnTimer10000:
 	mes "[Taho]";
 	mes "HMM. We almost got him but he is one fast creature...";
 	next;
-	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+	if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) {
 		mes "[Taho]";
 		mes "Are we going to try again?";
 		next;
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index d45fdfc23..1504f892f 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -39,7 +39,7 @@
 ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 	if (BaseLevel < 100) end;
 
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	cutin "malaya_nurseB",2;
 	if (!questprogress(9223)) {
 		.@quest = questprogress(9222);
@@ -60,7 +60,7 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 					else if (malaya_bang == 31)
 						callsub L_Closed,0;
 					else if (malaya_bang > 39)
-						callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,0,0;
+						callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,0,0;
 					else {
 						mes "[Nurse Maenne]";
 						mes "..........";
@@ -104,7 +104,7 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 					} else {
 						//if (!.@party_id) goto L_NoParty; //unneeded
 						if (malaya_bang > 39)
-							callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1;
+							callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,1,1;
 						else {
 							mes "[Nurse Maenne]";
 							mes ".......";
@@ -136,7 +136,7 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 					} else if (.@playtime == 2) {
 						//if (!.@party_id) goto L_NoParty; //unneeded
 						if (malaya_bang > 39)
-							callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1;
+							callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,1,1;
 						else {
 							mes "[Nurse Maenne]";
 							mes ".......";
@@ -215,7 +215,7 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 		} else {
 			if (!.@party_id) goto L_NoParty;
 			if (malaya_bang > 39)
-				callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1;
+				callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,1,1;
 			else {
 				mes "[Nurse Maenne]";
 				mes ".......";
@@ -275,7 +275,7 @@ L_Enter:
 	next;
 	switch(select(((getarg(0))?"Prepare to enter the second floor.":""), "Enter the second floor.", "Do not enter.")) {
 	case 1:
-		.@instance = instance_create(.@md_name$,getcharid(1));
+		.@instance = instance_create(.@md_name$,getcharid(CHAR_ID_PARTY));
 		if (.@instance < 0) {
 			mes "[Nurse Maenne]";
 			mes "A critical situation has happened.";
@@ -312,7 +312,7 @@ L_Enter:
 			mes "The party leader did not generate the dungeon yet.";
 			close;
 		} else {
-			mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member entered "+.@md_name$+".",bc_map,"0x00ff99";
+			mapannounce "ma_dun01", getpartyname(getcharid(CHAR_ID_PARTY))+" party's "+strcharinfo(PC_NAME)+" member entered "+.@md_name$+".",bc_map,"0x00ff99";
 			if (getarg(1)) {
 				if (questprogress(9223)) {
 					completequest 9223;
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 878000d0f..242d0a8e4 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -44,7 +44,7 @@ ma_fild02,312,317,5	script	Guard#buwaya_cave	4_MAL_SOLDIER,{
 		close;
 	}
 
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	.@md_name$ = "Buwaya Cave";
 
 	if (!.@party_id) {
@@ -54,7 +54,7 @@ ma_fild02,312,317,5	script	Guard#buwaya_cave	4_MAL_SOLDIER,{
 		mes "team with other people.";
 		close;
 	}
-	if (getcharid(0) == getpartyleader(.@party_id,2)) {
+	if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) {
 		mes "[Guard]";
 		mes "This place is dangerous. Please go back.";
 		mes "If you dont have any business here, please go back.";
@@ -159,7 +159,7 @@ OnTouch:
 			mes "The party leader did not generate the dungeon yet.";
 			close;
 		} else {
-			mapannounce "ma_fild02",getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member began hunting Buwaya in Buwaya Cave.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+			mapannounce "ma_fild02",getpartyname(getcharid(CHAR_ID_PARTY))+" party's "+strcharinfo(PC_NAME)+" member began hunting Buwaya in Buwaya Cave.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
 			setquest 4229;
 			warp "1@ma_c",35,57;
 			end;
diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt
index 9b232ac99..9ad8519b4 100644
--- a/npc/re/instances/EclageInterior.txt
+++ b/npc/re/instances/EclageInterior.txt
@@ -33,7 +33,7 @@
 //=========================================================================
 
 ecl_hub01,132,12,3	script	Chief of Staff#tl01::EclInstance	4_F_FAIRY,{
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	.@md_name$ = "Eclage Interior";
 	if (!.@party_id){
 		mes "-! Warning !-";
@@ -42,7 +42,7 @@ ecl_hub01,132,12,3	script	Chief of Staff#tl01::EclInstance	4_F_FAIRY,{
 		close;
 	}
 
-	if (getpartyleader(.@party_id,2) != getcharid(0)) {
+	if (getpartyleader(.@party_id,2) != getcharid(CHAR_ID_CHAR)) {
 		mes "-! Warning !-";
 		mes "This current quest will be held at Memorial dungeon.";
 		mes "Only the party leader will enter. Please create your party.";
@@ -93,7 +93,7 @@ ecl_hub01,130,15,0	script	It is closed shut.	CLEAR_NPC,{
 		next;
 		switch (select("Enter it.", "Forget it.")) {
 			case 1:
-				.@party_id = getcharid(1);
+				.@party_id = getcharid(CHAR_ID_PARTY);
 
 				if (has_instance("1@ecl") == "") {
 					mes "It is closed shut.";
@@ -101,7 +101,7 @@ ecl_hub01,130,15,0	script	It is closed shut.	CLEAR_NPC,{
 				}
 				if (.@party_id) {
 					.@md_name$ = "Eclage Interior";
-					if (getpartyleader(.@party_id,2) != getcharid(0)){
+					if (getpartyleader(.@party_id,2) != getcharid(CHAR_ID_CHAR)){
 						mes "-! Warning !-";
 						mes "This current quest will be held at Memorial dungeon.";
 						mes "Only the party leader will enter. Please create your party.";
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index 7b12e1649..7f85fee50 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -38,7 +38,7 @@
 //== Instance Creation =====================================
 bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	.@md_name$ = "Mistwood Maze";
 
 	mes "[Laphine Soldier]";
@@ -51,7 +51,7 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 		close;
 	}
 	.@playtime = questprogress(7211,PLAYTIME);
-	if (getcharid(0) == getpartyleader(.@party_id,2)) {
+	if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) {
 		if (.@playtime == 1) {
 			mes "[Laphine Soldier]";
 			mes "...Are you sure you're not doing too much?";
@@ -177,7 +177,7 @@ bif_fild01,161,355,0	script	Log Tunnel	CLEAR_NPC,{
 	} else {
 		if (questprogress(7211,PLAYTIME) == 2) erasequest 7211;
 		if (!questprogress(7211,PLAYTIME)) setquest 7211;
-		mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+		mapannounce "bif_fild01",getpartyname(getcharid(CHAR_ID_PARTY))+" party's "+strcharinfo(PC_NAME)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
 		warp "1@mist",89,29;
 		close;
 	}
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index e44fed03b..164caf548 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -399,7 +399,7 @@ mal_in01,160,34,4	script	Missing, the Cleaner	4_CAT_SAILOR2,{
 		mes "You don't look like you have Seagod Protection. I can't open door at the moment!";
 		close;
 	}
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	.@md_name$ = "Culvert";
 	if (!.@party_id) {
 		mes "^0000ffYou have to organize a party of";
@@ -409,7 +409,7 @@ mal_in01,160,34,4	script	Missing, the Cleaner	4_CAT_SAILOR2,{
 	}
 	.@playtime = questprogress(12254,PLAYTIME);
 	if (!.@playtime) {
-		if (getcharid(0) == getpartyleader(.@party_id,2)) {
+		if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) {
 			mes "[Missing, the Cleaner]";
 			mes "Ummm? What's up? Tell me the password if you're the leader!";
 			next;
@@ -476,7 +476,7 @@ L_Enter:
 
 //== Instance: Common Scripts ==============================
 1@pump,63,100,4	script	Missing, the Cleaner#0	4_CAT_SAILOR2,{
-	if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY),2)) {
 		mes "[Missing, the Cleaner]";
 		mes "I am trying to have a conversation with your leader now. Please don't disturb and wait!";
 		close;
@@ -497,7 +497,7 @@ L_Enter:
 			mes "Huh? Not ready yet? Talk to me again when you're ready.";
 			close;
 		}
-		'party_id = getcharid(1);
+		'party_id = getcharid(CHAR_ID_PARTY);
 		mapannounce instance_mapname("1@pump"),"Missing: Move toward the 3 o'clock direction and wait for my next order!",bc_map,"0xff88ff",FW_NORMAL,15;
 		disablenpc instance_npcname("Missing, the Cleaner#0");
 		enablenpc instance_npcname("Missing, the Cleaner#n");
@@ -519,7 +519,7 @@ L_Enter:
 			mes "Hmm? Talk to me again when you're ready.";
 			close;
 		}
-		'party_id = getcharid(1);
+		'party_id = getcharid(CHAR_ID_PARTY);
 		mapannounce instance_mapname("1@pump"),"Missing: I'll go in first, so follow me! I'll open up a gate at the 3 o'clock direction!",bc_map,"0xff88ff",FW_NORMAL,15;
 		disablenpc instance_npcname("Missing, the Cleaner#0");
 		enablenpc instance_npcname("Culvert Entrance#i");
@@ -566,7 +566,7 @@ function	script	F_mal_missing	{
 	mes "[Missing, the Cleaner]";
 	mes "I don't care if you get help from your friends or not. I want you to clean up all culverts! Don't forget! I will watch you and give you instructions. Just do what I said!!";
 	next;
-	if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY),2)) {
 		mes "[Missing, the Cleaner]";
 		mes "Once your leader finishes preparing, it will begin, so get your hearts ready for it!!";
 		close;
@@ -594,7 +594,7 @@ function	script	F_mal_missing	{
 	mes "[Missing, the Cleaner]";
 	mes "I see seaweed everywhere because you're wiggling! All the culverts will be blocked with seaweed!";
 	next;
-	if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY),2)) {
 		mes "[Missing, the Cleaner]";
 		mes "Once your leader finishes preparing, settlement will be decided so get your hearts ready for it!!";
 		close;
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 0b7bb7e6e..0b21767f7 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -93,7 +93,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	mes("Umm? Did you see me at another place? I don't think so. What about this time?");
 	next;
 	if (!questprogress(12317, PLAYTIME)) {
-		.@party_id = getcharid(1);
+		.@party_id = getcharid(CHAR_ID_PARTY);
 		.@p_name$ = getpartyname(.@party_id);
 		.@md_name$ = "Old Glast Heim";
 		if (!instance_check_party(.@party_id)) {
@@ -103,13 +103,13 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 		}
 		if (!questprogress(12318, HUNTING))
 			setquest 12318;
-		if (getcharid(0) == getpartyleader(.@party_id, 2))
+		if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id, 2))
 			.@menu1$ = "Generate Time Gap";
 		else
 			.@menu1$ = "";
 		switch (select(.@menu1$, "Enter Old Glast Heim", "Cancel")) {
 		case 1:
-			if (getcharid(0) != getpartyleader(.@party_id, 2))
+			if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id, 2))
 				end;
 			.@instance = instance_create(.@md_name$, .@party_id);
 			if (.@instance < 0) {
@@ -165,7 +165,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 // Floor 1
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 1@gl_k,149,41,6	script	Varmundt#ghinstance1	4_M_BARMUND,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) {
 		cutin("gl_barmund2", 2);
 		mes("[Varmundt]");
 		mes("Where's your leader? I need his help.");
@@ -181,7 +181,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	select("Oh. Well I...");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Ah yes, I am. Herico told me to meet you.");
-	unittalk(getcharid(3), _("Ah yes, I am. Herico told me to meet you."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Ah yes, I am. Herico told me to meet you."));
 	next;
 	cutin("gl_barmund2", 2);
 	mes("[Varmundt]");
@@ -191,7 +191,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	select("Himelmez...");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Who is Himelmez?");
-	unittalk(getcharid(3), _("Who is Himelmez?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Who is Himelmez?"));
 	next;
 	cutin("gl_barmund3", 2);
 	mes("[Varmundt]");
@@ -277,7 +277,7 @@ OnEnable:
 1@gl_k,154,104,3	duplicate(Khalitzburg Knight#1)	Khalitzburg Knight#22	4_F_KHALITZBURG
 
 1@gl_k,149,100,6	script	Heinrich#ghinstance1	4_M_HEINRICH,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) {
 		cutin("gl_heinrich2", 2);
 		mes("[Heinrich]");
 		mes("Where is your leader? I must talk to him.");
@@ -289,7 +289,7 @@ OnEnable:
 	select("Sir. Heinrich. Varmundt...");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sir. Heinrich. Do you know what is happening in the castle now?");
-	unittalk(getcharid(3), _("Sir. Heinrich. Do you know what is happening in the castle now?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sir. Heinrich. Do you know what is happening in the castle now?"));
 	next;
 	mes("[Heinrich]");
 	mes("Aren't you the adventurer that came along with Varmundt?");
@@ -302,7 +302,7 @@ OnEnable:
 	select("Himelmez's invasion...");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!");
-	unittalk(getcharid(3), _("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!"));
 	next;
 	cutin("gl_heinrich1", 2);
 	mes("[Heinrich]");
@@ -321,7 +321,7 @@ OnEnable:
 	select("Even if you don't believe me...");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("I can't make you believe me, but there's no time to argue!");
-	unittalk(getcharid(3), _("I can't make you believe me, but there's no time to argue!"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("I can't make you believe me, but there's no time to argue!"));
 	cutin("gl_barmund2", 255);
 	next;
 	cutin("gl_heinrich1", 2);
@@ -801,7 +801,7 @@ OnMyMobDead:
 }
 
 1@gl_k,17,51,3	script	Altar boy Domun#clearGH	4_M_KID1,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) {
 		mes("[Altar boy Domun]");
 		mes("Save me, save me, please...");
 		close;
@@ -814,7 +814,7 @@ OnMyMobDead:
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Hold on!\r"
 		"Are you the only survivor?");
-	unittalk(getcharid(3), _("Hold on! Are you the only survivor?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Hold on! Are you the only survivor?"));
 	next;
 	mes("[Altar boy Domun]");
 	mes("Chamberlains... monks...\r"
@@ -830,7 +830,7 @@ OnMyMobDead:
 	select("Pull it together!");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Wake up kid! Go east and find the middle passage to the outside! That is safe!");
-	unittalk(getcharid(3), _("Wake up kid! Go east and find the middle passage to the outside! That is safe!")); // Displays 1st Letter of char name in small?
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Wake up kid! Go east and find the middle passage to the outside! That is safe!")); // Displays 1st Letter of char name in small?
 	next;
 	mes("[Altar boy Domun]");
 	mes("To the east passage?\r"
@@ -841,7 +841,7 @@ OnMyMobDead:
 	select("I will give you a weapon.");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Here's a weapon. Just close your eye and swing for those monsters.");
-	unittalk(getcharid(3), _("Here's a weapon. Just close your eye and swing for those monsters."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Here's a weapon. Just close your eye and swing for those monsters."));
 	next;
 	mes("[Altar boy Domun]");
 	mes("Ok, I... I'l try.");
@@ -898,7 +898,7 @@ OnMyMobDead:
 }
 
 1@gl_k,291,145,3	script	Holgren the Destroyer	4_F_JOB_BLACKSMITH,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) {
 		mes("[Holgren the Destroyer]");
 		mes("Are you human?");
 		close;
@@ -911,7 +911,7 @@ OnMyMobDead:
 	select("Relax! I'm not a monster!");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Relax! I am Human. Are you alone? Anyone else here?");
-	unittalk(getcharid(3), _("Relax! I am Human. Are you alone? Anyone else here?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Relax! I am Human. Are you alone? Anyone else here?"));
 	next;
 	mes("[Holgren the Destroyer]");
 	mes("It's only me alive.");
@@ -920,7 +920,7 @@ OnMyMobDead:
 	select("It's dangerous here...");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("It's dangerous here. You know the way to the middle passage? Can you move?");
-	unittalk(getcharid(3), _("It's dangerous here. You know the way to the middle passage? Can you move?")); // Displays 1st Letter of char name in small?
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("It's dangerous here. You know the way to the middle passage? Can you move?")); // Displays 1st Letter of char name in small?
 	next;
 	mes("[Holgren the Destroyer]");
 	mes("Yes, I can move. I need to get out of here.");
@@ -929,7 +929,7 @@ OnMyMobDead:
 	select("Be safe...");
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sorry, I can't go with you.");
-	unittalk(getcharid(3), _("Sorry, I can't go with you."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sorry, I can't go with you."));
 	next;
 	mes("[Holgren the Destroyer]");
 	mes("It's ok. You've already done enough. I can help myself. Good luck to you too.");
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index ce0ca4c31..e88ec4332 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -1768,7 +1768,7 @@ lhz_dun04,151,276,3	script	Researcher#memo	4_LGTSCIENCE,{
 		mes "So, please prepare your party members, and take care of those boss creatures. I'm not sure how long this place can hold.";
 		close;
 	} else if (lght_duk01 > 6) {
-		if (getcharid(1) > 0) {
+		if (getcharid(CHAR_ID_PARTY) > 0) {
 			mes "[Wolfchev]";
 			mes "Are you all set there? I will prepare the entrance if you are the leader of that party.";
 			next;
@@ -1859,8 +1859,8 @@ lhz_dun04,151,276,3	script	Researcher#memo	4_LGTSCIENCE,{
 						}
 					}
 				}
-				if (getpartyleader(getcharid(1),2) == getcharid(0)) {
-					.@instance = instance_create("Worsef", getcharid(1));
+				if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) {
+					.@instance = instance_create("Worsef", getcharid(CHAR_ID_PARTY));
 					if (.@instance < 0) {
 						mes "[Wolfchev]";
 						mes "Hmm.. Lab entering system is a bit weird. Would wait for me to check the system?";
@@ -2035,7 +2035,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 1@lhz,39,168,0	script	Manual Sheet#1_1	CLEAR_NPC,{
 	mes "There are valve manual sheets littered on the floor.";
 	next;
-	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+	if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) {
 		mes "You the party leader, started to read the manual.";
 		next;
 		mes "[Emergency Access Valve Manual]";
@@ -2112,7 +2112,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 1@lhz,41,172,0	script	Valve#1_2	CLEAR_NPC,{
 	.@open_portal = 0;
 	mes "This is the left valve for the emergency access.";
-	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+	if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) {
 		next;
 		mes "To which direction do you wish to turn?";
 		next;
@@ -2174,7 +2174,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 1@lhz,52,172,0	script	Valve#1_3	CLEAR_NPC,{
 	.@open_portal = 0;
 	mes "This is the left valve for the emergency access.";
-	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+	if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) {
 		next;
 		mes "To which direction do you wish to turn?";
 		next;
@@ -2562,7 +2562,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 
 //== The Lab No.2 Valves ===================================
 -	script	bio4FLab2Valve	FAKE_NPC,{
-	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+	if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) {
 		progressbar "0xffff00", 20;
 		stopnpctimer;
 		donpcevent instance_npcname("Lab2#2_2")+"::OnDisableValve1";
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt
index 8b0bbb866..08fe3b71b 100644
--- a/npc/re/instances/ghost_palace.txt
+++ b/npc/re/instances/ghost_palace.txt
@@ -59,13 +59,13 @@ dali02,44,129,5	script	Unpleasent Royal Guard	4_M_SAKRAYROYAL,{
 			"I will be right behind you!");
 		close();
 	}
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	if (!.@party_id) {
 		mes("[Unpleasent Royal Guard]");
 		mes("This is a solo instance. Please form a solo party before continuing.");
 		close();
 	}
-	if (getcharid(0) != getpartyleader(.@party_id,2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id,2)) {
 		mes("[Unpleasent Royal Guard]");
 		mes("I'm looking for adventurers to help me!\r"
 			"I want to talk to the team leader, can I?");
@@ -134,7 +134,7 @@ dali02,41,134,0	script	Interdimensional Device::gpportal	PORTAL,{
 		mes("The monsters that attacked the palace are wandering around the secret entrance. It would be very bad if they spotted us... Please wait until the time limit for re-entrance passed.");
 		close();
 	}
-	if (getcharid(0) == getpartyleader(.@party_id,2) && !questprogress(1260)) {
+	if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2) && !questprogress(1260)) {
 		mes("[Unpleasent Royal Guard]");
 		mes("I'm looking for adventurers to help me!\r"
 			"I want to talk to the team leader, can I?");
@@ -155,7 +155,7 @@ dali02,41,134,0	script	Interdimensional Device::gpportal	PORTAL,{
 		mes("^FF0000Inside the device you see a dark hole. If you wish to enter you may wish to talk to the Unpleasant Royal Guard first.^000000");
 		close();
 	}
-	mapannounce("dali", sprintf(_$("%s of the party, %s, is entering the Ghost Palace."), strcharinfo(PC_NAME), getpartyname(getcharid(1))), bc_map, C_SPRINGGREEN);
+	mapannounce("dali", sprintf(_$("%s of the party, %s, is entering the Ghost Palace."), strcharinfo(PC_NAME), getpartyname(getcharid(CHAR_ID_PARTY))), bc_map, C_SPRINGGREEN);
 	if (!questprogress(1260)) setquest 1260;
 	setquest 1261;
 	warp("1@spa", 198, 188);
@@ -550,7 +550,7 @@ OnInstanceInit:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sakray, What do you want sympathy? Or is it a trap?");
-	unittalk(getcharid(3), _("Sakray, What do you want sympathy? Or is it a trap?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sakray, What do you want sympathy? Or is it a trap?"));
 	next;
 	mes("[Sakray]");
 	mes("Non...I did not need to make an effort to catch a novice.");
@@ -558,7 +558,7 @@ OnInstanceInit:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("If so... then why...?");
-	unittalk(getcharid(3), _("If so... then why...?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("If so... then why...?"));
 	next;
 	cutin("cry-b", 3);
 	mes("[Sakray]");
@@ -580,7 +580,7 @@ OnInstanceInit:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("...");
-	unittalk(getcharid(3), _("..."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("..."));
 	next;
 	mes("[Sakray]");
 	mes("Heh heh... I will keep watching you until the day you grow up enough.");
diff --git a/npc/re/instances/octopus_cave.txt b/npc/re/instances/octopus_cave.txt
index 71f164ff7..b09d243ab 100644
--- a/npc/re/instances/octopus_cave.txt
+++ b/npc/re/instances/octopus_cave.txt
@@ -38,7 +38,7 @@
 //== Instance Creation =====================================
 mal_dun01,151,235,5	script	Starfish	4_ASTER,{
 
-	.@party_id = getcharid(1);
+	.@party_id = getcharid(CHAR_ID_PARTY);
 	.@md_name$ = "Octopus Cave";
 
 	if (!.@party_id) {
@@ -46,7 +46,7 @@ mal_dun01,151,235,5	script	Starfish	4_ASTER,{
 		mes("You alone is powerless, hehe! Better get someone to help you out. Make a party, and come back later.");
 		close;
 	}
-	if (getcharid(0) != getpartyleader(.@party_id, 2)) {
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id, 2)) {
 		mes("[Starfish]");
 		mes("Where is your leader, hehe. I don't talk to some random people. Bring your boss to me.");
 		close;
@@ -136,7 +136,7 @@ mal_dun01,153,237,5	script	Weird Entrance	CLEAR_NPC,{
 				close;
 			}
 
-			mapannounce("mal_dun01", sprintf(_$("%s party's %s member started to hunt the Octopus!"), getpartyname(getcharid(1)), strcharinfo(PC_NAME)), bc_map, C_SPRINGGREEN);
+			mapannounce("mal_dun01", sprintf(_$("%s party's %s member started to hunt the Octopus!"), getpartyname(getcharid(CHAR_ID_PARTY)), strcharinfo(PC_NAME)), bc_map, C_SPRINGGREEN);
 			if (!questprogress(4197)) setquest 4197;
 			warp "1@cash", 199, 99;
 			end;
diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt
index 0c7f4a9cb..2b3b4f2c0 100644
--- a/npc/re/instances/saras_memory.txt
+++ b/npc/re/instances/saras_memory.txt
@@ -168,7 +168,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 		erasequest 15002;
 		end;
 	} else if (!.@sara_time) {
-		.@party_id = getcharid(1);
+		.@party_id = getcharid(CHAR_ID_PARTY);
 		.@p_name$ = getpartyname(.@party_id);
 		.@md_name$ = "Sara's Memory";
 		if (!instance_check_party(.@party_id)) {
@@ -177,13 +177,13 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 				"can use quotes to put spaces in a party name.");
 			close;
 		}
-		if (getcharid(0) == getpartyleader(.@party_id, 2))
+		if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id, 2))
 			.@menu1$ = "Boot up the dimensional device";
 		else
 			.@menu1$ = "";
 		switch (select(.@menu1$, "Use the dimensional device", "Cancel")) {
 		case 1:
-			if (getcharid(0) != getpartyleader(.@party_id, 2))
+			if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id, 2))
 				end;
 			.@instance = instance_create(.@md_name$, .@party_id);
 			if (.@instance < 0) {
@@ -219,11 +219,11 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 }
 
 1@sara,261,156,5	script	A girl#sarains	4_F_SARAH_BABY,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2))
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2))
 		end;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Where am I?");
-	unittalk(getcharid(3), _("Where am I?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Where am I?"));
 	next;
 	cutin "sara_9sara1.bmp", 2;
 	mes("[A girl]");
@@ -232,7 +232,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Are you from here? You don't seem to quite match the locals either.");
-	unittalk(getcharid(3), _("Are you from here? You don't seem to quite match to locals either."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Are you from here? You don't seem to quite match to locals either."));
 	next;
 	mes("[A girl]");
 	mes("Yes! I was born here! My name is Sara. Sara Irene!");
@@ -244,7 +244,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Oh! I am sorry! Uh... Why are you standing out here all alone?");
-	unittalk(getcharid(3), _("Oh! I am sorry! Uh... Why are you standing out here all alone?"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Oh! I am sorry! Uh... Why are you standing out here all alone?"));
 	next;
 	mes("[Sara Irene]");
 	mes("I am waiting for my father. He said that he will be here soon.");
@@ -523,7 +523,7 @@ OnEnable:
 OnTouch:
 	.@map$ = instance_mapname("1@sara");
 	warp .@map$, 89, 175;
-	if (getcharid(0) == getpartyleader(getcharid(1),2))
+	if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2))
 		viewpoint 1, 39, 142, 1, C_GREEN;
 	end;
 }
@@ -546,7 +546,7 @@ OnTouch:
 }
 
 1@sara,107,325,5	script	Sara Irene#sarains1	4_F_SARAH_BABY,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2))
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2))
 		end;
 	cutin "sara_9sara1.bmp", 2;
 	mes("[Sara Irene]");
@@ -1007,7 +1007,7 @@ OnMyMobDead:
 }
 
 1@sara,152,233,5	script	Sara Irene#sarains2	4_F_SARAH_BABY,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2))
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2))
 		end;
 	cutin "sara_9sara2.bmp", 2;
 	mes("[Sara Irene]");
@@ -1031,7 +1031,7 @@ OnMyMobDead:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("I won't let you take Sara!");
-	unittalk(getcharid(3), _("I won't let you take Sara!"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("I won't let you take Sara!"));
 	next;
 	cutin "sara_elder_irine3.bmp", 2;
 	mes("[Doyen Irene]");
@@ -1040,7 +1040,7 @@ OnMyMobDead:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sara... run! Save yourself!");
-	unittalk(getcharid(3), _("Sara... run! Save yourself!"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sara... run! Save yourself!"));
 	next;
 	cutin "sara_9sara2.bmp", 2;
 	mes("[Sara Irene]");
@@ -1151,7 +1151,7 @@ OnMyMobDead:
 }
 
 1@sara,156,236,3	script	Doyen Irene#sarains3	4_M_CHIEF_IRIN,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2))
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2))
 		end;
 	cutin "sara_elder_irine4.bmp", 2;
 	mes("[Doyen Irene]");
@@ -1164,7 +1164,7 @@ OnMyMobDead:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!");
-	unittalk(getcharid(3), _("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!"));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!"));
 	next;
 	mes("[Doyen Irene]");
 	mes("You.. think I killed Sara's mother?");
@@ -1188,7 +1188,7 @@ OnMyMobDead:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene.");
-	unittalk(getcharid(3), _("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene."));
 	next;
 	mes("[Doyen Irene]");
 	mes("If.. you are telling the truth...\r"
@@ -1201,11 +1201,11 @@ OnMyMobDead:
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("There might be more assassins so we have to find Sara as fast as we can.");
-	unittalk(getcharid(3), _("There might be more assassins so we have to find Sara as fast as we can."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("There might be more assassins so we have to find Sara as fast as we can."));
 	next;
 	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sara believes that you killed her mother. We need to tell her the truth.");
-	unittalk(getcharid(3), _("Sara believes that you killed her mother. We need to tell her the truth."));
+	unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sara believes that you killed her mother. We need to tell her the truth."));
 	next;
 	mes("[Doyen Irene]");
 	mes("We must do our best to find her. Let's split up and search for her.\r"
@@ -1233,7 +1233,7 @@ OnDisable:
 }
 
 1@sara,39,142,3	script	Sara Irene#sarains3	4_F_SARAH_BABY,{
-	if (getcharid(0) != getpartyleader(getcharid(1), 2))
+	if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2))
 		end;
 	mes("^FF0000As you are about to call out to Sara a sudden blow knocks you down from behind.^000000");
 	dispbottom(_("As you are about to call out to Sara a sudden blow knocks you down from behind."));
diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt
index 012a96afe..c912444cc 100644
--- a/npc/re/woe-fe/invest_main.txt
+++ b/npc/re/woe-fe/invest_main.txt
@@ -902,7 +902,7 @@ OnAgitInvest:
 			mes "Please come back during the investment duration.";
 			close;
 		}
-		.@guild = getcharid(2);
+		.@guild = getcharid(CHAR_ID_GUILD);
 		for(.@i = 1; .@i<=5; ++.@i) {
 			.@castle_name$[.@i] = getcastlename(.@npc$+"g_cas0"+.@i);
 			.@owner_id[.@i] = getcastledata(.@npc$+"g_cas0"+.@i,1);
@@ -1114,7 +1114,7 @@ OnAgitInvest:
 	}
 
 	.@GID = getcastledata(strnpcinfo(NPC_MAP),1);
-	if (getcharid(2) != .@GID) {
+	if (getcharid(CHAR_ID_GUILD) != .@GID) {
 		mes "[Gate Manager]";
 		mes "You don't seem to be the member of guild owning this castle.";
 		mes "If you need any help, please visit any of our guild members at "+.@realm$+" Square.";
@@ -1145,7 +1145,7 @@ OnAgitInvest:
 			mes "Please come back during the investment duration.";
 			close;
 		}
-		if (getcharid(2) != .@GID) {
+		if (getcharid(CHAR_ID_GUILD) != .@GID) {
 			mes "[Gate Manager]";
 			mes "You don't seem to be the member of the guild owning this castle.";
 			mes "Please use the normal investment from "+.@realm$+" Square.";