From 0598e1eeedf18e28d68f024c596b4b619c35e7d8 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Mon, 7 Oct 2019 09:36:01 +0200
Subject: [PATCH] cleanup limbs in reRelativeRecruiter.tw
---
src/js/surgery.js | 8 +++++++-
src/uncategorized/reRelativeRecruiter.tw | 7 +------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/js/surgery.js b/src/js/surgery.js
index b49e8082ff5..d79e787e717 100644
--- a/src/js/surgery.js
+++ b/src/js/surgery.js
@@ -685,8 +685,9 @@ window.attachLimbs = function(slave, limb, id) {
* @param {App.Entity.SlaveState} slave
* @param {string} limb
* @param {number} id
+ * @param {boolean} clean if the slave should be cleaned of all existing
*/
-window.configureLimbs = function(slave, limb, id) {
+window.configureLimbs = function(slave, limb, id, clean = false) {
if (limb === "all") {
configureLimbs(slave, "left arm", id);
configureLimbs(slave, "right arm", id);
@@ -695,6 +696,11 @@ window.configureLimbs = function(slave, limb, id) {
return;
}
+ if (clean) {
+ slave.PLimb = 0;
+ slave.readyProsthetics = [];
+ }
+
let p = limbToProsthetic(id);
if (p) {
addProsthetic(slave, p);
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index e7571546a92..c00cff48371 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -145,9 +145,6 @@
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.clone = 0>>
<<set $activeSlave.cloneID = 0>>
- <<set $activeSlave.PLimb = 0>>
- <<set $activeSlave.leg = {left: {type: 1}, right: {type: 1}}>>
- <<set $activeSlave.arm = {left: {type: 1}, right: {type: 1}}>>
/*<<set _relativeSeed = random(1,100)>> To be used if additional variants are added. Since there currently is one each, checking a seed for a 100% chance is pointless. */
@@ -381,6 +378,7 @@
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.ageImplant = 0>>
+<<run configureLimbs($activeSlave, "all", 1, true)>>
<<if $activeSlave.career != "a Futanari Sister">><<set $activeSlave.career = "a slave">><</if>>
<<set $activeSlave.relationship = 0>>
<<set $activeSlave.relationshipTarget = 0>>
@@ -1089,9 +1087,6 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<<set $activeSlave.lifetimeRepIncome = 0>>
<<set $activeSlave.lastWeeksRepIncome = 0>>
<<set $activeSlave.custom.desc = "">>
-<<set $activeSlave.PLimb = 0>>
-<<set $activeSlave.leg = {left: {type: 1}, right: {type: 1}}>>
-<<set $activeSlave.arm = {left: {type: 1}, right: {type: 1}}>>
<<set $slaveCost = slaveCost($activeSlave)>>
--
GitLab