diff --git a/src/facilities/fsDecoration.js b/src/facilities/fsDecoration.js
index 56ae1ec98b48f22ecd192c9998518af9d958aa23..9b57c9b92c6f860706fd60360596bb1485da494e 100644
--- a/src/facilities/fsDecoration.js
+++ b/src/facilities/fsDecoration.js
@@ -27,3 +27,124 @@ App.UI.facilityRedecoration = function(variable) {
}
return frag;
};
+
+/**
+ *
+ * @param {FC.FutureSociety} FS
+ * @param {Array} items
+ * @returns {HTMLElement}
+ */
+App.UI.FSChangeDecoration = function(FS, items) {
+ const el = document.createElement("div");
+ el.classList.add("indent");
+ const FSDecoration = FS + "Decoration";
+ let costs;
+ switch (V.arcologies[0][FSDecoration]) {
+ case 20:
+ costs = 2500;
+ el.append(`${V.arcologies[0].name} is not customized to support this goal. `);
+ if (V.arcologies[0][FS] >= 10) {
+ el.append(
+ App.UI.DOM.link(
+ `Modify your arcology's internal media to support this goal`,
+ () => {
+ V.arcologies[0][FSDecoration] = 40;
+ cashX(forceNeg(costs), "capEx");
+ },
+ [],
+ "Future Society",
+ `Costs ${cashFormat(costs)}`
+ ),
+ );
+ } else {
+ el.append(`You must advance this goal before customization to support it becomes available. `);
+ }
+ break;
+ case 40:
+ el.append(`${V.arcologies[0].name}'s media is supporting this goal. `);
+ if (V.arcologies[0][FS] >= 30) {
+ costs = 10000;
+ el.append(
+ App.UI.DOM.link(
+ `Redecorate your arcology's public spaces to support this goal`,
+ () => {
+ V.arcologies[0][FSDecoration] = 60;
+ cashX(forceNeg(costs), "capEx");
+ },
+ [],
+ "Future Society",
+ `Costs ${cashFormat(costs)}`
+ ),
+ );
+ } else {
+ el.append(`You must advance this goal before further customization to support it becomes available. `);
+ }
+ break;
+ case 60:
+ el.append(`${V.arcologies[0].name}'s media is supporting this goal, and ${V.arcologies[0].name}'s public spaces are decorated to support it too. `);
+ if (V.arcologies[0][FS] >= 50) {
+ costs = 10000;
+ el.append(
+ App.UI.DOM.link(
+ `Station slaves in your arcology's public spaces to promote this goal`,
+ () => {
+ V.arcologies[0][FSDecoration] = 80;
+ cashX(forceNeg(costs), "capEx");
+ },
+ [],
+ "Future Society",
+ `Costs ${cashFormat(costs)}`
+ ),
+ );
+ } else {
+ el.append(`You must advance this goal before further customization to support it becomes available. `);
+ }
+ break;
+ case 80:
+ el.append(`${V.arcologies[0].name}'s media is supporting this goal; ${V.arcologies[0].name}'s public spaces are decorated to support it, and have slaves stationed in them to support it too. `);
+ if (V.arcologies[0][FS] >= 70) {
+ if (FS === "FSRestart") {
+ costs = 75000;
+ el.append(
+ App.UI.DOM.link(
+ `Customize the exterior of the arcology to support this goal and fully establish the Societal Elite`,
+ () => {
+ V.arcologies[0].FSRestartDecoration = 100;
+ V.upgradeMultiplierArcology = upgradeMultiplier('engineering');
+ V.upgradeMultiplierMedicine = upgradeMultiplier('medicine');
+ for (const item of items) {
+ _.set(V, item, 1);
+ }
+ },
+ [],
+ "Future Society",
+ `Costs ${cashFormat(costs)}`
+ ),
+ );
+ } else {
+ costs = 10000;
+ el.append(
+ App.UI.DOM.link(
+ `Station slaves in your arcology's public spaces to promote this goal`,
+ () => {
+ V.arcologies[0][FSDecoration] = 100;
+ cashX(forceNeg(costs), "capEx");
+ for (const item of items) {
+ _.set(V, item, 1);
+ }
+ },
+ [],
+ "Future Society",
+ `Costs ${cashFormat(costs)}`
+ ),
+ );
+ }
+ } else {
+ el.append(`You must advance this goal before further customization to support it becomes available. `);
+ }
+ break;
+ case 100:
+ el.append(`${V.arcologies[0].name}'s media is supporting this goal; ${V.arcologies[0].name}'s public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it as well; the arcology is fully customized for this goal. `);
+ }
+ return el;
+};
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 89aa9cd429b4b51c80ce819831ba52b063aec883..484373fc7b37379cb2733dffc11a32c8901941db 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -606,9 +606,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSSupremacist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSSupremacist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "succubus")>>
<span class="note">
@@ -651,9 +649,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSSubjugationist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSSubjugationist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "amazon") || ($assistant.appearance == "imp")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -699,9 +695,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSRepopulationFocus" "boughtItem.clothing.maternityLingerie" "boughtItem.clothing.maternityDress" "boughtItem.clothing.belly">>
- </div>
+ <<set _items = ["boughtItem.clothing.maternityLingerie", "boughtItem.clothing.maternityDress", "boughtItem.clothing.belly"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSRepopulationFocus", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -732,9 +727,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSRestart">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSRestart")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "loli") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "incubus") || ($assistant.appearance == "angel")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -747,9 +740,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<else>>
<span class="detail"><<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSRestart")>><<if $assistant.fsAppearance == "eugenics">><<set $assistant.fsAppearance = "default">><</if>><</link>></span>
<</if>>
- <div class="indent">
- <<FSChangeDecoration "FSRestart">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSRestart")>>
The Societal Elite exist as the highest class, allowing you access to all manner of benefits
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "loli") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "incubus") || ($assistant.appearance == "angel")>>
@@ -785,9 +776,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSIntellectualDependency" "boughtItem.clothing.bimbo">>
- </div>
+ <<set _items = ["boughtItem.clothing.bimbo"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSIntellectualDependency", _items)>>
<<if $policies.publicPA == 1>>
<<if ["shemale", "succubus", "witch"].includes($assistant.appearance)>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -817,9 +807,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSSlaveProfessionalism" "boughtItem.clothing.courtesan">>
- </div>
+ <<set = ["boughtItem.clothing.courtesan"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSSlaveProfessionalism", _items)>>
<<if $policies.publicPA == 1>>
<<if ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"].includes($assistant.appearance)>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -853,9 +842,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSGenderRadicalist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSGenderRadicalist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "shemale") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -886,9 +873,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSGenderFundamentalist" "boughtItem.clothing.bunny">>
- </div>
+ <<set _items = ["boughtItem.clothing.bunny"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSGenderFundamentalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "loli") || ($assistant.appearance == "fairy") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -921,9 +907,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSPaternalist" "boughtItem.clothing.conservative">>
- </div>
+ <<set _items = ["boughtItem.clothing.conservative"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSPaternalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "loli") || ($assistant.appearance == "fairy") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -953,9 +938,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSDegradationist" "boughtItem.clothing.chains">>
- </div>
+ <<set _items = ["boughtItem.clothing.chains"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSDegradationist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "monstergirl") || ($assistant.appearance == "businesswoman") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "imp")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -988,9 +972,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSBodyPurist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSBodyPurist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "goddess") || ($assistant.appearance == "loli") || ($assistant.appearance == "fairy") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "angel") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1020,9 +1002,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSTransformationFetishist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSTransformationFetishist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "shemale") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1055,9 +1035,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSYouthPreferentialist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSYouthPreferentialist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "shemale") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "loli") || ($assistant.appearance == "succubus") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub") || ($assistant.appearance == "imp") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1087,9 +1065,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSMaturityPreferentialist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSMaturityPreferentialist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "goddess") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "angel")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1122,9 +1098,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSPetiteAdmiration">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSPetiteAdmiration")>>
<<if $policies.publicPA == 1>>
<<if ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus"].includes($assistant.appearance)>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1154,9 +1128,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSStatuesqueGlorification">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSStatuesqueGlorification")>>
<<if $policies.publicPA == 1>>
<<if ["amazon", "goddess", "incubus", "succubus", "witch"].includes($assistant.appearance)>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1189,9 +1161,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSSlimnessEnthusiast">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSSlimnessEnthusiast")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "shemale") || ($assistant.appearance == "loli") || ($assistant.appearance == "cherub") || ($assistant.appearance == "imp") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1221,9 +1191,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSAssetExpansionist">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSAssetExpansionist")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "shemale") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1255,9 +1223,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSPastoralist" "boughtItem.clothing.western">>
- </div>
+ <<set _items = ["boughtItem.clothing.western"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSPastoralist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "shemale") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1289,9 +1256,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSPhysicalIdealist" "boughtItem.clothing.oil">>
- </div>
+ <<set _items = ["boughtItem.clothing.oil"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSPhysicalIdealist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "shemale") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1321,9 +1287,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSHedonisticDecadence">>
- </div>
+ <<includeDOM App.UI.FSChangeDecoration("FSHedonisticDecadence")>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "imp") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1356,9 +1320,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSChattelReligionist" "boughtItem.clothing.habit">>
- </div>
+ <<set _items = ["boughtItem.clothing.habit"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSChattelReligionist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub") || ($assistant.appearance == "imp")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1547,9 +1510,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSRomanRevivalist" "boughtItem.clothing.toga">>
- </div>
+ <<set _items = ["boughtItem.clothing.toga"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSRomanRevivalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "amazon") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1579,9 +1541,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSNeoImperialist" "boughtItem.clothing.imperialarmor" "boughtItem.clothing.imperialsuit">>
- </div>
+ <<set _items = ["boughtItem.clothing.imperialarmor", "boughtItem.clothing.imperialsuit"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSNeoImperialist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "amazon") || ($assistant.appearance == "incubus") || ($assistant.appearance == "shemale") || ($assistant.appearance == "angel")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1611,9 +1572,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSAztecRevivalist" "boughtItem.clothing.huipil">>
- </div>
+ <<set _items = ["boughtItem.clothing.huipil"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSAztecRevivalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "amazon") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1643,9 +1603,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSEgyptianRevivalist" "boughtItem.clothing.egypt">>
- </div>
+ <<set _items = ["boughtItem.clothing.egypt"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSEgyptianRevivalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1675,9 +1634,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSEdoRevivalist" "boughtItem.clothing.kimono">>
- </div>
+ <<set _items = ["boughtItem.clothing.kimono"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSEdoRevivalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "loli") || ($assistant.appearance == "kitsune") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1707,9 +1665,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSArabianRevivalist" "boughtItem.clothing.harem">>
- </div>
+ <<set _items = ["boughtItem.clothing.harem"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSArabianRevivalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
@@ -1739,9 +1696,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</link>>
</span>
- <div class="indent">
- <<FSChangeDecoration "FSChineseRevivalist" "boughtItem.clothing.qipao">>
- </div>
+ <<set _items = ["boughtItem.clothing.qipao"]>>
+ <<includeDOM App.UI.FSChangeDecoration("FSChineseRevivalist", _items)>>
<<if $policies.publicPA == 1>>
<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 3ee42debfdba5273e1f0aafac0487f0ab3151a00..ab710d46a17eb3bc3cc20f20144362ddeb9be712 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -95,51 +95,3 @@ Allows for dynamic updating of the next button in the storyCaption (left side-ba
<<widget "LoliA">><<if _assistantSlaveLisp>>_LoliALisp<<else>>_LoliA<</if>><</widget>>
<<widget "WifeA">><<if _assistantSlaveLisp>>_WifeALisp<<else>>_WifeA<</if>><</widget>>
<<widget "WivesA">><<if _assistantSlaveLisp>>_WivesALisp<<else>>_WivesA<</if>><</widget>>
-
-/* Called as <<FSChangeDecoration "FSName" "clothesBoughtFSClothes">>, will generate description of current decoration level and a link to increase it if applicable, quotes are needed to pass FSName as reference - DO NOT INCLUDE IT AS PROPERTY OF $arcologies[0]! */
-<<widget "FSChangeDecoration">>
-<<set _FS = $args[0]>>
-<<set _FSDecoration = _FS + "Decoration">>
-<<capture _FS, _FSDecoration>>
-<<switch $arcologies[0][_FSDecoration]>>
-<<case 20>>
- $arcologies[0].name is not customized to support this goal.
- <<if $arcologies[0][_FS] >= 10>>
- [[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0][_FSDecoration] = 40, cashX(-2500, "capEx")]] //Costs <<print cashFormat(2500)>>//
- <<else>>
- You must advance this goal before customization to support it becomes available.
- <</if>>
-<<case 40>>
- $arcologies[0].name's media is supporting this goal.
- <<if $arcologies[0][_FS] >= 30>>
- [[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0][_FSDecoration] = 60, cashX(-10000, "capEx")]] //Costs <<print cashFormat(10000)>>//
- <<else>>
- You must advance this goal before further customization to support it becomes available.
- <</if>>
-<<case 60>>
- $arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
- <<if $arcologies[0][_FS] >= 50>>
- [[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0][_FSDecoration] = 80, cashX(-10000, "capEx")]] //Costs <<print cashFormat(10000)>>//
- <<else>>
- You must advance this goal before further customization to support it becomes available.
- <</if>>
-<<case 80>>
- $arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
- <<if $arcologies[0][_FS] >= 70>>
- <<if def $args[3]>> /* Only for FSRepopulation */
- [[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, State.variables[$args[1]] = 1, State.variables[$args[2]] = 1, State.variables[$args[3]] = 1, cashX(-20000, "capEx")]] //Costs <<print cashFormat(20000)>>//
- <<elseif def $args[1]>>
- [[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, State.variables[$args[1]] = 1, cashX(-20000, "capEx")]] //Costs <<print cashFormat(20000)>>//
- <<elseif $args[0] == "FSRestart">>
- [[Customize the exterior of the arcology to support this goal and fully establish the Societal Elite|Future Society][$arcologies[0].FSRestartDecoration = 100, $upgradeMultiplierArcology = upgradeMultiplier('engineering'), $upgradeMultiplierMedicine = upgradeMultiplier('medicine'), cashX(-75000, "capEx")]] //Costs <<print cashFormat(75000)>> and may dilute your control over the arcology//
- <<else>>
- [[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, cashX(-20000, "capEx")]] //Costs <<print cashFormat(20000)>>//
- <</if>>
- <<else>>
- You must advance this goal before further customization to support it becomes available.
- <</if>>
-<<case 100>>
- $arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it as well; the arcology is fully customized for this goal.
-<</switch>>
-<</capture>>
-<</widget>>