diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 7670cd4193754ed9e1f366dc948402283db9d25c..421ea249d748e8d2a4f7a94298d50ed46b6a17ce 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,13 @@ 12/29/17 + 243 + -fixed subordinate slave setting + + 242 + -anon's new family tree display (not yet implemented in startingGirls, so don't freak out) + -various little tweaks + 241 -fixed bad variable in costs JS -fixed unclosed set in endWeek diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw index 0f9348633f798c5d8b62c696d89b683053b6fa56..063577ef9d49100ee54e48ea9a18c23063ec265f 100644 --- a/src/uncategorized/subordinateTargeting.tw +++ b/src/uncategorized/subordinateTargeting.tw @@ -2,12 +2,15 @@ <<set $nextButton = "Back", $nextLink = "Slave Interact">> +<<set _displaySlave = $activeSlave>> + <<if $activeSlave.subTarget == $activeSlave.ID>> <<set $activeSlave.subTarget = 0>> <</if>> +<<assignJob $activeSlave "be a subordinate slave">> <<set _st = $slaves.findIndex(function(s) { return s.ID == $activeSlave.subTarget; })>> <<if _st != -1>> - $activeSlave.slaveName will submit to ''__@@.pink;$slaves[_i].slaveName@@__'' this week. + $activeSlave.slaveName will submit to ''__@@.pink;$slaves[_st].slaveName@@__'' this week. <<else>> $activeSlave.slaveName has not been given to any particular slave, so she will have to offer herself to everyone this week. <<set $activeSlave.subTarget = 0>> @@ -18,5 +21,6 @@ <br><br>[[None|Subordinate Targeting][$activeSlave.subTarget = 0]] +<<set $activeSlave = _displaySlave>> <<assignJob $activeSlave "be a subordinate slave">>