From c59be546c93436697413158d9b7e97e150bf0d13 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 6 Jun 2019 23:20:00 -0500
Subject: [PATCH] ToSetup
---
src/init/setupVars.tw | 1 +
src/init/storyInit.tw | 2 --
src/js/slaveSummaryWidgets.js | 2 +-
src/npc/fAbuse.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 3 ---
src/uncategorized/newSlaveIntro.tw | 4 ++--
src/uncategorized/salon.tw | 4 ++--
src/utility/descriptionWidgetsStyle.tw | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 31f3045e998..d5fc23a3e08 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -57,6 +57,7 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
<<set setup.filterRacesLowercase = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
<<set setup.filterRegions = ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"]>>
<<set setup.naturalSkins = ["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "extremely fair", "very fair", "fair", "light", "light olive", "tan", "olive", "bronze", "dark olive", "dark", "light beige", "beige", "dark beige", "light brown", "brown", "dark brown", "black", "ebony", "pure black"]>>
+<<set setup.dyedSkins = ["camouflage patterned", "dyed blue", "dyed gray", "dyed green", "dyed pink", "dyed red", "tiger striped"]>>
/* START Custom Nationalities region filter */
/* Not currently weighted, but will accept weights */
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index a1bdac2b43c..d5efa04608f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1022,8 +1022,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $brandTarget = {primary: "buttock", secondary: "buttock", local: "buttock"}>>
<<set $brandDesign = {primary: "your initials", local: "your initials"}>>
-<<set $dyedSkin = ["camouflage patterned", "dyed blue", "dyed gray", "dyed green", "dyed pink", "dyed red", "tiger striped"]>>
-
<<set $oralTotal = 0>>
<<set $vaginalTotal = 0>>
<<set $analTotal = 0>>
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index c2ba7659512..4b26f4072f4 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4920,7 +4920,7 @@ window.SlaveSummaryUncached = (function() {
case "fox tail":
r += `Attached fox tail. `;
break;
-
+
case "cow tail":
r += `Attached cow tail. `;
break;
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index 09e08c29410..8d50a912ddd 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -340,7 +340,7 @@ from your victim.
<</if>>
<</if>>
-<<if ($dyedSkin.indexOf($activeSlave.skin) != -1)>>
+<<if (!setup.dyedSkins.includes($activeSlave.skin))>>
$His dyed<<if $seeRace == 1>>, $activeSlave.race<</if>> ass barely shows the spanking.
<<elseif (skinToneLevel($activeSlave) < 5)>>
$His $activeSlave.skin<<if $seeRace == 1>>, $activeSlave.race<</if>> ass shows the spanking extremely well.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 37510f42749..79572853e87 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -589,9 +589,6 @@
<<if ndef $EliteSires>>
<<set $EliteSires = ["crazy", "futa", "moves", "preggo", "quick", "virgin"]>>
<</if>>
-<<if ndef $dyedSkin>>
- <<set $dyedSkin = ["camouflage patterned", "dyed blue", "dyed gray", "dyed green", "dyed pink", "dyed red", "tiger striped"]>>
-<</if>>
<<if ndef $startingPoint>>
<<set $startingPoint = -1>>
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index ad00ddfb559..15439cfd5a9 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1708,10 +1708,10 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
$He tries to squirm away from the moist spot growing under $his cheek, but you reveal your nipple and carefully direct $his mouth over it.
<<if $activeSlave.fetish == "pregnancy">>
- Slowly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure — a wasted effort as a hand sneaks its way to your <<if $PC.dick == 1>>growing erection and enthusiastically begins pumping away. You clutch your pervy $girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other<<else>>wet pussy and enthusiastically begins rubbing your clit. You clutch your pervy $girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other<</if>>. Before long you find yourself bucking your hips with lust, a queue for you to release $him from your nipple so $he may slide down your gravid dome of a belly to finish you off. Happy to serve $his pregnant <<= WrittenMaster($activeSlave)>>, $he returns to your chest, happy to relieve you of the pressure building in your neglected breast. <<if $activeSlave.fetishKnown == 0>>Judging by that show, @@.green;$he savors getting to be with a pregnant _womanP.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a pregnancy fetish and $his eagerness to serve a pregnant _womanP proves that.<</if>> A kick from within startles you from your thoughts; as you reach to soothe your child<<if $PC.pregType > 1>>ren<</if>>, you find your new slave @@.mediumaquamarine;already doting on them.@@ $He's already starting to @@.hotpink;show understanding of $his place.@@
+ Slowly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure — a wasted effort, as a hand sneaks its way to your <<if $PC.dick == 1>>growing erection and enthusiastically begins pumping away<<else>>wet pussy and enthusiastically begins rubbing your clit<</if>>. You clutch your pervy $girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other. Before long you find yourself bucking your hips with lust, a queue for you to release $him from your nipple so $he may slide down your gravid dome of a belly to finish you off. Happy to serve $his pregnant <<= WrittenMaster($activeSlave)>>, $he returns to your chest, happy to relieve you of the pressure building in your neglected breast. <<if $activeSlave.fetishKnown == 0>>Judging by that show, @@.green;$he savors getting to be with a pregnant _womanP.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a pregnancy fetish and $his eagerness to serve a pregnant _womanP proves that.<</if>> A kick from within startles you from your thoughts; as you reach to soothe your child<<if $PC.pregType > 1>>ren<</if>>, you find your new slave @@.mediumaquamarine;already doting on them.@@ $He's already starting to @@.hotpink;show understanding of $his place.@@
<<set $activeSlave.devotion += 15, $activeSlave.trust += 15>>
<<elseif $activeSlave.fetish == "boobs">>
- Eagerly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure, a wasted effort as a hand sneaks its way to your neglected breast. $He massages it, careful not to encourage your lactation too much, as $he greedily sucks you dry. $He wastes no time in swapping to your other nipple, shifting $his ministrations to the one the just left. By the time your reserves are tapped out, both you and $he are quite content. You permit $him to rest against your chest for a little before you send $him on $his way. <<if $activeSlave.fetishKnown == 0>>Judging by $his enthusiasm, @@.green;$he savors getting $his mouth close to a pair of boobs.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a breast fetishist and $his eagerness to lighten a lactating _womanP proves that.<</if>> A kick from within startles you from your thoughts; you pat your gravid middle, reassuring your child<<if $PC.pregType > 1>>ren<</if>> that you'll make sure to save some milk for them. $He's already starting to @@.hotpink;show understanding of $his place@@ and even @@.mediumaquamarine;beginning to build trust@@ with you.
+ Eagerly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure — a wasted effort, as a hand sneaks its way to your neglected breast. $He massages it, careful not to encourage your lactation too much, as $he greedily sucks you dry. $He wastes no time in swapping to your other nipple, shifting $his ministrations to the one the just left. By the time your reserves are tapped out, both you and $he are quite content. You permit $him to rest against your chest for a little before you send $him on $his way. <<if $activeSlave.fetishKnown == 0>>Judging by $his enthusiasm, @@.green;$he savors getting $his mouth close to a pair of boobs.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a breast fetishist and $his eagerness to lighten a lactating _womanP proves that.<</if>> A kick from within startles you from your thoughts; you pat your gravid middle, reassuring your child<<if $PC.pregType > 1>>ren<</if>> that you'll make sure to save some milk for them. $He's already starting to @@.hotpink;show understanding of $his place@@ and even @@.mediumaquamarine;beginning to build trust@@ with you.
<<set $activeSlave.devotion += 15, $activeSlave.trust += 15>>
<<else>>
Reluctantly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure, but it is too much. As $he drinks deeper, you begin moaning with relief. At first $he tenses at <<if canHear($activeSlave)>>the sound<<else>>your body's shuddering<</if>>, fearing punishment, but soon realizes you have no intent on @@.mediumaquamarine;harming $him.@@ $He allows you to dote over $him as if $he were <<if $activeSlave.father == -1 || $activeSlave.mother == -1>>a<<else>>your<</if>> child, carefully moving to your other breast once the first runs dry. As $he drinks, $he begins to massage your taut middle, $his touch soft and gentle. When you both finish, you push $him to $his feet and send $him on $his way. @@.hotpink;$He stays and offers a hand to help you to your feet.@@ You are surprised by this display; it might be obedience, but $he also may view you in your gravid state as someone weak. As $he helps you back to your desk, $he shoulders all of your weight. It would appear $he is putting you first, for now.
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 3ccd26ad087..12a20cebe4d 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -610,13 +610,13 @@ Apply makeup:
<br><br>
$His skin is $activeSlave.skin.
-<<if ($dyedSkin.indexOf($activeSlave.skin) != -1)>>
+<<if (setup.dyedSkins.includes($activeSlave.skin))>>
[[Remove coloring|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<elseif (($activeSlave.skin == "sun tanned") || ($activeSlave.skin == "spray tanned"))>>
[[Remove tanning|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
-<<if ($dyedSkin.indexOf($activeSlave.skin) == -1)>>
+<<if (!setup.dyedSkins.includes($activeSlave.skin))>>
<br>
<<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>
$His skin tanning must be removed before any advanced procedure to change $his skin color.
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 33d71ceb506..73b8c2c74dc 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -5925,7 +5925,7 @@ $His
<<elseif $activeSlave.buttplugAttachment == "fox tail">>
$He sways the bushy $activeSlave.hColor tail back and forth with every ginger movement of $his rear.
<<elseif $activeSlave.buttplugAttachment == "cow tail">>
- $He sways the spotted tail back and forth with every ginger movement of $his rear.
+ $He sways the spotted tail back and forth with every ginger movement of $his rear.
<<elseif $activeSlave.buttplugAttachment == "cat tail">>
$He jiggles the tail back and forth with every ginger movement of $his rear.
<</if>>
--
GitLab