From f73e05253114c4b3b5a1c4e2128c5f76a7c5606e Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Sat, 27 Jul 2019 18:30:04 -0700
Subject: [PATCH] Side bar/Story caption tweaking
---
src/gui/mainMenu/AlphaDisclaimer.tw | 4 +-
src/npc/acquisition.tw | 4 +-
src/uncategorized/storyCaption.tw | 60 ++++++++++++++---------------
3 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 38da9745db0..3c4f9bdcf5a 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -7,7 +7,7 @@
''This is an alpha.'' That means the game is missing content, is full of bugs, is imbalanced, and is generally in an incomplete state. The game will keep a start of turn autosave. If you encounter a bug, we strongly recommend you reload your start of turn autosave immediately. Please submit your feedback and bug reports at https://gitgud.io/pregmodfan/fc-pregmod/issues. Consider attaching a save file and screenshot of the problem. This Pregmod is a modification of the original <i>Free Cities</i> created by FCdev, which can be seen at https://freecitiesblog.blogspot.com/.
-An in-game encyclopedia is available from the sidebar (or [[here|Encyclopedia][$nextButton = "Back", $nextLink = passage()]] if you'd prefer to have a look before starting), with answers to most basic gameplay questions.
+An in-game encyclopedia is available from the sidebar, with answers to most basic gameplay questions.
__Important note for new players, and a reminder for FC veterans:__ when the player is offered a set of choices, the ''Continue'' button at the top of the left sidebar will almost always remain available. Using this to decline all the options presented is //not cheating.// If it's available, it's supposed to be available. It represents the player character politely bowing out of the situation.
@@ -17,4 +17,4 @@ If you enjoy FC and feel like using your real-life ¤ to express gratitude, you
@@.yellow;This is a text-based game that includes descriptions of sexual activity, graphic violence, drug use, and other subjects not suitable for persons under the age of 18. This is a work of fiction; any resemblance to actual persons, places, or events is unintended.@@
-[[I am 18 or more years of age, I understand, and I wish to continue|Economy Intro]]
+[[I am 18 or more years of age, I understand, and I wish to continue|Economy Intro]]
\ No newline at end of file
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index ff77c90cadf..9bc7d522606 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -2,7 +2,7 @@
<<unset $slaveWithoutBonuses, $startingGirlCopied, $startingGirlRelation>>
-<<set $fixedNationality = 0, $encyclopedia = " ">>
+<<set $fixedNationality = 0, $showEncyclopedia = 0>>
<<if $saveImported == 1>><<set _valueOwed = 5000>><<else>><<set _valueOwed = 50000>><</if>>
<<if $freshPC == 1 || $saveImported == 0>>
@@ -751,4 +751,4 @@ The previous owner seems to have left in something of a hurry.
<</if>>
<<script>>Save.autosave.save("Week Start Autosave")<</script>>
<<goto "Main">>
-<</link>>
+<</link>>
\ No newline at end of file
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 064927fa0ac..bea480e6d90 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -105,7 +105,7 @@
<br>[[Game Mods|Encyclopedia][$encyclopedia = "Game Mods"]]
<br>[[Credits|Encyclopedia][$encyclopedia = "Credits"]]
<<elseif _Pass == "Starting Girls">>
- <span id="cost"><<SlaveCostDescription>></span>
+ <span id="cost"><<SlaveCostDescription>></span> <br><br>
<</if>>
<<if $ui != "start" && _Pass !== "Encyclopedia">> <br>
@@ -769,39 +769,37 @@
<</if>>
<</if>> /* Closes nextButton !== "Continue" && nextButton !== " " */
+<</if>>
- <<if _Pass === "Encyclopedia" || $showEncyclopedia === 0 || $encyclopedia === " " || $nextButton === "Continue">>
- <<else>>
- <<if $nextButton === " ">> <br> <</if>>
- <br>//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
- <</if>>
+<<if _Pass !== "Encyclopedia" || $showEncyclopedia > 0 || $nextButton !== "Continue">>
+ <<if $nextButton === " ">> <br> <</if>> <<if $ui != "start">> <br> <</if>>
+ //''FCE'':// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
+<</if>>
- <<if ($debugMode == 1)>>
- <br><br>Debugging Tools<br>
- <<link "Display Variables">><<checkvars>><</link>>
- <br>
- <<link "Display Changed Variables">>
- <<set Config.history.maxStates = 2>> /* makes sure we store the current state so we can return to it */
- <<goto "Variable Difference">>
- <</link>>
+<<if $ui != "start" && _Pass !== "Encyclopedia" && $debugMode > 0>>
+ <br><br>Debugging Tools<br>
+ <<link "Display Variables">><<checkvars>><</link>>
+ <br>
+ <<link "Display Changed Variables">>
+ <<set Config.history.maxStates = 2>> /* makes sure we store the current state so we can return to it */
+ <<goto "Variable Difference">>
+ <</link>>
+ <br>
+ <<link "Bug Report">><<bugreport>><</link>>
+ <<if $debugModeCustomFunction > 0>>
<br>
- <<link "Bug Report">><<bugreport>><</link>>
- <<if $debugModeCustomFunction > 0>>
- <br>
- <<textarea "_customEvalCode" "">>
- <<link "Run Custom Function">>
- <<if _customEvalCode>>
- <<if _customEvalCode.charAt(0) != "(" || $nextLink == ")">> /* second condition is only there for sanityCheck */
- <<set _customEvalCode = "(" + _customEvalCode + ")">>
- <</if>>
- <<if typeof eval(_customEvalCode) === "function">>
- <<run (eval(_customEvalCode))()>>
- <</if>>
+ <<textarea "_customEvalCode" "">>
+ <<link "Run Custom Function">>
+ <<if _customEvalCode>>
+ <<if _customEvalCode.charAt(0) != "(" || $nextLink == ")">> /* second condition is only there for sanityCheck */
+ <<set _customEvalCode = "(" + _customEvalCode + ")">>
<</if>>
- <<goto _Pass>>
- <</link>>
- <</if>>
- <br> <<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
+ <<if typeof eval(_customEvalCode) === "function">>
+ <<run (eval(_customEvalCode))()>>
+ <</if>>
+ <</if>>
+ <<goto _Pass>>
+ <</link>>
<</if>>
-
+ <br> <<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
<</if>>
\ No newline at end of file
--
GitLab