From b02f0482e5cbc0dcf399ed62592adf483c946462 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 25 Sep 2017 20:48:43 -0400
Subject: [PATCH] Fixes
---
src/player/actions/fondleDick.tw | 4 ++--
src/uncategorized/REroyalblood.tw | 1 -
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/saDrugs.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 2 +-
src/utility/raWidgets.tw | 14 ++++++++++++++
6 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/player/actions/fondleDick.tw b/src/player/actions/fondleDick.tw
index 5ab36996f4c..d6d1761e6fa 100644
--- a/src/player/actions/fondleDick.tw
+++ b/src/player/actions/fondleDick.tw
@@ -213,7 +213,7 @@ You call her over so you can fondle her
Her dick remains flaccid as it cannot get stiff and you continue tenderly stroking her soft dick.
<<else>>
Her prick stiffens like a rod in your hands and you continue your expert strokes along the erect shaft.
- <</if>> Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands and get cleaned up.
+ <</if>> Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands before submissively avoiding your gaze as you get cleaned up.
<<elseif $activeSlave.devotion < -20>>
She clearly dislikes the thought of getting her dick fondled by you. Her lower lip quivers with trepidation as she watches your hands move towards her. She has no choice but to obey if she wants to avoid punishment. She gasps and shakes as you gently trace along her
<<if $activeSlave.dick == 1>>
@@ -314,7 +314,7 @@ You call her over so you can fondle her
Her dick remains flaccid as it cannot get stiff and you continue tenderly stroking her soft dick.
<<else>>
Her prick stiffens like a rod in your hands and you continue your expert strokes along the erect shaft.
- <</if>> Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands and get cleaned up. She rubs the marks on her dick and balls with her hands, an ecstatic look on her $activeSlave.skin face. She looks at you longingly, hungry for more.
+ <</if>> Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands. She rubs the marks on her dick and balls with her hands, an ecstatic look on her $activeSlave.skin face. She looks at you longingly as you get cleaned up, hungry for more.
<<elseif $activeSlave.devotion <= 20>>
She obeys silently, standing in front of you as you move your hands towards her. You gently trace your fingers along her
<<if $activeSlave.dick == 1>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index a21480a6362..7bcce990c9f 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -787,7 +787,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</if>>
<<set _queen = clone($activeSlave)>>
<<AddSlave _queen>> /* skip New Slave Intro */
- <</for>>
<</replace>>
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index c3ca928daba..4a206010dbb 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -147,7 +147,7 @@
<</if>>
<</if>>
<<if $activeSlave.sexualFlaw == "hates anal">>
- $pronounCaps has trouble thinking of her asshole as a sexy, fuckable hole, so her new piercings will be theraputic. The constant tickling back there should force her past her hangups.
+ $pronounCap has trouble thinking of her asshole as a sexy, fuckable hole, so her new piercings will be theraputic. The constant tickling back there should force her past her hangups.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index ef24b954c16..604a1a49ef6 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -1211,7 +1211,7 @@
<<set $slaves[$i].dick = Math.clamp($slaves[$i].dick,0,10), $slaves[$i].drugs = "no drugs">>
<<elseif $slaves[$i].clit >= 5 && $slaves[$i].dick == 0>>
$possessiveCap clit is now so huge that further drug enhancement will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@
- <<set $slaves[$i].clit = Math.clamp($slaves[$i].dick,0,5), $slaves[$i].drugs = "no drugs">>
+ <<set $slaves[$i].clit = Math.clamp($slaves[$i].clit,0,5), $slaves[$i].drugs = "no drugs">>
<</if>>
<<case "testicle enhancement" "intensive testicle enhancement">>
<<if ($slaves[$i].balls >= 10)>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index f7ec8980069..55d33d90ec0 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -2728,7 +2728,7 @@ $pronounCap's got a
<</if>>
<<if $activeSlave.balls > 0 && $activeSlave.vasectomy == 1>>
- $possessiveCap shoots blanks thanks to $possessive vasectomy.
+ $pronounCap shoots blanks thanks to $possessive vasectomy.
<</if>>
<<if $activeSlave.physicalAge <= 3>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 186289dccdc..27b97216a1b 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4063,14 +4063,17 @@ Your brand design is ''$brandDesign.''
<</if>>
<<if (def _combinedRule.hColor) && (_combinedRule.hColor !== "no default setting")>>
+<<if $args[0].bald != 1>>
<<if ($args[0].hColor !== _combinedRule.hColor)>>
<<set $args[0].hColor = _combinedRule.hColor>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's hair has been dyed _combinedRule.hColor.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.hStyle) && (_combinedRule.hStyle !== "no default setting")>>
+<<if $args[0].bald != 1>>
<<if ($args[0].hStyle !== _combinedRule.hStyle)>>
<<set $args[0].hStyle = _combinedRule.hStyle>>
<<set $cash -= $modCost>>
@@ -4082,8 +4085,10 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.hLength) && (_combinedRule.hLength !== "no default setting")>>
+<<if $args[0].bald != 1>>
<<if ($args[0].hLength !== _combinedRule.hLength)>>
<<if ($args[0].hLength > _combinedRule.hLength)>>
<<set $cash -= $modCost>>
@@ -4096,38 +4101,47 @@ is now _combinedRule.hLength cm long.
<<set $args[0].hLength = _combinedRule.hLength>>
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.pubicHColor) && (_combinedRule.pubicHColor !== "no default setting")>>
+<<if $args[0].pubicHStyle != "bald" && $args[0].pubicHStyle != "hairless">>
<<if ($args[0].pubicHColor !== _combinedRule.pubicHColor)>>
<<set $args[0].pubicHColor = _combinedRule.pubicHColor>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's pubic hair, if present, has been dyed _combinedRule.pubicHColor.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.pubicHStyle) && (_combinedRule.pubicHStyle !== "no default setting")>>
+<<if $args[0].pubicHStyle != "bald" && $args[0].pubicHStyle != "hairless">>
<<if ($args[0].pubicHStyle !== _combinedRule.pubicHStyle)>>
<<set $args[0].pubicHStyle = _combinedRule.pubicHStyle>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's pubic hair has been restyled; it is now _combinedRule.pubicHStyle.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.underArmHColor) && (_combinedRule.underArmHColor !== "no default setting")>>
+<<if $args[0].underArmHStyle != "bald" && $args[0].underArmHStyle != "hairless">>
<<if ($args[0].underArmHColor !== _combinedRule.underArmHColor)>>
<<set $args[0].underArmHColor = _combinedRule.underArmHColor>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's underarm hair, if present, has been dyed _combinedRule.underArmHColor.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.underArmHStyle) && (_combinedRule.underArmHStyle !== "no default setting")>>
+<<if $args[0].underArmHStyle != "bald" && $args[0].underArmHStyle != "hairless">>
<<if ($args[0].underArmHStyle !== _combinedRule.underArmHStyle)>>
<<set $args[0].underArmHStyle = _combinedRule.underArmHStyle>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's underarm hair has been restyled; it is now _combinedRule.underArmHStyle.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.nipplesPiercing) && (_combinedRule.nipplesPiercing !== "no default setting")>>
<<if ($args[0].nipplesPiercing !== _combinedRule.nipplesPiercing)>>
--
GitLab