From 0abe62c78bcbc9d51bead86a3c0866dccff545db Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 18 Jul 2019 07:27:21 -0400
Subject: [PATCH] FS work + boob cup fix
---
src/cheats/mod_EditFSCheat.tw | 123 +++++++++++++++++++++++++-
src/npc/descriptions/boobs/boobs.js | 6 ++
src/uncategorized/RESS.tw | 28 ++++++
src/uncategorized/bodyModification.tw | 6 +-
src/uncategorized/futureSociety.tw | 22 +++++
src/uncategorized/universalRules.tw | 16 +++-
6 files changed, 195 insertions(+), 6 deletions(-)
diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw
index 83b314e537f..33023585d2e 100644
--- a/src/cheats/mod_EditFSCheat.tw
+++ b/src/cheats/mod_EditFSCheat.tw
@@ -73,6 +73,64 @@
<br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][FutureSocieties.remove("FSSupremacist")]]
+<br><br>
+/*
+ <<if $arcologies[0].FSIntellectualDependency != "unset">>
+ <br>You are ''pursuing'' Intellectual Dependency.
+ <<else>>
+ <br>You are ''not pursuing'' Intellectual Dependency.
+ <</if>>
+
+ <br>Intellectual Dependency (0-100 or unset): <<textbox "$arcologies[0].FSIntellectualDependency" $arcologies[0].FSIntellectualDependency>>
+ <br>Decoration: $arcologies[0].FSIntellectualDependencyDecoration
+
+ <br><<radiobutton "$arcologies[0].FSIntellectualDependencyDecoration" 20>> 20 (Minimum)
+ <br><<radiobutton "$arcologies[0].FSIntellectualDependencyDecoration" 40>> 40 (Media support.)
+ <br><<radiobutton "$arcologies[0].FSIntellectualDependencyDecoration" 60>> 60 (Decorated public spaces.)
+ <br><<radiobutton "$arcologies[0].FSIntellectualDependencyDecoration" 80>> 80 (Slaves stationed in public spaces.)
+ <br><<radiobutton "$arcologies[0].FSIntellectualDependencyDecoration" 100>> 100 (Remodeled exterior; Fully customized.)
+
+ <br>Law: $arcologies[0].FSIntellectualDependencySMR |
+ <<radiobutton "$arcologies[0].FSIntellectualDependencySMR" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSIntellectualDependencySMR" 1>> 1 (Passed.)
+
+ <br>Law: $arcologies[0].FSIntellectualDependencyLaw |
+ <<radiobutton "$arcologies[0].FSIntellectualDependencyLaw" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSIntellectualDependencyLaw" 1>> 1 (Passed.)
+
+ <br>Law: $arcologies[0].FSIntellectualDependencyLawBeauty |
+ <<radiobutton "$arcologies[0].FSIntellectualDependencyLawBeauty" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSIntellectualDependencyLawBeauty" 1>> 1 (Passed.)
+
+ <br>[[Apply and reset Slave Professionalism|MOD_Edit FS Cheat][FutureSocieties.remove("FSSlaveProfessionalism")]]
+*/
+<br><br>
+/*
+ <<if $arcologies[0].FSSlaveProfessionalism != "unset">>
+ <br>You are ''pursuing'' Slave Professionalism.
+ <<else>>
+ <br>You are ''not pursuing'' Slave Professionalism.
+ <</if>>
+
+ <br>Slave Professionalism (0-100 or unset): <<textbox "$arcologies[0].FSSlaveProfessionalism" $arcologies[0].FSSlaveProfessionalism>>
+ <br>Decoration: $arcologies[0].FSSlaveProfessionalismDecoration
+
+ <br><<radiobutton "$arcologies[0].FSSlaveProfessionalismDecoration" 20>> 20 (Minimum)
+ <br><<radiobutton "$arcologies[0].FSSlaveProfessionalismDecoration" 40>> 40 (Media support.)
+ <br><<radiobutton "$arcologies[0].FSSlaveProfessionalismDecoration" 60>> 60 (Decorated public spaces.)
+ <br><<radiobutton "$arcologies[0].FSSlaveProfessionalismDecoration" 80>> 80 (Slaves stationed in public spaces.)
+ <br><<radiobutton "$arcologies[0].FSSlaveProfessionalismDecoration" 100>> 100 (Remodeled exterior; Fully customized.)
+
+ <br>Law: $arcologies[0].FSSlaveProfessionalismSMR |
+ <<radiobutton "$arcologies[0].FSSlaveProfessionalismSMR" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSSlaveProfessionalismSMR" 1>> 1 (Passed.)
+
+ <br>Law: $arcologies[0].FSSlaveProfessionalismLaw |
+ <<radiobutton "$arcologies[0].FSSlaveProfessionalismLaw" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSSlaveProfessionalismLaw" 1>> 1 (Passed.)
+
+ <br>[[Apply and reset Intellectual Dependency|MOD_Edit FS Cheat][FutureSocieties.remove("FSIntellectualDependency")]]
+*/
<br><br>
<<if $arcologies[0].FSGenderRadicalist != "unset">>
@@ -81,7 +139,7 @@
<br>You are ''not pursuing'' Gender Radicalism.
<</if>>
- <br>GenderRadicalism (0-100 or unset): <<textbox "$arcologies[0].FSGenderRadicalist" $arcologies[0].FSGenderRadicalist>>
+ <br>Gender Radicalism (0-100 or unset): <<textbox "$arcologies[0].FSGenderRadicalist" $arcologies[0].FSGenderRadicalist>>
<br>Decoration: $arcologies[0].FSGenderRadicalistDecoration
<br><<radiobutton "$arcologies[0].FSGenderRadicalistDecoration" 20>> 20 (Minimum)
@@ -318,6 +376,69 @@
<br>[[Apply and reset Youth Preferentialism|MOD_Edit FS Cheat][FutureSocieties.remove("FSYouthPreferentialist")]]
+<br><br>
+/*
+ <<if $arcologies[0].FSPetiteAdmiration != "unset">>
+ <br>You are ''pursuing'' Petite Admiration.
+ <<else>>
+ <br>You are ''not pursuing'' Petite Admiration.
+ <</if>>
+
+ <br>Petite Admiration (0-100 or unset): <<textbox "$arcologies[0].FSPetiteAdmiration" $arcologies[0].FSPetiteAdmiration>>
+ <br>Decoration: $arcologies[0].FSPetiteAdmirationDecoration
+
+ <br><<radiobutton "$arcologies[0].FSPetiteAdmirationDecoration" 20>> 20 (Minimum)
+ <br><<radiobutton "$arcologies[0].FSPetiteAdmirationDecoration" 40>> 40 (Media support.)
+ <br><<radiobutton "$arcologies[0].FSPetiteAdmirationDecoration" 60>> 60 (Decorated public spaces.)
+ <br><<radiobutton "$arcologies[0].FSPetiteAdmirationDecoration" 80>> 80 (Slaves stationed in public spaces.)
+ <br><<radiobutton "$arcologies[0].FSPetiteAdmirationDecoration" 100>> 100 (Remodeled exterior; Fully customized.)
+
+ <br>Law: $arcologies[0].FSPetiteAdmirationSMR |
+ <<radiobutton "$arcologies[0].FSPetiteAdmirationSMR" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSPetiteAdmirationSMR" 1>> 1 (Passed.)
+
+ <br>Law: $arcologies[0].FSPetiteAdmirationLaw |
+ <<radiobutton "$arcologies[0].FSPetiteAdmirationLaw" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSPetiteAdmirationLaw" 1>> 1 (Passed.)
+
+ <br>Law: $arcologies[0].FSPetiteAdmirationLaw2 |
+ <<radiobutton "$arcologies[0].FSPetiteAdmirationLaw2" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSPetiteAdmirationLaw2" 1>> 1 (Passed.)
+
+ <br>[[Apply and reset Statuesque Glorification|MOD_Edit FS Cheat][FutureSocieties.remove("FSStatuesqueGlorification")]]
+*/
+<br><br>
+/*
+ <<if $arcologies[0].FSStatuesqueGlorification != "unset">>
+ <br>You are ''pursuing'' Statuesque Glorification.
+ <<else>>
+ <br>You are ''not pursuing'' Statuesque Glorification.
+ <</if>>
+
+ <br>Statuesque Glorification (0-100 or unset): <<textbox "$arcologies[0].FSStatuesqueGlorification" $arcologies[0].FSStatuesqueGlorification>>
+ <br>Decoration: $arcologies[0].FSStatuesqueGlorificationDecoration
+
+ <br><<radiobutton "$arcologies[0].FSStatuesqueGlorificationDecoration" 20>> 20 (Minimum)
+ <br><<radiobutton "$arcologies[0].FSStatuesqueGlorificationDecoration" 40>> 40 (Media support.)
+ <br><<radiobutton "$arcologies[0].FSStatuesqueGlorificationDecoration" 60>> 60 (Decorated public spaces.)
+ <br><<radiobutton "$arcologies[0].FSStatuesqueGlorificationDecoration" 80>> 80 (Slaves stationed in public spaces.)
+ <br><<radiobutton "$arcologies[0].FSStatuesqueGlorificationDecoration" 100>> 100 (Remodeled exterior; Fully customized.)
+
+ <br>Law: $arcologies[0].FSStatuesqueGlorificationSMR |
+ <<radiobutton "$arcologies[0].FSStatuesqueGlorificationSMR" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSStatuesqueGlorificationSMR" 1>> 1 (Passed.)
+
+ <br>Law: $arcologies[0].FSStatuesqueGlorificationLaw |
+ <<radiobutton "$arcologies[0].FSStatuesqueGlorificationLaw" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSStatuesqueGlorificationLaw" 1>> 1 (Passed.)
+
+ <br>Law: $arcologies[0].FSStatuesqueGlorificationLaw2 |
+ <<radiobutton "$arcologies[0].FSStatuesqueGlorificationLaw2" 0>> 0 (Not passed.)
+ | <<radiobutton "$arcologies[0].FSStatuesqueGlorificationLaw2" 1>> 1 (Passed.)
+
+ <br>[[Apply and reset Petite Admiration|MOD_Edit FS Cheat][FutureSocieties.remove("FSPetiteAdmiration")]]
+*/
+
<br><br>
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index 9ed8744c84f..861b3193129 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -80,6 +80,12 @@ App.Desc.boobBits = function() {
8499: {
cup: "Z-cup", anCup: false, adjective: ["astounding", "tremendous"], noun: ["boobs", "breasts", "mammaries", "udders"]
},
+ 8999: {
+ cup: "ZZ-cup", anCup: true, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
+ },
+ 9999: {
+ cup: "ZZZ-cup", anCup: false, adjective: ["astounding", "tremendous"], noun: ["boobs", "breasts", "mammaries", "udders"]
+ },
14999: {
cup: "", anCup: false,
adjective: ["obscenely massive", "enormous"],
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 15676285dca..cb68ff8873d 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1959,6 +1959,16 @@ During a routine inspection of <<EventNameLink>>, you notice that $he's behaving
<<elseif $arcologies[0].FSRestart != "unset">>
<<set _qualifiedFS.push("eugenics")>>
<</if>>
+<<if $arcologies[0].FSIntellectualDependency != "unset">>
+ <<set _qualifiedFS.push("intellectual dependency")>>
+<<elseif $arcologies[0].FSSlaveProfessionalism != "unset">>
+ <<set _qualifiedFS.push("slave professionalism")>>
+<</if>>
+<<if $arcologies[0].FSPetiteAdmiration != "unset">>
+ <<set _qualifiedFS.push("petite admiration")>>
+<<elseif $arcologies[0].FSStatuesqueGlorification != "unset">>
+ <<set _qualifiedFS.push("statuesque glorification")>>
+<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
<<set _qualifiedFS.push("chattel religionist")>>
<<elseif $arcologies[0].FSNull != "unset">>
@@ -2015,6 +2025,18 @@ During a routine inspection of <<EventNameLink>>, you notice that $he's behaving
<<set _napkin = "a lotus flower">>
<<case "eugenics">>
<<set _napkin = "a makeshift chastity belt">>
+<<case "intellectual dependency">>
+ <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50>>
+ <<set _napkin = "a jasmine flower">>
+ <<else>>
+ <<set _napkin = "a dick">>
+ <</if>>
+<<case "slave professionalism">>
+ <<set _napkin = "an iris">>
+<<case "petite admiration">>
+ <<set _napkin = "a cute little buttercup">>
+<<case "statuesque glorification">>
+ <<set _napkin = "a large sunflower">>
<<case "chattel religionist">>
<<set _napkin = "a piece of religious iconography">>
<<case "multi">>
@@ -3677,8 +3699,14 @@ Passing by the kitchen in the morning, you take a moment to listen to the low hu
"It's how ripped you are," the other slave explains. "It promises you won't give out after one fuck, no matter how old you are."
<<elseif ($arcologies[0].FSSlimnessEnthusiast != "unset") && ($activeSlave.boobs < 800) && ($activeSlave.butt < 3)>>
"You're so slim," the other slave explains. "Everyone here loves slender <<= $girl>>s. They don't care that you're a little mature; they think you're hot."
+<<elseif ($arcologies[0].FSStatuesqueGlorification != "unset") && $activeSlave.height >= 186>>
+ "You're really fucking tall," the other slave explains. "Guys here love a $girl that tower over them and you're, like, the definition of tall."
+<<elseif ($arcologies[0].FSPetiteAdmiration != "unset") && $activeSlave.height < 150>>
+ "You're so small," the other slave explains. "A guy can just scoop you up and carry you off for a good time."
<<elseif ($arcologies[0].FSBodyPurist != "unset") && ($activeSlave.boobsImplant == 0) && ($activeSlave.health > 50)>>
"It's how healthy you are, and your natural boobs," the other slave explains. "You look good and natural, and everyone likes that here, especially if you're mature."
+<<elseif ($arcologies[0].FSIntellectualDependency != "unset") && bimboScore($activeSlave) >= 6>>
+ "You're so hot," the other slave explains. "Guys love a $girl who knows a good time and your body screams 'ravish me'."
<<elseif $activeSlave.face > 95>>
"It might have something to do with how incredibly beautiful you are," the other slave explains sarcastically. "Come on, you could be a model. Of course they want you."
<<elseif $activeSlave.boobs > 4000>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 556ba7a5912..f7bb9432a99 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -966,12 +966,12 @@ Use ''$brandDesign.local'' or choose another brand:
<<if ($arcologies[0].FSMaturityPreferentialist != "unset")>>
| //FS// [[Sexual Skill Info|Body Modification][$brandDesign.local = "$his sexual skills"]]
<</if>>
-<<if ($arcologies[0].FSSlimnessEnthusiast != "unset")>>
- | //FS// [[Breast Floor|Body Modification][$brandDesign.local = "$his absolute minimum breast size"]]
-<</if>>
<<if ($arcologies[0].FSPetiteAdmiration != "unset") || ($arcologies[0].FSStatuesqueGlorification != "unset")>>
| //FS// [[Current height|Body Modification][$brandDesign.local = "$his current height"]]
<</if>>
+<<if ($arcologies[0].FSSlimnessEnthusiast != "unset")>>
+ | //FS// [[Breast Floor|Body Modification][$brandDesign.local = "$his absolute minimum breast size"]]
+<</if>>
<<if ($arcologies[0].FSAssetExpansionist != "unset")>>
| //FS// [[Breast Ceiling|Body Modification][$brandDesign.local = "$his absolute maximum breast size"]]
<</if>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index ee2c5d1bd8a..5773e8a74e2 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -60,6 +60,18 @@
<<if ndef $arcologies[0].FSHedonisticDecadence>>
<<set $arcologies[0].FSHedonisticDecadence = "unset">>
<</if>>
+<<if ndef $arcologies[0].FSIntellectualDependency>>
+ <<set $arcologies[0].FSIntellectualDependency = "unset">>
+<</if>>
+<<if ndef $arcologies[0].FSSlaveProfessionalism>>
+ <<set $arcologies[0].FSSlaveProfessionalism = "unset">>
+<</if>>
+<<if ndef $arcologies[0].FSPetiteAdmiration>>
+ <<set $arcologies[0].FSPetiteAdmiration = "unset">>
+<</if>>
+<<if ndef $arcologies[0].FSStatuesqueGlorification>>
+ <<set $arcologies[0].FSStatuesqueGlorification = "unset">>
+<</if>>
<<if ndef $arcologies[0].FSChattelReligionist>>
<<set $arcologies[0].FSChattelReligionist = "unset">>
<</if>>
@@ -147,6 +159,16 @@
<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
<<set $rivalryFS = "Physical Idealism">>
<</if>>
+ <<if $arcologies[0].FSIntellectualDependency != "unset">>
+ <<set $rivalryFS = "Intellectual Dependency">>
+ <<elseif $arcologies[0].FSSlaveProfessionalism != "unset">>
+ <<set $rivalryFS = "Slave Professionalism">>
+ <</if>>
+ <<if $arcologies[0].FSPetiteAdmiration != "unset">>
+ <<set $rivalryFS = "Petite Admiration">>
+ <<elseif $arcologies[0].FSStatuesqueGlorification != "unset">>
+ <<set $rivalryFS = "Statuesque Glorification">>
+ <</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
<<set $rivalryFS = "Chattel Religionism">>
<<elseif $arcologies[0].FSNull != "unset">>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 3f5fc386f09..4174dd99186 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -1,7 +1,6 @@
:: Universal Rules [nobr]
-<<set $nextButton = "Back">>
-<<set $nextLink = "Manage Penthouse">>
+<<set $nextButton = "Back", $nextLink = "Manage Penthouse">>
''Permissions for slaves''
<br>
@@ -97,6 +96,10 @@ Use ''$brandDesign.official'' or choose another brand:
| //FS// [[Racial Slur|Universal Rules][$brandDesign.official = "a racial slur"]] <</if>>
<<if ($arcologies[0].FSSubjugationist != "unset") && ($activeSlave.race == $arcologies[0].FSSubjugationistRace)>>
| //FS// [[Racial Slur|Universal Rules][$brandDesign.official = "a racial slur"]] <</if>>
+<<if ($arcologies[0].FSIntellectualDependency != "unset")>>
+| //FS// [[Scores|Universal Rules][$brandDesign.official = "how much sex $he needs per day"]] <</if>>
+<<if ($arcologies[0].FSSlaveProfessionalism != "unset")>>
+| //FS// [[Scores|Universal Rules][$brandDesign.official = "$his average slave aptitude test scores"]] <</if>>
<<if ($arcologies[0].FSRepopulationFocus != "unset")>>
| //FS// [[Birth Count|Universal Rules][$brandDesign.official = "the number of children $he has birthed"]] <</if>>
<<if ($arcologies[0].FSGenderRadicalist != "unset") || ($arcologies[0].FSGenderFundamentalist != "unset")>>
@@ -113,6 +116,8 @@ Use ''$brandDesign.official'' or choose another brand:
| //FS// [[Virginity Status|Universal Rules][$brandDesign.official = "$his virginity status"]] <</if>>
<<if ($arcologies[0].FSMaturityPreferentialist != "unset")>>
| //FS// [[Sexual Skill Info|Universal Rules][$brandDesign.official = "$his sexual skills"]] <</if>>
+<<if ($arcologies[0].FSPetiteAdmiration != "unset") || ($arcologies[0].FSStatuesqueGlorification != "unset")>>
+| //FS// [[Current height|Universal Rules][$brandDesign.official = "$his current height"]] <</if>>
<<if ($arcologies[0].FSSlimnessEnthusiast != "unset")>>
| //FS// [[Breast Floor|Universal Rules][$brandDesign.official = "$his absolute minimum breast size"]] <</if>>
<<if ($arcologies[0].FSAssetExpansionist != "unset")>>
@@ -233,6 +238,11 @@ Use ''$brandDesign.primary'' or choose another brand:
| //FS// [[Racial Slur|Universal Rules][$brandDesign.primary = "a racial slur"]] <</if>>
<<if ($arcologies[0].FSSubjugationist != "unset") && ($activeSlave.race == $arcologies[0].FSSubjugationistRace)>>
| //FS// [[Racial Slur|Universal Rules][$brandDesign.primary = "a racial slur"]] <</if>>
+<<if ($arcologies[0].FSSubjugationist != "unset") && ($activeSlave.race == $arcologies[0].FSSubjugationistRace)>>
+| //FS// [[Racial Slur|Universal Rules][$brandDesign.primary = "a racial slur"]] <</if>>
+<<if ($arcologies[0].FSIntellectualDependency != "unset")>>
+| //FS// [[Scores|Universal Rules][$brandDesign.primary = "how much sex $he needs per day"]] <</if>>
+<<if ($arcologies[0].FSSlaveProfessionalism != "unset")>>
<<if ($arcologies[0].FSRepopulationFocus != "unset")>>
| //FS// [[Birth Count|Universal Rules][$brandDesign.primary = "the number of children $he has birthed"]] <</if>>
<<if ($arcologies[0].FSGenderRadicalist != "unset") || ($arcologies[0].FSGenderFundamentalist != "unset")>>
@@ -249,6 +259,8 @@ Use ''$brandDesign.primary'' or choose another brand:
| //FS// [[Virginity Status|Universal Rules][$brandDesign.primary = "$his virginity status"]] <</if>>
<<if ($arcologies[0].FSMaturityPreferentialist != "unset")>>
| //FS// [[Sexual Skill Info|Universal Rules][$brandDesign.primary = "$his sexual skills"]] <</if>>
+<<if ($arcologies[0].FSPetiteAdmiration != "unset") || ($arcologies[0].FSStatuesqueGlorification != "unset")>>
+| //FS// [[Current height|Universal Rules][$brandDesign.primary = "$his current height"]] <</if>>
<<if ($arcologies[0].FSSlimnessEnthusiast != "unset")>>
| //FS// [[Breast Floor|Universal Rules][$brandDesign.primary = "$his absolute minimum breast size"]] <</if>>
<<if ($arcologies[0].FSAssetExpansionist != "unset")>>
--
GitLab