From 405946646248eda3071673b0e84764fbb917163c Mon Sep 17 00:00:00 2001
From: deepmurk <axiao@protonmail.com>
Date: Sun, 15 Apr 2018 13:16:56 -0400
Subject: [PATCH] extremely pale revert
reverted to keep 'extremely pale' as an option
---
src/art/vector/Set_Colour_Skin.tw | 4 ++--
src/js/vectorRevampedArtControlJS.tw | 2 +-
src/npc/databases/dSlavesDatabase.tw | 4 ++--
src/npc/databases/ddSlavesDatabase.tw | 2 +-
src/pregmod/pcSurgeryDegredation.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 4 ++--
src/uncategorized/salon.tw | 4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/art/vector/Set_Colour_Skin.tw b/src/art/vector/Set_Colour_Skin.tw
index 20300419f9f..5bbe5c2445b 100644
--- a/src/art/vector/Set_Colour_Skin.tw
+++ b/src/art/vector/Set_Colour_Skin.tw
@@ -13,11 +13,11 @@
<<unset _scrotumSkinStyle>>
<<switch _artSlave.skin>>
-<<case "white" "pure white">>
+<<case "white" "pure white" "extremely pale">>
<<set _skinColour = "#F4EAF0">>
<<set _areolaStyle = "fill:#FCCADB;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
-<<case "pale" "very pale">>
+<<case "pale">>
<<set _skinColour = "#F5DFDC">> /* #f9ebf0 */
<<set _areolaStyle = "fill:#EFBDC9;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
diff --git a/src/js/vectorRevampedArtControlJS.tw b/src/js/vectorRevampedArtControlJS.tw
index f17b725d0d5..d478d0d5c87 100644
--- a/src/js/vectorRevampedArtControlJS.tw
+++ b/src/js/vectorRevampedArtControlJS.tw
@@ -230,7 +230,7 @@ class ArtStyleControl {
["white", "#feebe5"],
["fair", "#feebe5"],
["lightened", "#feebe5"],
- ["very pale", "#fff8f8"],
+ ["extremely pale", "#fff8f8"],
["pale", "#f9ebf0"],
["tanned", "#e8b693"],
["natural", "#e8b693"],
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index ac59c28a063..c169f190121 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -411,7 +411,7 @@
/*Reduced height, added entertainskill, added bitchy, changed eyes -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Elisa", _HS.birthName = "Elisa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 145, _HS.eyeColor = "bright blue", _HS.hColor = "white-blonde", _HS.pubicHColor = "white-blonde", _HS.skin = "very pale", _HS.hStyle = "in a long braid", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.face = 55, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural brother, Martin, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -9997, _HS.father = -9996>>
+<<set _HS.slaveName = "Elisa", _HS.birthName = "Elisa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 145, _HS.eyeColor = "bright blue", _HS.hColor = "white-blonde", _HS.pubicHColor = "white-blonde", _HS.skin = "extremely pale", _HS.hStyle = "in a long braid", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.face = 55, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural brother, Martin, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -9997, _HS.father = -9996>>
<<set $heroSlaves.push(_HS)>>
/*also hates pen*/
/*martin's sibling*/
@@ -489,7 +489,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "not known", _HS.origin = "In spite of the great demand for her kind, has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "very pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 3, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.customDesc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
+<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "not known", _HS.origin = "In spite of the great demand for her kind, has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 3, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.customDesc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index c4709682f97..d89c83da2d0 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -96,7 +96,7 @@
/*likes mods - gave internal tesiticles as such PM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Martin", _HS.birthName = "Martin", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "bright blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "very pale", _HS.hLength = 15, _HS.hStyle = "short and in a boyish cut", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 100, _HS.butt = 4, _HS.face = 55, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural sister, Elisa, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -9997, _HS.father = -9996>>
+<<set _HS.slaveName = "Martin", _HS.birthName = "Martin", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "bright blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 15, _HS.hStyle = "short and in a boyish cut", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 100, _HS.butt = 4, _HS.face = 55, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural sister, Elisa, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -9997, _HS.father = -9996>>
<<set $heroSlaves.push(_HS)>>
/*also hates pen*/
/*elisa's sibling*/
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index c88ca10b097..9f3f914859b 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -5,7 +5,7 @@
<<switch $surgeryType>>
<<case "skinTone">>
- After a few hours, you awaken in the recovery wing to find every inch of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["tanned", "lightened", "pale", "fair", "white", "dark", "light olive", "black", "brown", "dark olive", "light", "very pale"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every inch of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
+ After a few hours, you awaken in the recovery wing to find every inch of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["tanned", "lightened", "pale", "fair", "white", "dark", "light olive", "black", "brown", "dark olive", "light", "extremely pale"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every inch of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
<<case "restoreFace">>
After a few hours, you awaken in the recovery wing with a face both sore and somewhat numb. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you catch sight of yourself in the mirror-covered wall across from your bed. Your face is back to the way it was before you had it altered (not counting any additional years added to it) and looking just as good as you remember. You attempt to smile at yourself, only to find your face doesn't want to comply; guess the drugs haven't completely worn off yet. You lie back down to sleep off the rest of the anesthesia before returning to your arcology.
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index fd393de5e8f..0c9ed5496ee 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1098,12 +1098,12 @@ extremely pale -5
<<widget "GenSkinTone">>
<<script>>
(function() {
- var skinToMelanin = {black: 10, ebony: 9.5, 'dark brown': 9, brown: 8, dark: 7, 'dark olive': 6, bronzed: 5.5, tanned: 5, 'light olive': 4, lightened: 3.5, light: 3, fair: 2, 'very fair': 1.5, 'extremely fair': 1.5, pale: 1, 'very pale': 0.5, 'pure white': 0.001};
+ var skinToMelanin = {black: 10, ebony: 9.5, 'dark brown': 9, brown: 8, dark: 7, 'dark olive': 6, bronzed: 5.5, tanned: 5, 'light olive': 4, lightened: 3.5, light: 3, fair: 2, 'very fair': 1.5, 'extremely fair': 1.5, pale: 1, 'extremely pale': 0.5, 'pure white': 0.001};
var parents = State.variables.args;
var skin0 = parents[0] ? (skinToMelanin[parents[0].skin] || 5) : 3;
var skin1 = parents[1] ? (skinToMelanin[parents[1].skin] || 5) : 3;
var skin = Math.round(Math.random() * (skin1 - skin0) + skin0);
- State.variables.activeSlave.skin = ['white', 'pale', 'fair', 'light', 'light olive', 'tanned', 'dark olive', 'dark', 'brown', 'dark brown', 'black'][skin];
+ State.variables.activeSlave.skin = ['white', 'extremely pale', 'pale', 'fair', 'light', 'light olive', 'tanned', 'dark olive', 'dark', 'brown', 'dark brown', 'black'][skin];
})();
<</script>>
<</widget>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 179cde97793..887d8ade887 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -402,10 +402,10 @@ Treat nails:
/* SKIN */
-<<set $tannableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "very pale"]>>
+<<set $tannableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale"]>>
<<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", "very pale", "light olive", "tanned", "brown", "dark brown"]>>
+<<set $darkenableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale", "light olive", "tanned", "brown", "dark brown"]>>
<<set $dyedSkin = ["red dyed", "green dyed", "blue dyed", "dyed red", "dyed green", "dyed blue", "tiger striped", "camouflage patterned"]>>
--
GitLab