diff --git a/src/facilities/farmyard/farmyardShows.js b/src/facilities/farmyard/farmyardShows.js index fa67c146efddb3a17d99b3b4efb35bcbe3aaa9a6..0bf7ff7b60fa1d6418ed0964ef6ad7f7a879d350 100644 --- a/src/facilities/farmyard/farmyardShows.js +++ b/src/facilities/farmyard/farmyardShows.js @@ -434,7 +434,7 @@ App.Facilities.Farmyard.farmShowsIncome = function (slave) { fetishes.includes(slave.fetish); if (slave.devotion > 50) { - amount *= 1.3; + amount *= 1.5; if (V.seeBestiality) { if (slaveApproves) { @@ -460,7 +460,7 @@ App.Facilities.Farmyard.farmShowsIncome = function (slave) { } } } else if (slave.devotion < -50) { - amount *= 0.8; + amount *= 0.5; if (V.seeBestiality) { if (slaveApproves) { @@ -528,7 +528,7 @@ App.Facilities.Farmyard.farmShowsIncome = function (slave) { } } } else if (slave.trust < -50) { - amount *= 0.9; + amount *= slave.devotion > 50 ? 1.2 : 0.9; if (V.seeBestiality) { if (slaveApproves) { diff --git a/src/facilities/farmyard/shows/saFarmyardShows.js b/src/facilities/farmyard/shows/saFarmyardShows.js index f8276ffd3367da11d43a20dd240e057c75fc8130..59a63ad7161e2adda6834284c7e26a8866fcc162 100644 --- a/src/facilities/farmyard/shows/saFarmyardShows.js +++ b/src/facilities/farmyard/shows/saFarmyardShows.js @@ -197,8 +197,9 @@ App.Facilities.Farmyard.putOnShows = function (slave) { r.push(`${He} has experience with putting on shows from ${his} life before ${he} was a slave, making ${him} more effective at putting on shows.`); } + // FIXME: can slaves' careers overlap categories? if (setup.farmerCareers.includes(slave.career)) { - // TODO: write this + r.push(`${He} ${setup.entertainmentCareers.includes(slave.career) ? `also` : ``} has experience in working with animals from ${his} life before ${he} was a slave, making ${him} more effective at putting on shows.`); } if (slave.prestige === 1) { @@ -233,17 +234,19 @@ App.Facilities.Farmyard.putOnShows = function (slave) { r.push(`${His} audience isn't willing to pay as much because of how hard ${his} face is to look at.`); } - // TODO: write this block with different combinations of trust / devotion + // TODO: incorporate seeBestiality, breeding, and restraints if (slave.devotion > 50) { - // TODO: write this + if (slave.trust > 50) { + r.push(`${He} is so devoted that ${he} works ${his} hardest to make ${his} show a good one.`); + } else if (slave.trust < -50) { + r.push(`${He} is both devoted to you and terrified of you, so ${he} tries ${his} best to make ${his} show a good one.`); + } } else if (slave.devotion < -50) { - // TODO: write this - } - - if (slave.trust > 50) { - // TODO: write this - } else if (slave.trust < -50) { - // TODO: write this + if (slave.trust > 50) { + r.push(`${slave.slaveName} purposefully does the bare minimum ${he} can get away with to spite you.`); + } else if (slave.trust < -50) { + r.push(`${slave.slaveName} refuses to do anything without punishment, which is evident from ${his} meager earnings.`); + } } if (slave.weight > 30 && arcology.FSHedonisticDecadence === "unset") { @@ -275,23 +278,23 @@ App.Facilities.Farmyard.putOnShows = function (slave) { } if (slave.intelligence > 50) { - // TODO: write this - include something about .intelligenceImplant? + r.push(`Because ${he} is so intelligent, ${he} is able to tailor ${his} shows to ${his} audience, helping ${him} bring in more in profits.`); } else if (slave.intelligence < -50) { - // TODO: write this - } - - if (slave.energy <= 20) { - // TODO: write this - } else if (slave.energy <= 40) { - // TODO: write this - } else if (slave.energy <= 60) { - // TODO: write this - } else if (slave.energy <= 80) { - // TODO: write this - } else if (slave.energy <= 95) { - // TODO: write this + r.push(`${He} is so slow that all ${he} can really do is just ${V.seeBestiality ? `lie there and take it` : `put on the most basic of moves`}, which your audience finds dull and uninteresting.`); + } + + if (slave.energy > 95) { + r.push(`The fact that ${he} is a nymphomaniac helps ${him} to go for longer, allowing ${him} to really put on an amazing show.`); + } else if (slave.energy > 80) { + r.push(`The fact that ${his} sex drive is so powerful helps ${him} to really put on good shows.`); + } else if (slave.energy > 60) { + r.push(`The fact that ${his} sex drive is so good helps ${him} to put on good shows.`); + } else if (slave.energy > 40) { + r.push(`${His} average sex drive allows ${him} to put on a decent show.`); + } else if (slave.energy > 20) { + r.push(`The fact that ${his} sex drive is so poor affects ${his} performance.`); } else { - // TODO: write this + r.push(`The fact that ${his} sex drive is nonexistant really hinders ${his} ability to put on a decent show.`); } // TODO: add more to the fetishes and flaws / quirks