From 616064ec69938fc5efd1a079fe29babbb0373ab7 Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Sat, 5 Jan 2019 03:27:15 -0500 Subject: [PATCH] Improve the FS alert when it's backed up and needs construction I added the alert a while ago to pop up when credits were available. Now it should pop up each week if construction is possible. The flag clears whenever the FS screen is visited even if no construction takes place. --- src/uncategorized/fsDevelopments.tw | 48 ++++++++++++++--------------- src/uncategorized/futureSociety.tw | 2 +- src/uncategorized/storyCaption.tw | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw index 6d6e186906e..ba89ad92cfc 100644 --- a/src/uncategorized/fsDevelopments.tw +++ b/src/uncategorized/fsDevelopments.tw @@ -703,7 +703,7 @@ <</if>> <<if $arcologies[0].FSSupremacistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSSupremacist == $arcologies[0].FSSupremacistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<set $FSreminder = 1>> <<elseif $arcologies[0].FSSupremacistSMR == 1>> <<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -732,7 +732,7 @@ <</if>> <<if $arcologies[0].FSSubjugationistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSSubjugationist == $arcologies[0].FSSubjugationistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSSubjugationistSMR == 1>> <<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -761,7 +761,7 @@ <</if>> <<if $arcologies[0].FSRepopulationFocusDecoration < $FSLockinLevel>> <<if $arcologies[0].FSRepopulationFocus == $arcologies[0].FSRepopulationFocusDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSRepopulationFocusSMR == 1>> <<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>> <</if>> @@ -790,7 +790,7 @@ <</if>> <<if $arcologies[0].FSRestartDecoration < $FSLockinLevel>> <<if $arcologies[0].FSRestart == $arcologies[0].FSRestartDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSRestartSMR == 1>> <<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>> <</if>> @@ -819,7 +819,7 @@ <</if>> <<if $arcologies[0].FSGenderRadicalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSGenderRadicalist == $arcologies[0].FSGenderRadicalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSGenderRadicalistSMR == 1>> <<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -848,7 +848,7 @@ <</if>> <<if $arcologies[0].FSGenderFundamentalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSGenderFundamentalist == $arcologies[0].FSGenderFundamentalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSGenderFundamentalistSMR == 1>> <<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -877,7 +877,7 @@ <</if>> <<if $arcologies[0].FSPaternalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSPaternalist == $arcologies[0].FSPaternalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSPaternalistSMR == 1>> <<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -906,7 +906,7 @@ <</if>> <<if $arcologies[0].FSDegradationistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSDegradationist == $arcologies[0].FSDegradationistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSDegradationistSMR == 1>> <<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -935,7 +935,7 @@ <</if>> <<if $arcologies[0].FSBodyPuristDecoration < $FSLockinLevel>> <<if $arcologies[0].FSBodyPurist == $arcologies[0].FSBodyPuristDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSBodyPuristSMR == 1>> <<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -962,7 +962,7 @@ <</if>> <<if $arcologies[0].FSTransformationFetishistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSTransformationFetishist == $arcologies[0].FSTransformationFetishistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSTransformationFetishistSMR == 1>> <<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -989,7 +989,7 @@ <</if>> <<if $arcologies[0].FSMaturityPreferentialistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSMaturityPreferentialist == $arcologies[0].FSMaturityPreferentialistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSMaturityPreferentialistSMR == 1>> <<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1016,7 +1016,7 @@ <</if>> <<if $arcologies[0].FSYouthPreferentialistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSYouthPreferentialist == $arcologies[0].FSYouthPreferentialistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSYouthPreferentialistSMR == 1>> <<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1043,7 +1043,7 @@ <</if>> <<if $arcologies[0].FSSlimnessEnthusiastDecoration < $FSLockinLevel>> <<if $arcologies[0].FSSlimnessEnthusiast == $arcologies[0].FSSlimnessEnthusiastDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSSlimnessEnthusiastSMR == 1>> <<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1072,7 +1072,7 @@ <</if>> <<if $arcologies[0].FSAssetExpansionistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSAssetExpansionist == $arcologies[0].FSAssetExpansionistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSAssetExpansionistSMR == 1>> <<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1101,7 +1101,7 @@ <</if>> <<if $arcologies[0].FSPastoralistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSPastoralist == $arcologies[0].FSPastoralistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSPastoralistSMR == 1>> <<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1130,7 +1130,7 @@ <</if>> <<if $arcologies[0].FSPhysicalIdealistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSPhysicalIdealist == $arcologies[0].FSPhysicalIdealistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSPhysicalIdealistSMR == 1>> <<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1159,7 +1159,7 @@ <</if>> <<if $arcologies[0].FSHedonisticDecadenceDecoration < $FSLockinLevel>> <<if $arcologies[0].FSHedonisticDecadence == $arcologies[0].FSHedonisticDecadenceDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>> <<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1188,7 +1188,7 @@ <</if>> <<if $arcologies[0].FSChattelReligionistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSChattelReligionist == $arcologies[0].FSChattelReligionistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSChattelReligionistSMR == 1>> <<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1217,7 +1217,7 @@ <</if>> <<if $arcologies[0].FSRomanRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSRomanRevivalist == $arcologies[0].FSRomanRevivalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSRomanRevivalistSMR == 1>> <<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1246,7 +1246,7 @@ <</if>> <<if $arcologies[0].FSAztecRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSAztecRevivalist == $arcologies[0].FSAztecRevivalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSAztecRevivalistSMR == 1>> <<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1275,7 +1275,7 @@ <</if>> <<if $arcologies[0].FSEgyptianRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSEgyptianRevivalist == $arcologies[0].FSEgyptianRevivalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSEgyptianRevivalistSMR == 1>> <<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1304,7 +1304,7 @@ <</if>> <<if $arcologies[0].FSEdoRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSEdoRevivalist == $arcologies[0].FSEdoRevivalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSEdoRevivalistSMR == 1>> <<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1333,7 +1333,7 @@ <</if>> <<if $arcologies[0].FSArabianRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSArabianRevivalist == $arcologies[0].FSArabianRevivalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSArabianRevivalistSMR == 1>> <<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1362,7 +1362,7 @@ <</if>> <<if $arcologies[0].FSChineseRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSChineseRevivalist == $arcologies[0].FSChineseRevivalistDecoration>> - @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ <<set $FSreminder = 1>> <<elseif $arcologies[0].FSChineseRevivalistSMR == 1>> <<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw index b907c605155..5119bf2e014 100644 --- a/src/uncategorized/futureSociety.tw +++ b/src/uncategorized/futureSociety.tw @@ -1,7 +1,7 @@ :: Future Society [nobr] -<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Future Societies">> +<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Future Societies", $FSreminder = "">> <<if ndef $arcologies[0].FSSubjugationist>> <<set $arcologies[0].FSSubjugationist = "unset">> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 36370fc42fa..e368909bf9d 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -555,7 +555,7 @@ <br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@ <</if>> <<if $FSAnnounced>> - <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if $FSCredits > 0>>@@.yellow;[!]@@<</if>> + <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if ($FSCredits > 0) || ($FSreminder)>>@@.yellow;[!]@@<</if>> <</if>> <br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@ -- GitLab