diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js index 81a8425f80e4ec9ed6029cc524b554a78485bde1..abd51e986ae67d213fe5cf67913833b2d431770d 100644 --- a/src/data/backwardsCompatibility/datatypeCleanup.js +++ b/src/data/backwardsCompatibility/datatypeCleanup.js @@ -1034,16 +1034,10 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() { * @param {App.Entity.SlaveState} slave */ function slaveRulesDatatypeCleanup(slave) { - if (typeof slave.standardPunishment !== "string") { - slave.standardPunishment = "situational"; - } - if (typeof slave.standardReward !== "string") { - slave.standardReward = "situational"; - } if (slave.useRulesAssistant !== 0) { slave.useRulesAssistant = 1; } - slave.choosesOwnAssignment = Math.clamp(+slave.choosesOwnAssignment, 0) || 0; + slave.choosesOwnAssignment = Math.clamp(+slave.choosesOwnAssignment, 0, 1) || 0; slave.PCExclude = Math.clamp(+slave.PCExclude, 0, 1) || 0; slave.HGExclude = Math.clamp(+slave.HGExclude, 0, 1) || 0; slave.StudExclude = Math.clamp(+slave.StudExclude, 0, 1) || 0; @@ -1053,6 +1047,12 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() { if (typeof slave.rules.mobility !== "string") { slave.rules.mobility = "restrictive"; } + if (typeof slave.rules.punishment !== "string" || slave.rules.punishment === "orgasm" /* fix SI bug */) { + slave.rules.punishment = "situational"; + } + if (typeof slave.rules.reward !== "string") { + slave.rules.reward = "situational"; + } } /** diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js index dc52bdc71065f8e6d0e08465293051fedf73035d..6a532de345aa960074f2ad6d0bd8ce34e08b3172 100644 --- a/src/endWeek/saNanny.js +++ b/src/endWeek/saNanny.js @@ -12,13 +12,12 @@ App.SlaveAssignment.nanny = function(slave) { let t = `works as a nanny. ${He} ${V.nurseryChildren ? `looks after the ${child} in ${V.nurseryName}, ensuring their needs are met and that they are being raised as ${V.nurseryChildren === 1 ? `a good future slave` : - `good future slaves`}. ` : + `good future slaves`}` : `keeps ${V.nurseryName} neat and tidy for the children it will one day support`}. `; t += nannyEffort(slave); t += nannyRelationship(slave); t += nannyCareer(slave); - t += nannyEffort(slave); t += nannyFetish(slave); t += nannyEnergy(slave); t += nannyVision(slave); diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index ff329139bc40fd8aa364529acd69ecc404e6e135..b828cd25422288041bb2cde3c3dd95fd6c9bf3c6 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -1976,7 +1976,7 @@ FUTURE SOCIETIES <<case "Physical Idealism">> ''Physical Idealism'' is a future society model which approves of musculature, height, and health. - <br> Improves value of slaves with <<= App.Encyclopedia.Dialog.linkSC("muscles", "musculature")>>. + <br> Improves value of slaves with <<= App.Encyclopedia.Dialog.linkSC("muscles", "Musculature")>>. <br> Can be developed to affect goods seen in the slave market. <br> Provides demand for muscular slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>. <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Hedonistic Decadence", "Hedonistic Decadence")>>. diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js index 8b8850c336646454acafcd42da59d475e3a039b7..32a4e8272a16f56ead3eb48c170362d9035710e6 100644 --- a/src/interaction/slaveInteract.js +++ b/src/interaction/slaveInteract.js @@ -2243,7 +2243,6 @@ App.UI.SlaveInteract.rules = function(slave) { choices = [ {value: "confinement"}, {value: "whipping"}, - {value: "orgasm"}, {value: "chastity"}, {value: "situational"}, ];