diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js index 4ff9b0c3e5b20f8ed8f1d239b2f18ff82e850414..be509a1599939f2a9f5ba3499f8aa3480754a85d 100644 --- a/src/endWeek/slaveAssignmentReport.js +++ b/src/endWeek/slaveAssignmentReport.js @@ -169,7 +169,7 @@ App.EndWeek.slaveAssignmentReport = function() { if (V.HeadGirlID !== 0) { V.HGEnergy++; const slave = slaveStateById(V.HeadGirlID); - if (V.personalAttention === PersonalAttention.SUPPORTHG) { + if (V.personalAttention === PersonalAttention.SUPPORTHG && V.PC.health.shortDamage < 30) { V.HGEnergy++; if (slave.trust > 95) { V.HGEnergy++; diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw index f409b5fa69d4a2d6e0ef27ad4377c17843f38493..c04175c99395c3c419f24b4fb9f3dba13f195255 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -83,7 +83,7 @@ <br> <</if>> -<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; }) != -1>> +<<if $PC.health.shortDamage < 30 && Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; }) != -1>> <<set $activeSlave = $slaves[$i]>> <<include "PT Workaround">> <br> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index bf4d33b4cdd91ed004da9e3a0c382da6a0402b6e..7bd43749694133292e3a651c4f35fe9421b7f3a6 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -29,16 +29,14 @@ <</if>> <</if>> <<if $PC.health.shortDamage >= 30>> - <<if $PC.health.shortDamage >= 30>> - <<run endWeekHealthDamage($PC)>> - The injuries received in the recent battle prevents you from engaging in tiring endeavors. - <<if $PC.health.shortDamage >= 51>> - Your trusted physician believes it will still take a few weeks to fully recover. - <<elseif $PC.health.shortDamage >= 39>> - You are starting to feel better. It's very likely you will be back to full working order within the next week. - <<else>> - You have finally recovered from your injuries. - <</if>> + <<run endWeekHealthDamage($PC)>> + The injuries received in the recent battle prevents you from engaging in tiring endeavors. + <<if $PC.health.shortDamage >= 51>> + Your trusted physician believes it will still take a few weeks to fully recover. + <<elseif $PC.health.shortDamage >= 39>> + You are starting to feel better. It's very likely you will be back to full working order within the next week. + <<else>> + You have finally recovered from your injuries. <</if>> <<elseif ($personalAttention == "whoring")>> <<set _income = random(2000,4500)>>