From ee1e8ccb85331e0994ffda7d8bc333fd1e3706a0 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 17 Mar 2019 03:28:44 -0400
Subject: [PATCH] more little fixes
---
src/interaction/researchLab.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 11 ++++++++++-
src/uncategorized/surgeryDegradation.tw | 19 +++++++++++--------
src/utility/descriptionWidgetsFlesh.tw | 2 +-
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw
index 04f89dc7622..025372716e1 100644
--- a/src/interaction/researchLab.tw
+++ b/src/interaction/researchLab.tw
@@ -255,7 +255,7 @@
<</if>>*/
<br><br>
- //You contact a representative of one of the most popular japanese cybernetics companies and inquire about their products.<br> This is what they have to offer://<br><br>
+ //You contact a representative of one of the most popular Japanese cybernetics companies and inquire about their products.<br> This is what they have to offer://<br><br>
__Hardware__<br>
[[Neural Tail Interface|Research Lab][$temp = 1, cashX(-10000, "lab"), $stockpile.interfacePTail += 1]] //Costs <<print cashFormat(10000)>>. Currently have: $stockpile.interfacePTail//<br>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 3eba3043a13..d9b597eda57 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1108,7 +1108,16 @@ is
<<else>>
is @@.green;very happy@@
<</if>>
- when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of $his lower holes<<else>>$his rear hole<</if>>.
+ when a dick is pushed inside
+ <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0 && canDoAnal($activeSlave) && $activeSlave.anus > 0>>
+ either of $his lower holes.
+ <<elseif canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
+ $his front hole.
+ <<elseif canDoAnal($activeSlave) && $activeSlave.anus > 0>>
+ $his rear hole.
+ <<else>>
+ it.
+ <</if>>
<</if>>
<</if>> /* END MENTAL REPORT */
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 3f89746d099..c1c0a9853d5 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -2587,16 +2587,19 @@ As the remote surgery's long recovery cycle completes,
<<if ($activeSlave.amp == 1)>>
<<set _hairLand = "below " + $him>>
<</if>>
- <<if (($activeSlave.underArmHStyle != "hairless") && ($activeSlave.underArmHStyle != "bald"))>>
- <<set _hairChanges++, $activeSlave.underArmHStyle = "bald">>
- <<set _hair = "The first thing " + $he + " notices is that " + $his + " armpit hair has just fallen out, in a small pile " + _hairLand + ".">>
- <<if (($activeSlave.pubicHStyle != "hairless") && ($activeSlave.pubicHStyle != "bald"))>>
+ <<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
+ <<if ($activeSlave.physicalAge > _pubertyAge-2)>>
+ <<if (($activeSlave.underArmHStyle != "hairless") && ($activeSlave.underArmHStyle != "bald"))>>
+ <<set _hairChanges++, $activeSlave.underArmHStyle = "bald">>
+ <<set _hair = "The first thing " + $he + " notices is that " + $his + " armpit hair has just fallen out, in a small pile " + _hairLand + ".">>
+ <<if (($activeSlave.pubicHStyle != "hairless") && ($activeSlave.pubicHStyle != "bald"))>>
+ <<set _hairChanges++, $activeSlave.pubicHStyle = "bald">>
+ <<set _hair = _hair + " The same thing happens to " + $his + " pubic hair.">>
+ <</if>>
+ <<elseif $activeSlave.pubicHStyle != "hairless" && $activeSlave.pubicHStyle != "bald">>
<<set _hairChanges++, $activeSlave.pubicHStyle = "bald">>
- <<set _hair = _hair + " The same thing happens to " + $his + " pubic hair.">>
+ <<set _hair = "The first thing " + $he + " notices is that " + $his + " pubic hair has just fallen out, in a small pile " + _hairLand + ".">>
<</if>>
- <<elseif $activeSlave.pubicHStyle != "hairless" && $activeSlave.pubicHStyle != "bald">>
- <<set _hairChanges++, $activeSlave.pubicHStyle = "bald">>
- <<set _hair = "The first thing " + $he + " notices is that " + $his + " pubic hair has just fallen out, in a small pile " + _hairLand + ".">>
<</if>>
<<if canSee($activeSlave)>>
<<set _sense = "see">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 95dd2e5772f..06e39d0195f 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -5445,7 +5445,7 @@ $He's got a
<</if>>
<</if>>
<<print either("tend to droop when $he is relaxed or sad", "twitch at the slightest touch")>>.
-<<elseif $activeSlave.earT == "human">>
+<<elseif $activeSlave.earT == "normal">>
$He has <<if $activeSlave.earShape != "none">>a second set<<else>>a pair<</if>> of non-functioning ears grafted to the top of $his head.
<</if>>
--
GitLab