Merge branch 'pregmod-master' into 'pregmod-master'

Injuries no longer prevent PC to manage HG/BG/RC

See merge request pregmodfan/fc-pregmod!1477

src/uncategorized/persBusiness.tw

@@ -376,9 +376,6 @@
 	<<set $proclamationsCooldown = 4, $personalAttention = "business">>
 <</if>>
 
-<<if $PCWounded == 1 && $secExp == 1>>
- Does nothing this week
- <</if>>
  
 <<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
 	<<set _Cal = Math.ceil(random($AgeTrainingLowerBoundPC,$AgeTrainingUpperBoundPC)*$AgeEffectOnTrainerEffectivenessPC)>>
@@ -388,8 +385,9 @@
 /* <<set _Cal = Math.ceil(random($AgeTrainingLowerBoundPC,$AgeTrainingUpperBoundPC)*$AgeEffectOnTrainerEffectivenessPC)>> */
 /* <<set _X = 0>> */
 /* <</if>> */
- 
- <<switch $personalAttention>>
+
+<<if $PCWounded != 1>>
+<<switch $personalAttention>>
 <<case trading>>
 	<<set _oldSkill = $PC.trading>>
 	<<if _X == 1>>
@@ -560,6 +558,7 @@
 		<</if>>
 	<</if>>
 <</switch>>
+<</if>>
 
 <<if $CashForRep == 1>>
 	<<if $cash > 1000>>

src/utility/descriptionWidgets.tw

@@ -29,10 +29,11 @@
 		this week.
 	<</if>>
 <</switch>>
+<</if>>	/* closes wound check */
 
 <<if $lowercaseDonkey == 1>>
 
-<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@
+<<if $PCWounded != 1>><span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@<</if>>
 
 <<if $useTabs == 0>>
 	<br>
@@ -77,7 +78,7 @@
 
 <<else>>
 
-<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@
+<<if $PCWounded != 1>><span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@<</if>>
 <br>
 <<if _HG > -1>>
 	''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
@@ -212,7 +213,6 @@
 			<br>@@.yellow;For your first purchase, @@<strong>[[The Futanari Sisters][$slavesSeen += 1]]</strong>@@.yellow; will sell at half price this week.@@
 		<</if>>
 	<</if>>
-<</if>>	/* closes wound check */
 </center>
 
 <</widget>>