From 2e78c13745f6daabbd604a769e2d8fdd7a8f4483 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Thu, 30 Aug 2018 23:13:15 -0500 Subject: [PATCH] Cheat Fix --- src/cheats/mod_editSlaveCheatNew.tw | 26 ++++++++++++++++++++++-- src/utility/descriptionWidgetsFlesh.tw | 2 ++ src/utility/descriptionWidgetsTattoos.tw | 2 -- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index ffcd523c98a..9e35f9edcfe 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -1636,6 +1636,28 @@ <span id=hcol5></span> <br>Custom eyebrow color: <<textbox "$tempSlave.eyebrowHColor" $tempSlave.eyebrowHColor>> <br> + ''Eyebrow Hair Style: (@@.yellow;$tempSlave.eyebrowHStyle@@)'' + <<radiobutton "$tempSlave.eyebrowHStyle" "bald">> Bald + <<radiobutton "$tempSlave.eyebrowHStyle" "shaved">> Shaved + <<radiobutton "$tempSlave.eyebrowHStyle" "natural">> Natural + <<radiobutton "$tempSlave.eyebrowHStyle" "rounded">> Rounded + <<radiobutton "$tempSlave.eyebrowHStyle" "straight">> Straight + <<radiobutton "$tempSlave.eyebrowHStyle" "high-arched">> High-Arched + <<radiobutton "$tempSlave.eyebrowHStyle" "curved">> Curved + <<radiobutton "$tempSlave.eyebrowHStyle" "slanted inwards">> Slanted Inwards + <<radiobutton "$tempSlave.eyebrowHStyle" "slanted outwards">> Slanted Outwards + <<radiobutton "$tempSlave.eyebrowHStyle" "elongated">> Elongated + <<radiobutton "$tempSlave.eyebrowHStyle" "shortened">> Shortened + <br> + ''Eyebrow Hair Shape: (@@.yellow;$tempSlave.eyebrowFullness@@)'' + <<radiobutton "$tempSlave.eyebrowFullness" "pencil-thin">> Pencil-Thin + <<radiobutton "$tempSlave.eyebrowFullness" "thin">> Thin + <<radiobutton "$tempSlave.eyebrowFullness" "threaded">> Threaded + <<radiobutton "$tempSlave.eyebrowFullness" "natural">> Natural + <<radiobutton "$tempSlave.eyebrowFullness" "tapered">> Tapered + <<radiobutton "$tempSlave.eyebrowFullness" "thick">> Thick + <<radiobutton "$tempSlave.eyebrowFullness" "bushy">> Bushy + <br> ''Her pubic hair is @@.yellow;$tempSlave.pubicHColor@@ in color'' <<link "Hair Colors">> <<if (ndef _hcol3R) || (_hcol3R == 0) >> @@ -1956,8 +1978,8 @@ <<radiobutton "$tempSlave.genes" "XY">> Male <br> - ''Hormone Balance (<-400 to >+400): $activeSlave.hormoneBalance |'' - <<textbox "$activeSlave.hormoneBalance" $activeSlave.hormoneBalance>> + ''Hormone Balance (<-400 to >+400): $tempSlave.hormoneBalance |'' + <<textbox "$tempSlave.hormoneBalance" $tempSlave.hormoneBalance>> <br> <<radiobutton "$tempSlave.hormoneBalance" -400>> Overwhelmingly masculine <<radiobutton "$tempSlave.hormoneBalance" -300>> Extremely masculine diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 7227694ff27..eff50635cf2 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -14182,6 +14182,8 @@ $He has $He has spent so much time in the Free Cities that their statelessness is effectively $his nationality; ethnically, $he's <<elseif $activeSlave.nationality == "Zimbabwean" && $activeSlave.race == "white">> $He's originally @@.tan;Rhodesian@@; ethnically, $he's + <<elseif $activeSlave.nationality == "Vatican">> + $He's originally @@.tan;from Vatican City@@; ethnically, $he's <<else>> $He's originally @@.tan;<<print $activeSlave.nationality>>@@; ethnically, $he's <</if>> diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw index a75bed76ab7..c39e2705f91 100644 --- a/src/utility/descriptionWidgetsTattoos.tw +++ b/src/utility/descriptionWidgetsTattoos.tw @@ -73,8 +73,6 @@ <<case "permanent makeup">> <<if $activeSlave.makeup != 0>> $His normal makeup is difficult to distinguish from the underlying tattoo. - <<else>> - $his face has been tattooed so that $he appears to be wearing makeup. <</if>> <<case "sacrilege">> $His face is subtly tattooed to give $him a decidedly demonic appearance. -- GitLab