From fa20524029aa8a73dc3a1a0ff06a0fc9ef7980f5 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 8 Aug 2018 15:42:39 -0500
Subject: [PATCH] Colors2
---
devNotes/twine JS.txt | 1 +
src/art/vector/Set_Colour_Skin_JS.tw | 4 ++++
src/art/vector_revamp/vectorRevampedArtControlJS.tw | 6 +++++-
src/js/rulesAssistantOptions.tw | 1 +
src/uncategorized/salon.tw | 3 ++-
5 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 19a06ff4678..d778f86f193 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -17102,6 +17102,7 @@ window.rulesAssistantOptions = (function() {
["dyed red"],
["dyed green"],
["dyed blue"],
+ ["dyed pink"],
["dyed gray"],
["tiger striped"],
["camouflage patterned"],
diff --git a/src/art/vector/Set_Colour_Skin_JS.tw b/src/art/vector/Set_Colour_Skin_JS.tw
index 604a7ae37be..e76362921f1 100644
--- a/src/art/vector/Set_Colour_Skin_JS.tw
+++ b/src/art/vector/Set_Colour_Skin_JS.tw
@@ -33,6 +33,10 @@ if (artSlave.skin == "camouflage patterned") {
s.skinColour = "#5b8eb7";
s.areolaStyle = "#7BA4C5";
s.labiaStyle = "#F977A3";
+ } else if (artSlave.skin == "dyed pink") {
+ s.skinColour = "#fe62b0";
+ s.areolaStyle = "#fc45a1";
+ s.labiaStyle = "#fba2c0";
} else if (artSlave.skin == "dyed gray") {
s.skinColour = "#bdbdbd";
s.areolaStyle = "#666666";
diff --git a/src/art/vector_revamp/vectorRevampedArtControlJS.tw b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
index f1fdeb250dc..f99537da100 100644
--- a/src/art/vector_revamp/vectorRevampedArtControlJS.tw
+++ b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
@@ -168,7 +168,7 @@ class ArtStyleControl {
["almond-shaped", "#555555"],
["bright", "#555555"],
["teary", "#555555"],
- ["vacant", "#555555"]
+ ["vacant", "#555555"],
/* these are not actually FreeCities canon, but like to appear in custom descriptions */
["brunette", "#8D4F21"],
["dark", "#463325"]
@@ -211,6 +211,7 @@ class ArtStyleControl {
["dyed red", "#b04040"],
["dyed green", "#A0C070"],
["dyed blue", "#5080b0"],
+ ["dyed pink", "#ff4291"],
["dyed gray", "#171717"],
["tiger striped", "#e0d050"]
];
@@ -247,6 +248,7 @@ class ArtStyleControl {
["dyed red", "#C96D6D"],
["dyed green", "#B7CF8F"],
["dyed blue", "#7BA4C5"],
+ ["dyed pink", "#fc45a1"],
["dyed gray", "#666666"],
["tiger striped", "#E7DF7D"]
];
@@ -283,6 +285,7 @@ class ArtStyleControl {
["dyed red", "#F977A3"],
["dyed green", "#F977A3"],
["dyed blue", "#F977A3"],
+ ["dyed pink", "#fba2c0"],
["dyed gray", "#8C8C8C"],
["tiger striped", "#F977A3"]
];
@@ -320,6 +323,7 @@ class ArtStyleControl {
["dyed red", "#bc4949"],
["dyed green", "#A6C373"],
["dyed blue", "#5b8eb7"],
+ ["dyed pink", "#fe62b0"],
["dyed gray", "#bdbdbd"],
["tiger striped", "#e2d75d"]
];
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index aeff9c64c6a..174185ad0d8 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -3183,6 +3183,7 @@ window.rulesAssistantOptions = (function() {
["dyed red"],
["dyed green"],
["dyed blue"],
+ ["dyed pink"],
["dyed gray"],
["tiger striped"],
["camouflage patterned"],
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 4b33d958cfc..63522b63afc 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -408,7 +408,7 @@ Treat nails:
<<set $lightenableSkin = ["natural", "dark", "dark olive", "black", "brown", "dark brown", "tanned"]>>
<<set $bleachableSkin = ["natural", "lightened", "pale", "fair", "light"]>>
<<set $darkenableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale", "light olive", "tanned", "brown", "dark brown"]>>
-<<set $dyedSkin = ["dyed red", "dyed green", "dyed blue", "dyed gray", "tiger striped", "camouflage patterned"]>>
+<<set $dyedSkin = ["dyed red", "dyed green", "dyed blue", "dyed pink", "dyed gray", "tiger striped", "camouflage patterned"]>>
<br><br>
@@ -449,6 +449,7 @@ Dye or paint:
[[Red|Salon][$activeSlave.skin = "dyed red",$cash -= $modCost]]
| [[Green|Salon][$activeSlave.skin = "dyed green",$cash -= $modCost]]
| [[Blue|Salon][$activeSlave.skin = "dyed blue",$cash -= $modCost]]
+| [[Pink|Salon][$activeSlave.skin = "dyed pink",$cash -= $modCost]]
| [[Gray|Salon][$activeSlave.skin = "dyed gray",$cash -= $modCost]]
| [[Tiger Stripes|Salon][$activeSlave.skin = "tiger striped",$cash -= $modCost]]
| [[Camouflage|Salon][$activeSlave.skin = "camouflage patterned",$cash -= $modCost]]
--
GitLab