From 3c205c51643c42a7e474070ccb6e43c41c696cd9 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 19 Aug 2020 03:30:07 -0400 Subject: [PATCH] Fixes --- src/events/RESS/devotedShortstack.js | 2 +- src/npc/startingGirls/startingGirls.tw | 5 +++-- src/utility/extendedFamilyWidgets.tw | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/events/RESS/devotedShortstack.js b/src/events/RESS/devotedShortstack.js index 25beb36836d..51236567899 100644 --- a/src/events/RESS/devotedShortstack.js +++ b/src/events/RESS/devotedShortstack.js @@ -12,7 +12,7 @@ App.Events.RESSDevotedShortstack = class RESSDevotedShortstack extends App.Event canDoAnal, s => s.fetish !== "mindbroken", hasAnyArms, - hasAnyLegs, + s => canStand, s => s.trust <= 95, s => s.devotion > 20, ] diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 9ddd751a3e3..c94e08b6c3d 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -829,6 +829,7 @@ <<set _optionLeft = _options.addOption("Left eye", "vision", $activeSlave.eye.left)>> <<set _optionRight = _options.addOption("Right eye", "vision", $activeSlave.eye.right)>> + <<run _optionLeft.addValueList([["Normal", 2], ["Nearsighted", 1]]), _optionRight.addValueList([["Normal", 2], ["Nearsighted", 1]])>> <<if $seeExtreme === 1>> <<run _optionLeft.addValue("Blind", 0), _optionRight.addValue("Blind", 0)>> <<else>> @@ -839,15 +840,15 @@ <<set $activeSlave.eye.right.vision = 2>> <</if>> <</if>> - <<run _optionLeft.addValueList([["Nearsighted", 1], ["Normal", 2]]), _optionRight.addValueList([["Nearsighted", 1], ["Normal", 2]])>> <<set _option = _options.addOption("Hearing", "hears", $activeSlave)>> + <<run _option.addValueList([["Normal", 0], ["Hard of hearing", -1]])>> <<if $seeExtreme == 1>> <<run _option.addValue("Deaf", -2)>> <<elseif $activeSlave.hears === 0>> <<set $activeSlave.hears = 2>> <</if>> - <<run _option.addValueList([["Hard of hearing", -1], ["Normal", 0]])>> + <<if $seeExtreme == 1>> <<run _options.addOption("Smell ability", "smells", $activeSlave) diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw index ab224c14072..92db485317d 100644 --- a/src/utility/extendedFamilyWidgets.tw +++ b/src/utility/extendedFamilyWidgets.tw @@ -40,7 +40,7 @@ | <<link "You">><<set $activeSlave.mother = $PC.ID>><<redisplayFamily>><</link>> <</if>> <<for _efw = 0; _efw < $slaves.length; _efw++>> - <<if $slaves[_efw].vagina > 0 && (($slaves[_efw].actualAge - $activeSlave.actualAge) >= $fertilityAge) && (($slaves[_efw].mother != $activeSlave.mother) || ($activeSlave.mother == 0)) && $slaves[_efw].newGamePlus == 0>> + <<if $slaves[_efw].vagina > 0 && (($slaves[_efw].actualAge - $activeSlave.actualAge) >= $slaves[_efw].pubertAgeXX) && (($slaves[_efw].mother != $activeSlave.mother) || ($activeSlave.mother == 0)) && $slaves[_efw].newGamePlus == 0>> | <<set _id = $slaves[_efw].ID>> <<set _slaveName = $slaves[_efw].slaveName>> @@ -62,7 +62,7 @@ | <<link "You">><<set $activeSlave.father = $PC.ID>><<redisplayFamily>><</link>> <</if>> <<for _efw = 0; _efw < $slaves.length; _efw++>> - <<if ($slaves[_efw].dick > 0) && ((($slaves[_efw].actualAge - $activeSlave.actualAge) >= $potencyAge)) && (($slaves[_efw].father != $activeSlave.father) || ($activeSlave.father == 0)) && $slaves[_efw].newGamePlus == 0>> + <<if ($slaves[_efw].dick > 0) && ((($slaves[_efw].actualAge - $activeSlave.actualAge) >= $slaves[_efw].pubertAgeXY)) && (($slaves[_efw].father != $activeSlave.father) || ($activeSlave.father == 0)) && $slaves[_efw].newGamePlus == 0>> | <<set _id = $slaves[_efw].ID>> <<set _slaveName = $slaves[_efw].slaveName>> -- GitLab