Merge branch 'master' into 'pregmod-master'

fixes

See merge request pregmodfan/fc-pregmod!860

src/uncategorized/corporationDevelopments.tw

@@ -986,14 +986,14 @@ You hold $personalShares shares personally while $publicShares are publicly held
 		| <<link "No focus">><<set $entrapmentUpgradeDevotionTwo = "none">><<replace "#direction">><br><<print "You directed the corporation to train slaves regardless of devotion.">><</replace>><</link>>
 	<</if>>
 <</if>>
-<<if $entrapmentUpgradeDevotionTwo != "unselected" || $entrapmentUpgradeDevotionOne != "unselected">>
+	<br>
+	<<if $entrapmentUpgradeDevotionOne == "obedience">>The corporation selects slaves who are predisposed to obedience.
+		<<else>>The corporation trains slaves regardless of obedience.<</if>>
+	<<link "Refocus">><<set $entrapmentUpgradeDevotionOne = "unselected">><<replace "#direction">><br><<print "You direct the corporation to halt the current focus and prepare for a change in direction.">><</replace>><</link>>
 	<br>
 	<<if $entrapmentUpgradeDevotionTwo == "devotion">>The corporation selects slaves who are predisposed to devotion.
-	<<elseif $entrapmentUpgradeDevotionOne == "obedience">>The corporation selects slaves who are predisposed to obedience.
-		<<else>>The corporation trains slaves regardless of obedience.
-	<</if>>
-	<<link "Refocus">><<set $entrapmentUpgradeDevotionTwo = "unselected">><<set $entrapmentUpgradeDevotionOne = "unselected">><<replace "#direction">><br><<print "You direct the corporation to halt the current focus and prepare for a change in direction.">><</replace>><</link>>
-<</if>>
+		<<else>>The corporation trains slaves regardless of devotion.<</if>>
+	<<link "Refocus">><<set $entrapmentUpgradeDevotionTwo = "unselected">><<replace "#direction">><br><<print "You direct the corporation to halt the current focus and prepare for a change in direction.">><</replace>><</link>>
 <<if $entrapmentAssets >= 10000>>
 	<<if $entrapmentUpgradeIntelligence == "unselected">>
 		<br>The corporation is entrapping enough slaves to specialize. Focus on slaves who are
@@ -1141,7 +1141,7 @@ You hold $personalShares shares personally while $publicShares are publicly held
 	<br>
 	<<if $surgicalUpgradeImplants == "applied">>Slaves are given basic implants before being marketed.
 		<<elseif $surgicalUpgradeImplants == "applied">>Slaves are given absurd-sized implants before being marketed.
-		<<else>>The corporation does not bother with straightforward cosmetic surgery for slaves.
+		<<else>>The corporation does not bother with installing implants in slaves.
 	<</if>>
 	<<link "Refocus">><<set $surgicalUpgradeImplants = "unselected">><<replace "#direction">><br><<print "You direct the corporation to halt the current focus and prepare for a change in direction.">><</replace>><</link>>
 <</if>>