From ecf563ab698a27bbba1f99e3422e326c28dd0a85 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 1 Aug 2020 20:55:54 -0400
Subject: [PATCH] more

---
 src/pregmod/FCTV/FCTV.js      | 88 ++++++++---------------------------
 src/pregmod/FCTV/FCTVshows.js | 48 +++++++++++++++++--
 2 files changed, 63 insertions(+), 73 deletions(-)

diff --git a/src/pregmod/FCTV/FCTV.js b/src/pregmod/FCTV/FCTV.js
index 6cc499d6acc..2916b4b3a45 100644
--- a/src/pregmod/FCTV/FCTV.js
+++ b/src/pregmod/FCTV/FCTV.js
@@ -39,11 +39,12 @@ globalThis.FCTV = (function() {
 		}
 	}
 
-	function showChannel(i, { usedRemote = 0, seeAll = 0 } = {}) {
+	function showChannel(i, {usedRemote = 0, seeAll = 0} = {}) {
 		let x = {
 			canSelect: 1,
 			text: `A notification is shown: `
 		};
+		console.log("i: ", i);
 		if (App.Data.FCTV.shows[i].hasOwnProperty("tags")) {
 			for (const tag in App.Data.FCTV.shows[i].tags) {
 				switch (tag) {
@@ -118,6 +119,12 @@ globalThis.FCTV = (function() {
 		V.show = V.usedRemote ? V.show + 1 : V.show;
 	}
 
+	/**
+	 * checks value of selected channel in relation to an arbitrary number.  Have we watched it more/less/same than i.
+	 * @param {number} i
+	 * @param {string} operation eq/gt/lt: equals/greater than/less than.
+	 * @returns {boolean}
+	 */
 	function channelCount(i, operation = 'eq') {
 		if (operation === 'eq') {
 			if (V.FCTV.channel[num(V.FCTV.channel.selected, true)] === i) {
@@ -143,70 +150,15 @@ globalThis.FCTV = (function() {
 		}
 	}
 
-	function FinalTouches(i, channel) {
-		if (channel === 14) {
-
-		} else if (channel === 4) {
-			i.pubertyXX = 1; i.career = "a slave";
-			i.origin = "You purchased $him from FCTV's Home Slave Shopping stream channel.";
-			i.health.condition = 75;
-			if (V.show < 3) {
-				i.custom.tattoo = "$He has a small stylized 'A' tattooed on the nape of $his neck marking $him as the product of the famous breeding program at Arcturus Arcology.";
-				Object.assign(i.skill, {
-					'vaginal': 0,
-					'entertainment': jsRandom(50, 80),
-					'oral': jsRandom(20, 60),
-					'anal': 0,
-					'whoring': 0
-				});
-			} else if (V.show === 3) {
-				Object.assign(i.skill, {
-					'vaginal': jsRandom(50, 80),
-					'oral': jsRandom(40, 80),
-					'anal': jsRandom(20, 50),
-					'whoring': jsRandom(0, 50)
-				});
-			} else if (V.show === 4) {
-				Object.assign(i.skill, {
-					'vaginal': jsRandom(50, 100),
-					'oral': jsRandom(20, 50),
-					'anal': jsRandom(10, 20)
-				});
-				i.counter.birthsTotal = jsRandom(2, 3);
-			} else if (V.show === 5) {
-				Object.assign(i.skill, {
-					'vaginal': jsRandom(50, 100),
-					'entertainment': jsRandom(20, 80),
-					'oral': jsRandom(50, 100),
-					'anal': jsRandom(20, 80),
-					'whoring': jsRandom(20, 80)
-				});
-				i.counter.birthsTotal = jsRandom(1, 3);
-			} else if (V.show === 6) {
-				Object.assign(i.skill, {
-					'vaginal': 15,
-					'oral': 15,
-					'anal': 15,
-					'whoring': 15
-				});
-			} else if (V.show <= 8) {
-				Object.assign(i.skill, {
-					'oral': jsRandom(30, 60),
-					'anal': jsRandom(20, 50),
-					'whoring': jsRandom(0, 25)
-				});
-			} else if (V.show === 8) {
-				Object.assign(i.skill, {
-					'oral': jsRandom(40, 80),
-					'anal': jsRandom(40, 80),
-					'whoring': jsRandom(40, 70)
-				});
-			}
-		}
+	function FinalTouches(slave) {
+		slave.pubertyXX = 1;
+		slave.career = "a slave";
+		slave.origin = "You purchased $him from FCTV's Home Slave Shopping stream channel.";
+		slave.health.condition = 75;
 		updateHealth(slave);
 	}
 
-	function watch({ usedRemote = 0, seeAll = 0 } = {}) {
+	function watch({usedRemote = 0, seeAll = 0} = {}) {
 		let p;
 		let div;
 		let span;
@@ -230,7 +182,7 @@ globalThis.FCTV = (function() {
 					App.UI.DOM.link(
 						"Use your remote",
 						() => {
-							FCTV.watch({ usedRemote: 1, seeAll: seeAll });
+							FCTV.watch({usedRemote: 1, seeAll: seeAll});
 						}
 					)
 				);
@@ -306,14 +258,14 @@ globalThis.FCTV = (function() {
 			const buttons = [];
 
 			for (let i = 0; i < _possibleChannels.length; i++) {
-				if (FCTV.showChannel(i, { usedRemote: usedRemote, seeAll: seeAll }).canSelect > 0) {
+				if (FCTV.showChannel(i, {usedRemote: usedRemote, seeAll: seeAll}).canSelect > 0) {
 					if (V.FCTV.channel.selected !== i) {
 						buttons.push(
 							App.UI.DOM.link(
 								i,
 								() => {
 									V.FCTV.channel.selected = i;
-									FCTV.watch({ usedRemote: 1 });
+									FCTV.watch({usedRemote: 1, seeAll: seeAll});
 								}
 							)
 						);
@@ -326,7 +278,7 @@ globalThis.FCTV = (function() {
 								i,
 								() => {
 									V.FCTV.channel.selected = i;
-									FCTV.watch({ usedRemote: 1, seeAll: seeAll });
+									FCTV.watch({usedRemote: 1, seeAll: seeAll});
 								}
 							)
 						);
@@ -363,7 +315,7 @@ globalThis.FCTV = (function() {
 							} else {
 								seeAll = 1;
 							}
-							FCTV.watch({ usedRemote: usedRemote, seeAll: seeAll });
+							FCTV.watch({usedRemote: usedRemote, seeAll: seeAll});
 						}
 					)
 				);
@@ -374,7 +326,7 @@ globalThis.FCTV = (function() {
 				App.UI.DOM.link(
 					`Randomise channel selection`,
 					() => {
-						FCTV.watch({ usedRemote: 0, seeAll: seeAll });
+						FCTV.watch({usedRemote: 0, seeAll: seeAll});
 					}
 				)
 			);
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index 78601720349..d195eb5729e 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -137,6 +137,14 @@ App.Data.FCTV.actors = {
 		slave.intelligence = jsRandom(51, 70);
 		slave.intelligenceImplant = 30;
 		slave.trust = jsRandom(50, 80);
+
+		slave.custom.tattoo = "$He has a small stylized 'A' tattooed on the nape of $his neck marking $him as the product of the famous breeding program at Arcturus Arcology.";
+		slave.skill.vaginal = 0;
+		slave.skill.entertainment = jsRandom(50, 80);
+		slave.skill.oral = jsRandom(20, 60);
+		slave.skill.anal = 0;
+		slave.skill.whoring = 0;
+		FCTV.FinalTouches(slave);
 		return slave;
 	},
 	get hyperPregnant() {
@@ -180,6 +188,12 @@ App.Data.FCTV.actors = {
 		}
 		slave.pregWeek = slave.preg;
 		SetBellySize(slave);
+
+		slave.skill.vaginal = jsRandom(50, 80);
+		slave.skill.oral = jsRandom(40, 80);
+		slave.skill.anal = jsRandom(20, 50);
+		slave.skill.whoring = jsRandom(0, 50);
+		FCTV.FinalTouches(slave);
 		return slave;
 	},
 	get superfetation() { // superfetation
@@ -217,6 +231,12 @@ App.Data.FCTV.actors = {
 		slave.devotion = jsRandom(60, 90);
 		slave.trust = jsRandom(50, 80);
 		slave.geneticQuirks.superfetation = 2;
+
+		slave.skill.vaginal = jsRandom(50, 100);
+		slave.skill.oral = jsRandom(20, 50);
+		slave.skill.anal = jsRandom(10, 20);
+		slave.counter.birthsTotal = jsRandom(2, 3);
+		FCTV.FinalTouches(slave);
 		return slave;
 	},
 	get MILF() { // MILF
@@ -249,6 +269,13 @@ App.Data.FCTV.actors = {
 		slave.intelligenceImplant = 15;
 		slave.devotion = jsRandom(60, 90);
 		slave.trust = jsRandom(50, 80);
+		slave.skill.vaginal = jsRandom(50, 100);
+		slave.skill.entertainment = jsRandom(20, 80);
+		slave.skill.oral = jsRandom(50, 100);
+		slave.skill.anal = jsRandom(20, 80);
+		slave.skill.whoring = jsRandom(20, 80);
+		slave.counter.birthsTotal = jsRandom(1, 3);
+		FCTV.FinalTouches(slave);
 		return slave;
 	},
 	get youngHottie() { // discount young hottie
@@ -275,9 +302,14 @@ App.Data.FCTV.actors = {
 		slave.muscles = jsRandom(0, 25);
 		slave.devotion = jsRandom(-25, 25);
 		slave.trust = jsRandom(-25, 25);
-		if (_slave.physicalAge >= 12) {
+		if (slave.physicalAge >= 12) {
 			slave.teeth = "normal";
 		}
+		slave.skill.vaginal = 15;
+		slave.skill.oral = 15;
+		slave.skill.anal = 15;
+		slave.skill.whoring = 15;
+		FCTV.FinalTouches(slave);
 		return slave;
 	},
 	get hugeBalls() { // huge balls
@@ -289,8 +321,11 @@ App.Data.FCTV.actors = {
 		slave.prostate = 2;
 		slave.devotion = jsRandom(50, 80);
 		slave.trust = jsRandom(50, 80);
-		slave.scrotum = _slave.balls;
-
+		slave.scrotum = slave.balls;
+		slave.skill.oral = jsRandom(30, 60);
+		slave.skill.anal = jsRandom(20, 50);
+		slave.skill.whoring = jsRandom(0, 25);
+		FCTV.FinalTouches(slave);
 		return slave;
 	},
 	get mpreg() { // mpreg dickgirl
@@ -318,7 +353,10 @@ App.Data.FCTV.actors = {
 		slave.intelligenceImplant = 15;
 		slave.devotion = jsRandom(60, 90);
 		slave.trust = jsRandom(50, 80);
-
+		slave.skill.oral = jsRandom(40, 80);
+		slave.skill.anal = jsRandom(40, 80);
+		slave.skill.whoring = jsRandom(40, 70);
+		FCTV.FinalTouches(slave);
 		return slave;
 	},
 	get FSmodel() {
@@ -1314,7 +1352,7 @@ App.Data.FCTV.shows = {
 				r.push(`cock`);
 			}
 			r.push(`and two massive nipples, eventually revealing the two hosts that look to be in their early twenties.`);
-			if (V.FCTV.channel[num(V.FCTV.channel.selected, true)] < 2) {
+			if (V.FCTV.channel[num(10, true)] < 2) {
 				r.push(`A muscular man wearing athletic clothes, and a buxom young woman in a bikini that looks more like a microkini on her large breasts and hips. The pair is helpfully labeled on screen as Mike and Mindy, and as the camera gets closer it reveals that both have rather sizable endowments. Mike's crotch is soaked, and Mindy's bikini top allows small rivulets of milk to stream down from the sodden fabric.`);
 			} else {
 				r.push(`The fluid enthusiast Mike and Mindy pair are wearing their usual style in new colors, the clothes appearing to be as soddenly wet as any other episode.`);
-- 
GitLab