From b2564dc5299884f716ffaec47eccf169dcfe88c8 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Mon, 4 Feb 2019 21:45:41 -0500
Subject: [PATCH] Fixes
---
src/js/SlaveState.js | 4 +++-
src/uncategorized/costsWidgets.tw | 5 +++--
src/uncategorized/storyCaption.tw | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 1edddbae266..6cc977e2afe 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1041,7 +1041,9 @@ App.Entity.SlaveState = class SlaveState {
/**
* has brand
*
- * 0: no; 1: yes */
+ * accepts 0 or string
+ * * 0: no brand
+ * * string: brand description */
this.brand = 0;
/**
* brand location
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index 07a081949ac..86a047bdcac 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -421,9 +421,10 @@
<</if>>
<<if $assistantPower > 0>>
+ <<set _weeksOwned = $week - $args[0].weekAcquired>>
<br>
<<if $args[0].lifetimeCashExpenses < 0>>
- In her <<if $args[0].weekAcquired > 0>><<print ($week - $args[0].weekAcquired)>> weeks<<else>>time<</if>> with you, she has cost @@.red;<<print cashFormat($args[0].lifetimeCashExpenses)>>@@.
+ In her <<if _weeksOwned > 0>>_weeksOwned <<if _weeksOwned == 1>>week<<else>>weeks<</if>><<else>>time<</if>> with you, she has cost @@.red;<<print cashFormat($args[0].lifetimeCashExpenses)>>@@.
<<set _Expense = $args[0].lifetimeCashExpenses>>
<<else>>
You have no record of her costing you any ¤.
@@ -432,7 +433,7 @@
<br>
<<if $args[0].lifetimeCashIncome > 0>>
- In her <<if $args[0].weekAcquired > 0>><<print ($week - $args[0].weekAcquired)>> weeks<<else>>time<</if>> with you, she has earned @@.yellowgreen;<<print cashFormat($args[0].lifetimeCashIncome)>>@@.
+ In her <<if _weeksOwned > 0>>_weeksOwned <<if _weeksOwned == 1>>week<<else>>weeks<</if>><<else>>time<</if>> with you, she has earned @@.yellowgreen;<<print cashFormat($args[0].lifetimeCashIncome)>>@@.
<<set _Income = $args[0].lifetimeCashIncome>>
<<else>>
You have no record of her making you any ¤.
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 71ecf5294aa..a0256f5a148 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -191,7 +191,7 @@
| <<print massFormat($food)>>
</span>
<</if>>
- <br>@@.link;Upkeep@@ |
+ <br>Upkeep |
<</if>><<print cashFormat($costs)>>
<br><br>@@.pink;Total Sex Slaves@@ | <<print commaNum(_SL)>>
<br>@@.pink;Penthouse Beds@@ |
--
GitLab