Encyclopedia-BackButton-Tweaking

src/uncategorized/storyCaption.tw

@@ -29,32 +29,28 @@
 <</if>>
 
 <<if $ui != "start">>
-	<<if $nextButton === "END WEEK" || _Pass === "Encyclopedia">>
-		<span id="endWeekButton">
-		<<if $nextButton === "END WEEK">> <br><br> <</if>>
-		<strong>
-		<<link [[($nextButton)|($nextLink)]]>><</link>>
-		</strong>
-		<<if $nextButton === "END WEEK">>
+	<<if $nextButton === " ">>
+		<span id="nextButton">
+			/* Hide the button until the player makes a choice */
+		</span>
+	<<else>>
+		<<if $nextButton === "END WEEK">> <br><br>
+			<span id="endWeekButton"><strong>
+			<<link [[($nextButton)|($nextLink)]]>><</link>>
+			</strong></span>
 			@@.cyan;[Ent]@@
 			<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
+			<br>
 		<<else>>
-			to Free Cities.<br>
+			<span id="nextButton"><strong>
+			<<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */
+					<br><br> <<link "$nextButton">> <<set $ui = "main">> <<goto $nextLink>> <</link>>
+			<<else>>
+					<<link [[($nextButton)|($nextLink)]]>><</link>>
+			<</if>>
+			</strong></span>
+			<<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@<br><br>
 		<</if>>
-		</span>
-		<br>
-	<<elseif $nextButton == " ">> <br><br>
-		<span id="nextButton">
-			/* Hide the button until the player makes a choice */
-		</span>
-	<<else>> <br><br>
-		<span id="nextButton"> /* target for miscWidgets' <<UpdateNextButton>> */
-			<strong><<link "$nextButton">> /* must use link so spacebar shortcut will work */
-					<<set $ui = "main">>
-					<<goto $nextLink>>
-			<</link>></strong>
-			@@.cyan;[Space]@@<br>
-		</span>
 	<</if>>
 <</if>>
 
@@ -846,9 +842,8 @@
 				<</if>>
 				<<goto _Pass>>
 			<</link>>
-			<br>
 		<</if>>
-		<<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
+		<br> <<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
 	<</if>>
 
 <</if>> /* Closes ui != "start" */