diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 8edb822e61d30a25ea7064d2f6cac242e2c3f17c..53cfeb08d76048d674616e79362212c09c255b64 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -11009,7 +11009,7 @@ window.saRest = function saRest(slave) { if (_vignette.effect > 0) { if (slave.trust > 20) { t += `<span class='mediumaquamarine'>increasing ${his} trust in you.</span>`; - } else if (slave.trustt > -10) { + } else if (slave.trust > -10) { t += `<span class='mediumaquamarine'>reducing ${his} fear of you.</span>`; } else { t += `<span class='mediumaquamarine'>reducing ${his} terror of you.</span>`; @@ -11191,7 +11191,7 @@ window.saServant = function saServant(slave) { if (_vignette.effect > 0) { if (slave.trust > 20) { t += `<span class='mediumaquamarine'>increasing ${his} trust in you.</span>`; - } else if (slave.trustt > -10) { + } else if (slave.trust > -10) { t += `<span class='mediumaquamarine'>reducing ${his} fear of you.</span>`; } else { t += `<span class='mediumaquamarine'>reducing ${his} terror of you.</span>`; @@ -16451,18 +16451,13 @@ window.rulesAssistantOptions = (function() { this.onchange = (value) => { current_rule.set.dietCum = value.cum; current_rule.set.dietMilk = value.milk; + this.setValue(this.value2string(current_rule.set.dietCum, current_rule.set.dietMilk)); }; } value2string(cum, milk) { return `cum: ${cum}, milk: ${milk}`; } - - setValue(what) { - what = this.value2string(what.cum, what.milk); - super.setValue(what); - } - } class DietSolidFoodList extends List { diff --git a/src/endWeek/saRest.tw b/src/endWeek/saRest.tw index ffb8f0095c00ea397b607dd84aa244b251647731..0af696c93b689b15621576c478ba8c26e233b93e 100644 --- a/src/endWeek/saRest.tw +++ b/src/endWeek/saRest.tw @@ -94,7 +94,7 @@ window.saRest = function saRest(slave) { if (_vignette.effect > 0) { if (slave.trust > 20) { t += `<span class='mediumaquamarine'>increasing ${his} trust in you.</span>`; - } else if (slave.trustt > -10) { + } else if (slave.trust > -10) { t += `<span class='mediumaquamarine'>reducing ${his} fear of you.</span>`; } else { t += `<span class='mediumaquamarine'>reducing ${his} terror of you.</span>`; diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw index 36cf75b8f317f9882621d4730e397b32adc7ded4..5f0b9b509a6f6d72c78a6d15fd08758f817a5cd7 100644 --- a/src/endWeek/saServant.tw +++ b/src/endWeek/saServant.tw @@ -139,7 +139,7 @@ window.saServant = function saServant(slave) { if (_vignette.effect > 0) { if (slave.trust > 20) { t += `<span class='mediumaquamarine'>increasing ${his} trust in you.</span>`; - } else if (slave.trustt > -10) { + } else if (slave.trust > -10) { t += `<span class='mediumaquamarine'>reducing ${his} fear of you.</span>`; } else { t += `<span class='mediumaquamarine'>reducing ${his} terror of you.</span>`; diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw index 1ad15ac3a76a878ea2096bb91585cb2da10f5ecf..9b5a2c2edc92b439e0d5af4245f741dcaaf3377f 100644 --- a/src/js/rulesAssistantOptions.tw +++ b/src/js/rulesAssistantOptions.tw @@ -1765,18 +1765,13 @@ window.rulesAssistantOptions = (function() { this.onchange = (value) => { current_rule.set.dietCum = value.cum; current_rule.set.dietMilk = value.milk; + this.setValue(this.value2string(current_rule.set.dietCum, current_rule.set.dietMilk)); }; } value2string(cum, milk) { return `cum: ${cum}, milk: ${milk}`; } - - setValue(what) { - what = this.value2string(what.cum, what.milk); - super.setValue(what); - } - } class DietSolidFoodList extends List { diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw index c423bebd910b211a7f30c4541df3bd3db49c21b7..99a785c586f08acaf6db486ae1fcfabf3e37b8da 100644 --- a/src/pregmod/killSlave.tw +++ b/src/pregmod/killSlave.tw @@ -80,8 +80,7 @@ until <<if $activeSlave.fetish != "mindbroken">> - at which point abject fear fills $his face. $He immediately drops to $his knees and begins openly begging for -you to have mercy. + at which point abject fear fills $his face. $He immediately <<if canWalk($activeSlave)>>drops to $his knees and <</if>>begins openly begging for you to have mercy. <<else>> to which $he still doesn't respond. <</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index a72d8c1f3f041c65c00b3d1b4c957a17a902858c..70c89d2a1c427d58afba3ccef8e1ea0f1dcc6dee 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3435,12 +3435,6 @@ Done! <<if ndef _rule.surgery_vasectomy>> <<set _rule.surgery_vasectomy = "no default setting">> <</if>> - <<if ndef _rule.dietCum>> - <<set _rule.dietCum = "no default setting">> - <</if>> - <<if ndef _rule.dietMilk>> - <<set _rule.dietMilk = "no default setting">> - <</if>> <<if ndef _rule.toyHole>> <<set _rule.toyHole = "no default setting">> <</if>> @@ -3450,4 +3444,7 @@ Done! <<if ndef _rule.pornFameSpending || _rule.pornFameSpending === -1>> <<set _rule.pornFameSpending = "no default setting">> <</if>> + <<if ndef _rule.legAccessory>> + <<set _rule.legAccessory = "no default setting">> + <</if>> <</for>> diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw index 2c6f3ff1be258f43d01bfe2b79ecacdd57f8c522..a0228b05febecc6bd098baab513821c998d1c671 100644 --- a/src/uncategorized/dispensary.tw +++ b/src/uncategorized/dispensary.tw @@ -296,7 +296,7 @@ Dietary Upgrades <<if $seePreg == 1>> <<if $dietFertility != 1>> [[Purchase recipes to encourage ovulation|Dispensary][$cash -= 5000*_PCSkillCheck, $dietFertility = 1]] - //Costs <<print cashFormat(3000*_PCSkillCheck)>>// + //Costs <<print cashFormat(5000*_PCSkillCheck)>>// <br> //Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.// <br> <<elseif $dietFertility == 1>> diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw index 3b32ddd5c422d6fcf7f3bf63fbc552eddd582ec2..922509ec8b4891a83ed124bae49d905189a70781 100644 --- a/src/uncategorized/pSnatchAndGrabResult.tw +++ b/src/uncategorized/pSnatchAndGrabResult.tw @@ -105,7 +105,7 @@ <<set $activeSlave.whoreSkill = 0>> <<set $activeSlave.entertainSkill = 0>> <<set $activeSlave.birthWeek = 0>> -<<set $activeSlave.height = random(165,175)>> +<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 2]}))>> <<set $activeSlave.weight = 0>> <<set $activeSlave.muscles = 20>> <<set $activeSlave.waist = -75>>