diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 216a12bb1a72c4d4c2d7f8a27f553a2e4d22b005..923d3b564653b00e9743f34610accee7dfe5a67c 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -4930,18 +4930,12 @@ App.UI.slaveSummaryList = function (passageName) { listIndexContent += '<<link "Sort by Devotion">>' + '<<set $sortQuickList = "Devotion" >>' + '<<replace "#qlSort">> $sortQuickList <</replace>>' + - '<<run' + - '$("#qlWrapper").removeClass("trust").addClass("devotion");' + - 'sortButtonsByDevotion();' + - '>>' + + '<<run' + '$("#qlWrapper").removeClass("trust").addClass("devotion");' + 'sortButtonsByDevotion();' + '>>' + '<</link>> | ' + '<<link "Sort by Trust">>' + '<<set $sortQuickList = "Trust">>' + '<<replace "#qlSort">> $sortQuickList <</replace>>' + - '<<run' + - '$("#qlWrapper").removeClass("devotion").addClass("trust");' + - 'sortButtonsByTrust();' + - '>>' + + '<<run' + '$("#qlWrapper").removeClass("devotion").addClass("trust");' + 'sortButtonsByTrust();' + '>>' + '<</link>>' + '<br/>'; listIndexContent += '<div id="qlWrapper" class="quicklist devotion">'; diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index d1c9351cbb0c738e19c76c154f057b494a1b1ffc..056cee5447ac122d48dd4026ff89346fcbb79a42 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -2067,7 +2067,13 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he <</if>> <</if>> <<if canPenetrate($activeSlave) && $activeSlave.scrotum > 0 && $activeSlave.balls < 10>> - <<set _possibleDrugs.push({type: "balls", text: "te<<s>>ticle enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to <<if canHear($activeSlave)>>hear her grunt<<else>>feel her <<sh>>ake<</if>> every <<s>>ingle time the weight of my ball<<s>> <<s>>lap<<s>> again<<s>>t her body."})>> + <<set _possibleDrugs.push({type: "balls", text: "te<<s>>ticle enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to + <<if canHear($activeSlave)>> + hear her grunt + <<else>> + feel her <<sh>>ake + <</if>> + every <<s>>ingle time the weight of my ball<<s>> <<s>>lap<<s>> again<<s>>t her body."})>> <</if>> <<if $activeSlave.dick == 0 && $activeSlave.clit < 5>> <<set _possibleDrugs.push({type: "clit", text: "clit enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but I want to teach tho<<s>>e cocky <<s>>lut<<s>> a le<<ss>>on they'll never forget."})>> diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw index 13044d09ea061d0469667bcf9f017076f6159036..9a0a76788dd5459d8c24f2a38d645b03295e544d 100644 --- a/src/uncategorized/costsBudget.tw +++ b/src/uncategorized/costsBudget.tw @@ -184,7 +184,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ Since you are used to a fairly normal life, your personal living expenses are: <</if>>")>> - <<print budgetLine("PCtraining", "<<if ($personalAttention == \"trading\")>> + <<print budgetLine("PCtraining", " + <<if ($personalAttention == \"trading\")>> [[Trading trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees <<elseif ($personalAttention == \"warfare\")>> [[Warfare trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees @@ -194,16 +195,19 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ [[Engineering trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees <<elseif ($personalAttention == \"medicine\")>> [[Medicine trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees - <</if>>")>> + <</if>> + ")>> <<print budgetLine("PCmedical", "Your medical expenses")>> <<print budgetLine("PCskills", "Your skills")>> - <<print budgetLine("rents", "Your rents + <<print budgetLine("rents", + "Your rents <<if $lastWeeksCashExpenses.rents < 0>> and bribes - <</if>>")>> + <</if>> + ")>> <<print budgetLine("stocks", ">Stock dividends on ($personalShares/<<print ($publicShares + $personalShares)>> shares).")>> @@ -244,7 +248,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ <<elseif $TCR.schoolPresent == 1>>[[The Cattle Ranch|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] branch campus upkeep <<elseif $HA.schoolPresent == 1>>[[Hippolyta Academy|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] branch campus upkeep <<else>> Unknown school expense - <</if>>")>> + <</if>> + ")>> <<print budgetLine("citizenOrphanage", "Education of $citizenOrphanageTotal of your slaves\' children in citizen schools")>>