Skip to content
Snippets Groups Projects
Commit 4eae395e authored by deepmurk's avatar deepmurk
Browse files

Salon Tweaks

parent c85ae240
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 16975 additions and 2462 deletions
artTools/vector_deepmurk_extras.svg
+ 16727
− 2238
View file @ 4eae395e
This diff is collapsed.
src/art/artJS.tw
+ 17
− 16
View file @ 4eae395e
...@@ -87,41 +87,42 @@ window.extractColor = function (color, eyes) { ...@@ -87,41 +87,42 @@ window.extractColor = function (color, eyes) {
*/ */
var FCname2HTMLarray = [ var FCname2HTMLarray = [
["amber", "#ffbf00"], ["amber", "#ffbf00"],
["auburn", "#7e543e"], ["auburn", "#a53f2a"],
["black", "#3F4040"], ["black", "#191919"],
["blazing red", "#E00E2B"], ["blazing red", "#E00E2B"],
["blonde", "#F4F1A3"], ["blonde", "#F4F1A3"],
["blue-violet", "#8790B7"], ["blue-violet", "#8790B7"],
["blue", "#4685C5"], ["blue", "#4685C5"],
["brown", "#8D4F21"], ["brown", "#7e543e"],
["burgundy", "#5f3946"], ["burgundy", "#34000d"],
["chestnut", "#663622"], ["chestnut", "#663622"],
["chocolate", "#6e4937"], ["chocolate", "#402215"],
["copper", "#a16145"], ["copper", "#e29c58"],
["dark blue", "#00008B"], ["dark blue", "#000034"],
["dark brown", "#463325"], ["dark brown", "#4b3225"],
["dark orchid", "#9932CC"], ["dark orchid", "#9932CC"],
["deep red", "#6D1318"], ["deep red", "#6D1318"],
["ginger", "#da822d"], ["ginger", "#da822d"],
["golden", "#ffdf31"], ["golden", "#ffd700"],
["green", "#5FBA46"], ["green", "#5FBA46"],
["green-yellow", "#ADFF2F"], ["green-yellow", "#ADFF2F"],
["grey", "#9e9fa4"], ["grey", "#8d8d8d"],
["hazel", "#8d6f1f"], ["hazel", "#8d6f1f"],
["light olive", "#d4c6bb"], ["light black", "#3F4040"],
["neon blue", "#2284C3"], ["light olive", "#806b00"],
["neon blue", "#0e85fd"],
["neon green", "#25d12b"], ["neon green", "#25d12b"],
["neon pink", "#cc26aa"], ["neon pink", "#fc61cd"],
["pale-grey", "#b2babb"], ["pale-grey", "#b3b3b3"],
["pink", "#D18CBC"], ["pink", "#D18CBC"],
["platinum blonde", "#fcf3c1"], ["platinum blonde", "#fcf3c1"],
["purple", "#800080"], ["purple", "#800080"],
["red", "#BB2027"], ["red", "#BB2027"],
["sea green", "#2E8B57"], ["sea green", "#2E8B57"],
["silver", "#cdc9c6"], ["silver", "#d9d9d9"],
["strawberry-blonde", "#e5a88c"], ["strawberry-blonde", "#e5a88c"],
/* these are not actually FreeCities canon, but like to appear in custom descriptions */ /* these are not actually FreeCities canon, but like to appear in custom descriptions */
["brunette", "#8D4F21"], ["brunette", "#6d4936"],
["dark", "#463325"] ["dark", "#463325"]
]; ];
......
src/cheats/mod_EditChildCheatNew.tw
+ 5
− 0
View file @ 4eae395e
...@@ -950,6 +950,7 @@ ...@@ -950,6 +950,7 @@
<<H1Options "chestnut" >> <<H1Options "chestnut" >>
<<H1Options "hazel" >> <<H1Options "hazel" >>
<<H1Options "black" >> <<H1Options "black" >>
<<H1Options "light black" >>
<<H1Options "grey" >> <<H1Options "grey" >>
<<H1Options "silver" >> <<H1Options "silver" >>
<<H1Options "white" >> <<H1Options "white" >>
...@@ -996,6 +997,7 @@ ...@@ -996,6 +997,7 @@
<<H2Options "chestnut" >> <<H2Options "chestnut" >>
<<H2Options "hazel" >> <<H2Options "hazel" >>
<<H2Options "black" >> <<H2Options "black" >>
<<H2Options "light black" >>
<<H2Options "grey" >> <<H2Options "grey" >>
<<H2Options "silver" >> <<H2Options "silver" >>
<<H2Options "white" >> <<H2Options "white" >>
...@@ -1040,6 +1042,7 @@ ...@@ -1040,6 +1042,7 @@
<<H5Options "chestnut" >> <<H5Options "chestnut" >>
<<H5Options "hazel" >> <<H5Options "hazel" >>
<<H5Options "black" >> <<H5Options "black" >>
<<H5Options "light black" >>
<<H5Options "grey" >> <<H5Options "grey" >>
<<H5Options "silver" >> <<H5Options "silver" >>
<<H5Options "white" >> <<H5Options "white" >>
...@@ -1106,6 +1109,7 @@ ...@@ -1106,6 +1109,7 @@
<<H3Options "chestnut" >> <<H3Options "chestnut" >>
<<H3Options "hazel" >> <<H3Options "hazel" >>
<<H3Options "black" >> <<H3Options "black" >>
<<H3Options "light black" >>
<<H3Options "grey" >> <<H3Options "grey" >>
<<H3Options "silver" >> <<H3Options "silver" >>
<<H3Options "white" >> <<H3Options "white" >>
...@@ -1159,6 +1163,7 @@ ...@@ -1159,6 +1163,7 @@
<<H4Options "chestnut" >> <<H4Options "chestnut" >>
<<H4Options "hazel" >> <<H4Options "hazel" >>
<<H4Options "black" >> <<H4Options "black" >>
<<H4Options "light black" >>
<<H4Options "grey" >> <<H4Options "grey" >>
<<H4Options "silver" >> <<H4Options "silver" >>
<<H4Options "white" >> <<H4Options "white" >>
......
src/cheats/mod_editSlaveCheatNew.tw
+ 5
− 0
View file @ 4eae395e
...@@ -1543,6 +1543,7 @@ ...@@ -1543,6 +1543,7 @@
<<H1Options "chestnut" >> <<H1Options "chestnut" >>
<<H1Options "hazel" >> <<H1Options "hazel" >>
<<H1Options "black" >> <<H1Options "black" >>
<<H1Options "light black" >>
<<H1Options "grey" >> <<H1Options "grey" >>
<<H1Options "silver" >> <<H1Options "silver" >>
<<H1Options "white" >> <<H1Options "white" >>
...@@ -1589,6 +1590,7 @@ ...@@ -1589,6 +1590,7 @@
<<H2Options "chestnut" >> <<H2Options "chestnut" >>
<<H2Options "hazel" >> <<H2Options "hazel" >>
<<H2Options "black" >> <<H2Options "black" >>
<<H2Options "light black" >>
<<H2Options "grey" >> <<H2Options "grey" >>
<<H2Options "silver" >> <<H2Options "silver" >>
<<H2Options "white" >> <<H2Options "white" >>
...@@ -1633,6 +1635,7 @@ ...@@ -1633,6 +1635,7 @@
<<H5Options "chestnut" >> <<H5Options "chestnut" >>
<<H5Options "hazel" >> <<H5Options "hazel" >>
<<H5Options "black" >> <<H5Options "black" >>
<<H5Options "light black" >>
<<H5Options "grey" >> <<H5Options "grey" >>
<<H5Options "silver" >> <<H5Options "silver" >>
<<H5Options "white" >> <<H5Options "white" >>
...@@ -1699,6 +1702,7 @@ ...@@ -1699,6 +1702,7 @@
<<H3Options "chestnut" >> <<H3Options "chestnut" >>
<<H3Options "hazel" >> <<H3Options "hazel" >>
<<H3Options "black" >> <<H3Options "black" >>
<<H3Options "light black" >>
<<H3Options "grey" >> <<H3Options "grey" >>
<<H3Options "silver" >> <<H3Options "silver" >>
<<H3Options "white" >> <<H3Options "white" >>
...@@ -1752,6 +1756,7 @@ ...@@ -1752,6 +1756,7 @@
<<H4Options "chestnut" >> <<H4Options "chestnut" >>
<<H4Options "hazel" >> <<H4Options "hazel" >>
<<H4Options "black" >> <<H4Options "black" >>
<<H4Options "light black" >>
<<H4Options "grey" >> <<H4Options "grey" >>
<<H4Options "silver" >> <<H4Options "silver" >>
<<H4Options "white" >> <<H4Options "white" >>
......
src/gui/Encyclopedia/encyclopedia.tw
+ 1
− 1
View file @ 4eae395e
...@@ -2064,7 +2064,7 @@ LORE: THE FREE CITIES TODAY ...@@ -2064,7 +2064,7 @@ LORE: THE FREE CITIES TODAY
<<case "Dyes">> <<case "Dyes">>
//Fantastic news for every fashion oriented citizen and slaveowner: 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", "purple", "dark orchid", "sea green", "green-yellow", "dark blue", and "silver". //Fantastic news for every fashion oriented citizen and slaveowner: 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", "purple", "dark orchid", "sea green", "green-yellow", "dark blue", "light black", 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. <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.
......
src/js/rulesAssistantOptions.tw
+ 4
− 0
View file @ 4eae395e
...@@ -2312,6 +2312,7 @@ window.rulesAssistantOptions = (function() { ...@@ -2312,6 +2312,7 @@ window.rulesAssistantOptions = (function() {
["chestnut"], ["chestnut"],
["hazel"], ["hazel"],
["black"], ["black"],
["light black"],
["grey"], ["grey"],
["silver"], ["silver"],
["white"], ["white"],
...@@ -2385,6 +2386,7 @@ window.rulesAssistantOptions = (function() { ...@@ -2385,6 +2386,7 @@ window.rulesAssistantOptions = (function() {
["chestnut"], ["chestnut"],
["hazel"], ["hazel"],
["black"], ["black"],
["light black"],
["grey"], ["grey"],
["silver"], ["silver"],
["white"], ["white"],
...@@ -2467,6 +2469,7 @@ window.rulesAssistantOptions = (function() { ...@@ -2467,6 +2469,7 @@ window.rulesAssistantOptions = (function() {
["chestnut"], ["chestnut"],
["hazel"], ["hazel"],
["black"], ["black"],
["light black"],
["grey"], ["grey"],
["silver"], ["silver"],
["white"], ["white"],
...@@ -2527,6 +2530,7 @@ window.rulesAssistantOptions = (function() { ...@@ -2527,6 +2530,7 @@ window.rulesAssistantOptions = (function() {
["chestnut"], ["chestnut"],
["hazel"], ["hazel"],
["black"], ["black"],
["light black"],
["grey"], ["grey"],
["silver"], ["silver"],
["white"], ["white"],
......
src/pregmod/managePersonalAffairs.tw
+ 21
− 20
View file @ 4eae395e
...@@ -79,34 +79,35 @@ Around back; ...@@ -79,34 +79,35 @@ Around back;
<br>You have a selection of hair dyes available. <br>You have a selection of hair dyes available.
<br>&nbsp;&nbsp;&nbsp; <br>&nbsp;&nbsp;&nbsp;
<<if $PC.origHColor == $PC.hColor>>Your hair is its natural color.<<else>>[[Remove dye|Manage Personal Affairs][$PC.hColor = $PC.origHColor]]<</if>> <<if $PC.origHColor == $PC.hColor>>Your hair is its natural color.<<else>>[[Remove dye|Manage Personal Affairs][$PC.hColor = $PC.origHColor]]<</if>>
<<if $PC.origHColor != "auburn">>| [[Auburn|Manage Personal Affairs][$PC.hColor = "auburn"]]<</if>>
<<if $PC.origHColor != "black">>| [[Black|Manage Personal Affairs][$PC.hColor = "black"]]<</if>>
<<if $PC.origHColor != "blonde">>| [[Blonde|Manage Personal Affairs][$PC.hColor = "blonde"]]<</if>> <<if $PC.origHColor != "blonde">>| [[Blonde|Manage Personal Affairs][$PC.hColor = "blonde"]]<</if>>
<<if $PC.origHColor != "golden">>| [[Golden|Manage Personal Affairs][$PC.hColor = "golden"]]<</if>> <<if $PC.origHColor != "blue-violet">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "blue-violet"]]<</if>>
<<if $PC.origHColor != "platinum blonde">>| [[Platinum Blonde|Manage Personal Affairs][$PC.hColor = "platinum blonde"]]<</if>>
<<if $PC.origHColor != "strawberry-blonde">>| [[Strawberry-blonde|Manage Personal Affairs][$PC.hColor = "strawberry-blonde"]]<</if>>
<<if $PC.origHColor != "copper">>| [[Copper|Manage Personal Affairs][$PC.hColor = "copper"]]<</if>>
<<if $PC.origHColor != "ginger">>| [[Ginger|Manage Personal Affairs][$PC.hColor = "ginger"]]<</if>>
<<if $PC.origHColor != "red">>| [[Red|Manage Personal Affairs][$PC.hColor = "red"]]<</if>>
<<if $PC.origHColor != "crimson">>| [[Crimson|Manage Personal Affairs][$PC.hColor = "crimson"]]<</if>>
<<if $PC.origHColor != "green">>| [[Green|Manage Personal Affairs][$PC.hColor = "green"]]<</if>>
<<if $PC.origHColor != "blue">>| [[Blue|Manage Personal Affairs][$PC.hColor = "blue"]]<</if>> <<if $PC.origHColor != "blue">>| [[Blue|Manage Personal Affairs][$PC.hColor = "blue"]]<</if>>
<<if $PC.origHColor != "pink">>| [[Pink|Manage Personal Affairs][$PC.hColor = "pink"]]<</if>>
<<if $PC.origHColor != "dark brown">>| [[Dark Brown|Manage Personal Affairs][$PC.hColor = "dark brown"]]<</if>>
<<if $PC.origHColor != "brown">>| [[Brown|Manage Personal Affairs][$PC.hColor = "brown"]]<</if>> <<if $PC.origHColor != "brown">>| [[Brown|Manage Personal Affairs][$PC.hColor = "brown"]]<</if>>
<<if $PC.origHColor != "auburn">>| [[Auburn|Manage Personal Affairs][$PC.hColor = "auburn"]]<</if>>
<<if $PC.origHColor != "burgundy">>| [[Burgundy|Manage Personal Affairs][$PC.hColor = "burgundy"]]<</if>> <<if $PC.origHColor != "burgundy">>| [[Burgundy|Manage Personal Affairs][$PC.hColor = "burgundy"]]<</if>>
<<if $PC.origHColor != "chocolate brown">>| [[Chocolate|Manage Personal Affairs][$PC.hColor = "chocolate brown"]]<</if>>
<<if $PC.origHColor != "chestnut">>| [[Chestnut|Manage Personal Affairs][$PC.hColor = "chestnut"]]<</if>> <<if $PC.origHColor != "chestnut">>| [[Chestnut|Manage Personal Affairs][$PC.hColor = "chestnut"]]<</if>>
<<if $PC.origHColor != "hazel">>| [[Hazel|Manage Personal Affairs][$PC.hColor = "hazel"]]<</if>> <<if $PC.origHColor != "chocolate brown">>| [[Chocolate|Manage Personal Affairs][$PC.hColor = "chocolate brown"]]<</if>>
<<if $PC.origHColor != "black">>| [[Black|Manage Personal Affairs][$PC.hColor = "black"]]<</if>> <<if $PC.origHColor != "copper">>| [[Copper|Manage Personal Affairs][$PC.hColor = "copper"]]<</if>>
<<if $PC.origHColor != "crimson">>| [[Crimson|Manage Personal Affairs][$PC.hColor = "crimson"]]<</if>>
<<if $PC.origHColor != "dark blue">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "dark blue"]]<</if>>
<<if $PC.origHColor != "dark brown">>| [[Dark Brown|Manage Personal Affairs][$PC.hColor = "dark brown"]]<</if>>
<<if $PC.origHColor != "dark orchid">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "dark orchid"]]<</if>>
<<if $PC.origHColor != "ginger">>| [[Ginger|Manage Personal Affairs][$PC.hColor = "ginger"]]<</if>>
<<if $PC.origHColor != "golden">>| [[Golden|Manage Personal Affairs][$PC.hColor = "golden"]]<</if>>
<<if $PC.origHColor != "green">>| [[Green|Manage Personal Affairs][$PC.hColor = "green"]]<</if>>
<<if $PC.origHColor != "green-yellow">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "green-yellow"]]<</if>>
<<if $PC.origHColor != "grey">>| [[Grey|Manage Personal Affairs][$PC.hColor = "grey"]]<</if>> <<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 != "hazel">>| [[Hazel|Manage Personal Affairs][$PC.hColor = "hazel"]]<</if>>
<<if $PC.origHColor != "white">>| [[White|Manage Personal Affairs][$PC.hColor = "white"]]<</if>> <<if $PC.origHColor != "light black">>| [[Hazel|Manage Personal Affairs][$PC.hColor = "light black"]]<</if>>
<<if $PC.origHColor != "blue-violet">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "blue-violet"]]<</if>> <<if $PC.origHColor != "pink">>| [[Pink|Manage Personal Affairs][$PC.hColor = "pink"]]<</if>>
<<if $PC.origHColor != "platinum blonde">>| [[Platinum Blonde|Manage Personal Affairs][$PC.hColor = "platinum blonde"]]<</if>>
<<if $PC.origHColor != "purple">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "purple"]]<</if>> <<if $PC.origHColor != "purple">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "purple"]]<</if>>
<<if $PC.origHColor != "dark orchid">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "dark orchid"]]<</if>> <<if $PC.origHColor != "red">>| [[Red|Manage Personal Affairs][$PC.hColor = "red"]]<</if>>
<<if $PC.origHColor != "sea green">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "sea green"]]<</if>> <<if $PC.origHColor != "sea green">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "sea green"]]<</if>>
<<if $PC.origHColor != "green-yellow">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "green-yellow"]]<</if>> <<if $PC.origHColor != "silver">>| [[Silver|Manage Personal Affairs][$PC.hColor = "silver"]]<</if>>
<<if $PC.origHColor != "dark blue">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "dark blue"]]<</if>> <<if $PC.origHColor != "strawberry-blonde">>| [[Strawberry-blonde|Manage Personal Affairs][$PC.hColor = "strawberry-blonde"]]<</if>>
<<if $PC.origHColor != "white">>| [[White|Manage Personal Affairs][$PC.hColor = "white"]]<</if>>
<<if $FCTVreceiver == 1>> <<if $FCTVreceiver == 1>>
<br><br> <br><br>
......
src/uncategorized/salon.tw
+ 195
− 187
View file @ 4eae395e
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment