From 18c37c18eb71ecf61f454a22d7ea30317c1d8f59 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Wed, 30 May 2018 18:35:17 -0400
Subject: [PATCH] Tweaks and Fixes
---
slave variables documentation - Pregmod.txt | 10 ++++++++--
src/uncategorized/BackwardsCompatibility.tw | 4 ++--
src/uncategorized/remoteSurgery.tw | 12 +++---------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 319a5c3aff7..10283d4ebd9 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -956,7 +956,10 @@ is slave amputee
PLimb:
-something to do with cyberneticsmod. What PLimb she has installed?
+What level of prosthetic interface she has installed
+0 - no interface
+1 - basic interface (used both in and out of cyberMod)
+2 - advanced interface (used only in cyberMod)
heels:
@@ -2617,7 +2620,10 @@ Is she on gestation altering drugs?
readyLimbs:
-Array that holds an amputee's constructed limbs for anon's hotswap mod.
+Array that holds an amputee's constructed limbs for anon's hotswap mod. Elements of the array should be objects.
+.type - type of prosthetic limb, ranges from -1 to -5, see .amp for more information
+.armsTat - any string, see .armsTat for standard strings
+.legsTat - any string, see .legsTat for standard strings
bald:
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 421ad5a0aab..005b2896496 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2,8 +2,8 @@
<<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">>
-<<if $releaseID == 1021 || $releaseID == 1020 || $releaseID == 1019 || $releaseID == 2022>>
- <<set $releaseID = 1022>>
+<<if [1019, 1020, 1021, 1022, 1023, 2022].includes($releaseID)>>
+ <<set $releaseID = 1024>>
<</if>>
<<if Array.isArray($nationalities)>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 42b3ef74c0c..a84078f5f53 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1312,7 +1312,7 @@ Work on her structurally:
<</if>>
<<if $activeLimbs == 0>>
- <<if ($activeSlave.readyLimbs.length < 5 && $activeSlave.amp == 0) || ($activeSlave.readyLimbs.length < 4 && $activeSlave.amp < 0)>> /* missing at least one type of limb */
+ <<if ($activeSlave.readyLimbs.length < 5 && $activeSlave.amp >= 0) || ($activeSlave.readyLimbs.length < 4 && $activeSlave.amp < 0)>> /* missing at least one type of limb */
The prosthesis facility is not currently building a set of artificial limbs for $object.
<br>
Construct prosthetics:
@@ -1462,7 +1462,6 @@ Work on her structurally:
<<set $surgeryType = "cyberPLimbs">>
<<set $limbs.deleteAt(_i)>>
<</switch>>
- <<set $cash -= $surgeryCost>>
<<goto "Surgery Degradation">>
<</link>>
<</if>>
@@ -1475,29 +1474,24 @@ Work on her structurally:
<<link "Put into storage">>
<<set _i = $limbs.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
<<set _newLimbs = {type: 0, armsTat: 0, legsTat: 0}>>
- <<set _newLimbs.armsTat = $activeSlave.armsTat, _newLimbs.legsTat = $activeSlave.legsTat>>
<<switch $limbs[_i].type>>
<<case "simple">>
<<set _newLimbs.type = -1>>
- <<set $activeSlave.readyLimbs.push(_newLimbs)>>
<<case "sex">>
<<set _newLimbs.type = -2>>
- <<set $activeSlave.readyLimbs.push(_newLimbs)>>
<<case "beauty">>
<<set _newLimbs.type = -3>>
- <<set $activeSlave.readyLimbs.push(_newLimbs)>>
<<case "combat">>
<<set _newLimbs.type = -4>>
- <<set $activeSlave.readyLimbs.push(_newLimbs)>>
<<case "cyber">>
<<set _newLimbs.type = -5>>
- <<set $activeSlave.readyLimbs.push(_newLimbs)>>
<</switch>>
+ <<set $activeSlave.readyLimbs.push(_newLimbs)>>
<<set $limbs.deleteAt(_i)>>
<<goto "Remote Surgery">>
- <</link>>
+ <</link>><<if $activeSlave.PLimb == 1>>// These can be accessed at any time during slave inspection //<</if>>
<</if>>
<</if>>
--
GitLab