From 57cb9e16165eb3b934e9a002e2643261d8139cce Mon Sep 17 00:00:00 2001
From: FCGudder <-@->
Date: Fri, 14 Jul 2017 12:53:59 +0200
Subject: [PATCH] Invalidating the summary cache where sensible
---
src/npc/asDump.tw | 2 +
src/npc/descriptions/fAnus.tw | 1 +
src/npc/descriptions/fBoobs.tw | 1 +
src/npc/descriptions/fButt.tw | 2 +
src/npc/descriptions/fFuckdollWidgets.tw | 3 +
src/npc/descriptions/fLips.tw | 1 +
src/npc/descriptions/fVagina.tw | 1 +
src/npc/fAbuse.tw | 2 +
src/npc/fPCImpreg.tw | 1 +
src/npc/fRelation.tw | 2 +
src/npc/fRival.tw | 2 +
src/npc/fSlaveImpregConsummate.tw | 2 +
src/pregmod/widgets/slaveSummaryWidgets.tw | 10 +++
src/uncategorized/nextWeek.tw | 2 +
src/uncategorized/slaveSold.tw | 92 ++++++++++++++++++++--
src/uncategorized/summaryOptions.tw | 1 +
src/utility/raWidgets.tw | 1 +
17 files changed, 118 insertions(+), 8 deletions(-)
diff --git a/src/npc/asDump.tw b/src/npc/asDump.tw
index 13a4975ac79..34ddb96fb6f 100644
--- a/src/npc/asDump.tw
+++ b/src/npc/asDump.tw
@@ -39,6 +39,8 @@
<<case $Collectrix.ID>><<set $Collectrix = $activeSlave>>
<</switch>>
+ <<ClearSummaryCache $activeSlave>>
+
<</silently>>
<<goto $returnTo>>
diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index ffcc0896742..df6dfc188e6 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -1,6 +1,7 @@
:: FAnus [nobr]
<<set $activeSlave.analCount++, $analTotal++>>
+<<ClearSummaryCache $activeSlave>>
You call her over so you can
<<if ($activeSlave.anus > 3)>>
diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw
index aaf02ea1f99..0a10caaae32 100644
--- a/src/npc/descriptions/fBoobs.tw
+++ b/src/npc/descriptions/fBoobs.tw
@@ -2,6 +2,7 @@
<<nobr>>
<<set $activeSlave.mammaryCount++, $mammaryTotal++>>
+<<ClearSummaryCache $activeSlave>>
You call her over so you can play with her
<<if ($activeSlave.boobs >= 20000)>>
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 3e52dbf4d73..abd57b50598 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -1,5 +1,7 @@
:: FButt [nobr]
+<<ClearSummaryCache $activeSlave>>
+
You call her over so you can
<<if ($activeSlave.vagina == -1)>>
use her sole fuckhole.
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index b164d825536..bcdbca0f81d 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -3,6 +3,7 @@
<<widget "FFuckdollOral">>
<<set $activeSlave.oralCount++, $oralTotal++>>
+<<ClearSummaryCache $activeSlave>>
You decide to use the Fuckdoll's <<if $activeSlave.lips > 95>>facepussy<<else>>face hole<</if>>.
<<if $activeSlave.fuckdoll <= 10>>
Since it is not well adapted to life as a living sex toy yet, it won't respond to position commands. So, you simply <<if $activeSlave.amp == 0>>shove it into a kneeling position<<else>>set it on the couch<</if>> and straddle its face.
@@ -45,6 +46,7 @@ You climax, <<if $PC.dick == 1>>blowing your load down its throat<<else>>giving
<<widget "FFuckdollVaginal">>
<<set $activeSlave.vaginalCount++, $vaginalTotal++>>
+<<ClearSummaryCache $activeSlave>>
You decide to use the Fuckdoll's <<if $activeSlave.vagina > 3>>cavernous<<elseif $activeSlave.vagina == 3>>soft<<elseif $activeSlave.vagina == 2>>inviting<<elseif $activeSlave.vagina == 1>>tight<</if>> front hole.
<<if $activeSlave.fuckdoll <= 10>>
Since it is not well adapted to life as a living sex toy yet, it won't respond to position commands. So, you simply <<if $activeSlave.amp == 0>>push it down to lie on the couch<<else>>set it on your desk<</if>> and shove <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> inside its vagina.
@@ -103,6 +105,7 @@ You climax<<if $PC.dick == 1>>, your cum shooting forward to splash against its
<<widget "FFuckdollAnal">>
<<set $activeSlave.analCount++, $analTotal++>>
+<<ClearSummaryCache $activeSlave>>
You decide to use the Fuckdoll's <<if $activeSlave.anus > 3>>gaping<<elseif $activeSlave.anus == 3>>loose<<elseif $activeSlave.anus == 2>>relaxed<<elseif $activeSlave.anus == 1>>tight<</if>> rear hole.
<<if $activeSlave.fuckdoll <= 10>>
Since it is not well adapted to life as a living sex toy yet, it won't respond to position commands. So, you simply <<if $activeSlave.amp == 0>>walk over to it<<else>>flip it over<</if>> and ram <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> up its rear hole.
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index 0eb26bb02fd..6de41047ce5 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -2,6 +2,7 @@
<<set $activeSlave.oralCount++, $oralTotal++>>
+<<ClearSummaryCache $activeSlave>>
You tell $activeSlave.slaveName to
<<if ($PC.dick != 0)>>
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index b2e33143649..0c2d0e372fc 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -1,6 +1,7 @@
:: FVagina [nobr]
<<SlaveTitle $activeSlave>>
+<<ClearSummaryCache $activeSlave>>
You call her over so you can
<<if ($activeSlave.vagina == 10)>>
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index fe283ee7924..5f035c1d5ba 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -1,5 +1,7 @@
:: FAbuse [nobr]
+<<ClearSummaryCache $activeSlave>>
+
<<if ($activeSlave.ID == $Bodyguard.ID)>>
<<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 95)>>
Knowing how much your bodyguard likes being hurt, you decide to reward her in her own particular way.
diff --git a/src/npc/fPCImpreg.tw b/src/npc/fPCImpreg.tw
index 533c8edc2a9..2cd8806e2d2 100644
--- a/src/npc/fPCImpreg.tw
+++ b/src/npc/fPCImpreg.tw
@@ -1,5 +1,6 @@
:: FPCImpreg [nobr]
+<<ClearSummaryCache $activeSlave>>
<<set _bonus = random(6,20)>>
<<if $activeSlave.mpreg == 1>>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 383c9dbcc98..e66afa28351 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -44,6 +44,8 @@
<</switch>>
<</if>>
<<Enunciate $activeSlave>>
+<<ClearSummaryCache $activeSlave>>
+<<ClearSummaryCache $slaves[$partner]>>
You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your office.
diff --git a/src/npc/fRival.tw b/src/npc/fRival.tw
index 9aba3c74692..58ce9fe5af0 100644
--- a/src/npc/fRival.tw
+++ b/src/npc/fRival.tw
@@ -1,6 +1,8 @@
:: FRival [nobr]
<<set $partner = $slaves.findIndex(function(s) { return s.ID == $activeSlave.rivalryTarget; })>>
+<<ClearSummaryCache $activeSlave>>
+<<ClearSummaryCache $slaves[$partner]>>
You call $activeSlave.slaveName to your office and let her know you'll be abusing $slaves[$partner].slaveName together.
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index c9b229fd189..ef21807f3e2 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -4,6 +4,8 @@ The first necessary step is to prepare the donatrix.
<<set _penCountBonus = random(6,20), _analCountBonus = _penCountBonus, _vagCountBonus = _penCountBonus>>
<<set $activeSlave.penetrativeCount += _penCountBonus+1, $penetrativeTotal += _penCountBonus+1, $activeSlave.analCount += 1, $analTotal += 1>>
+<<ClearSummaryCache $activeSlave>>
+<<ClearSummaryCache $impregnatrix>>
<<if ($impregnatrix.fetish == "pregnancy") && ($impregnatrix.fetishKnown == 1) && ($impregnatrix.fetishStrength > 60) && ($impregnatrix.devotion >= -20)>>
This is very easy, since $impregnatrix.slaveName has an impregnation fetish.
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index 59a58b7707a..302092635af 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -23,6 +23,16 @@
<</if>>
<</widget>>
+<<widget "ClearSummaryCache">>
+<<if !$args[0]>>
+ <<set setup.summaryCache = {}>>
+<<elseif _.isObject($args[0]) && _.isFinite($args[0].ID)>>
+ <<set setup.summaryCache[$args[0].ID] = undefined>>
+<<else>>
+ <<set setup.summaryCache[$args[0]] = undefined>>
+<</if>>
+<</widget>>
+
<<widget "SlaveSummaryUncached">>
<<set _Slave = $args[0]>>
<<if $abbreviateDevotion == 1>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 7a768692197..d2c3c645039 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -233,6 +233,8 @@
<<set $analSkinDesc = "", $applyDesc = "", $bellyAccessory = "", $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "", $nickname = "", $notApplyDesc = "", $oldName = "", $oldSurname = "", $situationDesc = "", $skinDesc = "", $k = "">>
/% Done with zeroing out, what should be for the most part Temps %/
+<<ClearSummaryCache>>
+
/*HACKY EVENT WORKAROUNDS*/
<<if $eventID != -1>>
<<set $slaves[$eventID].devotion -= 50, $eventID = -1>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 433688af437..29ffdc3a3cf 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -41,34 +41,41 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $activeSlave.mother == $slaves[$j].ID>>
$slaves[$j].slaveName is @@.mediumorchid;grieved@@ that you are selling her daughter.
+ <<ClearSummaryCache $slaves[$j]>>
<br><br>
<<set $slaves[$j].devotion -= 20>>
<</if>>
<<if $activeSlave.father == $slaves[$j].ID>>
$slaves[$j].slaveName is @@.mediumorchid;disappointed@@ that you are selling her daughter.
+ <<ClearSummaryCache $slaves[$j]>>
<br><br>
<<set $slaves[$j].devotion -= 10>>
<</if>>
<<if $activeSlave.ID == $slaves[$j].father>>
$slaves[$j].slaveName is @@.mediumorchid;saddened@@ that you are selling her father.
+ <<ClearSummaryCache $slaves[$j]>>
<br><br>
<<set $slaves[$j].devotion -= 10>>
<</if>>
<<if $activeSlave.ID == $slaves[$j].mother>>
$slaves[$j].slaveName is @@.mediumorchid;grieved@@ that you are selling her mother.
+ <<ClearSummaryCache $slaves[$j]>>
<br><br>
<<set $slaves[$j].devotion -= 20>>
<</if>>
<<if areSisters($activeSlave, $slaves[$j]) == 1>>
$slaves[$j].slaveName is @@.mediumorchid;devastated@@ that you are selling her twin.
+ <<ClearSummaryCache $slaves[$j]>>
<br><br>
<<set $slaves[$j].devotion -= 30>>
<<elseif areSisters($activeSlave, $slaves[$j]) == 2>>
$slaves[$j].slaveName is @@.mediumorchid;grieved@@ that you are selling her sister.
+ <<ClearSummaryCache $slaves[$j]>>
<br><br>
<<set $slaves[$j].devotion -= 20>>
<<elseif areSisters($activeSlave, $slaves[$j]) == 3>>
$slaves[$j].slaveName is @@.mediumorchid;disheartened@@ that you are selling her half-sister.
+ <<ClearSummaryCache $slaves[$j]>>
<br><br>
<<set $slaves[$j].devotion -= 10>>
<</if>>
@@ -79,7 +86,8 @@
<<if $slaves[$j].ID == $activeSlave.relationTarget>>
<<if $slaves[$j].fetish != "mindbroken">>
$slaves[$j].slaveName is @@.mediumorchid;grieved@@ that you are selling her $activeSlave.relation.
- <br><br>
+ <<ClearSummaryCache $slaves[$j]>>
+ <br><br>
<<set $slaves[$j].devotion -= 20>>
<<set $display to 1>>
<<break>>
@@ -93,7 +101,8 @@
<<if $slaves[$j].ID == $activeSlave.relationshipTarget>>
<<if $slaves[$j].fetish != "mindbroken">>
$slaves[$j].slaveName is @@.mediumorchid;grieved@@ that you are selling her best source of comfort and companionship in a life of bondage.
- <br><br>
+ <<ClearSummaryCache $slaves[$j]>>
+ <br><br>
<<set $slaves[$j].devotion -= $slaves[$j].relationship>>
<<set $display = 1>>
<<break>>
@@ -102,7 +111,8 @@
<</for>>
<<elseif $activeSlave.relationship == -3>>
Selling one of your slave wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
- <br><br>
+ <<ClearSummaryCache>>
+ <br><br>
<<set $rep -= 200>>
<<set $display = 1>>
<<for $j = 0; $j < $slaves.length; $j++>>
@@ -116,7 +126,8 @@
<<if $slaves[$j].ID == $activeSlave.rivalryTarget>>
<<if $slaves[$j].fetish != "mindbroken">>
$slaves[$j].slaveName is @@.hotpink;pleased@@ that she won't have to see her rival any more.
- <br><br>
+ <<ClearSummaryCache $slaves[$j]>>
+ <br><br>
<<set $slaves[$j].devotion += $slaves[$j].rivalry*0.3>>
<<set $display = 1>>
<<break>>
@@ -133,6 +144,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].trust >= -20)>>
<<if ($slaves[$j].physicalAge > 30)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -146,6 +158,7 @@
In short order, $activeSlave.slaveName is heard out on the promenade, sobbing and screaming as her new owner breaks in her virgin butt in public.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].anus == 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -158,6 +171,7 @@
$activeSlave.slaveName is soon seen on shift outside a seedy establishment in the lower arcology, mechanically offering her holes to passersby and flinching whenever her superiors come out to check on her.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].assignment == "whore") || ($slaves[$j].assignment == "work in the brothel")>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -170,6 +184,7 @@
$activeSlave.slaveName disappears for a time as her training is perfected, but she reappears in the refined brothel, wearing classy clothes and flirting gracefully with patrons of her body.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].assignment == "whore") || ($slaves[$j].assignment == "work in the brothel")>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -182,6 +197,7 @@
$activeSlave.slaveName is never again seen in public, but her fate is obvious: she's chained to a milking rack somewhere in a cavernous factory farm, with milk draining from her tits<<if $activeSlave.balls > 0>> and an electroshock stimulator up her butt to force her to cum<<elseif $activeSlave.ovaries > 0>> and a new baby in her belly every ten months<</if>>.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion <= 50)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -194,6 +210,7 @@
$activeSlave.slaveName is quickly escorted out by her new master. She is rarely seen in public anymore, but her records show she is settling well into being her new owner's breeder.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].breedingMark != 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 5>>
<<set $seed = 1>>
<</if>>
@@ -206,6 +223,7 @@
$activeSlave.slaveName is a common sight around the arcology, since free range cows are allowed to range between milkings. She seems reasonably content.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].assignment == "get milked") || ($slaves[$j].assignment == "work in the dairy")>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -218,6 +236,7 @@
The breeder already has stud stock, and $activeSlave.slaveName is rapidly impregnated. She's kept in a stockyard on the lower service levels of the arcology, one of a dense crowd of beaten-down women with gravid bellies.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].ovaries == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -231,6 +250,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "pregnancy")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -245,6 +265,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "boobs")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -259,6 +280,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "buttslut")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -273,6 +295,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "cumslut")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -287,6 +310,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "masochist")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -301,6 +325,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "sadist")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -315,6 +340,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "dom")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -329,6 +355,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "submissive")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -342,6 +369,7 @@
$activeSlave.slaveName leaves your control forthwith, to be freed and installed in a favored life in an arcology that gives $activeSlave.race people every possible advantage.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion < 10)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -354,6 +382,7 @@
$activeSlave.slaveName is shipped off to help produce a race of $activeSlave.race idiots to perform eternal servitude. She is not perceptive enough to fear her upcoming life as a downtrodden breeder.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].intelligence > 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -367,6 +396,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].dick > 0)>>
<<if ($slaves[$j].devotion <= 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -380,6 +410,7 @@
$activeSlave.slaveName is taken away to join the legion of airheaded, big-titted sex slaves that throng the arcology owned by her purchaser.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].intelligence > 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -393,6 +424,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion < -20)>>
<<if ($slaves[$j].intelligenceImplant == 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -406,6 +438,7 @@
Stories about the place she's going have reached $arcologies[0].name, and $activeSlave.slaveName suspects the fate she's been condemned to when she's loaded into a shipping container expressly designed to keep the inmate awake and uncomfortable.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion > 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -418,6 +451,7 @@
$activeSlave.slaveName is taken away to join the tribe of squealing, slim forms that populate the arcology of her new owner.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].intelligence > 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -430,6 +464,7 @@
A shipping container arrives for $activeSlave.slaveName; as she's loaded into it, it sedates her and begins to pump hormones, curatives and growth enhancers into no less than seven places scattered over her body.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion <= 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -442,6 +477,7 @@
$activeSlave.slaveName is seen in a research report nine months later; she has undergone some interesting changes. As expected by someone interested in her odd womb, she is quite pregnant, but what really stands out is the massive size of her testicles and her huge round implants. A quick glance at the article reveals that they aren't implants, in fact, her breasts and testicles are rounded with children.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].mpreg == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 5>>
<<set $seed = 1>>
<</if>>
@@ -455,6 +491,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].preg > 20)>>
<<if ($slaves[$j].pregType >= 10)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 15>>
<<set $seed = 1>>
<</if>>
@@ -469,6 +506,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].vagina == 0)>>
<<if isFertile($slaves[$j])>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 20>>
<<set $seed = 1>>
<</if>>
@@ -484,6 +522,7 @@
<<if ($slaves[$j].vagina == 0)>>
<<if isFertile($slaves[$j])>>
<<if ($slaves[$j].fetish == "pregnancy")>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -499,6 +538,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].intelligence <= 0)>>
<<if isFertile($slaves[$j])>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -512,6 +552,7 @@
$activeSlave.slaveName is taken away to join a quivering mass of plump, pampered ladies that crowd the bedroom of her new owner.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].behavioralFlaw == "gluttonous">>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -524,6 +565,7 @@
$activeSlave.slaveName's new owner is quite fond of his work and typically sends out photos of his progress. This is no exception; you are treated to a series of images featuring $activeSlave.slaveName being force fed until her stomach bulges. Day after day, you watch her handle more and more food until her belly is big enough to fill her lap even when empty.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].weight < 10>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -536,6 +578,7 @@
A purchasing agent arrives for $activeSlave.slaveName; he uses a lull in the proceedings to use a permanent marker to begin mapping out surgical sites across her body. There are a lot of them.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion <= 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -549,6 +592,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].weight > 10)>>
<<if ($slaves[$j].intelligence < 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -563,6 +607,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].lactation == 0)>>
<<if ($slaves[$j].devotion <= 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -576,6 +621,7 @@
$activeSlave.slaveName is terrified of her impending religious life; perhaps she's heard the new text that reads 'no woman come of age is holy unless she performs the act as many times per day as she has years less than forty.'
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].analCount < 200)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -588,6 +634,7 @@
$activeSlave.slaveName is shipped to a new arcology, and culturally, across the centuries. Her skill at arms is well enough known that her impending role as a gladiatrix is easily deduced.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].combatSkill > 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -600,6 +647,7 @@
$activeSlave.slaveName is transported after losing a military engagement. Though her will remains strong, she's @@.gold;filled with fear@@ when she sees the rivers of blood that flow through the city.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].combatSkill > 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -612,6 +660,7 @@
$activeSlave.slaveName's journey to her new home is respectful, even celebratory, as far as you can see. She is gravely informed by the purchasing agent that many slaves await her learned instruction.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].intelligence < -1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -625,6 +674,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].vagina == 0)>>
<<if ($slaves[$j].ovaries == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -639,6 +689,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion <= 50)>>
<<if ($slaves[$j].boobsImplant > 1000)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -652,6 +703,7 @@
$activeSlave.slaveName is soon well-known among the slaves of the arcology, as many of them are sold after passing under her hands in training. She performs effectively, imparting good sex slave ethics in a generation of sluts.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].intelligence > 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -664,6 +716,7 @@
$activeSlave.slaveName is not pleased by her change in circumstances, since she is soon subjected to training rigor that she did not experience while your property.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].intelligenceImplant == 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -676,6 +729,7 @@
A few weeks later, $activeSlave.slaveName is seen in a shipment of slaves heading out of the arcology. She has new fake tits, a bigger butt, lip implants, and even some facial bone structure alterations, but her balloon breasts are the most shocking change.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].boobsImplant == 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -688,6 +742,7 @@
A few weeks later, $activeSlave.slaveName is seen in a shipment of slaves heading out of the arcology. She is almost unrecognizable, having been quickly returned to as natural an appearance as skillful removal of her implants could manage.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].boobsImplant > 800)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -700,6 +755,7 @@
$activeSlave.slaveName's buyer takes charge of her, and cannot resist immediately running a hand between her buttocks to sink a couple of groping fingers into her soft asspussy.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "buttslut")>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -712,6 +768,7 @@
$activeSlave.slaveName heads off to form part of whatever great design her new master is pursuing; all you know is that it apparently requires lots of lithe, sharp toothed slave girls.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion <= 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -724,6 +781,7 @@
$activeSlave.slaveName becomes a common sight around the arcology, training slaves for her new master. They're usually seen hanging close by her as she manages them with an air at once protective and frankly sexual.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].actualAge > 35)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -736,6 +794,7 @@
$activeSlave.slaveName becomes quite a fixture at social events hosted by her new master; he enjoys showing off how healthy, happy and productive his cow is.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].lactation > 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -748,6 +807,7 @@
$activeSlave.slaveName's nervous buyer comes to collect her, stammering and sweating and doing his best to pretend he does this all the time.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].vaginalCount + $slaves[$j].analCount < 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -760,6 +820,7 @@
$activeSlave.slaveName is occasionally visible around the arcology, looking rather tired and gaunt under the stresses of a severe crash diet coupled with a punishing cardio regime.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].weight > 10)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -772,6 +833,7 @@
$activeSlave.slaveName is only rarely seen around the arcology, since her new owners force her to spend most of her time sleeping, eating and looking after herself. But her belly, painfully distended with food, makes her situation obvious.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].weight > 10)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -784,6 +846,7 @@
$activeSlave.slaveName is last seen somewhat later, packed into a shipment of cows heading out of the arcology. She looks rather ill from the drugs she's been filled with, and her now-distended breasts are marred by unsightly stretch marks.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].lactation == 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -796,6 +859,7 @@
$activeSlave.slaveName is frequently seen in public over the next few weeks, since she's being trained to improve her feminine deportment. She grows visibly more feminine as time passes, as the hormonal effects of having her balls cut off become apparent.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].balls > 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -808,6 +872,7 @@
$activeSlave.slaveName is next seen after some weeks of surgery. She's barely recognizable, and now possesses a serviceable vagina which she clearly is unsure of. Her original status is scarcely discernible.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].dick > 0)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -820,6 +885,7 @@
The upper half of $activeSlave.slaveName's body is never seen again. Her butt, on the other hand, is periodically visible in a lower-level arcade, her orifices gradually showing the wear and her price gradually decreasing, until finally she is seen no more.
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].devotion < 10)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -830,20 +896,23 @@
<<case "D cannibal">>
$activeSlave.slaveName is never seen again. Her buyer prefers to keep whatever happened to her private. However, rumors of steaks, rump roasts, sweetbreads, and blood pudding eaten at three in the morning filter out from time to time. Naturally, these murmurs never fail to @@.gold;terrify@@ your other slaves.
+ <<ClearSummaryCache>>
<<for $j = 0; $j < $slaves.length; $j++>>
- <<set $slaves[$j].trust -= 2>>
+ <<set $slaves[$j].trust -= 2>>
<</for>>
<<case "harvester">>
Though $activeSlave.slaveName's fate as a source of organs for transplantation is not announced, rumors of what happens to girls who @@.gold;fail to be valuable to you@@ pass among your slaves.
+ <<ClearSummaryCache>>
<<for $j = 0; $j < $slaves.length; $j++>>
- <<set $slaves[$j].trust -= 2>>
+ <<set $slaves[$j].trust -= 2>>
<</for>>
<<case "D amazon hunter">>
When $activeSlave.slaveName's buyer appears, the big girl is almost bashful. He tries to resist the impulse, but quickly breaks down and sweeps her into a tight hug. She accepts the embrace meekly. Your other slaves find this @@.mediumaquamarine;very romantic.@@
+ <<ClearSummaryCache>>
<<for $j = 0; $j < $slaves.length; $j++>>
- <<set $slaves[$j].trust += 1>>
+ <<set $slaves[$j].trust += 1>>
<</for>>
<<case "D oral servants">>
@@ -851,6 +920,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetishKnown == 1)>>
<<if ($slaves[$j].fetish == "cumslut")>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<</if>>
<</if>>
@@ -861,6 +931,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].dick > 0)>>
<<if ($slaves[$j].devotion > 20)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<</if>>
<</if>>
@@ -871,6 +942,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "buttslut")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<</if>>
<</if>>
@@ -881,6 +953,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].dick > 0)>>
<<if ($slaves[$j].boobs > 400)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 1>>
<</if>>
<</if>>
@@ -891,6 +964,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if ($slaves[$j].fetish == "pregnancy")>>
<<if ($slaves[$j].fetishKnown == 1)>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].trust += 4>>
<</if>>
<</if>>
@@ -901,8 +975,9 @@
<<case "fuckdoll">>
Though $activeSlave.slaveName's fate as a living fucktoy is not obvious, since most of her body will for ever after be encased in thick latex, rumors of what happens to girls who @@.gold;fail to be valuable to you@@ pass among your slaves.
+ <<ClearSummaryCache>>
<<for $j = 0; $j < $slaves.length; $j++>>
- <<set $slaves[$j].trust -= 2>>
+ <<set $slaves[$j].trust -= 2>>
<</for>>
<<case "tentacle bred">>
@@ -910,6 +985,7 @@
<<for $j = 0; $j < $slaves.length; $j++>>
<<if canSee($slaves[$j])>>
<<if $slaves[$j].intelligence < 0>>
+ <<ClearSummaryCache $slaves[$j]>>
<<set $slaves[$j].devotion -= 4>>
<<set $seed = 1>>
<</if>>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index a352754b782..45f6ed094e8 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -1,6 +1,7 @@
:: Summary Options [nobr]
<<set $nextButton = "Back to Main", $nextLink = "Main">>
+<<ClearSummaryCache>>
//These options will affect the short slave summaries that appear on the main menu and the facility management screens.//
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index c2d532be52a..c66c45499a5 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -2502,6 +2502,7 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<continue>>
<</if>>
+ <<ClearSummaryCache $slaves[_rai]>>
<<CheckAutoRulesActivate $slaves[_rai]>> /* does not use or modify $currentRule */
<<DefaultRules $slaves[_rai]>> /* does not use or modify $currentRule */
<</for>>
--
GitLab