From 35994895c4866c1315c8ca8560201849cecc2be7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 10 Mar 2018 12:24:07 -0500
Subject: [PATCH] continued work
---
src/js/clothingSelectionJS.tw | 46 +++++++++++++++++
src/uncategorized/saChoosesOwnClothes.tw | 66 ++++++------------------
2 files changed, 63 insertions(+), 49 deletions(-)
diff --git a/src/js/clothingSelectionJS.tw b/src/js/clothingSelectionJS.tw
index e243ed5e072..0ed682401a2 100644
--- a/src/js/clothingSelectionJS.tw
+++ b/src/js/clothingSelectionJS.tw
@@ -662,4 +662,50 @@ window.todaysCollar = function(slave) {
neck.push({text: "dons a simple silk ribbon around her neck,", collar: "silk ribbon"});
}
return jsEither(neck);
+}
+
+window.todaysCorset = function(slave) {
+ var ArcologyZero = State.variables.arcologies[0];
+ var player = State.variables.PC;
+ var belly = [];
+ var empathyBellies = ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"];
+
+ if(slave.fetish == 'mindbroken') {
+ if(ArcologyZero.FSRepopulationFocus > 0 && slave.belly < 1500) {
+ if(slave.weight > 130) {
+ belly.push({text: "She notices the fake bellies; since every girl she has ever met has a rounded middle, it's only natural she is compelled to wear one. She struggles to fit it around her huge gut, only stopping when another slave takes it away from her so she moves on and stops blocking the wardrobe with her fat ass.", bellyAccessory: "none"});
+ } else {
+ belly.push({text: "She notices the fake bellies; since every girl she has ever met has a rounded middle, it's only natural she is compelled to wear one.", bellyAccessory: jsEither("a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly")});
+ }
+ } else {
+ belly.push({text: "", bellyAccessory: slave.bellyAccessory}); /*compatiblity for no output, will likely get deprecated in the future as content is added*/
+ }
+ } else if(slave.devotion <= 20) {
+
+ } else {
+ if(ArcologyZero.FSRepopulationFocus > 0 && slave.belly < 1500 && slave.sexualFlaw != "breeder") {
+ if(slave.weight > 130) {
+ belly.push({text: "struggles to fit a fake pregnant belly around her gut before giving up and hoping she can pass as fecund,", bellyAccessory: "none"});
+ } else {
+ belly.push({text: "straps on a fake pregnant belly to fit in with all the other pregnant girls,", bellyAccessory: jsEither("a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly")});
+ }
+ } else if(slave.belly < 1500 && slave.fetish == "pregnancy" && isItemAccessible("a small empathy belly") && slave.sexualFlaw != "breeder" && slave.weight <= 130) {
+ if(slave.fetishStrength <= 30) {
+ belly.push({text: "straps on a 1st trimester belly to sate her curiosity,", bellyAccessory: "a small empathy belly"});
+ belly.push({text: "straps on a 2nd trimester belly to sate her curiosity,", bellyAccessory: "a medium empathy belly"});
+ belly.push({text: "straps on a 3rd trimester belly to sate her curiosity,", bellyAccessory: "a large empathy belly"});
+ } else if(slave.fetishStrength <= 95) {
+ belly.push({text: "straps on a 3rd trimester belly to satisfy her pregnancy fetish,", bellyAccessory: "a large empathy belly"});
+ } else if(slave.fetishStrength > 95) {
+ belly.push({text: "straps on the largest belly she can find to satisfy her pregnancy fetish,", bellyAccessory: "a huge empathy belly"});
+ }
+ } else if(empathyBellies.includes(slave.bellyAccessory) && slave.fetish != "pregnancy") {
+ belly.push({text: "removes her fake belly, since she dislikes it,", bellyAccessory: "none"});
+ } else if(empathyBellies.includes(slave.bellyAccessory) && slave.sexualFlaw == "breeder") {
+ belly.push({text: "pulls her fake belly off, disgusted by it,", bellyAccessory: "none"});
+ } else {
+ belly.push({text: "", bellyAccessory: slave.bellyAccessory}); /*compatiblity for no output, will likely get deprecated in the future as content is added*/
+ }
+ }
+ return jsEither(belly);
}
\ No newline at end of file
diff --git a/src/uncategorized/saChoosesOwnClothes.tw b/src/uncategorized/saChoosesOwnClothes.tw
index d972b502343..1c59fca4ddb 100644
--- a/src/uncategorized/saChoosesOwnClothes.tw
+++ b/src/uncategorized/saChoosesOwnClothes.tw
@@ -1,5 +1,6 @@
:: SA chooses own clothes [nobr]
+/*for the time being, this will use female pronouns until the system is updated.*/
<<if $slaves[$i].choosesOwnClothes == 1>>
<<SlavePronouns $slaves[$i]>>
@@ -7,27 +8,26 @@
<<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.
+
<<if $slaves[$i].amp != 1>>
<<set _shoeChoice = todaysShoes($slaves[$i])>>
_shoeChoice.text
<<set $slaves[$i].shoes = _shoeChoice.shoes>>
<</if>>
- <<if ($arcologies[0].FSRepopulationFocus > 0) && $slaves[$i].belly < 1500>>
- $pronounCap sees the fake bellies; since every girl $pronoun has ever met has a rounded middle, it's only natural $pronoun is compelled to wear one.
- <<if $slaves[$i].weight > 130>>
- She struggles to fit it around her huge gut, only stopping when another slave takes it away from her so she moves on and stops blocking the wardrobe with her fat ass.
- <<else>>
- <<set $slaves[$i].bellyAccessory = "a large empathy belly">>
- <</if>>
- <</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>>
-<<else>>
-
-<<if ($slaves[$i].devotion <= 20)>>
+
+<<elseif ($slaves[$i].devotion <= 20)>>
<<set _clothingChoice = todaysOutfit($slaves[$i])>>
_clothingChoice.text
@@ -50,45 +50,15 @@
_neckChoice.text
<<set $slaves[$i].collar = _neckChoice.collar>>
- <<if ($arcologies[0].FSRepopulationFocus > 0) && ($slaves[$i].belly < 1500) && $slaves[$i].sexualFlaw != "breeder">>
- <<if $slaves[$i].weight > 130>>
- struggles to fit a fake pregnant belly around her gut before giving up and hoping she can pass as fecund,
- <<else>>
- straps on a fake pregnant belly to fit in with all the other pregnant girls,
- <<set $slaves[$i].bellyAccessory = "a large empathy belly">>
- <</if>>
- <<elseif ($slaves[$i].belly < 1500) && ($slaves[$i].fetish == "pregnancy") && isItemAccessible("a small empathy belly") && $slaves[$i].sexualFlaw != "breeder" && $slaves[$i].weight <= 130>>
- <<if ($slaves[$i].fetishStrength <= 30)>>
- <<set _bellySeed = random(1,3)>>
- <<if _bellySeed == 1>>
- straps on a 1st trimester belly to satisfy $possessive curiosity,
- <<set $slaves[$i].bellyAccessory = "a small empathy belly">>
- <<elseif _bellySeed == 2>>
- straps on a 2nd trimester belly to satisfy $possessive curiosity,
- <<set $slaves[$i].bellyAccessory = "a medium empathy belly">>
- <<else>>
- straps on a 3rd trimester belly to satisfy $possessive curiosity,
- <<set $slaves[$i].bellyAccessory = "a large empathy belly">>
- <</if>>
- <<elseif ($slaves[$i].fetishStrength <= 95)>>
- straps on a 3rd trimester belly to satisfy $possessive pregnancy fetish,
- <<set $slaves[$i].bellyAccessory = "a large empathy belly">>
- <<elseif ($slaves[$i].fetishStrength > 95)>>
- straps on the largest belly $pronoun can find to satisfy $possessive pregnancy fetish,
- <<set $slaves[$i].bellyAccessory = "a huge empathy belly">>
- <</if>>
- <<elseif (setup.fakeBellies.includes($bellyAccessory)) && ($slaves[$i].fetish != "pregnancy")>>
- removes $possessive fake belly, since $pronoun dislikes it,
- <<set $slaves[$i].bellyAccessory to "none">>
- <<elseif (setup.fakeBellies.includes($bellyAccessory)) && ($slaves[$i].sexualFlaw == "breeder")>>
- pulls $possessive fake belly off, disgusted by it,
- <<set $slaves[$i].bellyAccessory = "none">>
- <</if>>
-
+ <<set _corsetChoice = todaysCorset($slaves[$i])>>
+ _corsetChoice.text
+ <<set $slaves[$i].bellyAccessory = _clothingChoice.bellyAccessory>>
+
<<set _clothingChoice = todaysOutfit($slaves[$i])>>
_clothingChoice.text
<<set $slaves[$i].clothes = _clothingChoice.clothes>>
+ /* this'll require <<WrittenMaster>> to become JS to work. Maybe later on when it beomces a widespread need */
<<if $arcologies[0].FSRestart != "unset">>
<<if $slaves[$i].choosesOwnChastity == 1>>
<<if $slaves[$i].vagina > -1 && $slaves[$i].breedingMark == 1 && ($slaves[$i].vaginalAccessory == "chastity belt" || $slaves[$i].vaginalAccessory == "combined chastity")>>
@@ -117,9 +87,7 @@
<<set $slaves[$i].shoes = _shoeChoice.shoes>>
<</if>>
-<</if>> /* closes devotion > 20 */
-
-<</if>> /* closes MB check */
+<</if>> /* closes MB check & devotion <= 20*/
<</if>> /* closes choosesOwnClothes check */
--
GitLab