From c1c75a7ecb26ceaefcdb94c5564001ea2ca88be2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 24 Mar 2018 01:16:38 -0400
Subject: [PATCH] Fixed jsEither() usage.
---
src/js/clothingSelectionJS.tw | 20 ++++++++++----------
src/js/pregJS.tw | 32 ++++++++++++++++----------------
src/js/utilJS.tw | 1 +
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/js/clothingSelectionJS.tw b/src/js/clothingSelectionJS.tw
index 549c43f6418..ee39543f5b9 100644
--- a/src/js/clothingSelectionJS.tw
+++ b/src/js/clothingSelectionJS.tw
@@ -74,7 +74,7 @@ window.todaysOutfit = function(slave) {
break;
case 'genderFund':
if(jsRandom(1,2) == 1) {
- selection = {text: "she commonly sees cheerleaders around and instinctually follows along.", clothes: jsEither('a cheerleader outfit', 'a schoolgirl outfit')};
+ selection = {text: "she commonly sees cheerleaders around and instinctually follows along.", clothes: jsEither(['a cheerleader outfit', 'a schoolgirl outfit'])};
} else {
selection = {text: "she commonly sees bunnies around and instinctually follows along.", clothes: "a bunny outfit"};
}
@@ -83,22 +83,22 @@ window.todaysOutfit = function(slave) {
selection = {text: "she commonly sees others wearing clothing and is drawn to doing so herself.", clothes: "conservative clothing"};
break;
case 'degradationist':
- selection = {text: "she commonly sees others wearing chains and is drawn to doing so herself.", clothes: jsEither('chains', 'uncomfortable straps', 'shibari ropes')};
+ selection = {text: "she commonly sees others wearing chains and is drawn to doing so herself.", clothes: jsEither(['chains', 'uncomfortable straps', 'shibari ropes'])};
break;
case 'mature':
- selection = {text: "she commonly sees others wearing suits and is drawn to doing so herself.", clothes: jsEither('slutty business attire', 'a nice maid outfit', 'a military uniform', 'nice business attire')};
+ selection = {text: "she commonly sees others wearing suits and is drawn to doing so herself.", clothes: jsEither(['slutty business attire', 'a nice maid outfit', 'a military uniform', 'nice business attire'])};
break;
case 'youth':
- selection = {text: "she commonly sees schoolgirls around and instinctually follows along.", clothes: jsEither('a schoolgirl outfit', 'a cheerleader outfit')};
+ selection = {text: "she commonly sees schoolgirls around and instinctually follows along.", clothes: jsEither(['a schoolgirl outfit', 'a cheerleader outfit'])};
break;
case 'physicalIdealist':
- selection = {text: "she commonly sees naked girls around and seldom realizes they are coated in oil.", clothes: jsEither('body oil', 'no clothing', 'no clothing')};
+ selection = {text: "she commonly sees naked girls around and seldom realizes they are coated in oil.", clothes: jsEither(['body oil', 'no clothing', 'no clothing'])};
break;
case 'pastoralist':
selection = {text: "she commonly sees cowgirls around and instinctually follows along.", clothes: "Western clothing"};
break;
case 'bodyPurist':
- selection = {text: "she commonly sees others wearing tight, form-fitting clothes and is drawn to doing so herself.", clothes: jsEither('a leotard', 'a string bikini', 'a slave gown', 'a comfortable bodysuit', 'restrictive latex', 'clubslut netting', 'a leotard', 'a halter top dress')};
+ selection = {text: "she commonly sees others wearing tight, form-fitting clothes and is drawn to doing so herself.", clothes: jsEither(['a leotard', 'a string bikini', 'a slave gown', 'a comfortable bodysuit', 'restrictive latex', 'clubslut netting', 'a leotard', 'a halter top dress'])};
break;
default:
selection = {text: "she chooses to put on underwear, the reasons lost to her, and moves on.", clothes: "attractive lingerie"};
@@ -597,9 +597,9 @@ window.todaysShoes = function(slave) {
if(slave.fetish == 'mindbroken') {
if(slave.amp != 1 && slave.heels == 1) {
- shoes.push({text: "She finds she can inexplicably walk if she wears heels; a daily lesson for her, as she forgets shortly after leaving.", shoes: jsEither("heels", "extreme heels", "boots")});
+ shoes.push({text: "She finds she can inexplicably walk if she wears heels; a daily lesson for her, as she forgets shortly after leaving.", shoes: jsEither(["heels", "extreme heels", "boots"])});
}
- shoes.push({text: "She vaguely remembers putting things on her feet, so she does.", shoes: jsEither("heels", "extreme heels", "boots", "flats")});
+ shoes.push({text: "She vaguely remembers putting things on her feet, so she does.", shoes: jsEither(["heels", "extreme heels", "boots", "flats"])});
shoes.push({text: "She entered without shoes, and will leave the same.", shoes: "none"});
} else if(slave.devotion <= 20) {
if(slave.heels == 0) {
@@ -675,7 +675,7 @@ window.todaysCorset = function(slave) {
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")});
+ 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}); /*compatibility for no output, will likely get deprecated in the future as content is added*/
@@ -687,7 +687,7 @@ window.todaysCorset = function(slave) {
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")});
+ 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) {
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 6dc5be5e707..728d096a212 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -68,53 +68,53 @@ window.setPregType = function(actor) {
var ovum = 1;
var fertilityStack = 0; // adds an increasing bonus roll for stacked fertility drugs
- if(actor.broodmother < 1) { /* Broodmothers should be not processed here. Necessary now.*/
+ if(actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
if(typeof actor.readyOva == "number" && actor.readyOva != 0) {
- ovum = actor.readyOva; /*just single override; for delayed impregnation cases */
+ ovum = actor.readyOva; //just single override; for delayed impregnation cases
} else if(actor.ID == -1) {
if(actor.birthMaster > 0) { // Predisposed to twins
if(actor.fertDrugs == 1) {
- ovum += jsEither(1, 1, 2, 2, 2, 2, 3, 3);
+ ovum += jsEither([1, 1, 2, 2, 2, 2, 3, 3]);
} else {
- ovum += jsEither(0, 0, 0, 1, 1, 1, 1, 1, 1, 2);
+ ovum += jsEither([0, 0, 0, 1, 1, 1, 1, 1, 1, 2]);
}
if(actor.forcedFertDrugs > 0) {
- ovum += jsEither(1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4);
+ ovum += jsEither([1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4]);
}
} else {
if(actor.fertDrugs == 1) {
- ovum += jsEither(0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3);
+ ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3]);
} else {
- ovum += jsEither(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
}
if(actor.forcedFertDrugs > 0) {
- ovum += jsEither(0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4);
+ ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4]);
}
}
} else if(actor.pregType == 0) {
- ovum += jsEither(0, 0, 0, 0, 0, 0, 0, 0, 0, 1); //base chance for twins
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
if(actor.hormones == 2) {
- ovum += jsEither(0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2]);
fertilityStack++;
}
if(actor.hormoneBalance >= 400) {
- ovum += jsEither(0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3]);
fertilityStack++;
}
if(State.variables.masterSuitePregnancyFertilitySupplements == 1 && ((actor.assignment == "serve in the master suite" || actor.assignment == "be your Concubine"))) {
- ovum += jsEither(0, 0, 0, 1, 1, 2, 2, 2, 3, 3);
+ ovum += jsEither([0, 0, 0, 1, 1, 2, 2, 2, 3, 3]);
fertilityStack++;
fertilityStack++;
}
if(actor.drugs == "super fertility drugs") {
- ovum += jsEither(1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5);
+ ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
} else if(actor.drugs == "fertility drugs") {
- ovum += jsEither(0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3]);
fertilityStack++;
}
if(State.variables.seeHyperPreg == 1) {
@@ -126,10 +126,10 @@ window.setPregType = function(actor) {
} else {
ovum += jsRandom(0, fertilityStack);
if(ovum > 12) {
- ovum = jsRandom(6,12);
+ ovum = jsRandom(6, 12);
}
}
}
- return ovum;
}
+ return ovum;
}
\ No newline at end of file
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index 47b4117c879..33448f8fa50 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -414,6 +414,7 @@ window.jsRandomMany = function (arr, count) {
return result;
}
+//This function wants an array - which explains why it works like array.random(). Give it one or you'll face a NaN
window.jsEither = function(choices) {
var index = Math.floor(Math.random() * choices.length);
return choices[index];
--
GitLab