From ac4d0dfe743d413c24f6e8f6776ba546cabe2bdd Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Thu, 22 Aug 2019 20:32:25 -0500 Subject: [PATCH] Functions --- src/facilities/nursery/childInteract.tw | 4 ++-- src/uncategorized/matchmaking.tw | 2 +- src/uncategorized/wardrobeUse.tw | 4 ++-- src/utility/descriptionWidgetsPiercings.tw | 2 +- src/utility/descriptionWidgetsStyle.tw | 18 +++++++++--------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index da66a3ac154..7853150ef02 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -684,7 +684,7 @@ FIXME: <<replace "#collar">>$activeChild.collar<</replace>> <</link>> - <<if $activeChild.missingArms != 3>> + <<if hasAnyArms($activeChild)>> <br>Arm accessory: <b><span id="armAccessory">$activeChild.armAccessory</span>.</b> <<link "None">> <<set $activeChild.armAccessory = "none">> @@ -700,7 +700,7 @@ FIXME: <</link>> <</if>> - <<if $activeChild.missingLegs != 3>> + <<if hasAnyLegs($activeChild)>> <br>Shoes: <b><span id="shoes">$activeChild.shoes</span>.</b> <<link "Go barefoot">> <<set $activeChild.shoes = "none">> diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw index 2920a827a50..a388054967b 100644 --- a/src/uncategorized/matchmaking.tw +++ b/src/uncategorized/matchmaking.tw @@ -74,7 +74,7 @@ You tell $eventSlave.slaveName that you're going to marry $him. (A proposal, of good <<wife>>, <</if>> <<Master>>. Oh, thank you, <<Master>>," $he blubbers, and starts crying again. -<<elseif $eventSlave.amp != 1>> +<<elseif hasAnyArms($eventSlave)>> $he shakily signs $his thanks twice in a row before breaking down again. <<else>> $he painstakingly mouths $his thanks, since $he cannot speak or use hands to sign. diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw index 2ec5fb3655a..34d2faf3ce9 100644 --- a/src/uncategorized/wardrobeUse.tw +++ b/src/uncategorized/wardrobeUse.tw @@ -344,7 +344,7 @@ Collar: ''$activeSlave.collar.'' <</if>> <</if>> -<<if $activeSlave.missingArms != 3>> +<<if hasAnyArms($activeSlave)>> <br> Hands and arms: ''$activeSlave.armAccessory'' <br> @@ -364,7 +364,7 @@ Collar: ''$activeSlave.collar.'' <</if>> -<<if $activeSlave.missingLegs != 3>> +<<if hasAnyLegs($activeSlave)>> <br> Feet and legs: ''$activeSlave.shoes'' <<if $activeSlave.legAccessory != "none">> with ''$activeSlave.legAccessory''<</if>> diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw index fb8a5fc00ed..c5b77a2e27a 100644 --- a/src/utility/descriptionWidgetsPiercings.tw +++ b/src/utility/descriptionWidgetsPiercings.tw @@ -576,7 +576,7 @@ <<if ($activeSlave.devotion > 20)>> <<if ($activeSlave.energy > 90)>> $His very special body allows $him to wear an incredibly lewd piece of jewelry: a thin golden chain that runs from nipple to nipple, through $his pierced cockhead. The chain is short, and any motion at all tugs at $his nipples and penis. - <<if $activeSlave.amp != 1>> + <<if hasAnyLegs($activeSlave)>> The stimulation is almost unbearable, and the mere act of walking sometimes causes $him to cum. <</if>> <</if>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index a180bb36189..c6e872ccb3b 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -3469,7 +3469,7 @@ $His <</widget>> <<widget "nailsDescription">> - <<if $activeSlave.amp == 1>> + <<if !hasAnyArms($activeSlave)>> $He has no hands, and thus, no nails. <<elseif $activeSlave.nails == 1>> $His nails are long and elegant. @@ -3788,7 +3788,7 @@ $His <<widget "footwearDescription">> -<<if ($activeSlave.missingLegs != 3)>> +<<if (hasAnyLegs($activeSlave))>> <<switch $activeSlave.clothes>> <<case "a hijab and blouse" "conservative clothing">> <<switch $activeSlave.shoes>> @@ -4915,15 +4915,15 @@ $His <</widget>> <<widget "armwearDescription">> -<<if ($activeSlave.missingArms != 3)>> -<<switch $activeSlave.armAccessory>> -<<case "hand gloves">> - $He is wearing a pair of simple gloves that covers $his hands up to $his wrists. +<<if (hasAnyArms($activeSlave))>> + <<switch $activeSlave.armAccessory>> + <<case "hand gloves">> + $He is wearing a pair of simple gloves that covers $his hands up to $his wrists. -<<case "elbow gloves">> - $He is wearing a pair of long gloves that covers $his arms until just past $his elbows. + <<case "elbow gloves">> + $He is wearing a pair of long gloves that covers $his arms until just past $his elbows. -<</switch>> + <</switch>> <</if>> <</widget>> -- GitLab