diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 5f978ecd8b8721720be09e6868850c8822ec685d..a800c2d1126c927698917f02a17f4f5bcb96c365 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -8,7 +8,7 @@
[6000,9000,12000,15000,18000],
[6000,9000,12000,15000,17000,19000]]>>
<<set _FSRepDescriptors = ["solid","high","remarkable","great","excellent","unparalleled"]>>
-<<set _ordinalNames = ["second","third","fourth","fifth","sixth","seventh"]>>
+<<set _ordinalNames = ["second","third","fourth","fifth","sixth","seventh"]>>
<<if $FSCredits > 0>>
@@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@
<</if>>
@@ -23,7 +23,7 @@
<<set _ordinalName = _ordinalNames[$FSGotRepCredits-1]>>
<<if $FSGotRepCredits == $FSCreditCount-1>>
<<set _ordinalName += " and final">>
- <</if>>
+ <</if>>
@@.yellow;Your reputation is so _descriptor that $arcologies[0].name's society is ready to begin accepting a _ordinalName societal direction.@@
<<set $FSGotRepCredits += 1>>
<<set $FSCredits += 1>>
@@ -93,98 +93,35 @@
<</if>>
/* Spending, terrain, rep effects */
-<<set _broadProgress = "">>
-<<if ($arcologies[0].FSSupremacist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSSupremacist ">>
-<</if>>
-<<if ($arcologies[0].FSSubjugationist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSSubjugationist ">>
-<</if>>
-<<if ($arcologies[0].FSGenderRadicalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSGenderRadicalist ">>
-<</if>>
-<<if ($arcologies[0].FSGenderFundamentalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSGenderFundamentalist ">>
-<</if>>
-<<if ($arcologies[0].FSRepopulationFocus != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSRepopulationFocus ">>
-<</if>>
-<<if ($arcologies[0].FSRestart != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSRestart ">>
-<</if>>
-<<if ($arcologies[0].FSPaternalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSPaternalist ">>
-<</if>>
-<<if ($arcologies[0].FSDegradationist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSDegradationist ">>
-<</if>>
-<<if ($arcologies[0].FSBodyPurist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSBodyPurist ">>
-<</if>>
-<<if ($arcologies[0].FSTransformationFetishist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSTransformationFetishist ">>
-<</if>>
-<<if ($arcologies[0].FSYouthPreferentialist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSYouthPreferentialist ">>
-<</if>>
-<<if ($arcologies[0].FSMaturityPreferentialist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSMaturityPreferentialist ">>
-<</if>>
-<<if ($arcologies[0].FSSlimnessEnthusiast != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSSlimnessEnthusiast ">>
-<</if>>
-<<if ($arcologies[0].FSAssetExpansionist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSAssetExpansionist ">>
-<</if>>
-<<if ($arcologies[0].FSPastoralist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSPastoralist ">>
-<</if>>
-<<if ($arcologies[0].FSPhysicalIdealist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSPhysicalIdealist ">>
-<</if>>
-<<if ($arcologies[0].FSHedonisticDecadence != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSHedonisticDecadence ">>
-<</if>>
-<<if ($arcologies[0].FSChattelReligionistLaw != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSChattelReligionistLaw ">>
-<</if>>
-<<if ($arcologies[0].FSRomanRevivalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSRomanRevivalist ">>
-<</if>>
-<<if ($arcologies[0].FSAztecRevivalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSAztecRevivalist ">>
-<</if>>
-<<if ($arcologies[0].FSEgyptianRevivalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSEgyptianRevivalist ">>
-<</if>>
-<<if ($arcologies[0].FSEdoRevivalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSEdoRevivalist ">>
-<</if>>
-<<if ($arcologies[0].FSArabianRevivalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSArabianRevivalist ">>
-<</if>>
-<<if ($arcologies[0].FSArabianRevivalistLaw != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSArabianRevivalistLaw ">>
-<</if>>
-<<if ($arcologies[0].FSChineseRevivalist != "unset")>>
- <<set _broadProgress += "$arcologies[0].FSChineseRevivalist ">>
-<</if>>
+<<set _broadProgress = 0>>
<<if $FSSpending > 1>>
Your @@.yellowgreen;societal spending@@ helps forward your goals for the arcology's future.
- <<set _broadProgress += Math.ceil($FSSpending/1000)>>
+ <<set _broadProgress += Math.trunc($FSSpending/(1000-(500*$arcologies[0].FSEdoRevivalistLaw)-(250*$arcologies[0].FSArabianRevivalistLaw)))>>
<</if>>
<<if $FCTVreceiver == 3>>
- Your customized @@.yellowgreen;FCTV programming@@ influences your citizens, greatly helping define your arcology's culture.
- <<if ($week - $receiverAvailable) < 4>>
- <<set _broadProgress += .5>>
- <<elseif ($week - $receiverAvailable) < 8>>
- <<set _broadProgress += .75>>
- <<elseif ($week - $receiverAvailable) < 12>>
- <<set _broadProgress += 1>>
- <<elseif ($week - $receiverAvailable) < 36>>
+ Your customized @@.yellowgreen;FCTV programming@@ strongly influences your citizens, greatly helping define your arcology's culture.
+ <<if ($week - $receiverAvailable) > 29>>
+ <<set _broadProgress += 3>>
+ <<elseif ($week - $receiverAvailable) > 19>>
<<set _broadProgress += 2>>
- <<elseif ($week - $receiverAvailable) >= 37>>
+ <<elseif ($week - $receiverAvailable) > 4>>
+ <<set _broadProgress += 1>>
+ <</if>>
+<<elseif $FCTVreceiver == 2>>
+ Your customized @@.yellowgreen;FCTV programming@@ influences your citizens, helping define your arcology's culture.
+ <<if ($week - $receiverAvailable) > 34>>
<<set _broadProgress += 3>>
+ <<elseif ($week - $receiverAvailable) > 23>>
+ <<set _broadProgress += 2>>
+ <<elseif ($week - $receiverAvailable) > 8>>
+ <<set _broadProgress += 1>>
+ <</if>>
+<<elseif $FCTVreceiver == 1>>
+ Your customized @@.yellowgreen;FCTV programming@@ influences a small number of your citizens, slightly helping define your arcology's culture.
+ <<if ($week - $receiverAvailable) > 39>>
+ <<set _broadProgress += 2>>
+ <<elseif ($week - $receiverAvailable) > 24>>
+ <<set _broadProgress += 1>>
<</if>>
<</if>>
<<if $secExp == 1>>
@@ -268,6 +205,68 @@
<<case 5>>Maintaining five societal goals requires @@.red;very unfocused social engineering.@@
<</switch>>
<</if>> /*closes FS count changes */
+<<if _broadProgress != 0>>
+ <<if $arcologies[0].FSSupremacist != "unset">>
+ <<set $arcologies[0].FSSupremacist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSSubjugationist != "unset">>
+ <<set $arcologies[0].FSSubjugationist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSGenderRadicalist != "unset">>
+ <<set $arcologies[0].FSGenderRadicalist += _broadProgress>>
+ <<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
+ <<set $arcologies[0].FSGenderFundamentalist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSPaternalist != "unset">>
+ <<set $arcologies[0].FSPaternalist += _broadProgress>>
+ <<elseif $arcologies[0].FSDegradationist != "unset">>
+ <<set $arcologies[0].FSDegradationist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSBodyPurist != "unset">>
+ <<set $arcologies[0].FSBodyPurist += _broadProgress>>
+ <<elseif $arcologies[0].FSTransformationFetishist != "unset">>
+ <<set $arcologies[0].FSTransformationFetishist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
+ <<set $arcologies[0].FSSlimnessEnthusiast += _broadProgress>>
+ <<elseif $arcologies[0].FSAssetExpansionist != "unset">>
+ <<set $arcologies[0].FSAssetExpansionist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSPastoralist != "unset">>
+ <<set $arcologies[0].FSPastoralist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSPhysicalIdealist != "unset">>
+ <<set $arcologies[0].FSPhysicalIdealist += _broadProgress>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
+ <<set $arcologies[0].FSHedonisticDecadence += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSMaturityPreferentialist != "unset">>
+ <<set $arcologies[0].FSMaturityPreferentialist += _broadProgress>>
+ <<elseif $arcologies[0].FSYouthPreferentialist != "unset">>
+ <<set $arcologies[0].FSYouthPreferentialist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSChattelReligionist != "unset">>
+ <<set $arcologies[0].FSChattelReligionist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<set $arcologies[0].FSRomanRevivalist += _broadProgress>>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set $arcologies[0].FSAztecRevivalist += _broadProgress>>
+ <<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
+ <<set $arcologies[0].FSEgyptianRevivalist += _broadProgress>>
+ <<elseif $arcologies[0].FSEdoRevivalist != "unset">>
+ <<set $arcologies[0].FSEdoRevivalist += _broadProgress>>
+ <<elseif $arcologies[0].FSArabianRevivalist != "unset">>
+ <<set $arcologies[0].FSArabianRevivalist += _broadProgress>>
+ <<elseif $arcologies[0].FSChineseRevivalist != "unset">>
+ <<set $arcologies[0].FSChineseRevivalist += _broadProgress>>
+ <</if>>
+ <<if $arcologies[0].FSRepopulationFocus != "unset">>
+ <<set $arcologies[0].FSRepopulationFocus += _broadProgress>>
+ <<elseif $arcologies[0].FSRestart != "unset">>
+ <<set $arcologies[0].FSRestart += _broadProgress>>
+ <</if>>
+<</if>>
<<if $secExp == 1>>
<<if $slaveWatch == 1>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 926ba22b0202c790fe10939140f9d2527c9d0ce3..6b7ac8b997981e420e0dd8eba8654e93ca14a133 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -74,8 +74,14 @@ __Construction__
<br>
<<if ($receiverAvailable == 1) && ($FCTVenable != 0) && ($FCTVreceiver == 0)>>
- You have not installed a FCTV receiver. Installing this receiver will cost <<print cashFormat(Math.ceil(50000*$upgradeMultiplierArcology))>>.
- [[Install|Manage Arcology][$cash -= Math.ceil(50000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1]]
+ You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.
+ [[No subsidy|Manage Arcology][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1]]
+<<elseif ($FCTVreceiver == 3)>>
+ You have installed the FCTV receiver and have access to the full range of FCTV's programs. High viewership rates amongst your citizens makes it easier to pursue your societal goals.
+<<elseif ($FCTVreceiver == 2)>>
+ You have installed the FCTV receiver and have access to the full range of FCTV's programs. Decent viewership rates amongst your citizens makes it somewhat easier to pursue your societal goals.
+<<elseif ($FCTVreceiver == 1)>>
+ You have installed the FCTV receiver and have access to the full range of FCTV's programs. Low viewership rates amongst your citizens limits the impact of FCTV on your societal goals.
<</if>>
<<if $secExp == 1>>