From 5ab511ba447b427427601fe72bd0d068fc897727 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 23 Aug 2018 17:35:55 -0500
Subject: [PATCH] Syncs
---
devNotes/twine JS.txt | 8 +++-----
src/js/slaveGenerationJS.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 4 ++--
src/utility/descriptionWidgetsFlesh.tw | 12 ++++++++----
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index f5227f5593c..9a27b54cf02 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -4346,8 +4346,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.devotion < -20) {
if(eventSlave.trust > -20) {
if(eventSlave.health > -20) {
- var toSearch = eventSlave.race;
- if(toSearch.indexOf("surgically") == -1) {
+ if(eventSlave.race == eventSlave.origRace) {
if(eventSlave.indentureRestrictions < 1) {
State.variables.RESSevent.push("subjugation blues");
}
@@ -5905,8 +5904,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.devotion < -20) {
if(eventSlave.trust > -20) {
if(eventSlave.health > -20) {
- var toSearch = eventSlave.race;
- if(toSearch.indexOf("surgically") == -1) {
+ if(eventSlave.race == eventSlave.origRace) {
if(eventSlave.indentureRestrictions < 1) {
State.variables.RESSevent.push("subjugation blues");
}
@@ -29079,7 +29077,7 @@ window.disabilityRoll = function disabilityRoll(slave) {
disList.push("seeNot");
disList.push("speakNot");
let disableCount = 0;
- if (V.oneTimeDisableDisability === 1) {
+ if (V.oneTimeDisableDisability === 0) {
while (disList.length > 0) {
let rolled = jsEither(disList);
switch (rolled) {
diff --git a/src/js/slaveGenerationJS.tw b/src/js/slaveGenerationJS.tw
index 0b1b39555af..7e2ecd8a62d 100644
--- a/src/js/slaveGenerationJS.tw
+++ b/src/js/slaveGenerationJS.tw
@@ -1270,7 +1270,7 @@ window.disabilityRoll = function disabilityRoll(slave) {
disList.push("seeNot");
disList.push("speakNot");
let disableCount = 0;
- if (V.oneTimeDisableDisability === 1) {
+ if (V.oneTimeDisableDisability === 0) {
while (disList.length > 0) {
let rolled = jsEither(disList);
switch (rolled) {
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index b11169f7175..9aa09fa2d2e 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -81,11 +81,11 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $seeRace == 1>>
<<if $activeSlave.race != $activeSlave.origRace>>
- A blood test reveals that $he was originally $activeSlave.origRace, not $activeSlave.race<<if $PC.medicine >= 90 || $PC.career == "medicine">>, just as you suspected<</if>>.
+ A blood test reveals that $he was originally $activeSlave.origRace, not $activeSlave.race<<if $PC.medicine >= 50 || $PC.slaving >= 50>>, just as you suspected<</if>>.
<</if>>
<</if>>
<<if $activeSlave.race != $activeSlave.origRace>>
- An epidermis scan reveals that $his skin was originally $activeSlave.origSkin, not $activeSlave.skin<<if $PC.medicine >= 100 || $PC.career == "medicine">>, just as you suspected<</if>>.
+ An epidermis scan reveals that $his skin was originally $activeSlave.origSkin, not $activeSlave.skin<<if $PC.medicine >= 75 || $PC.slaving >= 75>>, just as you suspected<</if>>.
<</if>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 4679265cf58..8909320e9fa 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -14150,17 +14150,21 @@ $He has
<<if $saleDescription == 1>>
<<if ($seeRace == 1)>>
<<if $activeSlave.race != $activeSlave.origRace>>
- <<if $PC.medicine >= 90 || $PC.career == "medicine">>
+ <<if $PC.slaving >= 50>>
+ Thanks to your experience in buying and selling slaves, you can easily tell that $he has recieved plastic surgery to appear <<print $activeSlave.race>>; $his original race is currently unknown to you.
+ <<elseif $PC.medicine >= 50>>
Thanks to your medical experience, you can easily tell that $he has recieved plastic surgery to appear <<print $activeSlave.race>>; $his original race is currently unknown to you.
- <<elseif $PC.medicine >= 70>>
+ <<elseif $PC.medicine >= 30 || $PC.slaving >= 30>>
Something about some of $his more obviously <<print $activeSlave.race>> features strikes you as odd.
<</if>>
<</if>>
<</if>>
<<if $activeSlave.skin != $activeSlave.origSkin>>
- <<if $PC.medicine >= 100 || $PC.career == "medicine">>
+ <<if $PC.slaving >= 75>>
+ Thanks to your experience in buying and selling slaves, you can easily tell that $his skin has been treated to appear <<print $activeSlave.skin>>; $his original skin tone is currently unknown to you.
+ <<elseif $PC.medicine >= 75>>
Thanks to your medical experience, you can easily tell that $his skin has been treated to appear <<print $activeSlave.skin>>; $his original skin tone is currently unknown to you.
- <<elseif $PC.medicine >= 80>>
+ <<elseif $PC.medicine >= 55 || $PC.slaving >= 55>>
Something about the coloring of $his <<print $activeSlave.skin>> skin strikes you as odd.
<</if>>
<</if>>
--
GitLab