From 2fe2c6d846dcafb3d269def34aeae51a67bc8153 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Sat, 13 Jun 2020 14:23:56 -0700 Subject: [PATCH] Use resentment guard for blocked fetish relationships just like for assignment ones. Eliminate the $resentment global variable. Fix indentation symmetry. --- src/uncategorized/saRelationships.tw | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index e6968eeabed..74330ad71a1 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -70,7 +70,7 @@ <<set _seed = random(1, 80)>> <</if>> <<if _seed > 75>> - <<set $resentment = 0>> + <<set _resentment = 0>> <<for _j = 0; _j < _SL; _j++>> <<set _SlaveJ = $slaves[_j]>> <<setLocalPronouns _SlaveJ 2>> @@ -193,9 +193,9 @@ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>> <<break>> <<else>> - <<if $resentment == 0>> + <<if _resentment == 0>> _SlaveI.slaveName tries to strike up a friendship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; $he @@.mediumorchid;resents@@ being castigated for simple sociability. - <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2, $resentment++>> + <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2, _resentment++>> <</if>> <</if>> <</if>> @@ -217,18 +217,20 @@ <<set _SlaveJ.relationship = 3, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 3, _SlaveI.relationshipTarget = _SlaveJ.ID>> <<break>> <<else>> - _SlaveI.slaveName tries to strike up a sexual relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; $he @@.mediumorchid;resents@@ being prevented from pursuing _him2. - <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2>> - <</if>> - <</if>> - <</if>> - <</if>> - <</for>> - <<if _SlaveI.relationshipTarget != _SlaveJ.ID>> - <<set _SlaveJ = null>> + <<if _resentment == 0>> + _SlaveI.slaveName tries to strike up a sexual relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; $he @@.mediumorchid;resents@@ being prevented from pursuing _him2. + <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2, _resentment++>> + <</if>> + <</if>> <</if>> <</if>> + <</if>> + <</for>> + <<if _SlaveI.relationshipTarget != _SlaveJ.ID>> + <<set _SlaveJ = null>> <</if>> + <</if>> /*seed*/ + <</if>> /*devotion*/ <</if>> <<set _drop = 1>> <</if>> -- GitLab