diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index f744edbdf99e6888eec35ace848ea18e859f22a6..c423bebd910b211a7f30c4541df3bd3db49c21b7 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -39,54 +39,56 @@
<</switch>>
<<if canWalk($activeSlave)>>
- You call $activeSlave.slaveName into your office.
+ You call $activeSlave.slaveName into your office.
<<else>>
- You have $activeSlave.slaveName brought into your office.
+ You have $activeSlave.slaveName brought into your office.
<</if>>
-
-$He looks at you
+
+ $He looks at you
<<if $activeSlave.fetish != "mindbroken">>with
- <<if $activeSlave.devotion > 50>>
- adoration
- <<elseif ($activeSlave.devotion) > 20 && ($activeSlave.devotion <= 50)>>
- a calm acceptance
- <<elseif ($activeSlave.devotion > -20) && ($activeSlave.devotion <= 20)>>
- apprehension
- <<elseif $activeSlave.devotion <= -20>>
- hatred
- <</if>>
+ <<if $activeSlave.devotion > 50>>
+ adoration
+ <<elseif ($activeSlave.devotion) > 20 && ($activeSlave.devotion <= 50)>>
+ a calm acceptance
+ <<elseif ($activeSlave.devotion > -20) && ($activeSlave.devotion <= 20)>>
+ apprehension
+ <<elseif $activeSlave.devotion <= -20>>
+ hatred
+ <</if>>
<<else>>
- blankly
+ blankly
<</if>>
/*TODO: Add checks for trust*/
and waits for you to continue. You tell $him that you've gotten tired of having $him around and that you have decided it is time you got rid of $him.
<<if $activeSlave.fetish != "mindbroken">> $His expression changes to one of <</if>>
<<if $activeSlave.fetish != "mindbroken">>
- <<if $activeSlave.devotion > 50>>
- abject sorrow
- <<elseif ($activeSlave.devotion) > 20 && ($activeSlave.devotion <= 50)>>
- sadness
- <<else>>
- relief
- <</if>>
- until
+ <<if $activeSlave.devotion > 50>>
+ abject sorrow
+ <<elseif ($activeSlave.devotion) > 20 && ($activeSlave.devotion <= 50)>>
+ sadness
+ <<else>>
+ relief
+ <</if>>
+until
<<else>>
- $He just nods dumbly and continues to watch you with a vacant expression, even as
-
+ $He just nods dumbly and continues to watch you with a vacant expression, even as
+
<</if>>
-you reach behind your desk and pull out your trusty _weapon,
+ you reach behind your desk and pull out your trusty _weapon,
+
<<if $activeSlave.fetish != "mindbroken">>
- at which point abject fear fills $his face. $He immediately drops to $his knees and begins openly begging for you to have mercy.
+ at which point abject fear fills $his face. $He immediately drops to $his knees and begins openly begging for
+you to have mercy.
<<else>>
- to which $he still doesn't respond.
+ to which $he still doesn't respond.
<</if>>
-<br>
<br><<link "Kill $him" "KilledSlave">><<set $killChoice = 0>><</link>>
<br><<link "Have mercy on $him" "KilledSlave">><<set $killChoice = 1>><</link>>
<<if ($activeSlave.assignment != "guard you") && ($pit > 0)>>
- <br><<link "Let $him win $his life in combat" "KilledSlave">><<set $killChoice = 2>><</link>>
-<</if>>
\ No newline at end of file
+ <br><<link "Let $him win $his life in combat" "KilledSlave">><<set $killChoice = 2>><</link>>
+<</if>>
+<br><br>
\ No newline at end of file
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index 1fa603b833875b35c098ed23fead96b30259d57b..4b9622c3e53cc6ec38fa090f4332eec982156215 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -2,80 +2,174 @@
<<if $killChoice == 0>>
-<<set _qualifiedFS = []>>
-<<set _qualifiedFS.push("RND")>>
+ <<set _qualifiedFS = []>>
+ <<set _qualifiedFS.push("RND")>>
-<<if $arcologies[0].FSRomanRevivalist != "unset">>
- <<set _qualifiedFS.push("roman revivalist")>>
-<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
- <<set _qualifiedFS.push("aztec revivalist")>>
-<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<set _qualifiedFS.push("egyptian revivalist")>>
-<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- <<set _qualifiedFS.push("edo revivalist")>>
-<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
- <<set _qualifiedFS.push("arabian revivalist")>>
-<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
- <<set _qualifiedFS.push("chinese revivalist")>>
-<</if>>
+ <<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<set _qualifiedFS.push("roman revivalist")>>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set _qualifiedFS.push("aztec revivalist")>>
+ <<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
+ <<set _qualifiedFS.push("egyptian revivalist")>>
+ <<elseif $arcologies[0].FSEdoRevivalist != "unset">>
+ <<set _qualifiedFS.push("edo revivalist")>>
+ <<elseif $arcologies[0].FSArabianRevivalist != "unset">>
+ <<set _qualifiedFS.push("arabian revivalist")>>
+ <<elseif $arcologies[0].FSChineseRevivalist != "unset">>
+ <<set _qualifiedFS.push("chinese revivalist")>>
+ <</if>>
-You simply smile at $him and tell $him not to worry as you continue
+ You simply smile at $him and tell $him not to worry as you continue
-<<switch _qualifiedFS>>
-<<case "roman revivalist">>
- sharpening your gladius.
-<<case "aztec revivalist">>
- sharpening your macuahuitl.
-<<case "egyptian revivalist">>
- sharpening your kopesh.
-<<case "edo revivalist">>
- sharpening your katana.
-<<case "arabian revivalist">>
- sharpening your scimitar.
-<<case "chinese revivalist">>
- sharpening your jian.
-<<default>>
- threading on a silencer.
-<</switch>>
+ <<switch _qualifiedFS>>
+ <<case "roman revivalist">>
+ sharpening your gladius.
+ <<case "aztec revivalist">>
+ sharpening your macuahuitl.
+ <<case "egyptian revivalist">>
+ sharpening your kopesh.
+ <<case "edo revivalist">>
+ sharpening your katana.
+ <<case "arabian revivalist">>
+ sharpening your scimitar.
+ <<case "chinese revivalist">>
+ sharpening your jian.
+ <<default>>
+ threading on a silencer.
+ <</switch>>
-$activeSlave.slaveName gives an audible sigh of relief and begins to thank you profusely, though $his thanks are cut short as
+ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you profusely, though $his thanks are cut short as
-<<switch _qualifiedFS>>
-<<case "roman revivalist">>
- the sound of a sword tearing through flesh
-<<case "aztec revivalist">>
- the sound of a sword tearing through flesh
-<<case "egyptian revivalist">>
- the sound of a sword tearing through flesh
-<<case "edo revivalist">>
- the sound of a sword tearing through flesh
-<<case "arabian revivalist">>
- the sound of a sword tearing through flesh
-<<case "chinese revivalist">>
- the sound of a sword tearing through flesh
-<<default>>
- a silenced gunshot
-<</switch>>
+ <<switch _qualifiedFS>>
+ <<case "roman revivalist">>
+ the sound of a sword tearing through flesh
+ <<case "aztec revivalist">>
+ the sound of a sword tearing through flesh
+ <<case "egyptian revivalist">>
+ the sound of a sword tearing through flesh
+ <<case "edo revivalist">>
+ the sound of a sword tearing through flesh
+ <<case "arabian revivalist">>
+ the sound of a sword tearing through flesh
+ <<case "chinese revivalist">>
+ the sound of a sword tearing through flesh
+ <<default>>
+ a silenced gunshot
+ <</switch>>
-rings through the room. You have another servant clean up the mess as you continue with what you were previously doing.
+ rings through the room. You have another servant clean up the mess as you continue with what you were previously doing.
- <<include "Remove activeSlave">>
+ <br><br>
+ <<if $familyTesting == 1>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $activeSlave.mother == $slaves[_ss].ID>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her daughter.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <</if>>
+ <<if $activeSlave.father == $slaves[_ss].ID>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you have killed her daughter.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].father>>
+ $slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you have killed her father.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].mother>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her mother.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <</if>>
+ <<switch areSisters($activeSlave, $slaves[_ss])>>
+ <<case 1>>
+ $slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you have killed her twin.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <<case 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her sister.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <<case 3>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you have killed her half-sister.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</switch>>
+ <</for>>
+ <<else>>
+ <<if $activeSlave.relation != 0>>
+ <<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
+ <<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her $activeSlave.relation.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <<set $display = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $activeSlave.relationship > 0>>
+ <<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
+ <<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her best source of comfort and companionship in a life of bondage.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
+ <<set $display = 1>>
+ <</if>>
+ <<elseif $activeSlave.relationship == -3>>
+ Killing 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.
+ <<run clearSummaryCache()>>
+ <br><br>
+ <<set $rep -= 200>>
+ <<set $display = 1>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $slaves[_ss].devotion > 50>>
+ <<set $slaves[_ss].trust -= 10>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if $activeSlave.rivalry != 0>>
+ <<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
+ <<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+ $slaves[_ss].slaveName is @@.hotpink;pleased@@ that she won't have to see her rival any more.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
+ <<set $display = 1>>
+ <</if>>
+ <</if>>
- /*[if slave had family, they lose major devotion and trust, potentially become mindbroken]*/
+ <<include "Remove activeSlave">>
+ <<set $returnTo = "Main">>
+/*this will DEFINTELY need balancing*/
<<elseif $killChoice == 1>>
- You make a show of considering sparing $his life, then, with a heavy sigh, unbuckle your pants and sit down at your desk. You beckon to $him, and $he just about trips over $himself as $he hastily makes $his way over to you. $His blowjob isn't the best you've ever had, $him sobbing as much as $he was, though $his enthusiasm more than makes up for it. After you finish deep in $his throat, $he sits back and wipes away $his tears, sniffling and thanking you again for giving $him another chance.
- <<if $activeSlave.devotion <= 30>><<set $activeSlave.devotion = 30>><<else>><<set $activeSlave.devotion += 20>><</if>>
- <<set $activeSlave.trust = -100>>
+ You make a show of considering sparing $his life, then, with a heavy sigh, unbuckle your pants and sit down at your desk. You beckon to $him, and $he just about trips over $himself as $he hastily makes $his way over to you. $His blowjob isn't the best you've ever had, $him @@.gold;sobbing@@ as much as $he is; though $his enthusiasm more than makes up for it. After you finish deep in $his throat, $he sits back and wipes away $his tears, sniffling and @@.hotpink;thanking you again@@ for giving $him another chance.
+ <<if $activeSlave.devotion <= 30>>
+ <<set $activeSlave.devotion = 30>>
+ <<else>>
+ <<set $activeSlave.devotion += 20>>
+ <</if>>
+ <<set $activeSlave.trust = -100>>
<<elseif $killChoice == 2>>
- You tell $him that you'll let $bodyguard.slaveName decide $his fate. You tell $him that if $he wants to live, $he'll have to beat $him in hand-to-hand combat in the $pitName.
- <<if $activeSlave.combatSkill == 0>>
- The fear on $his face is palpable, though $he nods slowly and agrees, not seeing another choice.
- <<else>>
- $He nods $his head and straightens up, as though preparing $himself for the fight for $his life.
- <</if>>
-
- /*TODO: Connect this to the Pit, have an end-of-week event between the Bodyguard and the slave*/
+ You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate -- if $he wants to live, $he'll have to beat $him in hand-to-hand combat in $pitName.
+ <<if $activeSlave.combatSkill == 0>>
+ The fear on $his face is palpable, though $he nods slowly and agrees, not seeing another choice.
+ <<else>>
+ $He nods $his head and straightens up, as though preparing $himself for the fight for $his life.
+ <</if>>
+ //This scene is currently unfinished.//
+ /*TODO: Connect this to the Pit, have a end-of-week event between the Bodyguard and the slave*/
+
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 8ae6bd01e2ed7a2006d0daf1cba665d47e664548..560a36d591d7d4a8dc5c4698df30d2a7669d23f7 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1525,7 +1525,7 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule
<</if>>
<<link "Discard $him" "Discard Confirm">><</link>>
<<if $seeExtreme == 1 && $arcologies[0].FSPaternalist == "unset" && $cheatMode == 1>>
- <<link "Threaten $his life" "KillSlave">><</link>>
+ | <<link "Threaten $his life" "KillSlave">><</link>>
<</if>>
<<else>>
//You cannot sell or discard your last slave.//