From ff365fe0bcb25866d27dfe4249463f176fc8b890 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 24 Jul 2020 20:13:13 -0400
Subject: [PATCH] Redesign .mobilityAid
---
src/data/backwardsCompatibility/datatypeCleanup.js | 4 +++-
src/js/SlaveState.js | 12 ++++++------
src/player/js/enslavePlayer.js | 1 +
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 3394f4df8f0..60a17047a0e 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1049,7 +1049,9 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.choosesOwnChastity = Math.clamp(+slave.choosesOwnChastity, 0, 1) || 0;
slave.breedingMark = Math.clamp(+slave.breedingMark, 0, 1) || 0;
slave.rudeTitle = Math.clamp(+slave.rudeTitle, 0, 1) || 0;
- slave.mobilityAid = Math.clamp(+slave.mobilityAid, 0, 1) || 0;
+ if (typeof slave.rules.mobility !== "string") {
+ slave.rules.mobility = "restrictive";
+ }
}
/**
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 43a8a59e4d4..92f35f702d2 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -44,6 +44,12 @@ App.Entity.RuleState = class RuleState {
* * "mandatory"
*/
this.rest = "restrictive";
+ /**
+ * Is the slave allowed to use mobility aids
+ * * "restrictive"
+ * * "permissive"
+ */
+ this.mobility = "restrictive";
/**
* * "restrictive"
* * "permissive"
@@ -1917,12 +1923,6 @@ App.Entity.SlaveState = class SlaveState {
* * "cow tail"
*/
this.buttplugAttachment = "none";
- /**
- * Is the slave allowed to use mobility aids
- * * 0: no
- * * 1: yes
- */
- this.mobilityAid = 0;
/**
* slave intelligence
* * -100 - -96: borderline retarded
diff --git a/src/player/js/enslavePlayer.js b/src/player/js/enslavePlayer.js
index b995e6412f2..1632de4b3f9 100644
--- a/src/player/js/enslavePlayer.js
+++ b/src/player/js/enslavePlayer.js
@@ -89,6 +89,7 @@ globalThis.convertPlayerToSlave = function(slave, badEnd = "boring") {
slave.currentRules = [];
slave.HGExclude = 0;
slave.choosesOwnChastity = 0;
+ slave.mobilityAid = "restrictive";
slave.pregControl = "none";
slave.readyProsthetics = [];
slave.death = "";
--
GitLab