Fixes-slaveEventAdd

src/uncategorized/storyCaption.tw

@@ -13,7 +13,7 @@
 	<<else>>
 		<strong>
 		<<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */
-				<<link [[$nextButton|$nextLink][]]>><</link>>
+				<<link "$nextButton">> <<goto $nextLink>> <</link>>
 		<<else>>
 				<<link [[Back to Free Cities|$nextLink]]>><</link>>
 		<</if>>
@@ -31,23 +31,23 @@
 
 	<<if $propHub > 0 && _Pass !== "propagandaHub">>
 		<span id="propHub"> <br>
-			<<link [[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
+			<<link [[Manage PR|propagandaHub]]>><</link>>
 		</span> @@.cyan;[Shift+H]@@
 	<</if>>
 	<<if $secHQ > 0 && _Pass !== "securityHQ">>
 		<span id="securityHQ"> <br>
-			<<link [[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
+			<<link [[Manage Security|securityHQ]]>><</link>>
 		</span> @@.cyan;[Shift+S]@@
 	<</if>>
 
 	<<if $secBarracks > 0 && _Pass !== "secBarracks">>
 		<span id="secBarracks"> <br>
-			<<link [[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
+			<<link [[Manage Military|secBarracks]]>><</link>>
 		</span> @@.cyan;[Shift+A]@@
 	<</if>>
 	<<if $riotCenter > 0 && _Pass !== "riotControlCenter">>
 		<span id="riotCenter"> <br>
-			<<link [[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
+			<<link [[Manage Rebels|riotControlCenter]]>><</link>>
 		</span> @@.cyan;[Shift+R]@@
 	<</if>>
 <</widget>>
@@ -769,7 +769,7 @@
 	<</if>> /* Closes nextButton !== "Continue" && nextButton !== " " */
 <</if>>
 
-<<if _Pass !== "Encyclopedia" && ($showEncyclopedia > 0 || $nextButton !== "Continue")>>
+<<if _Pass !== "Encyclopedia" && $showEncyclopedia > 0 && $nextButton !== "Continue">>
 	<<if $nextButton === " ">> <br> <</if>> <<if $ui != "start">> <br> <</if>>
 	//''FCE'':// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
 <</if>>