From 149ebf228d01de6c533d33872ef265c313c73021 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 28 Feb 2019 22:44:26 -0500
Subject: [PATCH] Removed lingering TF laws
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 1 +
devNotes/twine CSS | 11 +++++++++++
src/cheats/mod_EditFSCheat.tw | 6 +++---
src/events/intro/initNationalities.tw | 1 -
src/uncategorized/arcmgmt.tw | 2 +-
src/uncategorized/arcologyDescription.tw | 2 +-
6 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d3fb52c8070..5b6b24408d5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -13,6 +13,7 @@ Pregmod
-RA can now manage basic abortions
-added abortion tracking tattoos
-added bulk incubator retrieval
+ -added "pFace" and "uFace" genetic traits
-fixes
0.10.7.1-2.1.x
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index c4d4e15ab98..2e3bf033493 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -371,6 +371,17 @@ button.accordion.active:before {
overflow: hidden;
}
+div.accordion:before {
+ content: '\002B';
+ color: #777;
+ font-weight: bold;
+ float: left;
+ margin-right: 5px;
+}
+div.accordion.active:before {
+ content: "\2212";
+}
+
/* begin efmCSS */
#graph .linage {
diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw
index e9d95ac122e..434a64cf002 100644
--- a/src/cheats/mod_EditFSCheat.tw
+++ b/src/cheats/mod_EditFSCheat.tw
@@ -264,9 +264,9 @@
<br><<radiobutton "$arcologies[0].FSTransformationFetishistDecoration" 80>> 80 (Slaves stationed in public spaces.)
<br><<radiobutton "$arcologies[0].FSTransformationFetishistDecoration" 100>> 100 (Remodeled exterior; Fully customized.)
- <br>Law: $arcologies[0].FSTransformationFetishistLaw |
- <<radiobutton "$arcologies[0].FSTransformationFetishistLaw" 0>> 0 (Not passed.)
- | <<radiobutton "$arcologies[0].FSTransformationFetishistLaw" 1>> 1 (Passed.)
+ <br>Law: $arcologies[0].FSTransformationFetishistSMR |
+ <<radiobutton "$arcologies[0].FSTransformationFetishistSMR" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSTransformationFetishistSMR" 1>> 1 (Passed.)
<br>[[Apply and reset Body Purism|MOD_Edit FS Cheat][removeFS("FSBodyPurist")]]
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index e01e8a82ddc..15f56987d29 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -182,7 +182,6 @@
<<set $arcologies[0].FSDegradationistSMR = 0>>
<<set $arcologies[0].FSBodyPuristLaw = 0>>
<<set $arcologies[0].FSBodyPuristSMR = 0>>
-<<set $arcologies[0].FSTransformationFetishistLaw = 0>>
<<set $arcologies[0].FSTransformationFetishistSMR = 0>>
<<set $arcologies[0].FSYouthPreferentialistLaw = 0>>
<<set $arcologies[0].FSYouthPreferentialistSMR = 0>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 85debf228ea..05113cef22b 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1011,7 +1011,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<if $arcologies[0].FSPaternalistLaw == 1>>The slaves are well cared for, and it can sometimes be difficult to tell slaves from citizens.
<<elseif $arcologies[0].FSDegradationistLaw == 1>>Most of the slaves are recent captures, since the vicious society that's taken root here uses people up quickly.<</if>>
<<if $arcologies[0].FSBodyPuristLaw == 1>>The average slave is quite healthy.
-<<elseif $arcologies[0].FSTransformationFetishistLaw == 1>>
+<<elseif $arcologies[0].FSTransformationFetishistSMR == 1>>
<<if $arcologies[0].FSTransformationFetishistResearch == 1>>
Breast implants are almost universal; <<if $arcologies[0].FSSlimnessEnthusiast == "unset">>an M-cup bust is below average among the slave population<<else>>even the most lithe slave sports a pair of overly round chest balloons<</if>>.
<<else>>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index 1330f5211e7..3f4101438a9 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -628,7 +628,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<if $arcologies[0].FSPaternalistLaw == 1>>The slaves are well cared for, and it can sometimes be difficult to tell slaves from citizens.
<<elseif $arcologies[0].FSDegradationistLaw == 1>>Most of the slaves are recent captures, since the vicious society that's taken root here uses people up quickly.<</if>>
<<if $arcologies[0].FSBodyPuristLaw == 1>>The average slave is quite healthy.
-<<elseif $arcologies[0].FSTransformationFetishistLaw == 1>>
+<<elseif $arcologies[0].FSTransformationFetishistSMR == 1>>
<<if $arcologies[0].FSTransformationFetishistResearch == 1>>
Breast implants are almost universal; <<if $arcologies[0].FSSlimnessEnthusiast == "unset">>an M-cup bust is below average among the slave population<<else>>even the most lithe slave sports a pair of overly round chest balloons<</if>>.
<<else>>
--
GitLab