Skip to content
Snippets Groups Projects
Commit e770bf95 authored by Pregmodder's avatar Pregmodder
Browse files

fix

parent d6dc7cf3
No related branches found
No related tags found
1 merge request!1234Pregmod v1021-243
...@@ -4,6 +4,13 @@ ...@@ -4,6 +4,13 @@
12/29/17 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 241
-fixed bad variable in costs JS -fixed bad variable in costs JS
-fixed unclosed set in endWeek -fixed unclosed set in endWeek
......
...@@ -2,12 +2,15 @@ ...@@ -2,12 +2,15 @@
<<set $nextButton = "Back", $nextLink = "Slave Interact">> <<set $nextButton = "Back", $nextLink = "Slave Interact">>
<<set _displaySlave = $activeSlave>>
<<if $activeSlave.subTarget == $activeSlave.ID>> <<if $activeSlave.subTarget == $activeSlave.ID>>
<<set $activeSlave.subTarget = 0>> <<set $activeSlave.subTarget = 0>>
<</if>> <</if>>
<<assignJob $activeSlave "be a subordinate slave">>
<<set _st = $slaves.findIndex(function(s) { return s.ID == $activeSlave.subTarget; })>> <<set _st = $slaves.findIndex(function(s) { return s.ID == $activeSlave.subTarget; })>>
<<if _st != -1>> <<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>> <<else>>
$activeSlave.slaveName has not been given to any particular slave, so she will have to offer herself to everyone this week. $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>> <<set $activeSlave.subTarget = 0>>
...@@ -18,5 +21,6 @@ ...@@ -18,5 +21,6 @@
<br><br>[[None|Subordinate Targeting][$activeSlave.subTarget = 0]] <br><br>[[None|Subordinate Targeting][$activeSlave.subTarget = 0]]
<<set $activeSlave = _displaySlave>>
<<assignJob $activeSlave "be a subordinate slave">> <<assignJob $activeSlave "be a subordinate slave">>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment