diff --git a/src/endWeek/saRules_old.js b/src/endWeek/saRules_old.js
index 8d16716be1aaccd7f49dc5235a9989b1588ede8c..0520d7e5fc160035b941aa4d8f30cd625b5efc0d 100644
--- a/src/endWeek/saRules_old.js
+++ b/src/endWeek/saRules_old.js
@@ -378,7 +378,7 @@
r += `${He}'s <span class="hotpink">rewarded</span> with`;
if (slave.clitPiercing === 3) {
r += `sustained orgasm from ${his} ${slave.dick ? `dick` : `clit`} piercing,`;
- } else if (slave.rules.release === "sapphic") {
+ } else if (slave.rules.release.slaves === 1) {
r += `immediate sex with any nearby slave,`;
} else {
r += `a quick climax from a vibrator,`;
diff --git a/src/js/releaseRules.js b/src/js/releaseRules.js
index cd9352a1d149fdbf09601ea71c06cff3e94d2284..b622efdbdf67798a96533c965fd2db8bf70fcf59 100644
--- a/src/js/releaseRules.js
+++ b/src/js/releaseRules.js
@@ -136,6 +136,7 @@ App.Utils.releaseSummaryLong = function releaseSummaryLong(slave) {
if (rel.master === 1) {
permissions.push("you");
}
+ if (permissions.length < 1) { return "unknown"; } // probably means BC didn't get run, but let's not die because of it
return permissions.reduce(function(res, ch, i, arr) { return res + (i === arr.length - 1 ? ' and ' : ', ') + ch; });
}
};
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 9a445f86b65f760420ec978a6f6cab4318de91d2..42f796c15f845bd4028c3268e9bf8d67fbfd4367 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -183,7 +183,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -495,7 +495,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -684,7 +684,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -968,7 +968,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing, often on stage during a dance,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -1393,7 +1393,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -1521,7 +1521,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -1822,7 +1822,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -2150,7 +2150,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -2327,7 +2327,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -2660,7 +2660,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -2853,7 +2853,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -3168,7 +3168,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -3350,7 +3350,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -3667,7 +3667,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -3844,7 +3844,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -4224,7 +4224,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -4402,7 +4402,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -4764,7 +4764,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -5143,7 +5143,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -5529,7 +5529,7 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing == 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $slaves[$i].rules.release == "sapphic">>
+ <<elseif $slaves[$i].rules.release.slaves == 1>>
immediate sex with any nearby slave,
<<else>>
a quick climax from a vibrator,
@@ -5572,7 +5572,7 @@
<<set $slaves[$i].trust -= _punishments>>
<</switch>>
<</if>>
- <<if $subSlaves > 0 && (_release == "permissive" || $slaves[$i].rules.release == "sapphic") && $slaves[$i].assignment != "serve your other slaves">>
+ <<if $subSlaves > 0 && _release.slaves == 1 && $slaves[$i].assignment != "serve your other slaves">>
<<set $slaves[$i].need -= (20*$subSlaves)>> /* make those serve your other slaves do some work for once */
<</if>>
<</switch>>