From 4d5300a8c51f29e4b0df1b7dd676d8a144c5d2e0 Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Mon, 22 Jul 2019 06:03:29 -0700
Subject: [PATCH] Options sub menu tweaking
---
src/uncategorized/descriptionOptions.tw | 6 +++++-
src/uncategorized/nextWeek.tw | 7 +------
src/uncategorized/summaryOptions.tw | 10 +++++++---
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index 41e6cafa82b..001684d01a7 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -9,7 +9,11 @@
<<set $nextButton = "Back">>
<<if $storedLink !== "Slave Interact">>
- <<set $nextLink = "Options">>
+ <<if lastVisited("Slave Interact") === 1>>
+ <<set $storedLink = "Slave Interact">>
+ <<else>>
+ <<set $storedLink = "Options">>
+ <</if>>
<<else>>
<<set $nextLink = $storedLink>>
<</if>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index df94927a775..abb80bddc53 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -1,10 +1,5 @@
:: Next Week [nobr]
-<<if def $storedReturn>>
- <<run delete $storedReturn>>
-<</if>>
-<<run delete $storedLink>>
-<<run delete $storedButton>>
<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
<<set $upgradeMultiplierMedicine = upgradeMultiplierMedicine()>>
@@ -466,4 +461,4 @@
<<if ($rep > 17500)>> <<set $rep = 17500>> <</if>>
<</if>>
<<set $NaNArray = findNaN()>>
-<<goto "Main">>
+<<goto "Main">>
\ No newline at end of file
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 04c1edc13df..cd341832488 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -1,8 +1,12 @@
:: Summary Options [nobr]
<<set $nextButton = "Back">>
-<<if $storedLink !== "Slave Interact">>
- <<set $nextLink = "Options">>
+<<if $storedLink !== "Slave Interact" || $storedLink !== "Main">>
+ <<if lastVisited("Main") === 1>>
+ <<set $storedLink = "Main">>
+ <<else>>
+ <<set $storedLink = "Options">>
+ <</if>>
<<else>>
<<set $nextLink = $storedLink>>
<</if>>
@@ -172,4 +176,4 @@ Main menu assignment shortcuts are
<</if>>
<br><br>
-//[[FC Dev's preferred options|Summary Options ][$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 1,$abbreviateSidebar = 1]]//
+//[[FC Dev's preferred options|Summary Options ][$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 1,$abbreviateSidebar = 1]]//
\ No newline at end of file
--
GitLab