From 255d5a1b027232b3f9c077ef1711aaae494f8ccd Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Sat, 25 May 2019 20:01:16 -0700
Subject: [PATCH] Story caption tweaking
---
src/uncategorized/descriptionOptions.tw | 7 ++++++-
src/uncategorized/options.tw | 17 +++++++++--------
src/uncategorized/storyCaption.tw | 19 ++++++++++++-------
src/uncategorized/summaryOptions.tw | 7 ++++++-
4 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index 3ff9a1acbec..b194a00dda1 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -1,6 +1,11 @@
:: Description Options [nobr]
-<<set $nextButton = "Back", $nextLink = "Options">>
+<<set $nextButton = "Back">>
+<<if $storedLink !== "Slave Interact">>
+ <<set $nextLink = "Options">>
+<<else>>
+ <<set $nextLink = $storedLink>>
+<</if>>
//These options will affect both the long form description of each slave and the miniscenes available from the main menu.//
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 87ff5f61f9e..8cdd90162df 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -1,22 +1,23 @@
:: Options [nobr]
-<<if ndef $storedLink>> <<set $storedLink = "">> <</if>>
-<<if ndef $storedButton>> <<set $storedButton = "">> <</if>>
-<<set $showEncyclopedia = 0>>
+<<if ndef $storedLink>> <<set $storedLink = "Main">> <</if>>
+<<if ndef $storedButton>> <<set $storedButton = "Back">> <</if>>
<<if lastVisited("attackReport") === 1>>
- <<set $storedButton = "Back">>
<<set $storedLink = "attackReport">>
+<<elseif lastVisited("Slave Interact") === 1>>
+ <<set $storedLink = "Slave Interact">>
<<elseif lastVisited("rebellionReport") === 1>>
- <<set $storedButton = "Back">>
<<set $storedLink = "rebellionReport">>
<<elseif lastVisited("Slave Assignments Report") === 1>>
- <<set $storedButton = "Back">>
<<set $storedLink = "Slave Assignments Report">>
-<<elseif passage() === "Options" && $storedLink === "" && $storedButton === "">>
- <<set $storedButton = "Back to Main">>
+<<else>>
<<set $storedLink = "Main">>
<</if>>
+<<if $storedLink === "Main" && $storedButton === "Back" && passage() === "Options">>
+ <<set $storedButton = "Back to Main">>
+<</if>>
+<<set $showEncyclopedia = 0>>
<<set $nextButton = $storedButton, $nextLink = $storedLink>>
''SAVES''
<br>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 6df4908d7f2..873baaefc0c 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -680,14 +680,19 @@
<</if>>
<</if>>
-<<if $nextButton !== "Continue" && _Pass !== "Options" || ["attackReport", "rebellionReport", "Slave Assignments Report"].includes(_Pass)>>
+<<if $nextButton !== "Continue" || ["attackReport", "rebellionReport", "Slave Assignments Report"].includes(_Pass)>>
<br><br>
- <span id="optionsButton">
- <<link "Game Options">>
- <<set $nextButton = "Back", $nextLink = _Pass>>
- <<goto "Options">>
- <</link>>
- </span> @@.cyan;[O]@@
+ <<if !["Options", "Summary Options", "Description Options"].includes(_Pass)>>
+ <span id="optionsButton">
+ <<link "Game Options">>
+ <<set $nextButton = "Back", $nextLink = _Pass>>
+ <<goto "Options">>
+ <</link>>
+ </span> @@.cyan;[O]@@
+ <<elseif _Pass === "Summary Options" || _Pass === "Description Options">>
+ <<if _Pass !== "Summary Options">> <<link "Summary Options" "Summary Options">> <</link>> <</if>>
+ <<if _Pass !== "Description Options">> <<link "Description Options" "Description Options">> <</link>> <</if>>
+ <</if>>
<</if>>
<<if _Pass === "Encyclopedia" || $showEncyclopedia === 0 || $encyclopedia === " " || $nextButton === "Continue">>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index f5fadf4ae76..9e6b406c9ab 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -1,6 +1,11 @@
:: Summary Options [nobr]
-<<set $nextButton = "Back", $nextLink = "Options">>
+<<set $nextButton = "Back">>
+<<if $storedLink !== "Slave Interact">>
+ <<set $nextLink = "Options">>
+<<else>>
+ <<set $nextLink = $storedLink>>
+<</if>>
<<run clearSummaryCache()>>
//These options will affect the short slave summaries that appear on the main menu and the facility management screens.//
--
GitLab