From 7cb4db38927fba2a6f42827e378ba453f16fe34f Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 22 Mar 2019 13:58:59 -0400
Subject: [PATCH] Changes, disabled incomeStats again
---
src/endWeek/saWorkTheFarm.js | 15 ++++++++-------
src/facilities/farmyard/farmyardReport.tw | 2 +-
src/js/vignettes.js | 21 ++++++++++-----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 397c79d0771..38bfe904262 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -7,13 +7,14 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
var He = capFirstChar(he), His = capFirstChar(his);
const V = State.variables;
var arcology = V.arcologies[0];
- var incomeStats = getSlaveStatisticData(slave, slave.assignment === Job.FARMYARD ? V.farmyard : undefined);
-
+ // var incomeStats = getSlaveStatisticData(slave, slave.assignment === window.Job.FARMYARD ? V.farmyard : undefined);
+ // let incomeStats.food;
+
var t = `works as a farmhand this week. `;
if (V.Farmer !== 0) {
t += `While there, ${he} gets benefit of ${Farmer.slaveName}'s `;
- if (V.Farmer.physicalAge < 21) {
+ if (V.Farmer.physicalAge < 21) { // TODO: not sure about this age
t += `youthful energy`;
} else {
t += `care`;
@@ -41,7 +42,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
}
V.food += food
V.foodTotal += food;
- incomeStats.food += food;
+ // incomeStats.food += food;
if (V.Farmer) {
t += `${Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should. `;
@@ -91,7 +92,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
// Open Shows
- incomeStats.income += farmShowsIncome(slave);
+ // incomeStats.income += farmShowsIncome(slave);
if (V.farmyardShows) {
t += `${He} also puts on shows with animals this week. `;
@@ -440,7 +441,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
t += `an incident without lasting effect. `;
}
cashX(Math.trunc(V.FResult*vignette.effect), "farmyard");
- incomeStats.income += (Math.trunc(V.FResult*vignette.effect));
+ // incomeStats.income += (Math.trunc(V.FResult*vignette.effect));
} else if (vignette.type === "devotion") {
if (vignette.effect > 0) {
if (slave.devotion > 50) {
@@ -506,7 +507,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
t += `an incident without lasting effect. `;
}
repX(Math.trunc(V.FResult*vignette.effect*0.1), "vignette", slave);
- incomeStats.rep += Math.trunc(V.FResult*vignette.effect*0.1);
+ // incomeStats.rep += Math.trunc(V.FResult*vignette.effect*0.1);
}
}
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 7f145027183..38e287e669d 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -315,7 +315,7 @@
<</script>>
<br><br>
- $farmyardNameCaps <<if _profits > 0>>makes you @@.yellowgreen;<<print cashFormat(_profits)>>@@ and <</if>>produced @@.chocolate;<<print massFormat(_foodWeek)>>@@ of food this week.
+ $farmyardNameCaps <<if _profits > 0>>makes you @@.yellowgreen;<<print cashFormat(Math.trunc(_profits))>>@@ and <</if>>produced @@.chocolate;<<print massFormat(_foodWeek)>>@@ of food this week.
<<set $food += _foodWeek>>
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 801b325847e..bc39f1dc80b 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -3551,10 +3551,9 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
effect: 0,
});
} else if (slave.assignment === "work as a farmhand" || slave.assignment === window.Job.FARMYARD || slave.assignment === window.Job.FARMER) {
- // saWorkTheFarm is a JS file, so a whitespace at the end of the text string is required
if (canWalk(slave)) {
vignettes.push({
- text: `${he} rather comically injured ${himself} by stepping on a rake, `,
+ text: `${he} rather comically injured ${himself} by stepping on a rake,`,
type: "health",
effect: -1,
});
@@ -3562,55 +3561,55 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
//TODO: add more vignettes
if ((V.farmyardShows === 1) && (V.seeBestiality === 1)) {
vignettes.push({
- text: `a citizen didn't realize how disgusting he found bestiality until he attended one of ${V.farmyardName}'s shows, `,
+ text: `a citizen didn't realize how disgusting he found bestiality until he attended one of ${V.farmyardName}'s shows,`,
type: "rep",
effect: -1,
});
vignettes.push({
- text: `a citizen attended one of ${V.farmyardName}'s shows and discovered he had a bestiality fetish, `,
+ text: `a citizen attended one of ${V.farmyardName}'s shows and discovered he had a bestiality fetish,`,
type: "rep",
effect: 1,
});
vignettes.push({
- text: `${he} dreamt that you decided to have ${him} do nothing but animals for the rest of ${his} life, `,
+ text: `${he} dreamt that you decided to have ${him} do nothing but animals for the rest of ${his} life,`,
type: "devotion",
effect: -1
});
vignettes.push({
- text: `${he} dreamt that you wouldn't come to ${his} aid when one of ${his} bestial partners was getting overeager, `,
+ text: `${he} dreamt that you wouldn't come to ${his} aid when one of ${his} bestial partners was getting overeager,`,
type: "trust",
effect: -1
});
if ((V.canines.length > 0) && (slave.amp === 0)) {
vignettes.push({
- text: `an over-excited dog left scratch marks on ${his} legs, `,
+ text: `an over-excited dog left scratch marks on ${his} legs,`,
type: "health",
effect: -1
});
}
if (V.hooved.length > 0) {
vignettes.push({
- text: `${he} was injured by a particularly well-endowed horse, `,
+ text: `${he} was injured by a particularly well-endowed horse,`,
type: "health",
effect: -1
});
}
if (V.felines.length > 0) {
vignettes.push({
- text: `${he} managed to take two tigers at once, aweing the crowd, `,
+ text: `${he} managed to take two tigers at once, aweing the crowd,`,
type: "cash",
effect: 1
});
}
} else {
vignettes.push({
- text: `${he} worked extra hard, and managed to sell extra produce, `,
+ text: `${he} worked extra hard, and managed to sell extra produce,`,
type: "cash",
effect: 1,
});
}
vignettes.push({
- text: `the pesticides ${he} accidentally inhaled made ${him} feel nauseous, `,
+ text: `the pesticides ${he} accidentally inhaled made ${him} feel nauseous,`,
type: "health",
effect: -1,
});
--
GitLab