From e7267096078d8a276921f8d1305a4f8e125cb758 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 10 Mar 2018 13:57:35 -0500 Subject: [PATCH] continued work --- src/uncategorized/saChoosesOwnClothes.tw | 35 ++++++------------------ 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/uncategorized/saChoosesOwnClothes.tw b/src/uncategorized/saChoosesOwnClothes.tw index 1c59fca4ddb..53b7fc4a655 100644 --- a/src/uncategorized/saChoosesOwnClothes.tw +++ b/src/uncategorized/saChoosesOwnClothes.tw @@ -8,30 +8,22 @@ <<set $bellyAccessory = $slaves[$i].bellyAccessory>> <<if $slaves[$i].fetish == "mindbroken">> - - $pronounCap is fundamentally broken, but still follows some faint memories of standing within the wardrobe. + <<set _corsetChoice = todaysCorset($slaves[$i]), _clothingChoice = todaysOutfit($slaves[$i])>> + <<set $slaves[$i].bellyAccessory = _corsetChoice.bellyAccessory, $slaves[$i].clothes = _clothingChoice.clothes>> + $pronounCap is fundamentally broken, but still follows some faint memories of standing within the wardrobe. <<if $slaves[$i].amp != 1>> <<set _shoeChoice = todaysShoes($slaves[$i])>> _shoeChoice.text <<set $slaves[$i].shoes = _shoeChoice.shoes>> <</if>> - - <<set _corsetChoice = todaysCorset($slaves[$i])>> - _corsetChoice.text - <<set $slaves[$i].bellyAccessory = _clothingChoice.bellyAccessory>> - - Faced with so many choices and no thought on the matter; - - <<set _clothingChoice = todaysOutfit($slaves[$i])>> - _clothingChoice.text - <<set $slaves[$i].clothes = _clothingChoice.clothes>> + _corsetChoice.text Faced with so many choices and no thought on the matter; _clothingChoice.text <<elseif ($slaves[$i].devotion <= 20)>> <<set _clothingChoice = todaysOutfit($slaves[$i])>> - _clothingChoice.text <<set $slaves[$i].clothes = _clothingChoice.clothes>> + _clothingChoice.text <<if $slaves[$i].amp != 1>> <<set _shoeChoice = todaysShoes($slaves[$i])>> @@ -43,20 +35,11 @@ <<set $slaves[$i].devotion -= 5>> <<else>> - $pronounCap @@.hotpink;loves@@ being able to dress <<print $object>>self, - <<set $slaves[$i].devotion += 1>> - - <<set _shoeChoice = todaysCollar($slaves[$i])>> - _neckChoice.text - <<set $slaves[$i].collar = _neckChoice.collar>> - - <<set _corsetChoice = todaysCorset($slaves[$i])>> - _corsetChoice.text - <<set $slaves[$i].bellyAccessory = _clothingChoice.bellyAccessory>> + <<set _neckChoice = todaysCollar($slaves[$i]), _corsetChoice = todaysCorset($slaves[$i]), _clothingChoice = todaysOutfit($slaves[$i])>> + <<set $slaves[$i].collar = _neckChoice.collar, $slaves[$i].bellyAccessory = _corsetChoice.bellyAccessory, $slaves[$i].clothes = _clothingChoice.clothes>> - <<set _clothingChoice = todaysOutfit($slaves[$i])>> - _clothingChoice.text - <<set $slaves[$i].clothes = _clothingChoice.clothes>> + $pronounCap @@.hotpink;loves@@ being able to dress <<print $object>>self, _neckChoice.text _corsetChoice.text _clothingChoice.text + <<set $slaves[$i].devotion += 1>> /* this'll require <<WrittenMaster>> to become JS to work. Maybe later on when it beomces a widespread need */ <<if $arcologies[0].FSRestart != "unset">> -- GitLab