diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index d5b3b972508205050e3e7a1ead733627177ea2e0..eaae9af20fcdcf46400f5543c02bf4131e7bba37 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ 9/28/2018 + 2 + -fixes + -devotion/trust check corrections + 1 -Security Force Mod overhaul -fixes diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 9e544123b389ba8e6d3aa4bc8e1678b24732c54c..ab7959791c9759f519c9e595bfb7b33bb58a737e 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -1967,7 +1967,11 @@ window.getCost = function(array) { if(slave.trust < -20) { costs -= rulesCost * 4; } else if(slave.devotion < -20) { - costs -= rulesCost * 2; + if (slave.trust >= 20) { + costs -= rulesCost / 2; + } else { + costs -= rulesCost * 2; + } } else if(slave.devotion <= 20) { costs -= rulesCost * 3; } else if(slave.devotion <= 50) { @@ -11109,11 +11113,15 @@ window.saServant = function saServant(slave) { if (V.Stewardess != 0) { t += ` This brings ${him} under ${V.Stewardess.slaveName}'s supervision. The Stewardess `; if (slave.devotion < -20) { - t += `subjects ${him} to corrective rape when ${his} service is imperfect, or when the Stewardess feels like raping ${him}, forcing the poor slave to <span class='yellowgreen'>find refuge in work.</span>`; + t += `subjects ${him} to <span class='gold'>corrective rape</span> when ${his} service is imperfect, <span class='hotpink'>when ${he] steps out of line</span>, or when the Stewardess just feels like raping ${him}, forcing the poor slave to <span class='yellowgreen'>find refuge in work.</span>`; + slave.devotion += 2; + slave.trust -= 2; } else if (slave.devotion <= 20) { - t += `molests ${him}, encouraging the poor slave to keep ${his} head down and <span class='yellowgreen'>work harder.</span>`; + t += `molests ${him}, encouraging the poor slave to <span class='hotpink'>keep ${his} head down</span> and <span class='yellowgreen'>work harder.</span>`; + slave.devotion += 2; } else { - t += `uses sex as a reward, getting ${him} off when ${he} <span class='yellowgreen'>works harder.</span>`; + t += `uses <span class='hotpink'>sex as a reward</span>, getting ${him} off when ${he} <span class='yellowgreen'>works harder.</span>`; + slave.devotion++; } if (!(canHear(slave))) { t += ` However, ${his} inability to hear often leaves ${him} oblivious to ${V.Stewardess.slaveName}'s orders, limiting their meaningful interactions.`; @@ -11132,7 +11140,11 @@ window.saServant = function saServant(slave) { if (slave.trust < -20) { t += "frightened of punishment and works very hard, <span class='yellowgreen'>reducing the upkeep</span> of your slaves."; } else if (slave.devotion < -20) { - t += `reluctant, requiring your other slaves to force ${his} services, and does not <span class='yellowgreen'>reduce upkeep</span> of your slaves much.`; + if (slave.trust >= 20) { + t += `uninterested in doing such work and barely lifts a finger to <span class='yellowgreen'>reduce the upkeep</span> of your slaves. + } else { + t += `reluctant, requiring your other slaves to force ${his} services, and does not <span class='yellowgreen'>reduce upkeep</span> of your slaves much.`; + } } else if (slave.devotion <= 20) { t += `hesitant, requiring your other slaves to demand ${his} services, and only slightly <span class='yellowgreen'>reduces upkeep</span> of your slaves.`; } else if (slave.devotion <= 50) { diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw index 5f0b9b509a6f6d72c78a6d15fd08758f817a5cd7..5e96e19361acf1b7906f43ac52a0c541c981c13f 100644 --- a/src/endWeek/saServant.tw +++ b/src/endWeek/saServant.tw @@ -18,11 +18,15 @@ window.saServant = function saServant(slave) { if (V.Stewardess != 0) { t += ` This brings ${him} under ${V.Stewardess.slaveName}'s supervision. The Stewardess `; if (slave.devotion < -20) { - t += `subjects ${him} to corrective rape when ${his} service is imperfect, or when the Stewardess feels like raping ${him}, forcing the poor slave to <span class='yellowgreen'>find refuge in work.</span>`; + t += `subjects ${him} to <span class='gold'>corrective rape</span> when ${his} service is imperfect, <span class='hotpink'>when ${he] steps out of line</span>, or when the Stewardess just feels like raping ${him}, forcing the poor slave to <span class='yellowgreen'>find refuge in work.</span>`; + slave.devotion += 2; + slave.trust -= 2; } else if (slave.devotion <= 20) { - t += `molests ${him}, encouraging the poor slave to keep ${his} head down and <span class='yellowgreen'>work harder.</span>`; + t += `molests ${him}, encouraging the poor slave to <span class='hotpink'>keep ${his} head down</span> and <span class='yellowgreen'>work harder.</span>`; + slave.devotion += 2; } else { - t += `uses sex as a reward, getting ${him} off when ${he} <span class='yellowgreen'>works harder.</span>`; + t += `uses <span class='hotpink'>sex as a reward</span>, getting ${him} off when ${he} <span class='yellowgreen'>works harder.</span>`; + slave.devotion++; } if (!(canHear(slave))) { t += ` However, ${his} inability to hear often leaves ${him} oblivious to ${V.Stewardess.slaveName}'s orders, limiting their meaningful interactions.`; @@ -41,7 +45,11 @@ window.saServant = function saServant(slave) { if (slave.trust < -20) { t += "frightened of punishment and works very hard, <span class='yellowgreen'>reducing the upkeep</span> of your slaves."; } else if (slave.devotion < -20) { - t += `reluctant, requiring your other slaves to force ${his} services, and does not <span class='yellowgreen'>reduce upkeep</span> of your slaves much.`; + if (slave.trust >= 20) { + t += `uninterested in doing such work and barely lifts a finger to <span class='yellowgreen'>reduce the upkeep</span> of your slaves. + } else { + t += `reluctant, requiring your other slaves to force ${his} services, and does not <span class='yellowgreen'>reduce upkeep</span> of your slaves much.`; + } } else if (slave.devotion <= 20) { t += `hesitant, requiring your other slaves to demand ${his} services, and only slightly <span class='yellowgreen'>reduces upkeep</span> of your slaves.`; } else if (slave.devotion <= 50) { diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index 2ec04d0769f85a39d4c17061f5e7a2eb1561c2f4..05f32a6caefc6c28f6a38599876aadea0fcf5c9e 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -159,7 +159,11 @@ window.getCost = function(array) { if(slave.trust < -20) { costs -= rulesCost * 4; } else if(slave.devotion < -20) { - costs -= rulesCost * 2; + if (slave.trust >= 20) { + costs -= rulesCost / 2; + } else { + costs -= rulesCost * 2; + } } else if(slave.devotion <= 20) { costs -= rulesCost * 3; } else if(slave.devotion <= 50) {