From 76ead48bbeab9581ba779b29ab53657ac06d05aa Mon Sep 17 00:00:00 2001 From: gumi Date: Tue, 3 Apr 2018 20:19:38 -0400 Subject: make shock white compatible with the headless hairstyles --- client-data | 2 +- world/map/npc/functions/headstyles.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-data b/client-data index 41243c8b..a3dd1786 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 41243c8beafcf97103a79963cbc6ccbe103b4a81 +Subproject commit a3dd178628798a47dcd7619e600af9df092d28ed diff --git a/world/map/npc/functions/headstyles.txt b/world/map/npc/functions/headstyles.txt index 5369be34..f5f2ea82 100644 --- a/world/map/npc/functions/headstyles.txt +++ b/world/map/npc/functions/headstyles.txt @@ -10,7 +10,7 @@ function|script|fixHeadStyles set @color, getlook(LOOK_HAIR_COLOR); // FIXME: this needs to be a param in the future if (@style < 1 || @style > getarraysize(@HairStyles$)) // leftover from previous attempt at classes setlook LOOK_HAIR_STYLE, 1; // FIXME: this needs to be a param in the future - if (@color >= 123 && @color <= HC_WHITE) // convert shock white + if (@color >= 120 && @color <= HC_WHITE) // convert shock white set @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 -- cgit v1.2.3-60-g2f50