From 0e4d21ca782f0074fb64bd7ed59ccb38b20f8cf0 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Sun, 27 Dec 2020 23:29:36 -0500
Subject: [PATCH] improve bc for disck and vag acc

---
 .../updateSlaveObject.js                      | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js
index 3fd344776df..7b93adc17b7 100644
--- a/src/data/backwardsCompatibility/updateSlaveObject.js
+++ b/src/data/backwardsCompatibility/updateSlaveObject.js
@@ -926,33 +926,29 @@ App.Update.Slave = function(slave, genepool = false) {
 		slave.pregControl = "labor suppressors";
 	}
 
-	if (slave.chastityAnus === undefined || slave.chastityPenis === undefined || slave.chastityVagina === undefined) {
-		// Fix dickAccessory
-		if (slave.dickAccessory === "combined chastity") {
-			slave.chastityAnus = 1;
-			slave.chastityPenis = 1;
-			slave.dickAccessory = "none";
-		} else if (slave.dickAccessory === "chastity") {
-			slave.chastityPenis = 1;
-			slave.dickAccessory = "none";
-		}
-		// Fix vaginalAccessory
-		if (slave.vaginalAccessory === "combined chastity") {
-			slave.chastityAnus = 1;
-			slave.chastityVagina = 1;
-			slave.vaginalAccessory = "none";
-		} else if (slave.vaginalAccessory === "chastity belt") {
-			slave.chastityVagina = 1;
-			slave.vaginalAccessory = "none";
-		}
-		if (slave.dickAccessory === "anal chastity" || slave.vaginalAccessory === "anal chastity") {
-			slave.chastityAnus = 1;
-			slave.dickAccessory = "none";
-			slave.vaginalAccessory = "none";
-		}
-		slave.chastityAnus = slave.chastityAnus || 0;
-		slave.chastityPenis = slave.chastityPenis || 0;
-		slave.chastityVagina = slave.chastityVagina || 0;
+	// Fix dickAccessory
+	if (slave.dickAccessory === "combined chastity") {
+		slave.chastityAnus = 1;
+		slave.chastityPenis = 1;
+		slave.dickAccessory = "none";
+	} else if (slave.dickAccessory === "chastity") {
+		slave.chastityPenis = 1;
+		slave.dickAccessory = "none";
+	} else if (slave.dickAccessory === "anal chastity") {
+		slave.chastityAnus = 1;
+		slave.dickAccessory = "none";
+	}
+	// Fix vaginalAccessory
+	if (slave.vaginalAccessory === "combined chastity") {
+		slave.chastityAnus = 1;
+		slave.chastityVagina = 1;
+		slave.vaginalAccessory = "none";
+	} else if (slave.vaginalAccessory === "chastity belt") {
+		slave.chastityVagina = 1;
+		slave.vaginalAccessory = "none";
+	} else if (slave.vaginalAccessory === "anal chastity") {
+		slave.chastityAnus = 1;
+		slave.vaginalAccessory = "none";
 	}
 
 	if (slave.rules !== undefined && slave.rules.rest === undefined) {
-- 
GitLab