Remove VAR_ constants

- there are 2 same constants for setlook script command, remove the wrong one
- VAR_ constant added by lone_wolf is invalid https://github.com/HerculesWS/Hercules/commit/f4278f36db32f35e535a0ea8feb1cf83ca95019e, so use the LOOK_ constant

4 files changed, 49 insertions, 22 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 0709cd758..790c0ed53 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3678,16 +3678,43 @@ constants_db: {
 	FW_EXTRABOLD:  800
 	FW_HEAVY:      900
 
-	/** setlook */
-	VAR_HEAD:        1
-	VAR_WEAPON:      2
-	VAR_HEAD_TOP:    3
-	VAR_HEAD_MID:    4
-	VAR_HEAD_BOTTOM: 5
-	VAR_HEADPALETTE: 6
-	VAR_BODYPALETTE: 7
-	VAR_SHIELD:      8
-	VAR_SHOES:       9
+	/** old setlook (use LOOK_* constants instead) */
+	VAR_HEAD: {
+		Value: 1
+		Deprecated: true // Use LOOK_HAIR
+	}
+	VAR_WEAPON: {
+		Value: 2
+		Deprecated: true // Use LOOK_WEAPON
+	}
+	VAR_HEAD_TOP: {
+		Value: 3
+		Deprecated: true // Use LOOK_HEAD_TOP
+	}
+	VAR_HEAD_MID: {
+		Value: 4
+		Deprecated: true // Use LOOK_HEAD_MID
+	}
+	VAR_HEAD_BOTTOM: {
+		Value: 5
+		Deprecated: true // Use LOOK_HEAD_BOTTOM
+	}
+	VAR_HEADPALETTE: {
+		Value: 6
+		Deprecated: true // Use LOOK_HAIR_COLOR
+	}
+	VAR_BODYPALETTE: {
+		Value: 7
+		Deprecated: true // Use LOOK_CLOTHES_COLOR
+	}
+	VAR_SHIELD: {
+		Value: 8
+		Deprecated: true // Use LOOK_SHIELD
+	}
+	VAR_SHOES: {
+		Value: 9
+		Deprecated: true // Use LOOK_SHOES
+	}
 
 	/** Directions */
 	DIR_NORTH:     0
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 130e5b5f6..709aa39dd 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4530,13 +4530,13 @@ the look value).
 	// This will change your hair(6), so that it uses palette 8, what ever 
 	// your palette 8 is, your hair will use that color.
 
-	setlook VAR_HEADPALETTE, 8;
+	setlook LOOK_HAIR_COLOR, 8;
 
 	// This will change your clothes(7), so they are using palette 1, 
 	// whatever your palette 1 is, your clothes will then use that set of 
 	// colors.
 
-	setlook VAR_BODYPALETTE,1;
+	setlook LOOK_CLOTHES_COLOR, 1;
 
 Here are the possible look types:
 
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index db261c215..1a786b415 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -97,7 +97,7 @@ prt_in,243,168,4	script	Jovovich	4_F_02,{
 						close;
 					}
 
-					if (.@headpalette == getlook(VAR_HEADPALETTE)) {
+					if (.@headpalette == getlook(LOOK_HAIR_COLOR)) {
 						mes "[Hairdresser Jovovich]";
 						mes "Eh? But that's the hair color you already have. Please choose a different color.";
 						next;
@@ -130,7 +130,7 @@ prt_in,243,168,4	script	Jovovich	4_F_02,{
 						case 8: delitem Scarlet_Dyestuffs,1; break;
 						}
 						Zeny -= 1000;
-						setlook VAR_HEADPALETTE,.@headpalette;
+						setlook LOOK_HAIR_COLOR,.@headpalette;
 						.@choose_success = 1;
 						break;
 					}
@@ -275,7 +275,7 @@ lhz_in02,100,134,3	script	Hair Dyer#lich	4_F_EINWOMAN,{
 						}
 						break;
 					}
-					if (getlook(VAR_HEADPALETTE) == .@headpalette) {
+					if (getlook(LOOK_HAIR_COLOR) == .@headpalette) {
 						mes "[Rossa]";
 						mes "Hmm, your hair color";
 						mes "is still fine, so there's";
@@ -388,7 +388,7 @@ lhz_in02,100,134,3	script	Hair Dyer#lich	4_F_EINWOMAN,{
 						else if (.@headpalette == 6) delitem White_Dyestuffs,1;
 						else if (.@headpalette == 7) delitem Black_Dyestuffs,1;
 						Zeny -= 1000;
-						setlook VAR_HEADPALETTE,.@headpalette;
+						setlook LOOK_HAIR_COLOR,.@headpalette;
 						.@choose_success = 1;
 						break;
 					}
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 7bfefadf4..2d61d02db 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -995,7 +995,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 			mes "you soooooooo beautiful!";
 			close;
 		}
-		else if (getlook(VAR_HEAD) == .@input) {
+		else if (getlook(LOOK_HAIR) == .@input) {
 			mes "[Prince Shammi]";
 			mes "Oh dear me, you're not";
 			mes "going to waste money for";
@@ -1017,7 +1017,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 			next;
 			switch(select("Yes.:No.")) {
 			case 1:
-				if (getlook(VAR_HEADPALETTE) == 0) {
+				if (getlook(LOOK_HAIR_COLOR) == 0) {
 					mes "[Prince Shammi]";
 					mes "Oh, Sweet Christmas,";
 					mes "I almost forgot! Would";
@@ -1072,8 +1072,8 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 				delitem Long_Hair,100;
 				delitem Golden_Hair,100;
 				delitem Glossy_Hair,100;
-				setlook VAR_HEAD,.@input;
-				setlook VAR_HEADPALETTE,.@headpalette;
+				setlook LOOK_HAIR,.@input;
+				setlook LOOK_HAIR_COLOR,.@headpalette;
 				mes "[Prince Shammi]";
 				mes "Well, we're all finished!";
 				mes "And my, oh my, you look even";
@@ -1272,8 +1272,8 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	4_F_LGTGIRL,{
 				mes "^333333*Pant Pant Pant*^000000";
 				next;
 				Zeny -= 250000;
-				setlook VAR_HEAD,.@style_r;
-				setlook VAR_HEADPALETTE,.@color_r;
+				setlook LOOK_HAIR,.@style_r;
+				setlook LOOK_HAIR_COLOR,.@color_r;
 				mes "[Assistant Beautician]";
 				mes "Bwahahaha! Success!";
 				if (.@input == .@style_r) {