From 6653fd51a19fd5636be79bf9a62de79760f9ebc4 Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Mon, 9 Oct 2017 19:22:05 +0200 Subject: [PATCH] fixing toggle function --- src/SecExp/securityReport.tw | 2 +- src/events/intro/introSummary.tw | 2 ++ src/events/intro/pcExperienceIntro.tw | 4 ++-- src/events/intro/terrainIntro.tw | 4 ++-- src/init/storyInit.tw | 2 ++ src/uncategorized/options.tw | 16 ++++++++++------ src/uncategorized/reputation.tw | 3 ++- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index 9dd8f5c4bc5..06dbf5ae1ca 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -10,7 +10,7 @@ <<set _crimeCap = 0>> <<set _newCrime = 0>> -<<if $useTabs == 0>>__Arcology Management__<</if>> +<<if $useTabs == 0>>__Security__<</if>> <br> <strong>Security</strong>: diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index c3d4e88c8ce..ef28c5b69f7 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -867,6 +867,8 @@ Image display <br> // This mod alters how prosthetics system works and adds some content.// +<br><br> + <<if $secExp == 1>> The Security Expansion Mod is ''enabled.'' [[Disable|Intro Summary][$secExp = 0]] diff --git a/src/events/intro/pcExperienceIntro.tw b/src/events/intro/pcExperienceIntro.tw index e06fa2169c5..33e2006fef9 100644 --- a/src/events/intro/pcExperienceIntro.tw +++ b/src/events/intro/pcExperienceIntro.tw @@ -35,11 +35,11 @@ You're a relative unknown in the Free Cities, but it's clear you're already acco <<if $showSecExp == 0>> <<link "Show Security Expansion changes">> <<set $showSecExp = 1>> - <<goto "terrainIntro">> + <<goto "PC Experience Intro">> <</link>> <<else>> <<link "Hide Security Expansion changes">> <<set $showSecExp = 0>> - <<goto "terrainIntro">> + <<goto "PC Experience Intro">> <</link>> <</if>> \ No newline at end of file diff --git a/src/events/intro/terrainIntro.tw b/src/events/intro/terrainIntro.tw index c5f48ceccec..932217461ab 100644 --- a/src/events/intro/terrainIntro.tw +++ b/src/events/intro/terrainIntro.tw @@ -71,11 +71,11 @@ Finally, a few Free Cities have been carved out from old world cities. Urban dec <<if $showSecExp == 0>> <<link "Show Security Expansion changes">> <<set $showSecExp = 1>> - <<goto "terrainIntro">> + <<goto "Terrain Intro">> <</link>> <<else>> <<link "Hide Security Expansion changes">> <<set $showSecExp = 0>> - <<goto "terrainIntro">> + <<goto "Terrain Intro">> <</link>> <</if>> \ No newline at end of file diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 9aa5b77dca5..55b14648de1 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1221,6 +1221,8 @@ erectileImplant: 0 } >> /* Security Expansion */ +<<set $secExp = 0>> +<<set $showSecExp = 0>> <<include "secInit">> <<goto "Alpha disclaimer">> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index e1dac91ac8c..aab2870f4d7 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -5,9 +5,10 @@ ''SAVES'' <br> This save was created using FC version $ver build $releaseID. -<br> - [[Apply Backwards Compatibility Update|Backwards Compatibility]] - [[Apply Backwards Compatibility Update only for Security Expansion mod|SecExpBackwardCompatibility]] +<br> [[Apply Backwards Compatibility Update|Backwards Compatibility]] +<<if $secExp == 1>> +<br> [[Apply Security Expansion mod backwards compatibility |SecExpBackwardCompatibility]] +<</if>> <br> <<if ($autosave == 0)>> @@ -347,16 +348,19 @@ Curative side effects are @@.red;DISABLED@@. [[Enable|Options][$curativeSideEffe Cybernetics Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$cyberMod = 0]] <</if>> +<br> + <<if $secExp == 0>> - The Security Expansion mod is @@.red;disabled@@. + The Security Expansion mod is @@.red;DISABLED@@. <<link "Enable">> <<set $secExp = 1>> <<include "SecExpBackwardCompatibility">> + <<goto "Options">> <</link>> <<else>> - The Security Expansion Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$SFMODToggle = 0]] + The Security Expansion Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$secExp = 0]] <</if>> -//The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late// +//The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game. If this is the first time activating the mod or you are updating an old save, please run backward compatibility.// <br><br> ''CHEATING/DEV OPTIONS'' diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index d6d75454cd6..480aa8567be 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -670,6 +670,7 @@ On formal occasions, you are announced as $PCTitle. <</if>> <br><br> -<</if $secExp == 1>> + +<<if $secExp == 1>> <<include "authorityReport">> <</if>> \ No newline at end of file -- GitLab