From 46473c8c5b2004498615f9607fcd3209409b681b Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 30 Jun 2019 13:34:59 -0400
Subject: [PATCH] fs work
---
src/js/slaveStatsChecker.js | 11 ++++++
src/uncategorized/barracks.tw | 8 ++++
src/uncategorized/brothel.tw | 8 ++++
src/uncategorized/brothelAdvertisement.tw | 8 ++++
src/uncategorized/club.tw | 16 ++++++++
src/uncategorized/clubAdvertisement.tw | 8 ++++
src/uncategorized/dairy.tw | 3 ++
src/uncategorized/pCitizensAndCivilians.tw | 44 +++++++++++++++++++++
src/uncategorized/pPeacekeepersInfluence.tw | 3 ++
src/uncategorized/peConcubineInterview.tw | 10 +++++
10 files changed, 119 insertions(+)
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index eca6c07cd6e..99bd4aef890 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -260,6 +260,17 @@ window.heightPass = function(slave) {
return measuresUp;
}
+/**
+ * Returns slave bimbo body degree (FSIntellectualDependencyLawBeauty).
+ * @param {App.Entity.SlaveState} slave
+ * @returns {boolean}
+ */
+window.bimboScore = function(slave) {
+ let degree = 0;
+ // to make the other js that calls this unfinished function not meltdown
+ return degree;
+}
+
/**
* Returns if slave is considered stacked (big T&A) or not.
* @param {App.Entity.SlaveState} slave
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index 10218658182..bab37e15ab4 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -67,6 +67,14 @@ As you enter the main bay of the armory, lined with modern arms and armor and a
Their sleek prototype armor is equipped with advanced restraining weapons.
<<case "Rangers">>
Their gear has a heavy Western influence; everyone carries heavy revolvers everywhere, and the armor sports rope lariats for lassoing 'cattle.'
+ <<case "Shepards">>
+ Their gear has a rather gaudy appearance; it makes it easier to attract wayward bimbos that way when they wander off and get lost.
+ <<case "Geniuses">>
+ Their prototype armor is extremely complex to control, but those who can reap the benefits.
+ <<case "Caretakers">>
+ Their towering prototype armor lets them stand out in a crowd and guide the way for those lost underfoot.
+ <<case "Titans">>
+ Their prototype armor towers over the average civilian and compacts for easy storage despite its size.
<</switch>>
<</if>>
There are doors to magazines, armories, and training areas to all sides, and muffled gunfire can be heard from the latter.
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 5dd2b021612..83c2ed294f1 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -55,6 +55,14 @@ $brothelNameCaps
is decorated to look like an old world bordello. The rich décor includes erotic photography and pornographic statuary, depicting slim, girlish figures playing, dancing, and loving.
<<case "Hedonistic">>
is comfortable and full of soft couches and chairs for its' overweight whores to lounge upon between clients <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>and enjoy a plate of snacks<<else>>and enjoy a big cup of slave food<</if>>. The smells of fresh baked goods are pumped into the facility to mask the smell of sweat. It's not unusual for a client to fuck a whore right on her chosen couch, since the effort of moving is often too much.
+<<case "Intellectual Dependency">>
+ is decorated to look like a club. The sexually charged atmosphere has the whores horny and making out with each other. Customers are expeted to come in, grab a bimbo to their tastes, and pull them off to have a good time.
+<<case "Slave Professionalism">>
+ is decorated to look like a high-class bordello. Courtesans are expected to greet and entice customers to join them for a night they'll never forget.
+<<case "Petite Admiration">>
+ is decorated to look like an old world whorehouse. The whores have personal platforms to stand on for inspection from their taller customers.
+<<case "Statuesque Glorification">>
+ is decorated to look like an old world bordello. The rich décor specializes in pornographic statuary, depicting towering human forms in the act of love.
<<default>>
is utilitarian. There's a businesslike foyer with an area for the merchandise to stand. Customers make their selection (or selections) and then lead the whores back into little rooms.
<</switch>>
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index 60847bbaa29..c19d3fd411f 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -49,6 +49,14 @@
$brothelNameCaps is decorated to look like a dairy. Though it isn't one, there is an intense sexual focus on boobs and lactation, and all the whores have their sizes proudly posted.
<<case "Hedonistic">>
$brothelNameCaps is comfortable and full of soft couches and chairs for its overweight whores to lounge upon between clients <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>and enjoy a plate of snacks<<else>>and enjoy a big cup of slave food<</if>>. The smells of fresh baked goods are pumped into the facility to mask the smell of sweat. It's not unusual for a client to fuck a whore right on her chosen couch, since the effort of moving is often too much.
+<<case "Intellectual Dependency">>
+ $brothelNameCaps is decorated to look like a club. The sexually charged atmosphere has the whores horny and making out with each other. Customers are expeted to come in, grab a bimbo to their tastes, and pull them off to have a good time.
+<<case "Slave Professionalism">>
+ $brothelNameCaps is decorated to look like a high-class bordello. Courtesans are expected to greet and entice customers to join them for a night they'll never forget.
+<<case "Petite Admiration">>
+ $brothelNameCaps is decorated to look like an old world whorehouse. The whores have personal platforms to stand on for inspection from their taller customers.
+<<case "Statuesque Glorification">>
+ $brothelNameCaps is decorated to look like an old world bordello. The rich décor specializes in pornographic statuary, depicting towering human forms in the act of love.
<</switch>>
<<if $brothelAdsSpending > 0>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 7bb411071d3..a9b8a5ef944 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -55,6 +55,14 @@ $clubNameCaps
is distinctly gaudy, with lots of sugary drinks on offer. The music and décor are of a decidedly bubblegum quality.
<<case "Hedonistic">>
has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
+<<case "Intellectual Dependency">>
+ is distinctly gaudy and easy for slaves to move around in. The dancing is as energetic and sexual, and the drinks sugary and sweet.
+<<case "Slave Professionalism">>
+ is decorated like an upper-class gentleman's club. It is where a true courtesan works their craft.
+<<case "Petite Admiration">>
+ has a gaudy appearance. The dance floor is surrounded by raised platforms so even the shortest slave can be seen by the crowd.
+<<case "Statuesque Glorification">>
+ has a tiered appearance. The booths and bar are positioned overlooking the dance floor so patrons may loom over the dancing slaves even when seated.
<<default>>
is set up in an uncomplicated way. There's a bar for drinks, a dance floor for slave girls, and private rooms for slave sex.
<</switch>>
@@ -211,6 +219,14 @@ $clubNameCaps
The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
<<case "Hedonistic">>
The sound of fat bodies fucking while feeding each other can be heard from one of the private rooms.
+ <<case "Intellectual Dependency">>
+ The sounds of an overstimulated bimbo can be heard from one of the private rooms.
+ <<case "Slave Professionalism">>
+ The sounds of an overstimulated patron can be heard from one of the private rooms.
+ <<case "Petite Admiration">>
+ The faint sound of a slave giving head can be heard from one of the private rooms.
+ <<case "Statuesque Glorification">>
+ The faint banging of a patron banging a slave against the wall can be heard echoing from one of the private rooms.
<<default>>
The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
<</switch>>
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index b8bd81a0ee0..bbc9e2905e9 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -49,6 +49,14 @@
$clubNameCaps is deafeningly loud. There's a bright light show running, offering staccato glimpses of the scene out on the dance floor.
<<case "Hedonistic">>
$clubNameCaps has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
+<<case "Intellectual Dependency">>
+ $clubNameCaps is distinctly gaudy and easy for slaves to move around in. The dancing is as energetic and sexual, and the drinks sugary and sweet.
+<<case "Slave Professionalism">>
+ $clubNameCaps is decorated like an upper-class gentleman's club. It is where a true courtesan works their craft.
+<<case "Petite Admiration">>
+ $clubNameCaps has a gaudy appearance. The dance floor is surrounded by raised platforms so even the shortest slave can be seen by the crowd.
+<<case "Statuesque Glorification">>
+ $clubNameCaps has a tiered appearance. The booths and bar are positioned overlooking the dance floor so patrons may loom over the dancing slaves even when seated.
<</switch>>
<<if $clubAdsSpending > 0>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index fbaefa33f06..243dbbd5ff5 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -251,8 +251,11 @@
<<case "Intellectual Dependency">>
is simple and fun. Getting situated for milking is easy enough for even the dumbest cow to figure out and there are all sorts of activities to keep the cows amused between milkings.
<<case "Slave Professionalism">>
+ is functional and clean. A wide selection of informative documentaries and books are available for cows to keep their minds sharp while the milker does its business.
<<case "Petite Admiration">>
+ is comfortable and well-kept. While designed for miniature cows, accommodations for large udders allow even the lankiest of cattle to make use of the machinery.
<<case "Statuesque Glorification">>
+ is comfortable and well-kept. While designed for towering cows, accommodations for large udders allow even the shortest of cattle to make use of the machinery; even if they need help to reach it.
<<default>>
is comfortable and well-kept. It features nice rest areas for cows to lounge in after a milking, and exercise equipment to keep them healthy.
<</switch>>
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 629dec1189b..2db8ae499a1 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -282,6 +282,28 @@
<</replace>>
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>>
<</if>>
+<<if $arcologies[0].FSIntellectualDependency >= 10>>
+<br><<link "They shall be the Shepards">>
+ <<replace "#result">>
+ You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<= properTitle()>>," he says, "you have no idea how needed this was. Just the other day I saw a half dozen bimbos waiting for a broken elevator. When I walked past an hour later, they were still waiting." He rises and gives you a short bow. "Shepard of the slow reporting for duty, <<= properTitle()>>." The mercenaries — no, the Shepards — are well looked after. They are each assigned a nice apartment, a very horny servant to stake their lust, and a suit of prototype armor equipped with the latest of weapons and a bevy of toys to lure wayward slaves with. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+ <<run repX(5000, "event")>>
+ <<run cashX(forceNeg(_cost), "mercenaries")>>
+ <<set $mercenaries = 5>>
+ <<set $mercenariesTitle = "Shepards">>
+ <</replace>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>>
+<</if>>
+<<if $arcologies[0].FSSlaveProfessionalism >= 10>>
+<br><<link "They shall be the Geniuses">>
+ <<replace "#result">>
+ You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<= properTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Chief brain reporting for duty, <<= properTitle()>>." The mercenaries — no, the Geniuses — are well looked after. They are each assigned a nice apartment, a skilled courtesan, and a suit of prototype armor equipped with cutting edge weaponry and combat systems. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+ <<run repX(5000, "event")>>
+ <<run cashX(forceNeg(_cost), "mercenaries")>>
+ <<set $mercenaries = 5>>
+ <<set $mercenariesTitle = "Geniuses">>
+ <</replace>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>>
+<</if>>
<<if $arcologies[0].FSBodyPurist >= 10>>
<br><<link "They shall be the Purifiers">>
<<replace "#result">>
@@ -304,6 +326,28 @@
<</replace>>
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>>
<</if>>
+<<if $arcologies[0].FSPetiteAdmiration >= 10>>
+<br><<link "They shall be the Caretakers">>
+ <<replace "#result">>
+ You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<= properTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "I'm ready to make a path for our little toys, <<= properTitle()>>." The mercenaries — no, the Caretakers — are well looked after. They are each assigned a nice apartment, a trio of tiny servants, and a suit of prototype armor capable of carrying multiple petite slaves in time of need. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+ <<run repX(5000, "event")>>
+ <<run cashX(forceNeg(_cost), "mercenaries")>>
+ <<set $mercenaries = 5>>
+ <<set $mercenariesTitle = "Caretakers">>
+ <</replace>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>>
+<</if>>
+<<if $arcologies[0].FSStatuesqueGlorification >= 10>>
+<br><<link "They shall be the Titans">>
+ <<replace "#result">>
+ You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<= properTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Tallest Titan reporting for duty, <<= properTitle()>>." The mercenaries — no, the Titans — are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a towering suit of prototype armor to make their presence known. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+ <<run repX(5000, "event")>>
+ <<run cashX(forceNeg(_cost), "mercenaries")>>
+ <<set $mercenaries = 5>>
+ <<set $mercenariesTitle = "Titans">>
+ <</replace>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>>
+<</if>>
<<if $arcologies[0].FSPastoralist >= 10>>
<br><<link "They shall be the Rangers">>
<<replace "#result">>
diff --git a/src/uncategorized/pPeacekeepersInfluence.tw b/src/uncategorized/pPeacekeepersInfluence.tw
index 6828f92f533..7fdd2fa10d8 100644
--- a/src/uncategorized/pPeacekeepersInfluence.tw
+++ b/src/uncategorized/pPeacekeepersInfluence.tw
@@ -59,6 +59,9 @@ As you review intelligence from the area at your desk,
<<case "transformation fetishist">>"<<print $PC.name>>, how do you think these implants would look in me?"
<<case "pastoralist">>"Oh <<print $PC.name>>, I'm so backed up. Would you give me a hand?"
<<case "slimness enthusiast">>"<<print $PC.name>>, do <<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>>these look bigger to you?"<<else>>you think they're getting bigger?"<</if>>
+ <<case "slave professionalism">>"Hey <<print $PC.name>>, what's most useful when it's long and hard? An education, of course!"
+ <<case "petite admiration">>"<<print $PC.name>>, I think I grew a little."
+ <<case "statuesque glorification">>"<<print $PC.name>>, are these heels long enough?"
<<default>>_HeA spasms with a powerful orgasm and moans lewdly and loudly.
<</switch>>
_HeA knows just how to get your attention.
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index 7c5ccfb33bc..41119c48993 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -355,6 +355,16 @@ You receive an official communication from a popular talk show e-hosted in one o
<<elseif $arcologies[0].FSGenderFundamentalist > 0>>
so much pu<<ss>>y it'<<s>> unbelievable,
<</if>>
+ <<if $arcologies[0].FSIntellectualDependency > 0>>
+ <<s>>lave<<s>> eager to get in your pant<<s>>,
+ <<elseif $arcologies[0].FSSlaveProfessionalism > 0>>
+ <<s>>lave<<s>> you can have a conver<<s>>ation with,
+ <</if>>
+ <<if $arcologies[0].FSPetiteAdmiration > 0>>
+ where even the <<sh>>orte<<s>>t can <<s>>tand tall,
+ <<elseif $arcologies[0].FSStatuesqueGlorification > 0>>
+ plenty of mouth<<s>> at crotch height,
+ <</if>>
<<if $arcologies[0].FSChattelReligionist > 0>>
a fulfilling <<s>>e<<x>>ual and <<s>>piritual life,
<</if>>
--
GitLab