From b68d580e0ef0bddde938b05eee9dda7d8fb2c07e Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 20 Oct 2018 17:29:40 -0400
Subject: [PATCH] fixes and a returning slave issue resolved
---
devNotes/twine JS.txt | 2 +-
src/js/slaveSummaryWidgets.tw | 2 +-
src/uncategorized/pUndergroundRailroad.tw | 3 ++-
src/uncategorized/slaveSold.tw | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 472741531b6..efb0e042644 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -22408,7 +22408,7 @@ window.SlaveSummaryUncached = (function(){
r += `<span class="orangered">Moronic, well educated.${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`;
}
} else if (slave.intelligenceImplant >= 15) {
- } if (intelligence > 95) {
+ if (intelligence > 95) {
r += `<span class="deepskyblue">Brilliant, educated.${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`;
} else if (intelligence > 50) {
r += `<span class="deepskyblue">Very smart, educated.${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`;
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index 0d63b31eec1..6b1471d9e28 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -2679,7 +2679,7 @@ window.SlaveSummaryUncached = (function(){
r += `<span class="orangered">Moronic, well educated.${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`;
}
} else if (slave.intelligenceImplant >= 15) {
- } if (intelligence > 95) {
+ if (intelligence > 95) {
r += `<span class="deepskyblue">Brilliant, educated.${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`;
} else if (intelligence > 50) {
r += `<span class="deepskyblue">Very smart, educated.${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`;
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index e3abb39d7b4..c273651108e 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -97,7 +97,8 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<set $activeSlave.relationshipTarget = 0, $activeSlave.relationship = 0>>
<<if def $i>><<set $slaves[$i].relationshipTarget = 0, $slaves[$i].relationship = 0>><<else>>@@.red;Error, relationshipTarget not found.@@<</if>>
<</if>>
- <<set $traitor = $activeSlave>>
+ <<set $traitor = clone($activeSlave)>>
+ <<set $traitor.assignment = "rest">>
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: [], traitorBody: 0}>>
<<if $familyTesting == 1>>
<<if $traitor.ID == $PC.pregSource>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index e50005433c7..999a83701f0 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -13,6 +13,7 @@
<<if $activeSlave.devotion > 50>>
<<if $activeSlave.trust > 95 || $activeSlave.trust < -20 || ($activeSlave.intelligence+$activeSlave.intelligenceImplant < -15)>>
<<set $boomerangSlave = clone($activeSlave), $boomerangWeeks = 1, $boomerangBuyer = $buyer>>
+ <<set $boomerangSlave.assignment = "rest">>
<<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: [], boomerangRelationship: 0, boomerangRivalry: 0, boomerangRelation: 0, boomerangBody: 0}>>
<<if $familyTesting == 1>>
<<if $activeSlave.ID == $PC.pregSource>>
--
GitLab