diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 12221bfffccf408ed2e759c7bd81eeddb4066b4e..c9ed69d5f0e78a4760af85a565bb228eafcf1dc4 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.1-0.3.x +6/20/2018 + + 25 + -more little fixes + -old RA should be a little more accepting of "" + 6/19/2018 24 diff --git a/devNotes/twine JS b/devNotes/twine JS index 72a2dcf806a8c4c3de2ff211bcecc781d7ae46e4..8449c0e28c31c3bdad7bd4c95bf1a1dd9f15c406 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -8624,7 +8624,7 @@ window.saServant = function saServant(slave) { var He = capFirstChar(he), His = capFirstChar(his); var V = State.variables; - var t = "works as a servant. ${He} performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief."; + var t = `works as a servant. ${He} performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief.`; if (V.servantsQuarters > 0) { if ((V.universalRulesFacilityWork == 1 && slave.assignment == "be a servant" && V.servantsQuartersSpots > 0) || (slave.assignment == "work as a servant")) { @@ -8666,39 +8666,39 @@ window.saServant = function saServant(slave) { V.oralTotal += _oral; if (slave.relationship == -2) { - t += ` ${He} does ${his} best to perfect your domesticity due to ${his} emotional bond to you.`; + t += ` ${He} does ${his} best to perfect your domesticity due to ${his} emotional bond to you.`; } else if (slave.relationship == -3 && slave.devotion > 50) { - t += ` ${He} does ${his}very best to be the perfect housewife, making ${him} an outstanding servant.`; + t += ` ${He} does ${his}very best to be the perfect housewife, making ${him} an outstanding servant.`; } if (setup.servantCareers.includes(slave.career)) { - t += ` ${He} has experience with house keeping from ${his} life before ${he} was a slave, making ${him} more effective.`; + t += ` ${He} has experience with house keeping from ${his} life before ${he} was a slave, making ${him} more effective.`; } else if (slave.skillS >= V.masteredXP) { - t += ` ${He} has experience with house keeping from working for you, making ${him} more effective.`; + t += ` ${He} has experience with house keeping from working for you, making ${him} more effective.`; } else { slave.skillS += jsRandom(1, (slave.intelligence + 4) * 2); } if (slave.fetishStrength > 60) { if (slave.fetish == "submissive" && slave.fetishKnown == 1) { - t += ` ${His} natural affinity for submission increases ${his} effectiveness.`; + t += ` ${His} natural affinity for submission increases ${his} effectiveness.`; } else if (slave.fetishKnown == 1 && slave.fetish == "dom") { - t += ` ${His} sexual appetite for domination reduces ${his} effectiveness.`; + t += ` ${His} sexual appetite for domination reduces ${his} effectiveness.`; } } if (slave.energy < 20) { - t += ` ${His} frigidity allows ${him} to ignore the intercourse all around ${him}, making ${him} very efficient.`; + t += ` ${His} frigidity allows ${him} to ignore the intercourse all around ${him}, making ${him} very efficient.`; } else if (slave.energy < 40) { t += ` ${His} low sex drive keeps ${him} from becoming too distracted by the intercourse all around ${him}, making ${him} more efficient.`; } if ((slave.eyes <= -1 && slave.eyewear != "corrective glasses" && slave.eyewear != "corrective contacts") || (slave.eyewear == "blurring glasses") || (slave.eyewear == "blurring contacts")) { - t += ` ${His} bad vision makes ${him} a worse servant.`; + t += ` ${His} bad vision makes ${him} a worse servant.`; } if (slave.lactation > 0) { - t += " Since ${he} is lactating, "; + t += ` Since ${he} is lactating, `; if (slave.devotion > 20 || slave.trust < -20) { t += ` ${he} serves `; } else { diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw index cbf820b1bfcae434153c7c877c795246d2ecbb22..d17dab75d255f7a6517aab6c546b573bff3262ea 100644 --- a/src/endWeek/saServant.tw +++ b/src/endWeek/saServant.tw @@ -7,7 +7,7 @@ window.saServant = function saServant(slave) { var He = capFirstChar(he), His = capFirstChar(his); var V = State.variables; - var t = "works as a servant. ${He} performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief."; + var t = `works as a servant. ${He} performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief.`; if (V.servantsQuarters > 0) { if ((V.universalRulesFacilityWork == 1 && slave.assignment == "be a servant" && V.servantsQuartersSpots > 0) || (slave.assignment == "work as a servant")) { @@ -49,39 +49,39 @@ window.saServant = function saServant(slave) { V.oralTotal += _oral; if (slave.relationship == -2) { - t += ` ${He} does ${his} best to perfect your domesticity due to ${his} emotional bond to you.`; + t += ` ${He} does ${his} best to perfect your domesticity due to ${his} emotional bond to you.`; } else if (slave.relationship == -3 && slave.devotion > 50) { - t += ` ${He} does ${his}very best to be the perfect housewife, making ${him} an outstanding servant.`; + t += ` ${He} does ${his}very best to be the perfect housewife, making ${him} an outstanding servant.`; } if (setup.servantCareers.includes(slave.career)) { - t += ` ${He} has experience with house keeping from ${his} life before ${he} was a slave, making ${him} more effective.`; + t += ` ${He} has experience with house keeping from ${his} life before ${he} was a slave, making ${him} more effective.`; } else if (slave.skillS >= V.masteredXP) { - t += ` ${He} has experience with house keeping from working for you, making ${him} more effective.`; + t += ` ${He} has experience with house keeping from working for you, making ${him} more effective.`; } else { slave.skillS += jsRandom(1, (slave.intelligence + 4) * 2); } if (slave.fetishStrength > 60) { if (slave.fetish == "submissive" && slave.fetishKnown == 1) { - t += ` ${His} natural affinity for submission increases ${his} effectiveness.`; + t += ` ${His} natural affinity for submission increases ${his} effectiveness.`; } else if (slave.fetishKnown == 1 && slave.fetish == "dom") { - t += ` ${His} sexual appetite for domination reduces ${his} effectiveness.`; + t += ` ${His} sexual appetite for domination reduces ${his} effectiveness.`; } } if (slave.energy < 20) { - t += ` ${His} frigidity allows ${him} to ignore the intercourse all around ${him}, making ${him} very efficient.`; + t += ` ${His} frigidity allows ${him} to ignore the intercourse all around ${him}, making ${him} very efficient.`; } else if (slave.energy < 40) { t += ` ${His} low sex drive keeps ${him} from becoming too distracted by the intercourse all around ${him}, making ${him} more efficient.`; } if ((slave.eyes <= -1 && slave.eyewear != "corrective glasses" && slave.eyewear != "corrective contacts") || (slave.eyewear == "blurring glasses") || (slave.eyewear == "blurring contacts")) { - t += ` ${His} bad vision makes ${him} a worse servant.`; + t += ` ${His} bad vision makes ${him} a worse servant.`; } if (slave.lactation > 0) { - t += " Since ${he} is lactating, "; + t += ` Since ${he} is lactating, `; if (slave.devotion > 20 || slave.trust < -20) { t += ` ${he} serves `; } else {