diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 36498d2dc242fc254ef9fdd5eb0e88fc8daf0578..c2fbca8c706451bab70b93f593bcb6baab7bc64f 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.4.x
+6/30/2018
+
+ 11
+ -fixes
+ -rivals are now more rapey and lovers more sexual
+
6/29/2018
10
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 7ac0e52df4af17ed660f08ca8248c99ce5326110..23cc44b1a10d7b484f08a41f01d7a5223267ff77 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10816,7 +10816,7 @@ window.DefaultRules = (function() {
if (rule.preg === true && slave.preg === 0) {
r += `<br>${slave.slaveName} is being given contraceptives.`;
slave.preg = -1;
- } else if (slave.preg === -1) {
+ } else if (slave.preg === -1 && rule.preg === false) {
r += `<br>${slave.slaveName} is no longer being put on contraceptives.`;
slave.preg = 0;
}
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index fcfdba60287fb5d1f60889562967728961b355ac..d10e931375271834d3bd9ee7c2accc830fb4b348 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -878,7 +878,7 @@ window.DefaultRules = (function() {
if (rule.preg === true && slave.preg === 0) {
r += `<br>${slave.slaveName} is being given contraceptives.`;
slave.preg = -1;
- } else if (slave.preg === -1) {
+ } else if (slave.preg === -1 && rule.preg === false) {
r += `<br>${slave.slaveName} is no longer being put on contraceptives.`;
slave.preg = 0;
}
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 97d7a8571e9db9d23061ad498dbc191cfc2e488a..31425397da5c26a1d72f82380c986da9e722f60e 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6149,6 +6149,40 @@
<</if>>
<</if>>
+/* There really is no good place for this since saRules is too early and saRivals/saRelationships is too late */
+<<if $slaves[$i].rivalry > 1>>
+ <<set _j = $slaveIndices[$slaves[$i].rivalryTarget]>>
+ <<if def _j && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* rape time */
+ <<set _fuckCount = random(1,(Math.ceil($slaves[$i].energy/10)+1))>>
+ <<set $slaves[$i].need -= _fuckCount*10>>
+ <<SimpleSlaveSlaveFucking $slaves[_j] $slaves[$i] _fuckCount>>
+ <</if>>
+<</if>>
+<<if $slaves[$i].relationship > 2>>
+ <<set _j = $slaveIndices[$slaves[$i].relationshipTarget]>>
+ <<if def _j && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* sexy time */
+ <<if $slaves[$i].relationship == 5 && canPenetrate($slaves[$i])>>
+ <<if $slaves[_j].vagina == 0 && canDoVaginal($slaves[_j])>>
+ <<set $slaves[_j].vagina++, $slaves[_j].vaginalCount++, $vaginalTotal++>>
+ <<set $slaves[$i].penetrativeCount++, $penetrativeTotal++>>
+ <<if canImpreg($slaves[_j], $slaves[$i])>>
+ <<= knockMeUp($slaves[_j], 50, 0, $slaves[$i].ID, 1)>>
+ <</if>>
+ <</if>>
+ <<if $slaves[_j].anus == 0 && canDoAnal($slaves[_j])>>
+ <<set $slaves[_j].anus++, $slaves[_j].analCount++, $analTotal++>>
+ <<set $slaves[$i].penetrativeCount++, $penetrativeTotal++>>
+ <<if canImpreg($slaves[_j], $slaves[$i])>>
+ <<= knockMeUp($slaves[_j], 50, 1, $slaves[$i].ID, 1)>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set _fuckCount = random(Math.min(4,Math.ceil($slaves[$i].energy/20)),5)>>
+ <<set $slaves[$i].need = 0>>
+ <<SimpleSlaveSlaveFucking $slaves[_j] $slaves[$i] _fuckCount>>
+ <</if>>
+<</if>>
+
<<if $slaves[$i].need>>
<<if $slaves[$i].need > $slaves[$i].energy/2>>
<<if $slaves[$i].aphrodisiacs > 0 || $slaves[$i].inflationType == "aphrodisiac">>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index b4883a260d17976085a58df909e6615fcf53c010..7bf63c5f1f476f7b05fa284042f0329c701f90a0 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -243,7 +243,7 @@
<<if _roll > 70 && $slaves[$i].rivalry < 3>>
$slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightsalmon;pursue their family rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
- <<elseif _roll > 40 && $slaves[$i].rivalry > 0>>
+ <<elseif _roll > 40 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
$slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightgreen;patch up their family relationship.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
@@ -254,7 +254,7 @@
<<if _roll > 70 && $slaves[$i].rivalry < 3>>
$slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightsalmon;pursue their family rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
- <<elseif _roll > 40 && $slaves[$i].rivalry > 0>>
+ <<elseif _roll > 40 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
$slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightgreen;patch up their family relationship.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
@@ -271,7 +271,7 @@
$slaves[$i].slaveName @@.lightsalmon;bickers with <<SlaveFullName $slaves[_j]>>@@ whenever she can, worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<</if>>
- <<elseif _roll < $slaves[$i].devotion-$slaves[$i].trust-10 && $slaves[$i].rivalry > 0>>
+ <<elseif _roll < $slaves[$i].devotion-$slaves[$i].trust-10 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
$slaves[$i].slaveName does her best to be nice to <<SlaveFullName $slaves[_j]>>, and manages to @@.lightgreen;de-escalate their little feud.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
@@ -282,7 +282,7 @@
<</if>>
<<if $slaves[$i].rivalry>>
-<<set _j = $slaveIndices[$slaves[$i].rivalryTarget]>>
+ <<set _j = $slaveIndices[$slaves[$i].rivalryTarget]>>
<<if def _j && ($slaves[$i].ID != $slaves[_j].rivalryTarget)>>
<<set $slaves[_j].rivalry = 0, $slaves[_j].rivalryTarget = 0>>
<<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index b0658c7bc1b54de94f166a818c850c0804698efe..3000c2c1ccc518724151a520e01affae1aaa4988 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -5053,7 +5053,7 @@ $He has
<</if>>
<</if>>
<<else>>
- $He looks so massively pregnant that $him dwarfs any normal pregnancy,
+ $He looks so massively pregnant that $he dwarfs any normal pregnancy,
<<if $activeSlave.physicalAge <= 3>>
and $he is nearly spherical. $His toddlerish form is utterly dwarfed by $his implant, all $he can do is lean against it.<<if $saleDescription == 0>> $He requires multiple slaves to move $his bulk when $he must go somewhere.<</if>>
<<elseif $activeSlave.physicalAge <= 12>>