From 143f996b423b9149f98b22831a0c5ebd6a42c1cd Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Mon, 11 Sep 2017 01:57:15 +0300 Subject: [PATCH] debug functions for JS console info and alert() pop-up use, and some RA interface tweaks --- src/js/storyJS.tw | 12 +++++++++++- src/uncategorized/rulesAssistant.tw | 12 ++++++------ src/utility/raWidgets.tw | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw index 304320483ef..29539e15224 100644 --- a/src/js/storyJS.tw +++ b/src/js/storyJS.tw @@ -994,4 +994,14 @@ window.nippleColor = function(slave) { return 'brown'; } } -} \ No newline at end of file +} + +window.jsAlert = function(obj) +{ + alert(obj); +} + +window.jsConsoleInfo = function(obj) +{ + console.info(obj); +} diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw index e36b9f9aecc..b94a8b970b6 100644 --- a/src/uncategorized/rulesAssistant.tw +++ b/src/uncategorized/rulesAssistant.tw @@ -1185,12 +1185,12 @@ Contraceptives for fertile slaves: <br> <<if $pregSpeedControl > 0 >> Pregnancy control agents for pregnant slaves: <span id = "pregSpeedControl"></span> -No changes <<rbutton "$currentRule.pregSpeed" "nds">> | -None <<rbutton "$currentRule.pregSpeed" "none">> | -Fast gestation <<rbutton "$currentRule.pregSpeed" "fast">> | -Slow gestation <<rbutton "$currentRule.pregSpeed" "slow">> | -Birth supressors <<rbutton "$currentRule.pregSpeed" "supress">> | -Birth stimulators <<rbutton "$currentRule.pregSpeed" "stimulate">> +<<rbutton "$currentRule.pregSpeed" "nds">> No changes | +<<rbutton "$currentRule.pregSpeed" "none">> None | +<<rbutton "$currentRule.pregSpeed" "fast">> Fast gestation | +<<rbutton "$currentRule.pregSpeed" "slow">> Slow gestation | +<<rbutton "$currentRule.pregSpeed" "supress">> Birth supressors | +<<rbutton "$currentRule.pregSpeed" "stimulate">> Birth stimulators <br> <</if>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 260dd1341fc..103ecaabdc8 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -610,6 +610,20 @@ <<RANormalizeAssignments "excludeAssignment">> <</link>> <</if>> +| +<<link "Exclude all">> + <<set $currentRule.excludeAssignment.push("work a glory hole")>> + <<set $currentRule.excludeAssignment.push("get milked")>> + <<set $currentRule.excludeAssignment.push("take classes")>> + <<set $currentRule.excludeAssignment.push("serve the public")>> + <<set $currentRule.excludeAssignment.push("whore")>> + <<set $currentRule.excludeAssignment.push("stay confined")>> + <<set $currentRule.excludeAssignment.push("be a servant")>> + <<set $currentRule.excludeAssignment.push("be a subordinate slave")>> + <<set $currentRule.excludeAssignment.push("please you")>> + <<set $currentRule.excludeAssignment.push("rest")>> + <<RANormalizeAssignments "excludeAssignment">> +<</link>> <</replace>> <</widget>> @@ -987,6 +1001,21 @@ <</link>> <</if>> <</if>> +| +<<link "Exclude all">> + <<set $currentRule.excludeFacility.push("be confined in the cellblock")>> + <<set $currentRule.excludeFacility.push("get treatment in the clinic")>> + <<set $currentRule.excludeFacility.push("rest in the spa")>> + <<set $currentRule.excludeFacility.push("learn in the schoolroom")>> + <<set $currentRule.excludeFacility.push("serve in the master suite")>> + <<set $currentRule.excludeFacility.push("work as a servant")>> + <<set $currentRule.excludeFacility.push("work in the dairy")>> + <<set $currentRule.excludeFacility.push("be confined in the arcade")>> + <<set $currentRule.excludeFacility.push("serve in the club")>> + <<set $currentRule.excludeFacility.push("work in the brothel")>> + <<set $currentRule.excludeFacility.push("live with your Head Girl")>> + <<RANormalizeAssignments "excludeFacility">> +<</link>> <</if>> <</replace>> <</widget>> -- GitLab