diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index 1ffc93c6b7b543f5a0012efbce0e5f7df0013422..fdfa019616ed328b6dc76c8346b56fea34db961d 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -16,6 +16,8 @@ App.SlaveAssignment.workTheFarm = function(slave) { { he, him, his, hers, He, His } = getPronouns(slave), incomeStats = getSlaveStatisticData(slave, V.facility.farmyard), arcology = V.arcologies[0], + _beautiful = beautiful(slave), + _pretty = pretty(slave), slaveApproves = () => sexualQuirks.includes(slave.sexualQuirk) || behavorialQuirks.includes(slave.behavioralQuirk) || fetishes.includes(slave.fetish); @@ -144,7 +146,8 @@ App.SlaveAssignment.workTheFarm = function(slave) { if (V.Farmer) { // TODO: replace with something else - t += `While there, ${he} benefits from ${V.Farmer.slaveName}'s ${V.Farmer.physicalAge < 21 ? `youthful energy` : `care`} ${V.Farmer.skill.oral ? ` and talented tongue` : ``}.`; + r.push(`While there, ${he} benefits from ${V.Farmer.slaveName}'s ${V.Farmer.physicalAge < 21 ? `youthful energy` : `care`} ${V.Farmer.skill.oral ? ` and talented tongue` : ``}.`); + if (slave.devotion < V.FarmerDevotionThreshold) { slave.devotion += V.FarmerDevotionBonus; } @@ -381,9 +384,9 @@ App.SlaveAssignment.workTheFarm = function(slave) { } if (slave.face > 40) { - r.push(`${He} is so ${slave.genes === "XY" ? `handsome` : `beautiful`} that ${his} audience is willing to pay more to watch ${him} put on shows.`); + r.push(`${He} is so ${_beautiful} that ${his} audience is willing to pay more to watch ${him} put on shows.`); } else if (slave.face > 10) { - r.push(`${He} is so ${slave.genes === "XY" ? `good-looking` : `pretty`} that ${his} audience is willing to pay more to watch ${him} put on shows.`); + r.push(`${He} is so ${_pretty} that ${his} audience is willing to pay more to watch ${him} put on shows.`); } else if (slave.face < -10) { r.push(`${His} audience isn't willing to pay as much because of how unattractive ${his} face is.`); } else if (slave.face < -40) { diff --git a/src/facilities/farmyard/farmyardShows.js b/src/facilities/farmyard/farmyardShows.js index 092b9f6e5555cb96147a464a1632f02ba4ff4a7c..a32877c284bcd7dc78915c6732ada7251dd3e4be 100644 --- a/src/facilities/farmyard/farmyardShows.js +++ b/src/facilities/farmyard/farmyardShows.js @@ -5,7 +5,8 @@ * @returns {number} */ App.Facilities.Farmyard.farmShowsIncome = function(slave) { - let arcology = V.arcologies[0]; + const arcology = V.arcologies[0]; + let cash = 1000; // TODO: will still need tweaking - may adjust rates below more as well if (!slave) { diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js index b895d9359752ac673a73534714915ff03c0de088..b9ef8cc527eb902305f14cce71e41b1b814147a9 100644 --- a/src/facilities/farmyard/reports/farmyardReport.js +++ b/src/facilities/farmyard/reports/farmyardReport.js @@ -506,13 +506,13 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { if (V.foodMarket) { if (profit && food) { - r.push(` and `); + r.push(`and`); } if (food) { r.push(`produced <span class="chocolate"> ${massFormat(food)}</span> of food`); } } - r.push(` this week.`); + r.push(`this week.`); } return $(profitContent).append(r.join(' '));