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

Merge branch 'TT-for-sleep-rules' into 'pregmod-master'

TT for sleep rules

Closes #2821

See merge request pregmodfan/fc-pregmod!8922
parents c58e6820 576ee4b2
No related branches found
No related tags found
No related merge requests found
...@@ -145,11 +145,11 @@ App.UI.SlaveInteract.rules = function(slave) { ...@@ -145,11 +145,11 @@ App.UI.SlaveInteract.rules = function(slave) {
App.UI.DOM.appendNewElement("span", div, ` ${His} sleeping schedule is managed by ${his} assignment.`, "note"); App.UI.DOM.appendNewElement("span", div, ` ${His} sleeping schedule is managed by ${his} assignment.`, "note");
} else if ([Job.GLORYHOLE, Job.FARMYARD, Job.CLUB, Job.PUBLIC, Job.WHORE, Job.BROTHEL, Job.SUBORDINATE, Job.HOUSE, Job.QUARTER, Job.FUCKTOY, Job.MASTERSUITE, Job.MILKED].includes(slave.assignment) || (V.dairyRestraintsSetting < 2 && slave.assignment === Job.DAIRY)) { } else if ([Job.GLORYHOLE, Job.FARMYARD, Job.CLUB, Job.PUBLIC, Job.WHORE, Job.BROTHEL, Job.SUBORDINATE, Job.HOUSE, Job.QUARTER, Job.FUCKTOY, Job.MASTERSUITE, Job.MILKED].includes(slave.assignment) || (V.dairyRestraintsSetting < 2 && slave.assignment === Job.DAIRY)) {
choices = [ choices = [
{value: "none"}, {value: "none", tooltip: "Never"},
{value: "cruel"}, {value: "cruel", tooltip: "When Exhausted"},
{value: "restrictive"}, {value: "restrictive", tooltip: "When Fatigued"},
{value: "permissive"}, {value: "permissive", tooltip: "When Tired"},
{value: "mandatory"}, {value: "mandatory", tooltip: "Every Week"},
]; ];
div.append(listChoices(choices, "rest")); div.append(listChoices(choices, "rest"));
} else { } else {
...@@ -284,7 +284,10 @@ App.UI.SlaveInteract.rules = function(slave) { ...@@ -284,7 +284,10 @@ App.UI.SlaveInteract.rules = function(slave) {
() => { () => {
slave.rules[property] = c.value; slave.rules[property] = c.value;
refresh(); refresh();
} },
[],
"",
c.tooltip ? c.tooltip : ""
) )
); );
} }
......
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