Merge branch 'twineJS' into 'pregmod-master'

twineJS update

See merge request pregmodfan/fc-pregmod!1975

devNotes/twine JS

@@ -242,11 +242,11 @@ window.canGetPregnant = function(slave) {
 		return null;
 	} else if (slave.preg == -1) { /* contraceptives check */
 		return false;
-	} else if (isFertile(slave) == false) { /* check other fertility factors */
+	} else if (!isFertile(slave)) { /* check other fertility factors */
 		return false;
-	} else if ((slave.ovaries == 1) && (canDoVaginal(slave) == true)) {
+	} else if ((slave.ovaries == 1) && (canDoVaginal(slave))) {
 		return true;
-	} else if ((slave.mpreg == 1) && (canDoAnal(slave) == true)) { /* pregmod */
+	} else if ((slave.mpreg == 1) && (canDoAnal(slave))) { /* pregmod */
 		return true;
 	} else {
 		return false;
@@ -280,9 +280,9 @@ window.canImpreg = function(slave1, slave2) {
 		return false;
 	} else if (slave2.vasectomy == 1) {
 		return false;
-	} else if (canBreed(slave1, slave2) == false) {
+	} else if (!canBreed(slave1, slave2)) {
 		return false;                   /* pregmod end */
-	} else if (canGetPregnant(slave1) == false) { /* includes chastity checks */
+	} else if (!canGetPregnant(slave1)) { /* includes chastity checks */
 		return false;
 	} else {
 		return true;
@@ -347,7 +347,7 @@ window.canAchieveErection = function(slave) {
 window.canPenetrate = function(slave) {
 	if (!slave) {
 		return null;
-	} else if (canAchieveErection(slave) == false) {
+	} else if (!canAchieveErection(slave)) {
 		return false;
 	} else if (slave.dickAccessory == "chastity") {
 		return false;
@@ -1076,9 +1076,9 @@ window.sameTParent = function(slave1, slave2) {
 */
 window.areTwins = function(slave1, slave2) {
-	if (sameDad(slave1, slave2) == false) {
+	if (!sameDad(slave1, slave2)) {
 		return false;
-	} else if (sameMom(slave1, slave2) == false) {
+	} else if (!sameMom(slave1, slave2)) {
 		return false;
 	} else if (slave1.actualAge == slave2.actualAge && slave1.birthWeek == slave2.birthWeek) {
 		return true;
@@ -1093,15 +1093,15 @@ window.areSisters = function(slave1, slave2) {
     } else if (((slave1.father == 0) || (slave1.father == -2)) && ((slave1.mother == 0) || (slave1.mother == -2))) {
 		return 0; //not related
 	} else {
-		if (sameDad(slave1, slave2) == false && sameMom(slave1, slave2) == true) {
+		if (!sameDad(slave1, slave2) && sameMom(slave1, slave2)) {
 			return 3; //half sisters
-		} else if (sameDad(slave1, slave2) == true && sameMom(slave1, slave2) == false) {
+		} else if (sameDad(slave1, slave2) && !sameMom(slave1, slave2)) {
 			return 3; //half sisters
 		} else if (sameTParent(slave1, slave2) == 3) {
 			return 3; //half sisters
 		} else if (sameTParent(slave1, slave2) == 2) {
 			return 2; //sisters
-		} else if (sameDad(slave1, slave2) == true && sameMom(slave1, slave2) == true) {
+		} else if (sameDad(slave1, slave2) && sameMom(slave1, slave2)) {
 			if (slave1.actualAge == slave2.actualAge && slave1.birthWeek == slave2.birthWeek) {
 				return 1; //twins
 			} else {