change *strcharinfo to use constants

2 files changed, 28 insertions, 28 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index b61f1ec0e..1ba177d18 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -30625,7 +30625,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
+		if(strcharinfo(PC_MAP)=="job3_arch02") {
 			bonus2 bAddDefClass,1761,50;
 			bonus2 bAddDefClass,1762,50;
 		}
@@ -34064,7 +34064,7 @@ item_db: (
 		bonus2 bHPLossRate,666,10000;
 	">
 	OnUnequipScript: <"
-		if((Hp <= 999) && !getmapflag(strcharinfo(3),mf_pvp) && !getmapflag(strcharinfo(3),mf_pvp_noparty) && !getmapflag(strcharinfo(3),mf_pvp_noguild)) {
+		if((Hp <= 999) && !getmapflag(strcharinfo(PC_MAP),mf_pvp) && !getmapflag(strcharinfo(PC_MAP),mf_pvp_noparty) && !getmapflag(strcharinfo(PC_MAP),mf_pvp_noguild)) {
 			heal (1-Hp),0;
 		}
 		else {
@@ -70176,7 +70176,7 @@ item_db: (
 	}
 	Script: <"
 		input @megaphone$;
-		announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000;
+		announce strcharinfo(PC_NAME) + ": " + @megaphone$,bc_all,0xFF0000;
 		end;
 	">
 },
@@ -70590,7 +70590,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_rang02") {
+		if(strcharinfo(PC_MAP)=="job3_rang02") {
 			monster "this",-1,-1,"--ja--",1904,1,"";
 		}
 
@@ -72394,7 +72394,7 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if (strcharinfo(3) == "job3_arch02") {
+		if (strcharinfo(PC_MAP) == "job3_arch02") {
 			mercenary_create VALKYRIE_A, 1800000;
 		}
 
@@ -72408,7 +72408,7 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if (strcharinfo(3) == "job3_arch02") {
+		if (strcharinfo(PC_MAP) == "job3_arch02") {
 			mercenary_create VALKYRIE_B, 1800000;
 		}
 
@@ -72440,7 +72440,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		//if(strcharinfo(3)=="job3_war02") {
+		//if(strcharinfo(PC_MAP)=="job3_war02") {
 		//	itemskill WL_FROSTMISTY,5;
 		//}
 	">
@@ -72461,7 +72461,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		//if(strcharinfo(3)=="job3_war02") {
+		//if(strcharinfo(PC_MAP)=="job3_war02") {
 		//	itemskill WL_CRIMSONROCK,5;
 		//}
 	">
@@ -72482,7 +72482,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		//if(strcharinfo(3)=="job3_war02") {
+		//if(strcharinfo(PC_MAP)=="job3_war02") {
 		//	itemskill WL_CHAINLIGHTNING,5;
 		//}
 	">
@@ -72503,7 +72503,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		//if(strcharinfo(3)=="job3_war02") {
+		//if(strcharinfo(PC_MAP)=="job3_war02") {
 		//	itemskill WL_EARTHSTRAIN,5;
 		//}
 	">
@@ -72528,7 +72528,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		//if(strcharinfo(3)=="job3_rune02") {
+		//if(strcharinfo(PC_MAP)=="job3_rune02") {
 		//	itemskill RK_CRUSHSTRIKE,1;
 		//}
 	">
@@ -72553,7 +72553,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		//if(strcharinfo(3)=="job3_rune02") {
+		//if(strcharinfo(PC_MAP)=="job3_rune02") {
 		//	itemskill RK_STORMBLAST,1;
 		//}
 	">
@@ -72578,7 +72578,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		//if(strcharinfo(3)=="job3_rune02") {
+		//if(strcharinfo(PC_MAP)=="job3_rune02") {
 		//	itemskill RK_MILLENNIUMSHIELD,1;
 		//}
 	">
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index a8d37ab0f..b6861a46f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -38030,7 +38030,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
+		if(strcharinfo(PC_MAP)=="job3_arch02") {
 			bonus2 bAddDefClass,1761,50;
 			bonus2 bAddDefClass,1762,50;
 		}
@@ -43946,7 +43946,7 @@ item_db: (
 		bonus2 bHPLossRate,666,10000;
 	">
 	OnUnequipScript: <"
-		if((Hp<=999) && !getmapflag(strcharinfo(3),mf_pvp) && !getmapflag(strcharinfo(3),mf_pvp_noparty) && !getmapflag(strcharinfo(3),mf_pvp_noguild)) {
+		if((Hp<=999) && !getmapflag(strcharinfo(PC_MAP),mf_pvp) && !getmapflag(strcharinfo(PC_MAP),mf_pvp_noparty) && !getmapflag(strcharinfo(PC_MAP),mf_pvp_noguild)) {
 			heal(1-Hp),0;
 		}
 		else {
@@ -46922,7 +46922,7 @@ item_db: (
 		else bonus2 bHPLossRate,888,5000;
 	">
 	OnUnequipScript: <"
-		if((Hp<=999) && !getmapflag(strcharinfo(3),mf_pvp) && !getmapflag(strcharinfo(3),mf_pvp_noparty) && !getmapflag(strcharinfo(3),mf_pvp_noguild)) {
+		if((Hp<=999) && !getmapflag(strcharinfo(PC_MAP),mf_pvp) && !getmapflag(strcharinfo(PC_MAP),mf_pvp_noparty) && !getmapflag(strcharinfo(PC_MAP),mf_pvp_noguild)) {
 			heal(1-Hp),0;
 		}
 		else {
@@ -87615,7 +87615,7 @@ item_db: (
 	}
 	Script: <"
 		input @megaphone$;
-		announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000;
+		announce strcharinfo(PC_NAME) + ": " + @megaphone$,bc_all,0xFF0000;
 		end;
 	">
 },
@@ -88044,7 +88044,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_rang02") {
+		if(strcharinfo(PC_MAP)=="job3_rang02") {
 			monster "this",-1,-1,"--ja--",1904,1,"";
 		}
 	">
@@ -89803,7 +89803,7 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if (strcharinfo(3) == "job3_arch02") {
+		if (strcharinfo(PC_MAP) == "job3_arch02") {
 			mercenary_create VALKYRIE_A, 1800000;
 		}
 	">
@@ -89816,7 +89816,7 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if (strcharinfo(3) == "job3_arch02") {
+		if (strcharinfo(PC_MAP) == "job3_arch02") {
 			mercenary_create VALKYRIE_B, 1800000;
 		}
 	">
@@ -89847,7 +89847,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_war02") {
+		if(strcharinfo(PC_MAP)=="job3_war02") {
 			itemskill WL_FROSTMISTY,5;
 		}
 	">
@@ -89868,7 +89868,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_war02") {
+		if(strcharinfo(PC_MAP)=="job3_war02") {
 			itemskill WL_CRIMSONROCK,5;
 		}
 	">
@@ -89889,7 +89889,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_war02") {
+		if(strcharinfo(PC_MAP)=="job3_war02") {
 			itemskill WL_CHAINLIGHTNING,5;
 		}
 	">
@@ -89910,7 +89910,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_war02") {
+		if(strcharinfo(PC_MAP)=="job3_war02") {
 			itemskill WL_EARTHSTRAIN,5;
 		}
 	">
@@ -89935,7 +89935,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_rune02") {
+		if(strcharinfo(PC_MAP)=="job3_rune02") {
 			itemskill RK_CRUSHSTRIKE,1;
 		}
 	">
@@ -89960,7 +89960,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_rune02") {
+		if(strcharinfo(PC_MAP)=="job3_rune02") {
 			itemskill RK_STORMBLAST,1;
 		}
 	">
@@ -89985,7 +89985,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		if(strcharinfo(3)=="job3_rune02") {
+		if(strcharinfo(PC_MAP)=="job3_rune02") {
 			itemskill RK_MILLENNIUMSHIELD,1;
 		}
 	">
@@ -95252,7 +95252,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		warp strcharinfo(3),0,0; /* NOTE: Temporary script until we get the correct information. */
+		warp strcharinfo(PC_MAP),0,0; /* NOTE: Temporary script until we get the correct information. */
 	">
 },
 {