From 44b156e4c99552c06121bf6a12440edaf1b3416a Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Wed, 22 Jan 2020 17:22:52 -0500 Subject: [PATCH] remove FSCreditCountString --- src/events/intro/introSummary.tw | 10 ---------- src/init/storyInit.tw | 1 - src/uncategorized/BackwardsCompatibility.tw | 4 ++-- src/uncategorized/futureSociety.tw | 13 +------------ 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index d3b45414bc2..ab036459fd3 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -589,16 +589,6 @@ __''The Free City''__ <br> <</if>> -<<if $FSCreditCount >= 7>> - <<set $FSCreditCountString = "seven">> -<<elseif $FSCreditCount == 6>> - <<set $FSCreditCountString = "six">> -<<elseif $FSCreditCount == 5>> - <<set $FSCreditCountString = "five">> -<<elseif $FSCreditCount <= 4>> - <<set $FSCreditCountString = "four">> -<</if>> - <<options $FSCreditCount>> The Free City could develop as many as ''$FSCreditCount'' future societies. <<option>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index ee3b1f700dc..83742f4b211 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -384,7 +384,6 @@ You should have received a copy of the GNU General Public License along with thi <<set $customRetirementAge = 45>> <<set $customMenialRetirementAge = 65>> <<set $FSCreditCount = 5>> - <<set $FSCreditCountString = "five">> <<include "Init Rules">> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 382a04a201e..bb4142d9c58 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -1257,8 +1257,8 @@ <<if ndef $FSCreditCount>> <<set $FSCreditCount = 5>> <</if>> -<<if ndef $FSCreditCountString>> - <<set $FSCreditCountString = "five">> +<<if def $FSCreditCountString>> + <<unset $FSCreditCountString>> <</if>> <<if ndef $FSGotRepCredits>> <<if $FSGotRepCreditSix == 1>> diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw index e6cb3d40bb9..1bc9d3e64d2 100644 --- a/src/uncategorized/futureSociety.tw +++ b/src/uncategorized/futureSociety.tw @@ -96,17 +96,6 @@ <<if ndef $arcologies[0].FSChineseRevivalist>> <<set $arcologies[0].FSChineseRevivalist = "unset">> <</if>> -<<if ndef $FSCreditCountString>> - <<if $FSCreditCount == 7>> - <<set $FSCreditCountString = "seven">> - <<elseif $FSCreditCount == 6>> - <<set $FSCreditCountString = "six">> - <<elseif $FSCreditCount == 5>> - <<set $FSCreditCountString = "five">> - <<else>> - <<set $FSCreditCountString = "four">> - <</if>> -<</if>> /* FIRST FS STORING FOR RIVALRY */ @@ -496,7 +485,7 @@ You have unlocked <span class="detail"> <<= num($FSGotRepCredits, true)>> - of <<print $FSCreditCountString>> + of <<= num($FSCreditCount, true)>> </span> possible societal customizations. -- GitLab