diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 1edddbae266619fe45cbefdfb98e7ebb4a81912e..6cc977e2afeb08aa4280f101774c8210e0699fc8 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 07a081949acfec4ba67f7065237069b1b3df5999..86a047bdcacab9d51f80a2c23497c9dc74734d23 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 71ecf5294aa3741eb4c97a21257b04a4b8b80960..a0256f5a148ce5b902d9d2d246d73eee871f44f0 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@@ |