Remove some ugly artifacts, fix Shock White ID from 122~127 to "22"

5 files changed, 4 insertions, 29 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 4917dbb5..43b4ec54 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3410,7 +3410,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	HC_BLACK:10
 	HC_PINK:11
 	HC_BROWN_TWO:12
-	HC_WHITE:127
+	HC_WHITE:22
 	cNone:11
 	cWhite:10
 	cRed:0
diff --git a/npc/017-9/npcs.txt b/npc/017-9/npcs.txt
index 27a14fe2..9b9c2a1d 100644
--- a/npc/017-9/npcs.txt
+++ b/npc/017-9/npcs.txt
@@ -2,7 +2,7 @@
 
 009-1,42,43,0	script	#SecretDoor	NPC32767,0,0,{
     if (GM < MAP_LOUNGE && GM < G_SYSOP && !debug) end;
-    gmlog "@warp 017-9";
+    //gmlog "@warp 017-9";
     warp "017-9", 36, 26;
     end;
 }
diff --git a/npc/functions/gm_island.txt b/npc/functions/gm_island.txt
index 82fc0210..1a916cae 100644
--- a/npc/functions/gm_island.txt
+++ b/npc/functions/gm_island.txt
@@ -54,7 +54,7 @@ L_Disguise:
 L_ResetClass:
     mes "Your appearance has been reset.";
     Class = if_then_else(@old_class, @old_class, 1);
-    callfunc "fixHeadStyles";
+    //callfunc "fixHeadStyles";
     return;
 }
 001-1,49,68,0	script	Gm Event#1	NPC368,0,0,{
diff --git a/npc/functions/headstyles.txt b/npc/functions/headstyles.txt
index c56eb900..c0aeee60 100644
--- a/npc/functions/headstyles.txt
+++ b/npc/functions/headstyles.txt
@@ -1,28 +1,3 @@
-
-function	script	fixHeadStyles	{
-    callfunc "getHeadStyles";
-    if (!HELLOWORLD)
-        goto L_RandomHair;
-    set @style, getlook(LOOK_HAIR); // FIXME: this needs to be a param in the future
-    set @color, getlook(LOOK_HAIR_COLOR); // FIXME: this needs to be a param in the future
-    debugmes "Login OK";
-    return;
-    if (@color >= 123 && @color <= HC_WHITE) // convert shock white
-        @color = (HC_WHITE - Class) + 1;
-    if (@color < 105 && ((@color - (15 * (Class - 1))) < 0 || @color > ((15 * (Class - 1)) + (getarraysize(@HairColors$) - 1))))
-        set @color, 15 * (Class - 1); // it is possible to style color 0 but not style 0 since style is treated as an item
-    setlook LOOK_HAIR_COLOR, @color; // FIXME: this needs to be a param in the future
-    return;
-
-L_RandomHair:
-    HELLOWORLD=true;
-    //resetstatus; // <= important! gives 48 stat points
-    debugmes "Set random look....";
-    setlook LOOK_HAIR, rand(1, getarraysize(@HairStyles$));
-    setlook LOOK_HAIR_COLOR, rand(15);
-    return;
-}
-
 // Hairstyle config
 // set array of style and colors
 -	script	hairstyle_config	NPC_HIDDEN,{
diff --git a/npc/items/shock_sweet.txt b/npc/items/shock_sweet.txt
index c35ce37f..3f6e5fb0 100644
--- a/npc/items/shock_sweet.txt
+++ b/npc/items/shock_sweet.txt
@@ -6,7 +6,7 @@ function	script	useShockSweet	{
     return;
 
 L_Change:
-    setlook LOOK_HAIR_COLOR, 122;
+    setlook LOOK_HAIR_COLOR, HC_WHITE;
     message strcharinfo(0), "Gah! That was some strong stuff!";
     sc_start SC_POISON, 1, 20;
     misceffect 15, strcharinfo(0);