Merge branch 'pregmod-master' into 'pregmod-master'

bit o' cleaning

See merge request pregmodfan/fc-pregmod!2364

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -2,6 +2,13 @@
 
 0.10.7.1-0.5.x
 
+8/01/2018
+
+	14
+	-fixes
+	-JS tinkering
+	-tweaks to porn fame face gains
+
 7/30/2018
 
 	13

devNotes/twine JS.txt

@@ -9485,7 +9485,6 @@ window.saChoosesOwnClothes = (function() {
 	let boy;
 	let He;
 	let His;
-	let belly_accessory;
 	function saChoosesOwnClothes(slave) {
 		V = State.variables;
@@ -9501,12 +9500,11 @@ window.saChoosesOwnClothes = (function() {
 		boy = pronouns.noun;
 		He = capFirstChar(he);
 		His = capFirstChar(his);
-		belly_accessory = slave.bellyAccesory;
 		if (slave.fetish === "mindbroken") {
 			let corsetChoice = todaysCorset(slave);
 			let clothingChoice = todaysOutfit(slave);
-			slave.bellyAccesory = corsetChoice.bellyAccesory;
+			slave.bellyAccessory = corsetChoice.bellyAccessory;
 			slave.clothes = clothingChoice.clothes;
 			r += `${He} is fundamentally broken, but still follows some faint memories of standing within the wardrobe. `;
 			if (slave.amp !== 1) {
@@ -9531,7 +9529,7 @@ window.saChoosesOwnClothes = (function() {
 			let corsetChoice = todaysCorset(slave);
 			let clothingChoice = todaysOutfit(slave);
 			slave.collar = neckChoice.collar;
-			slave.bellyAccesory = corsetChoice.bellyAccesory;
+			slave.bellyAccessory = corsetChoice.bellyAccessory;
 			slave.clothes = clothingChoice.clothes;
 			r += `${He} <span class="hotpink">loves</span> being able to dress ${himself}, ${neckChoice.text} ${corsetChoice.text} ${clothingChoice.text} `;
 			slave.devotion += 1;
@@ -9567,6 +9565,7 @@ window.saChoosesOwnClothes = (function() {
 	function todaysOutfit(slave) {
 		let clothing = [];
+		let chosenClothing;
 		let wardrobeAssignment = [];
 		let wardrobeFS = [];
 		let wardrobeTastes = [];
@@ -9612,8 +9611,8 @@ window.saChoosesOwnClothes = (function() {
 				if(V.arcologies[0].FSBodyPurist > 0) {
 					clothing.push('bodyPurist');
 				}
-				clothing = jsEither(clothing);
-				switch(clothing) {
+				chosenClothing = jsEither(clothing);
+				switch(chosenClothing) {
 				case 'egyptian':
 					selection = {text: `${he} commonly sees others wearing nothing but jewelry and is drawn to doing so ${himself}.`, clothes: "slutty jewelry"};
 					break;
@@ -10143,6 +10142,7 @@ window.saChoosesOwnClothes = (function() {
 				}
 			}
 			/*Separated in three categories in case you want to, say, increase the probability of choosing _wardrobeAssignment to look more professional*/
+			/*clothing = clothing.concat(wardrobeAssignment, wardrobeFS, wardrobeTastes); better version should the above never amount to anything*/
 			if(wardrobeAssignment.length > 0) {
 				for (let i = 0; i < wardrobeAssignment.length; i++) {
 					clothing.push(wardrobeAssignment[i]);

src/endWeek/saChoosesOwnClothes.tw

@@ -14,7 +14,6 @@ window.saChoosesOwnClothes = (function() {
 	let boy;
 	let He;
 	let His;
-	let belly_accessory;
 
 	function saChoosesOwnClothes(slave) {
 		V = State.variables;
@@ -30,12 +29,11 @@ window.saChoosesOwnClothes = (function() {
 		boy = pronouns.noun;
 		He = capFirstChar(he);
 		His = capFirstChar(his);
-		belly_accessory = slave.bellyAccesory;
 
 		if (slave.fetish === "mindbroken") {
 			let corsetChoice = todaysCorset(slave);
 			let clothingChoice = todaysOutfit(slave);
-			slave.bellyAccesory = corsetChoice.bellyAccesory;
+			slave.bellyAccessory = corsetChoice.bellyAccessory;
 			slave.clothes = clothingChoice.clothes;
 			r += `${He} is fundamentally broken, but still follows some faint memories of standing within the wardrobe. `;
 			if (slave.amp !== 1) {
@@ -60,7 +58,7 @@ window.saChoosesOwnClothes = (function() {
 			let corsetChoice = todaysCorset(slave);
 			let clothingChoice = todaysOutfit(slave);
 			slave.collar = neckChoice.collar;
-			slave.bellyAccesory = corsetChoice.bellyAccesory;
+			slave.bellyAccessory = corsetChoice.bellyAccessory;
 			slave.clothes = clothingChoice.clothes;
 			r += `${He} <span class="hotpink">loves</span> being able to dress ${himself}, ${neckChoice.text} ${corsetChoice.text} ${clothingChoice.text} `;
 			slave.devotion += 1;
@@ -96,6 +94,7 @@ window.saChoosesOwnClothes = (function() {
 
 	function todaysOutfit(slave) {
 		let clothing = [];
+		let chosenClothing;
 		let wardrobeAssignment = [];
 		let wardrobeFS = [];
 		let wardrobeTastes = [];
@@ -141,8 +140,8 @@ window.saChoosesOwnClothes = (function() {
 				if(V.arcologies[0].FSBodyPurist > 0) {
 					clothing.push('bodyPurist');
 				}
-				clothing = jsEither(clothing);
-				switch(clothing) {
+				chosenClothing = jsEither(clothing);
+				switch(chosenClothing) {
 				case 'egyptian':
 					selection = {text: `${he} commonly sees others wearing nothing but jewelry and is drawn to doing so ${himself}.`, clothes: "slutty jewelry"};
 					break;
@@ -672,6 +671,7 @@ window.saChoosesOwnClothes = (function() {
 				}
 			}
 			/*Separated in three categories in case you want to, say, increase the probability of choosing _wardrobeAssignment to look more professional*/
+			/*clothing = clothing.concat(wardrobeAssignment, wardrobeFS, wardrobeTastes); better version should the above never amount to anything*/
 			if(wardrobeAssignment.length > 0) {
 				for (let i = 0; i < wardrobeAssignment.length; i++) {
 					clothing.push(wardrobeAssignment[i]);