From dc825c67c8ebd8079c63f8719c9cd86eba2a4705 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 11 Nov 2017 04:16:52 -0500
Subject: [PATCH] fixes and very bushy crotches
---
slave variables documentation - Pregmod.txt | 1 +
src/cheats/mod_editSlaveCheatNew.tw | 1 +
src/npc/databases/dSlavesDatabase.tw | 4 ++--
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/cosmeticRulesAssistantSettings.tw | 4 ++++
src/uncategorized/generateXXSlave.tw | 2 +-
src/uncategorized/generateXYSlave.tw | 2 +-
src/uncategorized/slaveInteract.tw | 5 +++--
src/utility/descriptionWidgetsFlesh.tw | 4 +++-
9 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 21258d15a5d..649c14abcdb 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -808,6 +808,7 @@ accepts string
"in a strip"
"neat"
"bushy"
+"very bushy"
"bushy in the front and neat in the rear"
"bald"
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 0eed353c0c8..f1849e9954d 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1075,6 +1075,7 @@
<<radiobutton "$tempSlave.pubicHStyle" "in a strip">> Strip
<<radiobutton "$tempSlave.pubicHStyle" "neat">> Neat
<<radiobutton "$tempSlave.pubicHStyle" "bushy">> Bushy
+ <<radiobutton "$tempSlave.pubicHStyle" "very bushy">> Very bushy
<br>
''Her underarm hair is @@.yellow;$tempSlave.underArmHColor@@ in color''
<<link "Hair Colors">>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index b7f64ba0151..ba56a986d5b 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -224,9 +224,9 @@
/*Changed eyes to blue -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Blue", _HS.birthName = "Blue", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, _HS.health = 40, _HS.devotion = 25, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has angel wings across her back.", _HS.customDesc = "She has hairy, unshaven armpits, bush and asscrack.">>
+<<set _HS.slaveName = "Blue", _HS.birthName = "Blue", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, _HS.health = 40, _HS.devotion = 25, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has angel wings across her back.", _HS.punderArmHStyle = "bushy">>
<<set $heroSlaves.push(_HS)>>
-/*Fixed tattoo syntax -BoneyM*/
+/*Fixed tattoo syntax -BoneyM "She has hairy, unshaven armpits, bush and asscrack."*/
<<set _HS = {}>>
<<set _HS.slaveName = "Maya", _HS.birthName = "Maya", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 40, _HS.devotion = 100, _HS.height = 190, _HS.markings = "freckled", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "light", _HS.hLength = 10, _HS.pubicHStyle = "waxed", _HS.boobs = 800, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customTat = "She has a tramp stamp, and ‘Fuck Me’ in flowery script on her right thigh">>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5443aa68a89..0fcedc65365 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -592,7 +592,7 @@
<</if>>
<<if ndef $DOLFigureHeadFamilyStatuesChildren>>
<<set $DOLFigureHeadFamilyStatuesChildren = 0>>
-<</if<<
+<</if>>
<<if ndef $DOLFigureHeadFamilyStatuesEscorts>>
<<set $DOLFigureHeadFamilyStatuesEscorts = 0>>
<</if>>
diff --git a/src/uncategorized/cosmeticRulesAssistantSettings.tw b/src/uncategorized/cosmeticRulesAssistantSettings.tw
index 5e6984cd3ee..7b73ef44c70 100644
--- a/src/uncategorized/cosmeticRulesAssistantSettings.tw
+++ b/src/uncategorized/cosmeticRulesAssistantSettings.tw
@@ -570,6 +570,10 @@ Pubic hair style: ''$currentRule.pubicHStyle.''
<<set $currentRule.pubicHStyle = "bushy in the front and neat in the rear">>
<<RAChangePHStyle>>
<</link>>
+| <<link "Very bushy">>
+<<set $currentRule.pubicHStyle = "very bushy">>
+<<RAChangePHStyle>>
+<</link>>
<br>
<span id = "ahcolor">
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 28791d10020..c8d60ddb2ea 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -303,7 +303,7 @@
<<set $activeSlave.origHColor = $activeSlave.hColor>>
<<set $activeSlave.origSkin = $activeSlave.skin>>
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
-<<set $activeSlave.pubicHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "waxed", "waxed", "in a strip", "in a strip", "in a strip", "in a strip", "in a strip", "neat", "neat", "neat", "neat", "neat", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy", "bushy", "bushy", "bushy", "bushy")>>
+<<set $activeSlave.pubicHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "waxed", "waxed", "in a strip", "in a strip", "in a strip", "in a strip", "in a strip", "neat", "neat", "neat", "neat", "neat", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy", "bushy", "bushy", "bushy", "bushy", "very bushy", "very bushy")>>
<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
<<set $activeSlave.underArmHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "shaved", "shaved", "shaved", "shaved", "shaved", "neat", "neat", "neat", "neat", "neat", "bushy", "bushy", "bushy")>>
<<if ($activeSlave.pubicHStyle == "hairless" || $activeSlave.underArmHStyle == "hairless") && random(1,100) > 40>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index e89196ea3ff..6499f881c79 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -307,7 +307,7 @@
<<set $activeSlave.origHColor = $activeSlave.hColor>>
<<set $activeSlave.origSkin = $activeSlave.skin>>
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
-<<set $activeSlave.pubicHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "waxed", "waxed", "in a strip", "in a strip", "in a strip", "neat", "neat", "neat", "neat", "neat", "neat", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy")>>
+<<set $activeSlave.pubicHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "waxed", "waxed", "in a strip", "in a strip", "in a strip", "neat", "neat", "neat", "neat", "neat", "neat", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy in the front and neat in the rear", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "very bushy", "very bushy")>>
<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
<<set $activeSlave.underArmHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "shaved", "shaved", "shaved", "shaved", "shaved", "neat", "neat", "neat", "neat", "neat", "neat", "neat", "bushy", "bushy", "bushy", "bushy", "bushy")>>
<<if ($activeSlave.pubicHStyle == "hairless" || $activeSlave.underArmHStyle == "hairless") && random(1,100) > 40>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 089c1f69fce..30954431a87 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1346,7 +1346,8 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule
//You cannot sell or discard your last slave.//
<</if>>
-| [[Upload her|Upload Slave]]
+/*| [[Upload her|Upload Slave]]*/
+| [[Export this slave|Export Slave]]
<<if $cheatMode>>
- | [[Export this slave|Export Slave]] | [[Import a slave|Import Slave]]
+ | [[Import a slave|Import Slave]]
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 6f4afa859d7..2376b896826 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1805,7 +1805,7 @@ $pronounCap's got a
<</if>>
<</if>>
-<<if ($activeSlave.pubicHStyle == "bushy")>>
+<<if ($activeSlave.pubicHStyle == "bushy" || $activeSlave.pubicHStyle == "very bushy")>>
<<if ($activeSlave.physicalAge >= 13)>>
Since $pronoun has been left natural $pronoun has some light $activeSlave.pubicHColor pubic hair around $possessive ass.
<</if>>
@@ -3441,6 +3441,8 @@ $pronounCap's got a
$possessiveCap $activeSlave.pubicHColor pubic hair forms a natural bush above $possessive <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
<<elseif ($activeSlave.pubicHStyle == "bushy")>>
$possessiveCap $activeSlave.pubicHColor pubic hair forms a natural bush above $possessive <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "very bushy")>>
+ $possessiveCap $activeSlave.pubicHColor pubic hair forms a dense bush above $possessive <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>> that trails up to her navel.
<</if>>
<<if $activeSlave.fuckdoll == 0>>
--
GitLab