diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index 5bb9b85f0b5d055e90d2afacb4228619dd78b84a..594304f73c794d9fc4eaba8cf0b91fd3067e7a9d 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -47,6 +47,7 @@ <<elseif $PC.rumor == "social engineering">> <<set $FSAnnounced = 1>> <<set $FSCredits = 1>> + <<set $FSGotRepCredits = 1>> <<elseif $PC.rumor == "luck">> <<set $rep += 4000>> <</if>> @@ -528,6 +529,7 @@ <<set $activeArcology.FSSupremacistDecoration = 20, $activeArcology.FSSubjugationistDecoration = 20, $activeArcology.FSGenderRadicalistDecoration = 20, $activeArcology.FSGenderFundamentalistDecoration = 20, $activeArcology.FSPaternalistDecoration = 20, $activeArcology.FSDegradationistDecoration = 20, $activeArcology.FSBodyPuristDecoration = 20, $activeArcology.FSTransformationFetishistDecoration = 20, $activeArcology.FSYouthPreferentialistDecoration = 20, $activeArcology.FSMaturityPreferentialistDecoration = 20, $activeArcology.FSSlimnessEnthusiastDecoration = 20, $activeArcology.FSAssetExpansionistDecoration = 20, $activeArcology.FSPastoralistDecoration = 20, $activeArcology.FSPhysicalIdealistDecoration = 20, $activeArcology.FSChattelReligionistDecoration = 20, $activeArcology.FSRomanRevivalistDecoration = 20, $activeArcology.FSAztecRevivalistDecoration = 20, $activeArcology.FSEgyptianRevivalistDecoration = 20, $activeArcology.FSEdoRevivalistDecoration = 20, $activeArcology.FSArabianRevivalistDecoration = 20, $activeArcology.FSChineseRevivalistDecoration = 20, $activeArcology.FSRepopulationFocusDecoration = 20, $activeArcology.FSRestartDecoration = 20, $activeArcology.FSHedonisticDecadenceDecoration = 20, $activeArcology.FSCummunismDecoration = 20>> <<if $targetArcology.type != "New">> <<set $FSAnnounced = 1>> + <<set $FSGotRepCredits = 1>> <<set $activeArcology.name = $targetArcology.name, $activeArcology.prosperity = $targetArcology.prosperity, $ACitizens += $targetArcology.citizens*500>> <<set _decoration = $targetArcology.FSProgress + 10>> <<switch $targetArcology.type>> @@ -583,7 +585,7 @@ <<set $activeArcology.FSNull = 20>> <</switch>> <<if $PC.rumor == "social engineering">> - <<set $FSGotRepCreditOne = 1>> + <<set $FSGotRepCredits += 1>> <</if>> <</if>> <<else>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 4ef5662919343fa0ad02e18c4431cf088e5fcffa..aa5e39bc3943d12c3a5d961dfc2977b27f9fafa4 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -561,12 +561,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $FSCredits = 0>> <<set $FSCreditCount = 5>> <<set $FSCreditCountString = "five">> -<<set $FSGotRepCreditOne = 0>> -<<set $FSGotRepCreditTwo = 0>> -<<set $FSGotRepCreditThree = 0>> -<<set $FSGotRepCreditFour = 0>> -<<set $FSGotRepCreditFive = 0>> -<<set $FSGotRepCreditSix = 0>> +<<set $FSGotRepCredits = 0>> <<set $FSSingleSlaveRep = 10>> <<set $FSSpending = 0>> <<set $FSLockinLevel = 100>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 512a1d72b976d16026c579a696597940489a92b7..a58b079e181564ed0dce6c86290d02098dc7d646 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -503,11 +503,42 @@ <<if ndef $FSCreditCountString>> <<set $FSCreditCountString = "five">> <</if>> -<<if ndef $FSGotRepCreditFive>> - <<set $FSGotRepCreditFive = 0>> +<<if ndef $FSGotRepCredits>> + <<if $FSGotRepCreditSix == 1>> + <<set $FSGotRepCredits = 7>> + <<elseif $FSGotRepCreditFive == 1>> + <<set $FSGotRepCredits = 6>> + <<elseif $FSGotRepCreditFour == 1>> + <<set $FSGotRepCredits = 5>> + <<elseif $FSGotRepCreditThree == 1>> + <<set $FSGotRepCredits = 4>> + <<elseif $FSGotRepCreditTwo == 1>> + <<set $FSGotRepCredits = 3>> + <<elseif $FSGotRepCreditOne == 1>> + <<set $FSGotRepCredits = 2>> + <<elseif $FSAnnounced == 1>> + <<set $FSGotRepCredits = 1>> + <<else>> + <<set $FSGotRepCredits = 0>> + <</if>> +<</if>> +<<if def $FSGotRepCreditSix>> + <<unset $FSGotRepCreditSix>> +<</if>> +<<if def $FSGotRepCreditFive>> + <<unset $FSGotRepCreditFive>> +<</if>> +<<if def $FSGotRepCreditFour>> + <<unset $FSGotRepCreditFour>> +<</if>> +<<if def $FSGotRepCreditThree>> + <<unset $FSGotRepCreditThree>> +<</if>> +<<if def $FSGotRepCreditTwo>> + <<unset $FSGotRepCreditTwo>> <</if>> -<<if ndef $FSGotRepCreditSix>> - <<set $FSGotRepCreditSix = 0>> +<<if def $FSGotRepCreditOne>> + <<unset $FSGotRepCreditOne>> <</if>> <<if ndef $makeDicks>> <<set $makeDicks = 0>> diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw index 9df3f0ce8ba7916503e9199ef7d4523a9f8e5106..1bb592667f629150ef321d742f3d69e5b52dfb0a 100644 --- a/src/uncategorized/fsDevelopments.tw +++ b/src/uncategorized/fsDevelopments.tw @@ -6,134 +6,133 @@ <<if $FSCredits > 0>> @@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@ <</if>> - <<if $FSCreditCount == 4>> - <<if ($FSGotRepCreditOne != 1)>> + <<if ($FSGotRepCredits == 1)>> <<if ($rep > 7000)>> @@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@ - <<set $FSGotRepCreditOne = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditTwo != 1)>> + <<if ($FSGotRepCredits == 2)>> <<if ($rep > 11000)>> @@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@ - <<set $FSGotRepCreditTwo = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditThree != 1)>> + <<if ($FSGotRepCredits == 3)>> <<if ($rep > 15000)>> @@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a fourth and final societal direction.@@ - <<set $FSGotRepCreditThree = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> <<elseif $FSCreditCount == 5>> - <<if ($FSGotRepCreditOne != 1)>> + <<if ($FSGotRepCredits == 1)>> <<if ($rep > 6000)>> @@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@ - <<set $FSGotRepCreditOne = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditTwo != 1)>> + <<if ($FSGotRepCredits == 2)>> <<if ($rep > 9000)>> @@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@ - <<set $FSGotRepCreditTwo = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditThree != 1)>> + <<if ($FSGotRepCredits == 3)>> <<if ($rep > 12000)>> @@.yellow;Your reputation is so great that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@ - <<set $FSGotRepCreditThree = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditFour != 1)>> + <<if ($FSGotRepCredits == 4)>> <<if ($rep > 15000)>> @@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a fifth and final societal direction.@@ - <<set $FSGotRepCreditFour = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> <<elseif $FSCreditCount == 6>> - <<if ($FSGotRepCreditOne != 1)>> + <<if ($FSGotRepCredits == 1)>> <<if ($rep > 6000)>> @@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@ - <<set $FSGotRepCreditOne = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditTwo != 1)>> + <<if ($FSGotRepCredits == 2)>> <<if ($rep > 9000)>> @@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@ - <<set $FSGotRepCreditTwo = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditThree != 1)>> + <<if ($FSGotRepCredits == 3)>> <<if ($rep > 12000)>> @@.yellow;Your reputation is so great that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@ - <<set $FSGotRepCreditThree = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditFour != 1)>> + <<if ($FSGotRepCredits == 4)>> <<if ($rep > 15000)>> @@.yellow;Your reputation is so excellent that $arcologies[0].name's society is ready to begin accepting a fifth societal direction.@@ - <<set $FSGotRepCreditFour = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditFive != 1)>> + <<if ($FSGotRepCredits == 5)>> <<if ($rep > 18000)>> @@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a sixth and final societal direction.@@ - <<set $FSGotRepCreditFive = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> <<elseif $FSCreditCount == 7>> - <<if ($FSGotRepCreditOne != 1)>> + <<if ($FSGotRepCredits == 1)>> <<if ($rep > 6000)>> @@.yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@ - <<set $FSGotRepCreditOne = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditTwo != 1)>> + <<if ($FSGotRepCredits == 2)>> <<if ($rep > 9000)>> @@.yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@ - <<set $FSGotRepCreditTwo = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditThree != 1)>> + <<if ($FSGotRepCredits == 3)>> <<if ($rep > 12000)>> @@.yellow;Your reputation is so remarkable that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@ - <<set $FSGotRepCreditThree = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditFour != 1)>> + <<if ($FSGotRepCredits == 4)>> <<if ($rep > 15000)>> @@.yellow;Your reputation is so great that $arcologies[0].name's society is ready to begin accepting a fifth societal direction.@@ - <<set $FSGotRepCreditFour = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditFive != 1)>> + <<if ($FSGotRepCredits == 5)>> <<if ($rep > 17000)>> @@.yellow;Your reputation is so excellent that $arcologies[0].name's society is ready to begin accepting a sixth societal direction.@@ - <<set $FSGotRepCreditFive = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> - <<if ($FSGotRepCreditSix != 1)>> + <<if ($FSGotRepCredits == 6)>> <<if ($rep > 19000)>> @@.yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a seventh and final societal direction.@@ - <<set $FSGotRepCreditSix = 1>> + <<set $FSGotRepCredits += 1>> <<set $FSCredits += 1>> <</if>> <</if>> diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw index 38aaf165344626995ad366d6eabb6e424a4f68e4..daf35e0da94bd96fe74fda914dda0fb0435a492e 100644 --- a/src/uncategorized/futureSocities.tw +++ b/src/uncategorized/futureSocities.tw @@ -173,7 +173,7 @@ <<if $FSCredits > 0>> @@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@ -<<elseif $FSGotRepCreditTwo == 1>> +<<elseif $FSGotRepCredits >= 3>> Your society is so radically changed that it is starting to take on a life of its own. The major decisions about its direction have been made. <<else>> You must develop your reputation further for $arcologies[0].name's society to be ready for a new societal direction. @@ -430,17 +430,17 @@ <</if>> You have unlocked -<<if ($FSGotRepCreditSix == 1)>> +<<if ($FSGotRepCredits == 7)>> __seven of <<print $FSCreditCountString>>__ -<<elseif ($FSGotRepCreditFive == 1)>> +<<elseif ($FSGotRepCredits == 6)>> __six of <<print $FSCreditCountString>>__ -<<elseif ($FSGotRepCreditFour == 1)>> +<<elseif ($FSGotRepCredits == 5)>> __five of <<print $FSCreditCountString>>__ -<<elseif ($FSGotRepCreditThree == 1)>> +<<elseif ($FSGotRepCredits == 4)>> __four of <<print $FSCreditCountString>>__ -<<elseif ($FSGotRepCreditTwo == 1)>> +<<elseif ($FSGotRepCredits == 3)>> __three of <<print $FSCreditCountString>>__ -<<elseif ($FSGotRepCreditOne == 1)>> +<<elseif ($FSGotRepCredits == 2)>> __two of <<print $FSCreditCountString>>__ <<else>> __one of <<print $FSCreditCountString>>__ diff --git a/src/uncategorized/pFSAnnouncement.tw b/src/uncategorized/pFSAnnouncement.tw index 849b0258248cf5a307df852f12e9a36d210e3ceb..1b6708a5fd8a8f69f411353869e69a1f4391e482 100644 --- a/src/uncategorized/pFSAnnouncement.tw +++ b/src/uncategorized/pFSAnnouncement.tw @@ -4,6 +4,7 @@ <<set $FSAnnounced = 1>> <<set $FSCredits += 1>> +<<set $FSGotRepCredits = 1>> The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> knows to allow you these moments of peace. <br><br>