From 3ce9cb307c9e15054186b7050905b5596a67fbc0 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Fri, 24 Aug 2018 22:23:49 -0500 Subject: [PATCH] Revert --- src/uncategorized/newSlaveIntro.tw | 4 ++-- src/utility/descriptionWidgetsFlesh.tw | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index 2b1b728a1ac..70eefd3ef7c 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -80,11 +80,11 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <<run removeGingering()>> /* retrieve original $activeSlave without gingering effects */ <<if $seeRace == 1>> - <<if $activeSlave.race != $activeSlave.origRace && $activeSlave.override_Race == 1>> + <<if $activeSlave.race != $activeSlave.origRace>> 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.skin != $activeSlave.origSkin && $activeSlave.override_Skin == 1>> +<<if $activeSlave.skin != $activeSlave.origSkin>> 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>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index f8365cef3f4..8909320e9fa 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -14149,7 +14149,7 @@ $He has <<if $saleDescription == 1>> <<if ($seeRace == 1)>> - <<if $activeSlave.race != $activeSlave.origRace && $activeSlave.override_Race == 1>> + <<if $activeSlave.race != $activeSlave.origRace>> <<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>> @@ -14159,7 +14159,7 @@ $He has <</if>> <</if>> <</if>> - <<if $activeSlave.skin != $activeSlave.origSkin && $activeSlave.override_Skin == 1>> + <<if $activeSlave.skin != $activeSlave.origSkin>> <<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>> @@ -14170,11 +14170,11 @@ $He has <</if>> <<else>> <<if ($seeRace == 1)>> - <<if $activeSlave.race != $activeSlave.origRace && $activeSlave.override_Race == 1>> + <<if $activeSlave.race != $activeSlave.origRace>> $He has recieved plastic surgery to appear <<print $activeSlave.race>>; $he is originally <<print $activeSlave.origRace>>. <</if>> <</if>> - <<if $activeSlave.skin != $activeSlave.origSkin && $activeSlave.override_Skin == 1>> + <<if $activeSlave.skin != $activeSlave.origSkin>> $His skin has been treated to appear <<print $activeSlave.skin>>; $his skin is originally <<print $activeSlave.origSkin>> in color. <</if>> <</if>> -- GitLab