Updated the script to use the commands cloakonnpcself/cloakoffnpcself (#6946)

npc/re/jobs/novice/academy.txt

@@ -66,8 +66,8 @@ iz_int04,51,30,0	duplicate(iz_int#intro_evt02)	iz_int04#intro_evt02	HIDDEN_WARP_
 //== Wounded Swordsman (iz_int) =================================
 iz_int,56,32,3	script	Wounded Swordsman#intro_npc01_iz_int	4_TOWER_01,5,5,{
 	npctalk "Oh...", "", bc_self;
-	cloakonnpc strnpcinfo(0), getcharid(0);
-	cloakoffnpc "Wounded Swordsman#intro_npc02_" + strnpcinfo(4), getcharid(0);
+	cloakonnpcself();
+	cloakoffnpcself( "Wounded Swordsman#intro_npc02_" + strnpcinfo(4) );
 	end;
 
 OnTouch:
@@ -283,7 +283,7 @@ int_land,73,100,3	script	Lumin#new_ship	4_M_NOV_RUMIN,{
 		mes "[Lumin]";
 		mes "Yes.";
 		next;
-		cloakonnpc strnpcinfo(0), getcharid(0);
+		cloakonnpcself();
 		cutin "fly_trock.bmp",2;
 		mes "[Captain Carocc]";
 		mes "Oh boy.";
@@ -307,7 +307,7 @@ int_land,73,100,3	script	Lumin#new_ship	4_M_NOV_RUMIN,{
 	mes ".....";
 	mes "....So?";
 	next;
-	cloakonnpc strnpcinfo(0), getcharid(0);
+	cloakonnpcself();
 	mes "- Lu just walked away with a cynical look on his face.";
 	next;
 	cutin "fly_trock.bmp",2;

npc/re/merchants/enchan_illusion_17_1.txt

@@ -124,7 +124,7 @@ sp_cor,108,130,5	script	Rebellion#rm171_7	4_F_REBELLION3,{
 		mes "[Rebellion]";
 		mes "So, you received the message. The Captains are having a meeting on the inside. Captain Elena Volkova must have called you.";
 		mes "... I was going to call her, but she's already here.";
-		cloakoffnpc "Elena Volkova#rm171_0", getcharid(0);
+		cloakoffnpcself( "Elena Volkova#rm171_0" );
 		npctalk "Elena Volkova: Ah, I've been looking for you, Adventurer.", "Elena Volkova#rm171_0", bc_self;
 		if (isbegin_quest(16352) == 0)
 			setquest 16352;
@@ -146,7 +146,7 @@ sp_cor,108,130,5	script	Rebellion#rm171_7	4_F_REBELLION3,{
 	mes "[Rebellion]";
 	mes "Did you bring Damaged Weapons? Would you like to see that science criminal? He's in there. Want me to call him for you?";
 	mes "Or do you have business with me? I can exchange Weapon Modification Devices and Armor Modification Modules.";
-	cloakoffnpc "Elyumina#rm171_4", getcharid(0);
+	cloakoffnpcself( "Elyumina#rm171_4" );
 	npctalk "Rebellion: Hey, criminal. You're wanted.", "Rebellion#rm171_7", bc_self;
 	npctalk "Elyumina: Alright, alright! I'm coming! You're so pathetic that without me, you'll have to fight with bean bags.", "Elyumina#rm171_4", bc_self;
 	next;
@@ -266,7 +266,7 @@ sp_cor,111,130,3	script	Elyumina#rm171_4	4_EP17_ELYUMINA,{
 		mes "[Elyumina]";
 		mes "Argh! Why do you keep asking for me when I need to focus on my research? I'm busy, alright? If you're bored, go bring me more damaged weapons!";
 		close2;
-		cloakonnpc "Elyumina#rm171_3", getcharid(0);
+		cloakonnpcself( "Elyumina#rm171_3" );
 		cutin "",255;
 		end;
 	}

npc/re/other/achievements.txt

@@ -15,7 +15,7 @@ OnTouch:
 	if (.@num == 0)
 		end;
 	if (!achievementexists(.@num)) // Don't trigger if the player has already completed.
-		cloakoffnpc ("#tr" + .@num), getcharid(0);
+		cloakoffnpcself( ("#tr" + .@num) );
 	end;
 }
 
@@ -277,7 +277,7 @@ yuno_fild11,141,357,4	duplicate(ach_treasure#touch)	#wp120061	HIDDEN_WARP_NPC,5,
 		end;
 	if (!achievementexists(.@num))
 		achievementcomplete(.@num);
-	cloakonnpc strnpcinfo(0), getcharid(0);
+	cloakonnpcself();
 	end;
 OnInit:
 	cloakonnpc();

npc/re/quests/quests_16_2_illusion.txt

@@ -1917,9 +1917,9 @@ OnTouch:
 		cloakoffnpc( "Wizard#ilgf28", .@char_id );
 	}
 	else if (ill_vampire == 10) {
-		cloakoffnpc "Dracula#ilgf02", getcharid(0);
-		cloakoffnpc "King#ilgf01", getcharid(0);
-		cloakoffnpc "Wizard#ilgf02", getcharid(0);
+		cloakoffnpcself( "Dracula#ilgf02" );
+		cloakoffnpcself( "King#ilgf01" );
+		cloakoffnpcself( "Wizard#ilgf02" );
 	}
 	else if (ill_vampire == 12 || ill_vampire == 13) {
 		.@char_id = getcharid(0);
@@ -3334,9 +3334,9 @@ gef_d01_i,81,135,5	script	Wizard#ilgf01	4_F_BOMI,5,5,{
 		next;
 		mes "[Bomi]";
 		mes "You'd better hurry.";
-		cloakoffnpc "Dracula#ilgf02", getcharid(0);
-		cloakoffnpc "King#ilgf01", getcharid(0);
-		cloakoffnpc "Wizard#ilgf02", getcharid(0);
+		cloakoffnpcself( "Dracula#ilgf02" );
+		cloakoffnpcself( "King#ilgf01" );
+		cloakoffnpcself( "Wizard#ilgf02" );
 		delitem 25268,10;// Sticky_Blood
 		delitem 25269,10;// Mushroom_Sap
 		erasequest 14660;// Ingredients for Fake Blood
@@ -3345,9 +3345,9 @@ gef_d01_i,81,135,5	script	Wizard#ilgf01	4_F_BOMI,5,5,{
 		close;
 	}
 	if (ill_vampire < 12) {
-		cloakoffnpc "Dracula#ilgf02", getcharid(0);
-		cloakoffnpc "King#ilgf01", getcharid(0);
-		cloakoffnpc "Wizard#ilgf02", getcharid(0);
+		cloakoffnpcself( "Dracula#ilgf02" );
+		cloakoffnpcself( "King#ilgf01" );
+		cloakoffnpcself( "Wizard#ilgf02" );
 		mes "[Bomi]";
 		mes "I hope you'll find your friend soon. Why don't you check the catacombs in the south? He might be there.";
 		close;

npc/re/quests/quests_17_1.txt

@@ -6168,13 +6168,13 @@ sp_cor,110,130,3	script	Elena Volkova#rm171_0	4_F_ELENA,{
 			mes "Ack, what was that?";
 			next;
 			cutin "",255;
-			cloakoffnpc "Rebellion#rm171_0", getcharid(0);
+			cloakoffnpcself( "Rebellion#rm171_0" );
 			mes "[Rebellion]";
 			mes "Captain, there was another explosion near the facilities!";
 			mes "That researcher named ^0000CDElyumina^000000 must have done it. We'll go after him right away!";
 			next;
 			cutin "162elena_01",2;
-			cloakonnpc "Rebellion#rm171_0", getcharid(0);
+			cloakonnpcself( "Rebellion#rm171_0" );
 			emotion 6;
 			mes "[Elena Volkova]";
 			mes "So, he knows he can't take us head-on. He's using guerrilla tactics.";
@@ -6286,12 +6286,12 @@ sp_cor,180,169,3	script	Elena Volkova#rm171_1	4_F_ELENA,{
 			setquest 16357;
 			close3;
 		}
-		cloakoffnpc "Rebellion#rm171_1", getcharid(0);
-		cloakoffnpc "Rebellion#rm171_2", getcharid(0);
-		cloakoffnpc "Rebellion#rm171_3", getcharid(0);
-		cloakoffnpc "Rebellion#rm171_4", getcharid(0);
-		cloakoffnpc "Rebellion#rm171_5", getcharid(0);
-		cloakoffnpc "Rebellion#rm171_6", getcharid(0);
+		cloakoffnpcself( "Rebellion#rm171_1" );
+		cloakoffnpcself( "Rebellion#rm171_2" );
+		cloakoffnpcself( "Rebellion#rm171_3" );
+		cloakoffnpcself( "Rebellion#rm171_4" );
+		cloakoffnpcself( "Rebellion#rm171_5" );
+		cloakoffnpcself( "Rebellion#rm171_6" );
 		cutin "162elena_01",2;
 		mes "[Elena Volkova]";
 		mes "The area has been closed. The evacuation process is almost complete.";
@@ -6354,12 +6354,12 @@ sp_cor,180,169,3	script	Elena Volkova#rm171_1	4_F_ELENA,{
 				end;
 			switch (instance_enter("Cor Memorial")) {
 			case IE_OK:
-				cloakonnpc "Rebellion#rm171_1", getcharid(0);
-				cloakonnpc "Rebellion#rm171_2", getcharid(0);
-				cloakonnpc "Rebellion#rm171_3", getcharid(0);
-				cloakonnpc "Rebellion#rm171_4", getcharid(0);
-				cloakonnpc "Rebellion#rm171_5", getcharid(0);
-				cloakonnpc "Rebellion#rm171_6", getcharid(0);
+				cloakonnpcself( "Rebellion#rm171_1" );
+				cloakonnpcself( "Rebellion#rm171_2" );
+				cloakonnpcself( "Rebellion#rm171_3" );
+				cloakonnpcself( "Rebellion#rm171_4" );
+				cloakonnpcself( "Rebellion#rm171_5" );
+				cloakonnpcself( "Rebellion#rm171_6" );
 				if (isbegin_quest(16355) > 0)
 					erasequest 16355;
 				if (isbegin_quest(16356) > 0)
@@ -6505,16 +6505,16 @@ sp_cor,136,210,7	script	Goni#rm171_1	4_M_GONY,{
 		mes "...";
 		next;
 		cutin "16loo_01",2;
-		cloakoffnpc "Rookie#rm171_1", getcharid(0);
-		cloakoffnpc "Elena Volkova#rm171_2", getcharid(0);
-		cloakoffnpc "Philopontes#rm171_1", getcharid(0);
+		cloakoffnpcself( "Rookie#rm171_1" );
+		cloakoffnpcself( "Elena Volkova#rm171_2" );
+		cloakoffnpcself( "Philopontes#rm171_1" );
 		mes "[Rookie]";
 		mes "Ah, you came early. I thought you'd come later after a break.";
 		mes "Mr. Lazy, please bring out the prisoner.";
 		next;
 		cutin "16lei_01",2;
-		cloakoffnpc "Lazy#rm171_1", getcharid(0);
-		cloakoffnpc "Elyumina#rm171_1", getcharid(0);
+		cloakoffnpcself( "Lazy#rm171_1" );
+		cloakoffnpcself( "Elyumina#rm171_1" );
 		mes "[Lazy]";
 		mes "Yes, sir. Here he is.";
 		mes "It hasn't been that long since we met, and you're already bossing me around.";
@@ -6540,11 +6540,11 @@ sp_cor,136,210,7	script	Goni#rm171_1	4_M_GONY,{
 		close3;
 	case 2:
 		if (isbegin_quest(16359) < 2) {
-			cloakoffnpc "Rookie#rm171_1", getcharid(0);
-			cloakoffnpc "Elena Volkova#rm171_2", getcharid(0);
-			cloakoffnpc "Philopontes#rm171_1", getcharid(0);
-			cloakoffnpc "Lazy#rm171_1", getcharid(0);
-			cloakoffnpc "Elyumina#rm171_1", getcharid(0);
+			cloakoffnpcself( "Rookie#rm171_1" );
+			cloakoffnpcself( "Elena Volkova#rm171_2" );
+			cloakoffnpcself( "Philopontes#rm171_1" );
+			cloakoffnpcself( "Lazy#rm171_1" );
+			cloakoffnpcself( "Elyumina#rm171_1" );
 		}
 		cutin "16go_01",0;
 		mes "[Goni]";
@@ -6691,8 +6691,8 @@ sp_cor,135,216,5	script	Rookie#rm171_1	4_M_ROOKIE,{
 		mes "Now, let's get down to the business, shall we? Please send him here, Mr. Lazy.";
 		npctalk "Lazy: Go do your best, Ms. Great Scientist.", "Lazy#rm171_1", bc_self;
 		next;
-		cloakonnpc "Elyumina#rm171_1", getcharid(0);
-		cloakoffnpc "Elyumina#rm171_2", getcharid(0);
+		cloakonnpcself( "Elyumina#rm171_1" );
+		cloakoffnpcself( "Elyumina#rm171_2" );
 		cutin "16lei_01",2;
 		npctalk "Rookie: ... So... Ah, I see...", "Rookie#rm171_1", bc_self;
 		mes "[Lazy]";
@@ -6759,11 +6759,11 @@ sp_cor,135,216,5	script	Rookie#rm171_1	4_M_ROOKIE,{
 		completequest 16359;
 		setquest 16360;
 		close2;
-		cloakonnpc "Rookie#rm171_1", getcharid(0);
-		cloakonnpc "Elena Volkova#rm171_2", getcharid(0);
-		cloakonnpc "Lazy#rm171_1", getcharid(0);
-		cloakonnpc "Elyumina#rm171_2", getcharid(0);
-		cloakonnpc "Philopontes#rm171_1", getcharid(0);
+		cloakonnpcself( "Rookie#rm171_1" );
+		cloakonnpcself( "Elena Volkova#rm171_2" );
+		cloakonnpcself( "Lazy#rm171_1" );
+		cloakonnpcself( "Elyumina#rm171_2" );
+		cloakonnpcself( "Philopontes#rm171_1" );
 		cutin "",255;
 		end;
 	case 2:
@@ -6811,9 +6811,9 @@ sp_cor,255,285,1	script	Rookie#rm171_2	4_M_ROOKIE,{
 			mes " - Your bag is full. Please check your weight and carrying item quantity, and then talk to me again. -";
 			close;
 		}
-		cloakoffnpc "Goni#rm171_2", getcharid(0);
-		cloakoffnpc "Elyumina#rm171_3", getcharid(0);
-		cloakoffnpc "Elena Volkova#rm171_3", getcharid(0);
+		cloakoffnpcself( "Goni#rm171_2" );
+		cloakoffnpcself( "Elyumina#rm171_3" );
+		cloakoffnpcself( "Elena Volkova#rm171_3" );
 		cutin "16loo_03",2;
 		emotion 19;
 		mes "[Rookie]";
@@ -6899,9 +6899,9 @@ sp_cor,255,285,1	script	Rookie#rm171_2	4_M_ROOKIE,{
 		getexp 0,400000;
 		getexp 0,400000;
 		close2;
-		cloakonnpc "Goni#rm171_2", getcharid(0);
-		cloakonnpc "Elyumina#rm171_3", getcharid(0);
-		cloakonnpc "Elena Volkova#rm171_3", getcharid(0);
+		cloakonnpcself( "Goni#rm171_2" );
+		cloakonnpcself( "Elyumina#rm171_3" );
+		cloakonnpcself( "Elena Volkova#rm171_3" );
 		cutin "",255;
 		end;
 	case 2:
@@ -7706,7 +7706,7 @@ sp_cor,113,130,3	script	Rebellion#rm171_8	4_M_REBELLION3,{
 		mes "[Rebellion]";
 		mes "Mina said you can come back later. It's too early for his lovely children to be up and about.";
 		next;
-		cloakoffnpc "Elyumina#rm171_4", getcharid(0);
+		cloakoffnpcself( "Elyumina#rm171_4" );
 		cutin "ep171_elyumina03",0;
 		npctalk "Elyumina: S-stop calling me that ridiculous name!", "Elyumina#rm171_4", bc_self;
 		mes "[Elyumina]";
@@ -7731,7 +7731,7 @@ sp_cor,113,130,3	script	Rebellion#rm171_8	4_M_REBELLION3,{
 		npctalk "Mina?", "", bc_self;
 		next;
 		cutin "ep171_elyumina03",0;
-		cloakoffnpc "Elyumina#rm171_4", getcharid(0);
+		cloakoffnpcself( "Elyumina#rm171_4" );
 		npctalk "Elyumina: S-stop calling me that!", "Elyumina#rm171_4", bc_self;
 		npctalk "You?", "", bc_self;
 		mes "[Elyumina]";
@@ -7789,7 +7789,7 @@ sp_cor,113,130,3	script	Rebellion#rm171_8	4_M_REBELLION3,{
 		mes "It's time Mina's children are up and about, Adventurer.";
 		mes "Do you want to play with them and tuck them back into bed while everyone else waits for you to finish?";
 		next;
-		cloakoffnpc "Elyumina#rm171_4", getcharid(0);
+		cloakoffnpcself( "Elyumina#rm171_4" );
 		cutin "ep171_elyumina03",0;
 		mes "[Elyumina]";
 		mes "... Soon, my security devices and traps will come out of their low power mode and become mobile again.";

npc/re/quests/quests_rockridge.txt

@@ -1023,7 +1023,7 @@ har_in01,89,26,5	script	Johnny James#har_in01	4_M_JOHNNYJAMES,{
 		setpcblock PCBLOCK_NPC, true;
 		npctalk "You sneaky bastards, how dare you show up again? Go to hell!", "", bc_self;
 		sleep2 2000;
-		cloakoffnpc  "Ivoka Skudi#har02", getcharid(0);
+		cloakoffnpcself(  "Ivoka Skudi#har02" );
 		setpcblock PCBLOCK_NPC, false;
 		npctalk "Ah, you'd better show some respect to our future mayor.", "Ivoka Skudi#har02", bc_self;
 		mes "[Ivoka Skudi]";
@@ -1212,7 +1212,7 @@ har_in01,88,22,6	script	Ivoka Skudi#har02	4_M_EVOKASCUDI,{
 		mes "[Ivoka Skudi]";
 		mes "(Whispering) He's more simpleminded than I thought. Let's go report to the Sheriff.";
 		close2;
-		cloakonnpc  "Ivoka Skudi#har02", getcharid(0);
+		cloakonnpcself(  "Ivoka Skudi#har02" );
 		end;
 	}
 	end;
@@ -1234,19 +1234,19 @@ rockrdg1,156,312,3	script	Unmoving Freight Train#	4_ENERGY_RED,{
 		setpcblock PCBLOCK_NPC, true;
 		unittalk getcharid(3), "" + strcharinfo(0) + " : I think this is the place, but maybe I came too early.", bc_self;
 		sleep2 2000;
-		cloakoffnpc "Johnny James#revt04", getcharid(0);
+		cloakoffnpcself( "Johnny James#revt04" );
 		sleep2 1000;
 		emotion ET_QUESTION, getnpcid(0,"Johnny James#revt04");
 		npctalk "Who's this? You're not the one I was expecting.", "Johnny James#revt04", bc_self;
 		sleep2 1000;
-		cloakoffnpc "Albert Ford#revt08", getcharid(0);
+		cloakoffnpcself( "Albert Ford#revt08" );
 		npctalk "Hey Boss, I told you not to go without me.", "Albert Ford#revt08", bc_self;
 		sleep2 2000;
 		npctalk "Mm? I don't remember if Costello looks like that.", "Albert Ford#revt08", bc_self;
 		sleep2 2500;
 		npctalk "Hey, I'm having an important meeting here. Scram!", "Johnny James#revt04", bc_self;
 		sleep2 2000;
-		cloakoffnpc "Wyatt Warp#revt03", getcharid(0);
+		cloakoffnpcself( "Wyatt Warp#revt03" );
 		sleep2 1000;
 		npctalk "Johnny James? You shouldn't be so rude to the Officer.", "Wyatt Warp#revt03", bc_self;
 		sleep2 2500;
@@ -1277,10 +1277,10 @@ rockrdg1,156,312,3	script	Unmoving Freight Train#	4_ENERGY_RED,{
 		npctalk "What? I haven't even started?", "Johnny James#revt04", bc_self;
 		sleep2 500;
 		specialeffect 563, AREA, "Johnny James#revt04";
-		cloakoffnpc "Cactus Gunslinger#revt05", getcharid(0);
-		cloakoffnpc "Cactus Gunslinger#revt06", getcharid(0);
-		cloakoffnpc "Cactus Gunslinger#revt07", getcharid(0);
-		cloakoffnpc "Ivoka Skudi#revt02", getcharid(0);
+		cloakoffnpcself( "Cactus Gunslinger#revt05" );
+		cloakoffnpcself( "Cactus Gunslinger#revt06" );
+		cloakoffnpcself( "Cactus Gunslinger#revt07" );
+		cloakoffnpcself( "Ivoka Skudi#revt02" );
 		npctalk "Freeze!", "Ivoka Skudi#revt02", bc_self;
 		sleep2 1000;
 		specialeffect 453, AREA, "Johnny James#revt04";
@@ -1306,7 +1306,7 @@ rockrdg1,156,312,3	script	Unmoving Freight Train#	4_ENERGY_RED,{
 		npctalk "I-I'll go bring the rest of our gang!", "Albert Ford#revt08", bc_self;
 		sleep2 1000;
 		npctalk "WHAT?", "Johnny James#revt04", bc_self;
-		cloakonnpc "Albert Ford#revt08", getcharid(0);
+		cloakonnpcself( "Albert Ford#revt08" );
 		sleep2 1000;
 		npctalk "ALBERT!", "Johnny James#revt04", bc_self;
 		sleep2 2000;
@@ -1329,11 +1329,11 @@ rockrdg1,156,312,3	script	Unmoving Freight Train#	4_ENERGY_RED,{
 		sleep2 1000;
 		npctalk "Guys, let's go!", "Ivoka Skudi#revt02", bc_self;
 		sleep2 2000;
-		cloakonnpc "Cactus Gunslinger#revt05", getcharid(0);
-		cloakonnpc "Cactus Gunslinger#revt06", getcharid(0);
-		cloakonnpc "Cactus Gunslinger#revt07", getcharid(0);
-		cloakonnpc "Ivoka Skudi#revt02", getcharid(0);
-		cloakonnpc "Johnny James#revt04", getcharid(0);
+		cloakonnpcself( "Cactus Gunslinger#revt05" );
+		cloakonnpcself( "Cactus Gunslinger#revt06" );
+		cloakonnpcself( "Cactus Gunslinger#revt07" );
+		cloakonnpcself( "Ivoka Skudi#revt02" );
+		cloakonnpcself( "Johnny James#revt04" );
 		sleep2 2000;
 		npctalk "Let's go back, shall we?", "Wyatt Warp#revt03", bc_self;
 		rock_main_quest = 6;
@@ -1367,7 +1367,7 @@ rockrdg1,153,303,5	script	Wyatt Warp#revt03	4_M_YATTWARP,{
 		mes "[Wyatt Warp]";
 		mes "Let's go back to my office.";
 		close2;
-		cloakonnpc  "Wyatt Warp#revt03", getcharid(0);
+		cloakonnpcself(  "Wyatt Warp#revt03" );
 		end;
 	}
 	end;
@@ -1820,14 +1820,14 @@ rockrdg2,279,313,3	script	Concaved Rock#revt09	4_ENERGY_RED,{
 			close;
 		}
 		npctalk "Boss? Is that you, Boss?", "Albert Ford#rockrdg2", bc_self;
-		cloakoffnpc "Albert Ford#rockrdg2", getcharid(0);
+		cloakoffnpcself( "Albert Ford#rockrdg2" );
 		close;
 	}
 	if (rock_main_quest == 14) {
 		if (countitem(25249) < 1) {
 			mes "I knocked on the signaling rock, and Albert Ford came out running.";
 			npctalk "Who are you?!", "Albert Ford#rockrdg2", bc_self;
-			cloakoffnpc "Albert Ford#rockrdg2", getcharid(0);
+			cloakoffnpcself( "Albert Ford#rockrdg2" );
 			close;
 		}
 		mes "I don't have to use this right now.";
@@ -1840,7 +1840,7 @@ rockrdg2,279,313,3	script	Concaved Rock#revt09	4_ENERGY_RED,{
 		}
 		mes "I knocked on the signaling rock, and Albert Ford came out running.";
 		npctalk "Who are you?!", "Albert Ford#rockrdg2", bc_self;
-		cloakoffnpc "Albert Ford#rockrdg2", getcharid(0);
+		cloakoffnpcself( "Albert Ford#rockrdg2" );
 		close;
 	}
 	if (rock_main_quest == 20) {
@@ -1850,7 +1850,7 @@ rockrdg2,279,313,3	script	Concaved Rock#revt09	4_ENERGY_RED,{
 		}
 		if (countitem(25249) < 1) {
 			mes "I knocked on the signaling rock, and Albert Ford came out running.";
-			cloakoffnpc "Albert Ford#rockrdg2", getcharid(0);
+			cloakoffnpcself( "Albert Ford#rockrdg2" );
 			npctalk "Who are you?!", "Albert Ford#rockrdg2", bc_self;
 			close;
 		}
@@ -2066,7 +2066,7 @@ rockrdg2,295,309,3	script	Albert Ford#rockrdg2	4_M_ALBERTFORD,{
 		setquest 7803;// Happy for Broken Trust
 		rock_main_quest = 14;
 		close2;
-		cloakonnpc strnpcinfo(0), getcharid(0);
+		cloakonnpcself();
 		end;
 	}
 	if (rock_main_quest == 14 && countitem(25249) < 1) {
@@ -2084,7 +2084,7 @@ rockrdg2,295,309,3	script	Albert Ford#rockrdg2	4_M_ALBERTFORD,{
 		mes "Here, take it.";
 		getitem 25249,1;// Mane_Of_Cow
 		close2;
-		cloakonnpc strnpcinfo(0), getcharid(0);
+		cloakonnpcself();
 		end;
 	}
 	if (rock_main_quest == 20 && checkquest(7807,HUNTING) == 2) {
@@ -2096,7 +2096,7 @@ rockrdg2,295,309,3	script	Albert Ford#rockrdg2	4_M_ALBERTFORD,{
 			mes "What? What is it?";
 			mes "Don't call me unless you have something to tell me!";
 			close2;
-			cloakonnpc strnpcinfo(0), getcharid(0);
+			cloakonnpcself();
 			end;
 		}
 		mes "[Albert Ford]";
@@ -2189,7 +2189,7 @@ rockrdg2,295,309,3	script	Albert Ford#rockrdg2	4_M_ALBERTFORD,{
 			setquest 7808;// Case Solved
 			rock_main_quest = 21;
 			close2;
-			cloakonnpc strnpcinfo(0), getcharid(0);
+			cloakonnpcself();
 		}
 		end;
 	}
@@ -2516,7 +2516,7 @@ rockrdg1,182,124,3	script	Suspicious Sand Mound#rremef05	4_ENERGY_RED,15,15,{
 	getitem 25246,1;	// Juice_Package
 	setquest 16082;
 	completequest 16082;
-	cloakonnpc "Suspicious Sand Mound#rremef05", getcharid(0);
+	cloakonnpcself( "Suspicious Sand Mound#rremef05" );
 	if (countitem("Juice_Package") > 4) {
 		next;
 		.@name$ = strcharinfo(0);
@@ -2532,9 +2532,9 @@ rockrdg1,182,124,3	script	Suspicious Sand Mound#rremef05	4_ENERGY_RED,15,15,{
 	close;
 OnTouch:
 	if (checkquest(16078,HUNTING) != 0 && checkquest(16078,HUNTING) != 1 || countitem("Juice_Package") > 4 || isbegin_quest(16082) == 2)
-		cloakonnpc "Suspicious Sand Mound#rremef05", getcharid(0);
+		cloakonnpcself( "Suspicious Sand Mound#rremef05" );
 	else
-		cloakoffnpc "Suspicious Sand Mound#rremef05", getcharid(0);
+		cloakoffnpcself( "Suspicious Sand Mound#rremef05" );
 	end;
 OnInit:
 	cloakonnpc();
@@ -2564,7 +2564,7 @@ rockrdg1,286,247,3	script	Suspicious Sand Mound#rremef06	4_ENERGY_RED,15,15,{
 		getitem 25246,1;	// Juice_Package
 		setquest .@quest_id;
 		completequest .@quest_id;
-		cloakonnpc .@npc_name$, getcharid(0);
+		cloakonnpcself( .@npc_name$ );
 		if (countitem("Juice_Package") > 4) {
 			next;
 			.@name$ = strcharinfo(0);
@@ -2584,7 +2584,7 @@ rockrdg1,286,247,3	script	Suspicious Sand Mound#rremef06	4_ENERGY_RED,15,15,{
 	mes "- It's not usable. I'll just have to leave it and look for another one. -";
 	setquest .@quest_id;
 	completequest .@quest_id;
-	cloakonnpc strnpcinfo(0), getcharid(0);
+	cloakonnpcself();
 	close;
 
 S_Quest:
@@ -2608,9 +2608,9 @@ OnTouch:
 	.@quest_id = callsub( S_Quest );
 	.@npc_name$ = callsub( S_Name );
 	if (checkquest(16078,HUNTING) != 0 && checkquest(16078,HUNTING) != 1 || countitem("Juice_Package") > 4 || isbegin_quest(.@quest_id) == 2)
-		cloakonnpc .@npc_name$, getcharid(0);
+		cloakonnpcself( .@npc_name$ );
 	else
-		cloakoffnpc .@npc_name$, getcharid(0);
+		cloakoffnpcself( .@npc_name$ );
 	end;
 
 OnInit:
@@ -2702,7 +2702,7 @@ rockrdg1,146,164,1	script	Wasteland Cactuten#rremef01	4_ENERGY_RED,15,15,{
 		getitem 25246,1;// Juice_Package
 		setquest 16083;// Discovered Wasteland Cactuten
 		erasequest 16083;// Discovered Wasteland Cactuten
-		cloakonnpc "Wasteland Cactuten#rremef01", getcharid(0);
+		cloakonnpcself( "Wasteland Cactuten#rremef01" );
 		if (countitem(25246) > 4) {
 			next;
 			mes "[" + .@player_name$ + "]";
@@ -2722,9 +2722,9 @@ rockrdg1,146,164,1	script	Wasteland Cactuten#rremef01	4_ENERGY_RED,15,15,{
 
 OnTouch:
 	if (isbegin_quest(16078) != 1 || countitem("Juice_Package") > 4 || isbegin_quest(16083) > 1)
-		cloakonnpc "Wasteland Cactuten#rremef01", getcharid(0);
+		cloakonnpcself( "Wasteland Cactuten#rremef01" );
 	else
-		cloakoffnpc "Wasteland Cactuten#rremef01", getcharid(0);
+		cloakoffnpcself( "Wasteland Cactuten#rremef01" );
 	end;
 
 OnInit:
@@ -2737,9 +2737,9 @@ rockrdg1,195,183,3	script	Curious Coyote#rremef03	4_ENERGY_RED,15,15,{
 	end;
 OnTouch:
 	if (isbegin_quest(16078) != 1 || countitem("Juice_Package") > 4 || isbegin_quest(16085) > 1)
-		cloakonnpc "Curious Coyote#rremef03", getcharid(0);
+		cloakonnpcself( "Curious Coyote#rremef03" );
 	else
-		cloakoffnpc "Curious Coyote#rremef03", getcharid(0);
+		cloakoffnpcself( "Curious Coyote#rremef03" );
 	end;
 OnInit:
 	cloakonnpc();
@@ -2770,7 +2770,7 @@ OnTouch:
 		getitem 25246,1;// Juice_Package
 		setquest 16085;// Discovered Coyote
 		completequest 16085;// Discovered Coyote
-		cloakonnpc "Curious Coyote#rremef03", getcharid(0);
+		cloakonnpcself( "Curious Coyote#rremef03" );
 		if (countitem(25246) > 4) {
 			next;
 			mes "[" + .@player_name$ + "]";
@@ -2843,7 +2843,7 @@ rockrdg1,305,200,3	script	Cactus Girl#rremef02	4_ENERGY_RED,15,15,{
 		getitem 25246,1;// Juice_Package
 		setquest 16087;// Discovered Cactus Girl
 		completequest 16087;// Discovered Cactus Girl
-		cloakonnpc "Cactus Girl#rremef02", getcharid(0);
+		cloakonnpcself( "Cactus Girl#rremef02" );
 		if (countitem(25246) > 4) {
 			next;
 			mes "[" + .@player_name$ + "]";
@@ -2865,9 +2865,9 @@ rockrdg1,305,200,3	script	Cactus Girl#rremef02	4_ENERGY_RED,15,15,{
 
 OnTouch:
 	if (isbegin_quest(16078) != 1 || countitem("Juice_Package") > 4 || isbegin_quest(16087) > 1)
-		cloakonnpc "Cactus Girl#rremef02", getcharid(0);
+		cloakonnpcself( "Cactus Girl#rremef02" );
 	else
-		cloakoffnpc "Cactus Girl#rremef02", getcharid(0);
+		cloakoffnpcself( "Cactus Girl#rremef02" );
 	end;
 
 OnInit:
@@ -2880,9 +2880,9 @@ rockrdg1,266,219,3	script	Absorbed Coyote#rremef04	4_ENERGY_RED,15,15,{
 	end;
 OnTouch:
 	if (isbegin_quest(16078) != 1 || countitem("Juice_Package") > 4 || isbegin_quest(16088) > 1)
-		cloakonnpc "Absorbed Coyote#rremef04", getcharid(0);
+		cloakonnpcself( "Absorbed Coyote#rremef04" );
 	else
-		cloakoffnpc "Absorbed Coyote#rremef04", getcharid(0);
+		cloakoffnpcself( "Absorbed Coyote#rremef04" );
 	end;
 OnInit:
 	cloakonnpc();
@@ -2913,7 +2913,7 @@ OnTouch:
 		getitem 25246,1;// Juice_Package
 		setquest 16088;// Discovered Coyote
 		completequest 16088;// Discovered Coyote
-		cloakonnpc "Absorbed Coyote#rremef04", getcharid(0);
+		cloakonnpcself( "Absorbed Coyote#rremef04" );
 		if (countitem(25246) > 4) {
 			next;
 			mes "[" + .@player_name$ + "]";
@@ -5162,16 +5162,16 @@ rockrdg1,36,250,5	script	Mr. McPhy#rkdlout	4W_M_02,{
 			next;
 			mes "[Mr. McPhy]";
 			mes "But he couldn't have gone too far because he came back to me pretty quickly. Why don't you walk along the fence and look for holes with white hair floating around them?";
-			cloakoffnpc "#rkq1321", getcharid(0);
-			cloakoffnpc "#rkdqgd11", getcharid(0);
-			cloakoffnpc "#rkdqgd22", getcharid(0);
-			cloakoffnpc "#rkdqgd33", getcharid(0);
+			cloakoffnpcself( "#rkq1321" );
+			cloakoffnpcself( "#rkdqgd11" );
+			cloakoffnpcself( "#rkdqgd22" );
+			cloakoffnpcself( "#rkdqgd33" );
 			close;
 		}
 		if (isbegin_quest(1322) == 1 || isbegin_quest(1328) == 1) {
 			mes "[Mr. McPhy]";
 			mes "Did you find something? Then let's go back!";
-			cloakonnpc "Mr. McPhy#rkdlout", getcharid(0);
+			cloakonnpcself( "Mr. McPhy#rkdlout" );
 			close;
 		}
 		mes "[Mr. McPhy]";
@@ -5179,15 +5179,15 @@ rockrdg1,36,250,5	script	Mr. McPhy#rkdlout	4W_M_02,{
 		next;
 		mes "[Mr. McPhy]";
 		mes "Oh, right! Spotty has been shedding a lot lately. Maybe you should look for holes with white hair floating around them.";
-		cloakoffnpc "#rkq1321", getcharid(0);
-		cloakoffnpc "#rkq1323", getcharid(0);
-		cloakoffnpc "#rkq1324", getcharid(0);
-		cloakoffnpc "#rkq1325", getcharid(0);
-		cloakoffnpc "#rkq1326", getcharid(0);
-		cloakoffnpc "#rkq1327", getcharid(0);
-		cloakoffnpc "#rkdqgd11", getcharid(0);
-		cloakoffnpc "#rkdqgd22", getcharid(0);
-		cloakoffnpc "#rkdqgd33", getcharid(0);
+		cloakoffnpcself( "#rkq1321" );
+		cloakoffnpcself( "#rkq1323" );
+		cloakoffnpcself( "#rkq1324" );
+		cloakoffnpcself( "#rkq1325" );
+		cloakoffnpcself( "#rkq1326" );
+		cloakoffnpcself( "#rkq1327" );
+		cloakoffnpcself( "#rkdqgd11" );
+		cloakoffnpcself( "#rkdqgd22" );
+		cloakoffnpcself( "#rkdqgd33" );
 		next;
 		mes "[Mr. McPhy]";
 		mes "And he doesn't seem to venture out too far. It's probably because he's still young. I've marked three possible locations in the middle of your map. You don't have to look further than those locations.";
@@ -5209,7 +5209,7 @@ rockrdg1,36,250,5	script	Mr. McPhy#rkdlout	4W_M_02,{
 	}
 	mes "[Mr. McPhy]";
 	mes "*Gasp* Buffalo Bandits!";
-	cloakonnpc "Mr. McPhy#rkdlout", getcharid(0);
+	cloakonnpcself( "Mr. McPhy#rkdlout" );
 	close;
 
 OnInit:
@@ -5274,10 +5274,10 @@ rockrdg1,43,145,3	script	Hole#rkq1321	4_CRACK,{
 			mes "I should take it with me for now. -";
 			completequest 1321;
 			setquest 1322;// Found Something
-			cloakonnpc "#rkq1321", getcharid(0);
-			cloakonnpc "#rkdqgd11", getcharid(0);
-			cloakonnpc "#rkdqgd22", getcharid(0);
-			cloakonnpc "#rkdqgd33", getcharid(0);
+			cloakonnpcself( "#rkq1321" );
+			cloakonnpcself( "#rkdqgd11" );
+			cloakonnpcself( "#rkdqgd22" );
+			cloakonnpcself( "#rkdqgd33" );
 			close;
 		}
 		mes "It has something inside it. -";
@@ -5285,15 +5285,15 @@ rockrdg1,43,145,3	script	Hole#rkq1321	4_CRACK,{
 		mes "- This must be what Mr. McPhy is looking for. I should bring it to her. -";
 		erasequest .@list[.@i];
 		setquest 1328;// Found Missing Items
-		cloakonnpc "#rkq1321", getcharid(0);
-		cloakonnpc "#rkq1323", getcharid(0);
-		cloakonnpc "#rkq1324", getcharid(0);
-		cloakonnpc "#rkq1325", getcharid(0);
-		cloakonnpc "#rkq1326", getcharid(0);
-		cloakonnpc "#rkq1327", getcharid(0);
-		cloakonnpc "#rkdqgd11", getcharid(0);
-		cloakonnpc "#rkdqgd22", getcharid(0);
-		cloakonnpc "#rkdqgd33", getcharid(0);
+		cloakonnpcself( "#rkq1321" );
+		cloakonnpcself( "#rkq1323" );
+		cloakonnpcself( "#rkq1324" );
+		cloakonnpcself( "#rkq1325" );
+		cloakonnpcself( "#rkq1326" );
+		cloakonnpcself( "#rkq1327" );
+		cloakonnpcself( "#rkdqgd11" );
+		cloakonnpcself( "#rkdqgd22" );
+		cloakonnpcself( "#rkdqgd33" );
 		close;
 	}
 	switch( .@list[.@i] ) {