From cee8f70a5c78ece8f6d9a87264967b6801ca4e0b Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 2 Jan 2018 19:44:25 -0500
Subject: [PATCH] Fixes
---
devNotes/Bodyswap text.txt | 19 +++++++++----------
devNotes/twine JS | 9 ++++++++-
src/utility/assayWidgets.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 2 +-
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/devNotes/Bodyswap text.txt b/devNotes/Bodyswap text.txt
index 5331b8b4aa8..8f408c82b2d 100644
--- a/devNotes/Bodyswap text.txt
+++ b/devNotes/Bodyswap text.txt
@@ -102,15 +102,14 @@ Her hand roams over her face until it reaches her lips.
<<elseif $args[0].teeth != "removable" && $args[0].tonguePiercing > 0 && $args[1].tonguePiercing == 0>> /* (if tongue pierced+has teeth) */
You can vaguely hear her rattling her tongue piercing against her teeth.
<<else>> /* (no oral fixation) */
- She can feel the lack of wrinkles in her face, and smiles broadly<(only prints if devoted and younger).
-
-
-
-
-
-
-
-
+ <<if $args[0].physicalAge < 40 && $args[1].physicalAge > 50>>
+ <<if $args[0].devotion > 20>>
+ She can feel the lack of wrinkles on her face and @@.hotpink;smiles broadly.@@
+ <<else>>
+ She can feel the lack of wrinkles on her face and cringes at what this means for her future.
+ <</if>>
+ <</if>>
+<</if>>
After a moment, she sits up to try and take stock of her new body.
@@ -208,9 +207,9 @@ She turns to you and opens her mouth to speak.
At first, she's slightly startled by her new voice, but manages a single word. “..mirror..â€
+<<else>> /* (amputee) */
-(amputee)
After a while, she begins to stir, her eyes fluttering. She lets out a low groan and reaches up to rub at her eyes. Or rather, she attempts to.
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 18de3ae1969..e4381f72657 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -4083,7 +4083,14 @@ window.renderFamilyTree = function(slaves, filterID) {
node.append('circle')
.attr('r', function(d){ return d.r })
- .attr('stroke', '#5a5a5a')
+ .attr('stroke', function(d) {
+ console.log(d.ID, filterID);
+ if(d.id == filterID) {
+ return '#ffff20';
+ } else {
+ return '#5a5a5a';
+ }
+ })
.attr('class', 'node-circle')
.attr('r', 20);
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 170ef095016..0b370537ef0 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -236,7 +236,7 @@
<<if ($arcologies[0].FSTransformationFetishist > 20)>>
<<if $args[0].lips > 70>>
- <<if ($args[0].lipsImplant/$args[0].lips < 50)>>
+ <<if ($args[0].lipsImplant/$args[0].lips < .50)>>
<<set $beauty -= (($args[0].lips/10)+($arcologies[0].FSTransformationFetishist/20))>>
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 5c0e15ad22b..ab4c29343a6 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4055,7 +4055,7 @@ $pronounCap has
<</if>>
<<if ($arcologies[0].FSTransformationFetishist > 20)>>
<<if $activeSlave.lips > 70>>
- <<if ($activeSlave.lipsImplant/$activeSlave.lips < 50)>>
+ <<if ($activeSlave.lipsImplant/$activeSlave.lips < .50)>>
$possessiveCap lips are huge and @@.red;disgustingly natural@@ for their size.
<<else>>
$possessiveCap lips are huge and @@.green;obviously implants,@@ as they should be.
--
GitLab