From 02a01e108e386cf3a503b162db1fd4202dabff67 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sun, 15 Apr 2018 23:32:45 -0400
Subject: [PATCH] Slave Variable Cleanup
---
src/uncategorized/BackwardsCompatibility.tw | 9 +++------
src/uncategorized/randomNonindividualEvent.tw | 12 ++++++------
src/uncategorized/reRelativeRecruiter.tw | 4 ++--
src/uncategorized/saLongTermEffects.tw | 14 +++++++-------
src/uncategorized/scheduledEvent.tw | 18 +++++++++---------
src/uncategorized/seExpiration.tw | 10 +++++-----
src/uncategorized/seRetirement.tw | 2 +-
src/uncategorized/slaveInteract.tw | 2 +-
8 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 59c223d07cf..56a262b9efe 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -148,6 +148,9 @@
<<if def $assayedSlaveAvailable>>
<<unset $assayedSlaveAvailable>>
<</if>>
+<<if def $RERepressedAnalVirginSub>>
+ <<unset $RERepressedAnalVirginSub>>
+<</if>>
/* pregmod stuff */
@@ -2099,12 +2102,6 @@ Setting missing global variables:
<<set $assistantName = "your personal assistant">>
<</if>>
-<<if ndef $expiree>>
- <<set $expiree = 0>>
-<</if>>
-<<if ndef $retiree>>
- <<set $retiree = 0>>
-<</if>>
<<if ndef $birthee>>
<<set $birthee = 0>>
<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index e7c3fbc5147..364b827f33c 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -715,14 +715,14 @@
<<set _recruiterSlaves = $slaves.filter(function(s) { return s.fuckdoll == 0 && s.canRecruit == 1 && s.devotion > 50 && canWalk(s); })>>
<<for _recruiterSlaves.length > 0>>
- <<set $recruiterSlave = _recruiterSlaves.pluck()>>
+ <<set $recruiterSlave = _recruiterSlaves.pluck().ID>>
<<if random(1,100) > 90+(totalRelatives($recruiterSlave)*2)>>
- <<set $j = $genePool.findIndex(function(o) { return o.ID == $recruiterSlave.ID; })>>
+ <<set $j = $genePool.findIndex(function(o) { return o.ID == $recruiterSlave; })>>
<<if $j != -1>>
<<set $events.push("RE relative recruiter")>>
<<break>>
<<else>> /* no matching slave object in the slavesOriginal array */
- <<set $i = $slaves.findIndex(function(o) { return o.ID == $recruiterSlave.ID; })>>
+ <<set $i = $slaves.findIndex(function(o) { return o.ID == $recruiterSlave; })>>
<<set $slaves[$i].canRecruit = 0>>
<</if>>
<</if>>
@@ -732,13 +732,13 @@
<<set _recruiterSlaves = $slaves.filter(function(s) { return s.recruiter != 0 && s.fuckdoll == 0 && s.devotion > 50 && s.relation == 0 && canWalk(s); })>>
<<for _recruiterSlaves.length > 0>>
- <<set $recruiterSlave = _recruiterSlaves.pluck()>>
- <<set $j = $genePool.findIndex(function(o) { return o.ID == $recruiterSlave.ID; })>>
+ <<set $recruiterSlave = _recruiterSlaves.pluck().ID>>
+ <<set $j = $genePool.findIndex(function(o) { return o.ID == $recruiterSlave; })>>
<<if $j != -1>>
<<set $events.push("RE relative recruiter")>>
<<break>>
<<else>> /* no matching slave object in the slavesOriginal array -- bug? */
- <<set $i = $slaves.findIndex(function(o) { return o.ID == $recruiterSlave.ID; })>>
+ <<set $i = $slaves.findIndex(function(o) { return o.ID == $recruiterSlave; })>>
<<set $slaves[$i].recruiter = 0>>
<</if>>
<</for>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 10972065e5f..667e67e9f32 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -4,7 +4,7 @@
<<if $familyTesting == 1>>
-<<set $eventSlave = getSlave($recruiterSlave.ID)>>
+<<set $eventSlave = getSlave($recruiterSlave)>>
<<set $activeSlave = clone($genePool.find(function(o) { return o && o.ID == $eventSlave.ID; }))>>
/* 000-250-006 */
@@ -747,7 +747,7 @@ You look up the _relationType. She costs <<print cashFormat($slaveCost)>>, a bar
<<else>> /* vanilla */
-<<set $i = $slaveIndices[$recruiterSlave.ID]>>
+<<set $i = $slaveIndices[$recruiterSlave]>>
<<set $j = $genePool.findIndex(function(o) { return o.ID == $slaves[$i].ID; })>>
<<set $eventSlave = $slaves[$i]>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 337e86ca65f..d44c5a8370c 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7301,28 +7301,28 @@
<<if $retiree == 0>>
<<if $slaves[$i].indenture < 0>>
<<if $slaves[$i].actualAge >= $retirementAge && $PhysicalRetirementAgePolicy != 1>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<<elseif $slaves[$i].physicalAge >= $retirementAge && $PhysicalRetirementAgePolicy == 1>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<</if>>
<<if $SexMilestoneRetirement == 1>>
<<if $slaves[$i].oralCount + $slaves[$i].analCount + $slaves[$i].vaginalCount + $slaves[$i].penetrativeCount + $slaves[$i].mammaryCount >= $retirementSex>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<</if>>
<</if>>
<<if $MilkMilestoneRetirement == 1>>
<<if $slaves[$i].milk >= $retirementMilk>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<</if>>
<</if>>
<<if $BirthsMilestoneRetirement == 1>>
<<if $slaves[$i].births >= $retirementBirths>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<</if>>
<</if>>
<<if $KillsMilestoneRetirement == 1>>
<<if $slaves[$i].pitkills >= $retirementKills>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<</if>>
<</if>>
<</if>>
@@ -7349,7 +7349,7 @@
<<if $slaves[$i].indenture == 0>>
<<if $expiree == 0>>
- <<set $expiree = $slaves[$i]>>
+ <<set $expiree = $slaves[$i].ID>>
<</if>>
<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index ca3c718d791..c65e9c2e336 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -3,11 +3,11 @@
<<set $showEncyclopedia = 0>>
<<if $expired == 1>>
- <<set $activeSlave = getSlave($expiree.ID), $expiree = 0>>
+ <<set $activeSlave = getSlave($expiree), $expiree = 0>>
<<include "Remove activeSlave">>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i]>>
+ <<set $expiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</for>>
@@ -15,39 +15,39 @@
<<set $expired = 0>>
<<if $retired == 1>>
- <<set $activeSlave = getSlave($retiree.ID), $retiree = 0>>
+ <<set $activeSlave = getSlave($retiree), $retiree = 0>>
<<include "Remove activeSlave">>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture < 0>>
<<if $slaves[$i].actualAge >= $retirementAge && $PhysicalRetirementAgePolicy != 1>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<<break>>
<</if>>
<<if $slaves[$i].physicalAge >= $retirementAge && $PhysicalRetirementAgePolicy == 1>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<<break>>
<</if>>
<<if $SexMilestoneRetirement == 1>>
<<if $slaves[$i].oralCount + $slaves[$i].analCount + $slaves[$i].vaginalCount + $slaves[$i].penetrativeCount + $slaves[$i].mammaryCount >= $retirementSex>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</if>>
<<if $MilkMilestoneRetirement == 1>>
<<if $slaves[$i].milk >= $retirementMilk>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</if>>
<<if $BirthsMilestoneRetirement == 1>>
<<if $slaves[$i].births >= $retirementBirths>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</if>>
<<if $KillsMilestoneRetirement == 1>>
<<if $slaves[$i].pitkills >= $retirementKills>>
- <<set $retiree = $slaves[$i]>>
+ <<set $retiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index 854f56d3487..fdb0ae15b48 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -6,7 +6,7 @@
<<set $expired = 1>>
-<<set $activeSlave = getSlave($expiree.ID)>>
+<<set $activeSlave = getSlave($expiree)>>
<<Enunciate $activeSlave>>
@@ -44,7 +44,7 @@ Since she is mindbroken, there is precisely no chance that she will be able to l
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i]>>
+ <<set $expiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</for>>
@@ -83,7 +83,7 @@ She has been trying desperately hard not to think about this trying situation, b
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i]>>
+ <<set $expiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</for>>
@@ -124,7 +124,7 @@ at the moment of her scheduled emancipation, she seems to be struggling to expre
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i]>>
+ <<set $expiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</for>>
@@ -157,7 +157,7 @@ at the moment of her scheduled emancipation, she seems willing to consider a sho
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i]>>
+ <<set $expiree = $slaves[$i].ID>>
<<break>>
<</if>>
<</for>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 00af41c7c72..bd2a671bcd4 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -6,7 +6,7 @@
<<set $retired = 1>>
-<<set $activeSlave = getSlave($retiree.ID)>>
+<<set $activeSlave = getSlave($retiree)>>
<<set _playerName = $PC.name, _playerName = nameReplace(_playerName)>>
<<Enunciate $activeSlave>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 628fe48c238..d9fda4ba621 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1422,7 +1422,7 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule
[[Sell her|Sell Slave][$cash -= 500]] //Listing her for sale will cost <<print cashFormat(500)>>// |
<<if ($seeAge != 0) && ($activeSlave.indenture < 1)>>
<<if ($retiree == 0)>>
- [[Retire her|Slave Interact][$retiree = $activeSlave, $manuallyRetired = 1]] |
+ [[Retire her|Slave Interact][$retiree = $activeSlave.ID, $manuallyRetired = 1]] |
<<else>>
//A slave has been manually retired this turn.//
<</if>>
--
GitLab