More consolidation

src/js/futureSocietyJS.js

@@ -38,6 +38,7 @@ window.FutureSocieties = (function() {
 	return {
 		activeCount: activeCount,
 		applyBroadProgress: applyBroadProgress,
+		overflowToInfluence: overflowToInfluence,
 		remove: removeFS,
 		DecorationCleanup: DecorationCleanup,
 		Change: FSChange,
@@ -59,9 +60,21 @@ window.FutureSocieties = (function() {
 
 	// call as FutureSocieties.applyBroadProgress(arcologyID, progress)
 	function applyBroadProgress(arcologyID, progress) {
-		activeFSes(arcologyID).forEach((fs) => {
+		for (fs of activeFSes(arcologyID)) {
 			V.arcologies[arcologyID][fs] += progress;
-		});
+		}
+	}
+
+	// call as FutureSocieties.overflowToInfluence(arcologyID)
+	// converts excess progress into influence bonus
+	function overflowToInfluence(arcologyID) {
+		const arcology = V.arcologies[arcologyID];
+		for (fs of activeFSes(arcologyID)) {
+			if (arcology[fs] > V.FSLockinLevel) {
+				arcology.influenceBonus += arcology[fs] - V.FSLockinLevel;
+				arcology[fs] = V.FSLockinLevel;
+			}
+		}
 	}
 
 	// call as FutureSocieties.remove(FS)

src/uncategorized/fsDevelopments.tw

@@ -497,106 +497,7 @@
 <</if>>
 
 /* Progress overflow into influence */
-<<if $arcologies[0].FSSupremacist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSSupremacist - $FSLockinLevel>>
-	<<set $arcologies[0].FSSupremacist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSSubjugationist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSSubjugationist - $FSLockinLevel>>
-	<<set $arcologies[0].FSSubjugationist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSGenderRadicalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSGenderRadicalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSGenderRadicalist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSGenderFundamentalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSGenderFundamentalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSGenderFundamentalist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSPaternalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSPaternalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSPaternalist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSPaternalist != "unset">>
-	<<set $arcologies[0].FSPaternalist += _broadProgress>>
-<<elseif $arcologies[0].FSDegradationist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSDegradationist - $FSLockinLevel>>
-	<<set $arcologies[0].FSDegradationist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSIntellectualDependency > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSIntellectualDependency - $FSLockinLevel>>
-	<<set $arcologies[0].FSIntellectualDependency = $FSLockinLevel>>
-<<elseif $arcologies[0].FSSlaveProfessionalism > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSSlaveProfessionalism - $FSLockinLevel>>
-	<<set $arcologies[0].FSSlaveProfessionalism = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSBodyPurist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSBodyPurist - $FSLockinLevel>>
-	<<set $arcologies[0].FSBodyPurist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSTransformationFetishist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSTransformationFetishist - $FSLockinLevel>>
-	<<set $arcologies[0].FSTransformationFetishist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSPastoralist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSPastoralist - $FSLockinLevel>>
-	<<set $arcologies[0].FSPastoralist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSPhysicalIdealist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSPhysicalIdealist - $FSLockinLevel>>
-	<<set $arcologies[0].FSPhysicalIdealist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSHedonisticDecadence > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSHedonisticDecadence - $FSLockinLevel>>
-	<<set $arcologies[0].FSHedonisticDecadence = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSMaturityPreferentialist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSMaturityPreferentialist - $FSLockinLevel>>
-	<<set $arcologies[0].FSMaturityPreferentialist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSYouthPreferentialist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSYouthPreferentialist - $FSLockinLevel>>
-	<<set $arcologies[0].FSYouthPreferentialist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSPetiteAdmiration > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSPetiteAdmiration - $FSLockinLevel>>
-	<<set $arcologies[0].FSPetiteAdmiration = $FSLockinLevel>>
-<<elseif $arcologies[0].FSStatuesqueGlorification > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSStatuesqueGlorification - $FSLockinLevel>>
-	<<set $arcologies[0].FSStatuesqueGlorification = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSSlimnessEnthusiast > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSSlimnessEnthusiast - $FSLockinLevel>>
-	<<set $arcologies[0].FSSlimnessEnthusiast = $FSLockinLevel>>
-<<elseif $arcologies[0].FSAssetExpansionist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSAssetExpansionist - $FSLockinLevel>>
-	<<set $arcologies[0].FSAssetExpansionist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSChattelReligionist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSChattelReligionist - $FSLockinLevel>>
-	<<set $arcologies[0].FSChattelReligionist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSRomanRevivalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSRomanRevivalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSRomanRevivalist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSAztecRevivalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSAztecRevivalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSAztecRevivalist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSEgyptianRevivalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSEgyptianRevivalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSEgyptianRevivalist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSEdoRevivalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSEdoRevivalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSEdoRevivalist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSArabianRevivalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSArabianRevivalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSArabianRevivalist = $FSLockinLevel>>
-<<elseif $arcologies[0].FSChineseRevivalist > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSChineseRevivalist - $FSLockinLevel>>
-	<<set $arcologies[0].FSChineseRevivalist = $FSLockinLevel>>
-<</if>>
-<<if $arcologies[0].FSRepopulationFocus > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSRepopulationFocus - $FSLockinLevel>>
-	<<set $arcologies[0].FSRepopulationFocus = $FSLockinLevel>>
-<<elseif $arcologies[0].FSRestart > $FSLockinLevel>>
-	<<set $arcologies[0].influenceBonus += $arcologies[0].FSRestart - $FSLockinLevel>>
-	<<set $arcologies[0].FSRestart = $FSLockinLevel>>
-<</if>>
+<<run FutureSocieties.overflowToInfluence(0)>>
 
 /* warm up policy influence */
 <<if $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1 && $arcologies[0].FSEgyptianRevivalistInterest < 26>>