From 2c59ba149e1c4a37652d72a067dbbc12cbb0fa15 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Fri, 26 Oct 2018 02:01:18 -0400
Subject: [PATCH] Update
---
devNotes/twine JS.txt | 9 +++++++++
src/js/datatypeCleanupJS.tw | 9 +++++++++
src/uncategorized/BackwardsCompatibility.tw | 10 ----------
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 9307dc740b3..f0fafb338e2 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -33837,6 +33837,15 @@ window.SlaveDatatypeCleanup = function SlaveDatatypeCleanup (slave) {
slave.mammaryCount = Math.max(+slave.mammaryCount, 0) || 0;
slave.penetrativeCount = Math.max(+slave.penetrativeCount, 0) || 0;
slave.pitKills = Math.max(+slave.pitKills, 0) || 0;
+ if (typeof slave.headAccessory !== "string") {
+ slave.headAccessory = "none";
+ }
+ if (typeof slave.rearAccessory !== "string") {
+ slave.rearAccessory = "none";
+ }
+ if (typeof slave.backAccessory !== "string") {
+ slave.backAccessory = "none";
+ }
if (typeof slave.customTat !== "string") {
slave.customTat = "";
}
diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw
index b2855ef9214..aa49e6b8ba4 100644
--- a/src/js/datatypeCleanupJS.tw
+++ b/src/js/datatypeCleanupJS.tw
@@ -395,6 +395,15 @@ window.SlaveDatatypeCleanup = function SlaveDatatypeCleanup (slave) {
slave.mammaryCount = Math.max(+slave.mammaryCount, 0) || 0;
slave.penetrativeCount = Math.max(+slave.penetrativeCount, 0) || 0;
slave.pitKills = Math.max(+slave.pitKills, 0) || 0;
+ if (typeof slave.headAccessory !== "string") {
+ slave.headAccessory = "none";
+ }
+ if (typeof slave.rearAccessory !== "string") {
+ slave.rearAccessory = "none";
+ }
+ if (typeof slave.backAccessory !== "string") {
+ slave.backAccessory = "none";
+ }
if (typeof slave.customTat !== "string") {
slave.customTat = "";
}
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index f1ca8d2ef42..3ef4e46d3fd 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3215,16 +3215,6 @@ Setting missing slave variables:
<<set _Slave.lipsTat = "advertisements">>
<</switch>>
-<<if def _Slave.headAccessory>>
- <<run delete _Slave.headAccessory>>
-<</if>>
-<<if def _Slave.rearAccessory>>
- <<run delete _Slave.rearAccessory>>
-<</if>>
-<<if def _Slave.backAccessory>>
- <<run delete _Slave.backAccessory>>
-<</if>>
-
<<if (ndef _Slave.currentRules) || (_Slave.currentRules.length < 1)>>
<<set _Slave.currentRules = []>>
<</if>>
--
GitLab