diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 5dbd2b6354b009523ba54017ac05e0e69bfc0e4a..38fca2c30c48068a7ab397704dc56bd51790d07b 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -670,9 +670,6 @@ DairyRestraintsSetting($dairyRestraintsSetting) /* economy reports variables */ <<set $showEconomicDetails = 0>> -/* filter by assignment mod */ -<<set $assignFilter = 0>> - /*pregmod variables */ <<set $newDescriptions = 0>> <<set $specialSlavesPriceOverride = 0>> diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw index d1ff2c92fe6a104eaf07e7c4b56494f4604f007e..4ce8621e6eda96e89ad90c7b46c57b58beeec666 100644 --- a/src/js/utilJS.tw +++ b/src/js/utilJS.tw @@ -511,7 +511,7 @@ window.getSlaveDevotionClass = function (slave) if (-95 > slave.devotion) return 'very-hateful'; else if (-50 > slave.devotion) return 'hateful'; else if (-20 > slave.devotion) return 'resistant'; - else if (20 >= slave.devotion) return 'ambivelent'; + else if (20 >= slave.devotion) return 'ambivalent'; else if (50 >= slave.devotion) return 'accepting'; else if (95 >= slave.devotion) return 'devoted'; else return 'worshipful'; diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 2170a704d0529b43e9352c6d00d91df09328a4f1..d00f3e5fb419fcc1086071832499b02124aaaf6f 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -647,8 +647,8 @@ <<if ndef $showEconomicDetails>> <<set $showEconomicDetails = 0>> <</if>> -<<if ndef $assignFilter>> - <<set $assignFilter = 0>> +<<if def $assignFilter>> + <<unset $assignFilter>> <</if>> <<if ndef $personalAttention>> <<set $personalAttention = "sex">> diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index d603f78ca8bb9192c33111cfa04e67db1c03c2b7..c7e5ce60fa61b85dd00bbb92669eef9ce844ec27 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -432,8 +432,8 @@ __''MAIN MENU''__ //[[Summary Options]]// <<if $positionMainLinks >= 0>> <<MainLinks>> <</if>> + /* TASK ARRAY */ -<<if $assignFilter == 1>> <<set $jobTypes = [{title: "Rest", asgn: "rest"}, {title: "Subordinate", asgn: "be a subordinate slave"}, {title: "Whore", asgn: "whore"}, {title: "Public Servant", asgn: "serve the public"}, {title: "Hole", asgn: "work a glory hole"}, {title: "Milking", asgn: "get milked"}, {title: "House Servant", asgn: "be a servant"}, {title: "Fucktoy", asgn: "please you"}, {title: "Confinement", asgn: "stay confined"}, {title: "Classes", asgn: "take classes"}, {title: "Choose own", asgn: "choose her own job"}]>> <br> <<link Reset>><<resetAssignmentFilter>><<replace '#summarylist'>><<include "Slave Summary">><</replace>><</link>> @@ -450,7 +450,7 @@ Filter by assignment: | ">> | <</if>> <</for>> -<</if>> + <span id='summarylist'><<include "Slave Summary">></span> <<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>