diff --git a/src/endWeek/illness.js b/src/endWeek/illness.js index badab59ffecffa4e850f9e9140d342bdb527af2a..3bf68abb8a36759112e74d8058764edbcbd201fc 100644 --- a/src/endWeek/illness.js +++ b/src/endWeek/illness.js @@ -19,7 +19,7 @@ window.illness = function illness(slave) { const H = slave.health; let assignBonus = 0; // bonus for healthy assignments // On the macro side of things disease could also happen to the acrology's population as the arcology becomes crowded, killing citizens and putting slaves at greater risk of getting ill. Again with upgrades/policies to mitigate the issue made availble TODO? - if (slave.assignment !== "live with your agent" || slave.assignemnt !== "be your agent") { // Let's make sure agents don't get sick and accidentally die, they should take care of themselves + if (slave.assignment !== "live with your agent" || slave.assignment !== "be your agent") { // Let's make sure agents don't get sick and accidentally die, they should take care of themselves if (slave.assignment === "rest" || slave.assignment === "rest in the spa" || slave.assignment === "get treatment in the clinic" || slave.assignment === "serve in the master suite" || slave.assignment === "please you") { assignBonus += 10; } @@ -276,6 +276,16 @@ window.tired = function tired(slave) { assignment += normalRandInt(20, 2); // Increases tired by an average of 20 points while on a demanding assignment } else if (slave.assignment === "be your agent" || slave.assignment === "live with your agent") { assignment -= normalRandInt(15, 2); // Making sure agents don't get exhausted, surely they can afford to do some relaxing + } else if (slave.assignment === "work in the dairy") { + if (V.dairyRestraintsSetting > 1) { + assignment += normalRandInt(20, 2); // Full industrial Dairy is exhausting + } else if (V.dairyRestraintsSetting > 0) { + assignment += normalRandInt(5); // Restraining while milking is a little stressful + } else { + assignment -= normalRandInt(5); // Being a free range cow is relatively relaxing + } + } else if (slave.assignment === "get milked") { + assignment += normalRandInt(5); } // Rewards diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 7c9c1734ce6f1af4f77133dfc8a76aa6093bc12e..cbd257c7470ec282cb6f753b6df2d1ba527c6b45 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1365,7 +1365,7 @@ You should have received a copy of the GNU General Public License along with thi <<set $weatherToday = $niceWeather.random()>> <<set $customSlaveOrdered = 0>> -<<set $customSlave = {age: 19, health: {health: 0, condition: 0, shortDamage: 0, longDamage: 0, illness: 0}, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", leg: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, arm: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, eye: new App.Entity.EyeState(), hears: 0}>> +<<set $customSlave = {age: 19, health: {}, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", leg: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, arm: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, eye: new App.Entity.EyeState(), hears: 0}>> <<set $huskSlaveOrdered = 0>> <<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>>