From a84c33ddbc35213b54b54fbd3161aa2fb6f2ad01 Mon Sep 17 00:00:00 2001
From: deepmurk <axiao@protonmail.com>
Date: Sun, 29 Apr 2018 21:35:46 -0400
Subject: [PATCH] Hair Color Sync
---
devNotes/Deepmurk_Vector_Art_Changelog.txt | 10 ++++++++--
src/cheats/mod_editSlaveCheatNew.tw | 4 ++++
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/js/artColorToolsJS.tw | 2 ++
src/js/vectorRevampedArtControlJS.tw | 2 ++
src/pregmod/managePersonalAffairs.tw | 1 +
src/uncategorized/cosmeticRulesAssistantSettings.tw | 12 ++++++++++++
src/uncategorized/salon.tw | 4 ++++
8 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/devNotes/Deepmurk_Vector_Art_Changelog.txt b/devNotes/Deepmurk_Vector_Art_Changelog.txt
index 6696cb79532..4cdc3b4fb1f 100644
--- a/devNotes/Deepmurk_Vector_Art_Changelog.txt
+++ b/devNotes/Deepmurk_Vector_Art_Changelog.txt
@@ -21,7 +21,8 @@ planned additions
known issues
-------------
-minor clipping issue leg/ass outfits due to their outfit transparency effects
- -Not all outfit art works with amputees
+ -not all outfit art works with amputees
+ -minor hair clipping on some outfits
pending requests/suggestions
-------------
@@ -77,9 +78,14 @@ v0.9 (05-05-2018)
-added beauty mark as misc facial feature
-added birthmark as misc facial feature
-minor outfit polishing on some outfits
- -polished lines on torso art (normal, narrow, absurd)
+ -polished outlines on torso art (normal, narrow, absurd)
-reworked naked apron outfit
-updated bangles outfit
+ -reworked clubslut netting outfit
+ -updated cheerleader outfit
+ -added AI personal assistant art
+ -added blue-violet hair color
+ -updated deep red hair color
v0.8 (04-21-2018)
-------------
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 0a14a84c677..943ee716d4e 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1397,6 +1397,7 @@
<<H1Options "grey" >>
<<H1Options "silver" >>
<<H1Options "white" >>
+ <<H1Options "blue-violet" >>
<br>
<</replace>>
<<else>>
@@ -1437,6 +1438,7 @@
<<H2Options "grey" >>
<<H2Options "silver" >>
<<H2Options "white" >>
+ <<H2Options "blue-violet" >>
<br>
<</replace>>
<<else>>
@@ -1475,6 +1477,7 @@
<<H3Options "grey" >>
<<H3Options "silver" >>
<<H3Options "white" >>
+ <<H3Options "blue-violet" >>
<br>
<</replace>>
<<else>>
@@ -1522,6 +1525,7 @@
<<H4Options "grey" >>
<<H4Options "silver" >>
<<H4Options "white" >>
+ <<H4Options "blue-violet" >>
<br>
<</replace>>
<<else>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 56cd9bd4748..4c0a8fceee8 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2028,7 +2028,7 @@ LORE: THE FREE CITIES TODAY
<<case "Dyes">>
- //Fantastic news for every fashion oriented citizen and slave-owner: Your slave's hair color must no longer be exclusively chosen by one the bland @@.darkviolet;[[authority|Encyclopedia][$encyclopedia = "Security Expansion"]]@@-approved colors "blazing red", "neon green", "neon blue", "neon pink", "platinum blonde", "dark brown", "brown", "auburn", "black", "blonde", "blue", "burgundy", "chestnut", "chocolate", "copper", "ginger", "golden", "green", "grey", "hazel", "pink", "red", and "silver".
+ //Fantastic news for every fashion oriented citizen and slave-owner: Your slave's hair color must no longer be exclusively chosen by one the bland @@.darkviolet;[[authority|Encyclopedia][$encyclopedia = "Security Expansion"]]@@-approved colors "blazing red", "neon green", "neon blue", "neon pink", "platinum blonde", "dark brown", "brown", "auburn", "black", "blonde", "blue", "burgundy", "chestnut", "chocolate", "copper", "ginger", "golden", "green", "grey", "hazel", "pink", "red", "blue-violet", and "silver".
<br><br>Today, we are proud to announce that our, the Free Cities Dyes Department, Research and Development team, found 140 new and exciting ways to color your slave's capital hair. The <a target="_blank" href="https://www.w3schools.com/colors/colors_names.asp">extensive list</a> with the names of all the available colors will be made available to the public, soon.
diff --git a/src/js/artColorToolsJS.tw b/src/js/artColorToolsJS.tw
index 697950bbb82..b2aab8762c8 100644
--- a/src/js/artColorToolsJS.tw
+++ b/src/js/artColorToolsJS.tw
@@ -36,6 +36,8 @@ window.extractHairColor = function(hColor) {
["hazel", "#8d6f1f"],
["pink", "#D18CBC"],
["red", "#BB2027"],
+ ["deep red", "#6D1318"],
+ ["blue-violet", "#8790B7"],
["silver", "#cdc9c6"],
["light olive", "#d4c6bb"],
["dark", "#a46237"],
diff --git a/src/js/vectorRevampedArtControlJS.tw b/src/js/vectorRevampedArtControlJS.tw
index 47a3f735620..8256f50781e 100644
--- a/src/js/vectorRevampedArtControlJS.tw
+++ b/src/js/vectorRevampedArtControlJS.tw
@@ -149,6 +149,8 @@ class ArtStyleControl {
["pink", "#D18CBC"],
["platinum blonde", "#fcf3c1"],
["red", "#BB2027"],
+ ["deep red", "#6D1318"],
+ ["blue-violet", "#8790B7"],
["silver", "#cdc9c6"],
["strawberry-blonde", "#e5a88c"],
["blazing red", "#E00E2B"],
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 2904b21314a..c46da7508ce 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -75,6 +75,7 @@ Around back;
<<if $PC.origHColor != "grey">>| [[Grey|Manage Personal Affairs][$PC.hColor = "grey"]]<</if>>
<<if $PC.origHColor != "silver">>| [[Silver|Manage Personal Affairs][$PC.hColor = "silver"]]<</if>>
<<if $PC.origHColor != "white">>| [[White|Manage Personal Affairs][$PC.hColor = "white"]]<</if>>
+ <<if $PC.origHColor != "blue-violet">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "blue-violet"]]<</if>>
<<if $FCTVreceiver == 1>>
<br><br>
diff --git a/src/uncategorized/cosmeticRulesAssistantSettings.tw b/src/uncategorized/cosmeticRulesAssistantSettings.tw
index af0c3f5846f..68ad298663c 100644
--- a/src/uncategorized/cosmeticRulesAssistantSettings.tw
+++ b/src/uncategorized/cosmeticRulesAssistantSettings.tw
@@ -336,6 +336,10 @@ Hair color: ''$currentRule.hColor.''
<<set $currentRule.hColor = "white">>
<<RAChangeHColor>>
<</link>>
+| <<link "Blue-Violet">>
+<<set $currentRule.hColor = "blue-violet">>
+<<RAChangeHColor>>
+<</link>>
| <<link "Blazing red">>
<<set $currentRule.hColor = "red">>
<<RAChangeHColor>>
@@ -528,6 +532,10 @@ Pubic hair color, when present: ''$currentRule.pubicHColor.''
<<set $currentRule.pubicHColor = "white">>
<<RAChangePHColor>>
<</link>>
+| <<link "Blue-Violet">>
+<<set $currentRule.pubicHColor = "blue-violet">>
+<<RAChangePHColor>>
+<</link>>
| <<link "Blazing red">>
<<set $currentRule.pubicHColor = "red">>
<<RAChangePHColor>>
@@ -673,6 +681,10 @@ Underarm hair color, when present: ''$currentRule.underArmHColor.''
<<set $currentRule.underArmHColor = "white">>
<<RAChangeAHColor>>
<</link>>
+| <<link "Blue-Violet">>
+<<set $currentRule.underArmHColor = "blue-violet">>
+<<RAChangeAHColor>>
+<</link>>
<br>
<<if ndef $currentRule.underArmHStyle>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 887d8ade887..01f522c4aad 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -168,6 +168,7 @@
| [[Grey|Salon][$primaryHairColor = "grey"]]
| [[Silver|Salon][$primaryHairColor = "silver"]]
| [[White|Salon][$primaryHairColor = "white"]]
+ | [[Blue-Violet|Salon][$primaryHairColor = "blue-violet"]]
| [[Blazing red|Salon][$primaryHairColor = "blazing red"]]
| [[Neon green|Salon][$primaryHairColor = "neon green"]]
| [[Neon blue|Salon][$primaryHairColor = "neon blue"]]
@@ -291,6 +292,7 @@
| [[Grey|Salon][$primaryHairColor = "grey"]]
| [[Silver|Salon][$primaryHairColor = "silver"]]
| [[White|Salon][$primaryHairColor = "white"]]
+ | [[Blue-Violet|Salon][$primaryHairColor = "blue-violet"]]
| [[Blazing red|Salon][$primaryHairColor = "blazing red"]]
| [[Neon green|Salon][$primaryHairColor = "neon green"]]
| [[Neon blue|Salon][$primaryHairColor = "neon blue"]]
@@ -514,6 +516,7 @@ Dye or paint:
| [[Grey|Salon][$activeSlave.pubicHColor = "grey",$cash -= $modCost]]
| [[Silver|Salon][$activeSlave.pubicHColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.pubicHColor = "white",$cash -= $modCost]]
+ | [[Blue-Violet|Salon][$activeSlave.pubicHColor = "blue-violet",$cash -= $modCost]]
| [[Blazing red|Salon][$activeSlave.pubicHColor = "blazing red",$cash -= $modCost]]
| [[Neon green|Salon][$activeSlave.pubicHColor = "neon green",$cash -= $modCost]]
| [[Neon blue|Salon][$activeSlave.pubicHColor = "neon blue",$cash -= $modCost]]
@@ -567,6 +570,7 @@ Dye or paint:
| [[Grey|Salon][$activeSlave.underArmHColor = "grey",$cash -= $modCost]]
| [[Silver|Salon][$activeSlave.underArmHColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.underArmHColor = "white",$cash -= $modCost]]
+ | [[Blue-Violet|Salon][$activeSlave.underArmHColor = "blue-violet",$cash -= $modCost]]
| [[Blazing red|Salon][$activeSlave.underArmHColor = "blazing red",$cash -= $modCost]]
| [[Neon green|Salon][$activeSlave.underArmHColor = "neon green",$cash -= $modCost]]
| [[Neon blue|Salon][$activeSlave.underArmHColor = "neon blue",$cash -= $modCost]]
--
GitLab