From 7ed91f845e95ff72c6b0d54e15873dc2726f8a3d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 14 Feb 2020 20:50:26 -0500
Subject: [PATCH] tired work + PA stuff + anal drug suppositor virginity loss
---
Changelog.txt | 1 +
src/endWeek/healthFunctions.js | 4 +-
src/uncategorized/clinicReport.tw | 2 +
.../personalAssistantAppearance.tw | 42 +++++++++++--------
src/uncategorized/saDrugs.tw | 17 ++++++--
src/uncategorized/saRules.tw | 2 +
src/uncategorized/spaReport.tw | 2 +
7 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index 435c67f4479..a255957cebf 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -8,6 +8,7 @@ Pregmod
-slave performance listing
-debug beauty/FResult listing
-reminder system
+ -engineering & warfare personal attention options
-porn/ads code optimization
-expanded racial eye, hair and skin color ranges
-royal blood event can now use real dynasties
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 82f3b6b4ac2..f613c89fa0b 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -375,8 +375,10 @@ window.tired = function tired(slave) {
assignment += 18; // A tough assignment with a girl that doesn't use her provided room unless it is attached to yours.
} else if (["be your Head Girl"].includes(slave.assignment)) {
assignment += 22; // Always busy. Could benefit from a helper...
- } else if (["be the Attendant", "be the Matron", "be the Stewardess", "be the Milkmaid", "be the Farmer", "be the DJ", "be the Madam", "be the Schoolteacher", "be the Wardeness", "be the Nurse"].includes(slave.assignment)) { // Heads are very busy, but always have luxurious conditions, so it balances out, save for the two exceptions
+ } else if (["be the Matron", "be the Stewardess", "be the Milkmaid", "be the Farmer", "be the DJ", "be the Madam", "be the Schoolteacher", "be the Wardeness", "be the Nurse"].includes(slave.assignment)) { // Heads are very busy, but always have luxurious conditions, so it balances out, save for the exceptions
assignment += 15;
+ } else if (["be the Attendant", "be your Concubine"].includes(slave.assignment)) { // Cushy head positions
+ assignment += 5;
} else if (["recruit girls"].includes(slave.assignment)) {
if (H.tired > 80) { // I'll take it easy a week to better recruit the next.
assignment -= 20;
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index b6e6aa27e15..1ffad45a186 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -213,6 +213,7 @@
<span class='slave-name'><<= SlaveFullName($slaves[_FLs])>></span> is serving as the clinical nurse.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
+ <<run tired($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -223,6 +224,7 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
+ <<run tired($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 5e8139f97e3..39a1bff7c9e 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -891,18 +891,18 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "body purist">>
fairy wearing _hisA birthday suit, with pale unblemished skin on full display and silky golden hair cascading down _hisA back.
<<case "intellectual dependency">>
- //WIP//
+ fairy wearing a thong as a string bikini. _HeA keeps asking questions you are certain _heA knows the answers to.
<<case "slave professionalism">>
- //WIP//
+ fairy wearing a graduation gown.
<<case "petite admiration">>
- //WIP//
+ fairy wearing _hisA birthday suit, with _hisA nude form obscured by the light _heA's giving off. _HeA's recently adjusted _hisA size so that, at a glance, _heA appears to be nothing more than a glowing ball.
<<case "statuesque glorification">>
- //WIP//
+ fairy wearing a simple dress. _HeA's adjusted the length of _hisA dress to make it appear that _heA is taller than _heA really is.
<<default>>
fairy wearing _hisA birthday suit, with _hisA nude form obscured by the light _heA's giving off. _HisA silky golden hair cascades down _hisA back.
<</switch>>
<<else>>
- fairy wearing _hisA birthday suit, with _hisA nude form obscured by the light _heA's giving off. _HisA silky golden hair cascades down _hisA back.
+ fairy wearing _hisA birthday suit, with _hisA nude form obscured by the light _heA's giving off.
<</if>>
<<if ($cockFeeder == 1) && (_paSeed == 1)>>
A recognizable little representation of one of your slaves underneath _himA, with _hisU tongue sticking out to catch _hisA dripping love juices. The slave must be down in the kitchen, getting a meal out of the food dispensers. The fairy notices you watching and winks, dripping even more with your eyes on _himA.
@@ -982,13 +982,13 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "body purist">>
wearing _hisA birthday suit, with pale unblemished pregnant belly on full display and silky golden hair cascading down _hisA back.
<<case "intellectual dependency">>
- //WIP//
+ wearing a thong as a string bikini. _HeA frequently pouts over all the weight _heA has been putting on lately.
<<case "slave professionalism">>
- //WIP//
+ wearing a graduation gown.
<<case "petite admiration">>
- //WIP//
+ wearing _hisA birthday suit, with _hisA nude form obscured by the light _hisA belly. _HeA's recently adjusted _hisA size so that, at a glance, _heA appears to be nothing more than a glowing oval.
<<case "statuesque glorification">>
- //WIP//
+ wearing a simple dress. _HeA's adjusted the length of _hisA dress to make it appear that _heA is taller than _heA really is, but it keeps riding up _hisA middle and ruining the look.
<<default>>
wearing _hisA birthday suit, with _hisA nude form obscured by the light coming from _hisA belly. _HisA silky golden hair cascades down _hisA back.
<</switch>>
@@ -1023,7 +1023,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<</if>>
<<case "slimegirl">>
- _HeA's a girlish shaped figure, with a crimson core, made entirely out of
+ _HeA's a girlish shaped figure, bearing a crimson core, made entirely out of
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
@@ -1035,7 +1035,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "roman revivalist">>
slime with a _girlA's stola sinking into _hisA head.
<<case "egyptian revivalist">>
- slime looking quite perturbed about the amount of sand caught in _himA.
+ slime and quite perturbed about the amount of sand caught in _himA.
<<case "edo revivalist">>
slime with a silken kimono floating inside _himA.
<<case "arabian revivalist">>
@@ -1051,9 +1051,11 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "degradationist">>
slime with a number of piercings sinking into _hisA body.
<<case "physical idealist">>
- slime trying to shape _hisA goo into muscles.
+ slime and trying to shape _hisA goo into muscles.
+ <<case "hedonistic decadence">>
+ slime. _HeA has accumulated a large amount of excess goo, giving _himA quite a corpulent shape.
<<case "gender radicalist">>
- slime with a very androgynous appearance. _HeA keeps trying to shape _hisA goo into a cock.
+ slime. _HeA keeps trying to shape _hisA goo into a cock.
<<case "gender fundamentalist">>
slime. _HisA amorphous body has noticeable hip, butt, and breast curves.
<<case "asset expansionist">>
@@ -1063,18 +1065,22 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "pastoralist">>
slime with quite a large amount of milk mixed with _hisA body. _HeA keeps trying to shape _hisA goo into big milky tits.
<<case "maturity preferentialist">>
- slime with a noticeably large core.
+ slime. _HisA core is noticeably larger and shows signs of splitting many times.
<<case "youth preferentialist">>
- slime with a tiny core and immature body
+ slime. _HisA core is as immature as _hisA body
<<case "slimness enthusiast">>
slime. _HeA is compacting _hisA slime to make _himselfA look thinner.
<<case "body purist">>
slime with the purest goo _hisA body could be made of.
+ <<case "intellectual dependency">>
+ <<case "slave professionalism">>
+ <<case "petite admiration">>
+ <<case "statuesque glorification">>
<<default>>
- slime with a pair of shorts and a shirt floating inside _himA.
+ slime.
<</switch>>
<<else>>
- slime with a pair of shorts and a shirt floating inside _himA.
+ slime.
<</if>>
<<if ($cockFeeder == 1) && (_paSeed == 1)>>
A recognizable little representation of one of your slaves has _hisU head in _hisA moist crotch, and is eating _himA out. The slave must be down in the kitchen, getting a meal out of the food dispensers. As you watch, the goo _girlA orgasms, nearly turning into a puddle when _heA notices you watching.
@@ -1089,7 +1095,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<elseif (_paSeed == 6) && ($studio == 1)>>
_HeA's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
<<else>>
- _HeA's watching you attentively from a bowl filled with _hisA body. When _heA sees your glance, _heA reforms _himselfA and awaits your response.
+ _HeA's watching you attentively from a bowl <<$assistantFSAppearance == "hedonistic decadence">>overflowing<<else>>filled<</if>> with _hisA body. When _heA sees your glance, _heA reforms _himselfA and awaits your response.
<</if>>
<<case "angel">>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 7fba584cdc5..27a707a655f 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -1417,13 +1417,22 @@
<</if>>
<</if>>
-/* TODO: update this for virgins */
-<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+<<if $slaves[$i].fuckdoll == 0>>
<<if $suppository == 1>>
<<if ($slaves[$i].aphrodisiacs > 0) || ($slaves[$i].curatives > 0) || ($slaves[$i].drugs == "psychosuppressants") || ($slaves[$i].drugs == "hormone enhancers") || ($slaves[$i].drugs == "hormone blockers") || ($slaves[$i].hormones != 0)>>
<<if $slaves[$i].anus == 0>>
+ <<if $slaves[$i].fetish == "mindbroken">>
+ $His @@.lime;virgin anus is broken in@@ by a callous machine, but $he didn't notice.
+ <<elseif $slaves[$i].devotion <= 20>>
+ $His @@.lime;anal virginity is taken@@ by a machine whose sole purpose is to fuck drugs into $him; @@.mediumorchid;an indignity $he does not take well.@@
+ <<set $slaves[$i].devotion -= 10>>
+ <<else>>
+ $His @@.lime;virgin anus is broken in@@ by a callous machine, but $he accepts such indignities as a part of life.
+ <</if>>
<<else>>
- <<if ($slaves[$i].sexualFlaw == "hates anal")>>
+ <<if $slaves[$i].fetish == "mindbroken">>
+ A reciprocating dildo pumps $his drug regime into $him each morning and night.
+ <<elseif ($slaves[$i].sexualFlaw == "hates anal")>>
<<if random(1,100) > 80>>
Getting buttfucked morning and night by reciprocating dildos that ejaculate $his drug regime forces $him to @@.green;accept anal sex@@ as a fact of life.
<<set $slaves[$i].sexualFlaw = "none">>
@@ -1448,6 +1457,8 @@
<<set $slaves[$i].fetish = "buttslut">>
<<set $slaves[$i].fetishKnown = 1>>
<<set $slaves[$i].fetishStrength = 10>>
+ <<else>>
+ A reciprocating dildo pumps $his drug regime into $him each morning and night.
<</if>>
<</if>>
<<if ($slaves[$i].sexualQuirk == "painal queen")>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 2d9c69e17fd..7f675182c5a 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1147,6 +1147,7 @@
$He is @@.hotpink;very happy@@ with $his private room in $clinicName and @@.mediumaquamarine;trusts@@ you a bit more for placing $him in charge of it.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+ Having a place to call $his own each night helps keep the stress of $his duties from catching up with $him.
<<if ($universalRulesConsent == 0)>>
<<if (_release.slaves === 1)>>
@@ -1876,6 +1877,7 @@
$He is @@.hotpink;very happy@@ with $his private room in the back of $spaName and @@.mediumaquamarine;trusts@@ you a bit more for placing the well-being of your slaves in $his <<if !hasAnyArms($slaves[$i])>>figurative <</if>>hand<<if hasBothArms($slaves[$i])>>s<</if>>.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+ $He finds plenty of time to relax between $his duties, or during them, should $his company be requested.
<<if ($universalRulesConsent == 0)>>
<<if (_release.slaves === 1)>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index c5e64b3e11d..1fcc3fd1318 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -235,6 +235,7 @@
<span class='slave-name'><<= SlaveFullName($slaves[$i])>></span> is serving as the Attendant in $spaName.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
+ <<run tired($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -245,6 +246,7 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
+ <<run tired($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
--
GitLab