diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 9e8c0ffbb795a16c65302f6e40bbabfdcf2790d3..65241f61101503f89e17557117c0d2536c10fcc4 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -144,15 +144,63 @@ SlaveTitle(slave) - Returns the slave's descriptive title.
relativeTerm(slave1, slave2) - Returns the term for slave2's relation to slave1. (daughter, mother, etc)
+relationshipChecks [script] All work as expected with <<if X.rivalryTarget == $slaves[$i].ID>> preceding them.
+ rivalryTerm(id) - Returns the rivarly term for the input . e.g. lines 99-100 of brothelReport.
+ <<if $Madam.rivalryTarget == $slaves[$i].ID>>
+ She forces her <<print rivalryTerm($Madam)>>, to service all the men in the brothel.
+ Would print 'She forces her growing rival, to service all the men in the brothel.'
+
+ relationshipTerm(id) Returns the long form relationship term for the input . e.g. lines 147-148 of saRules.
+ <<if $slaves[$i].relationship > 0>>
+ $He often asks to save these breaks so $he can spend them with $his <<print relationshipTerm($slaves[$i])>>.
+ Would print '$He often asks to save these breaks so $he can spend them with $his friend.'
+
+ relationshipTermShort(id) Prints the short form of the above. e.g. line 321 of slaveInteract.
+ `"Fuck $him with $his <<print relationshipTermShort($activeSlave)>> <<= SlaveFullName($slaves[_si])>>"`
+ Would print 'Fuck $him with $his BFF <<= SlaveFullName($slaves[_si])>>'
+
bellyAdjective(slave) - Returns a string describing her belly size.
lispReplace(string) - Ruturns the string lispified.
nippleColor(slave) - Returns the slave's nipple color.
+UtilJS [script]
+ commaNum() - Returns the value thousand sepeated with ',' if $formatNumbers > 0 else provides the raw value.
+ line 138 of src/SpecialForce/Report.tw, '...focused their <<print commaNum($SFUnit.Troops)>> troops'
+ if $formatNumbers > 0 'focused their 1,589 troops' else 'focused their 1589 troops'
+
+ cashFormat() - uses the above function to return the value thousand sepeated with ',' if $formatNumbers > 0 else provides the raw value. either way prepend ¤ (the fc domination) symbol.
+ line 157 of the previously listed file, '..totaling @@.yellowgreen;<<print cashFormat(_SFIncome)>>@@'
+ if $formatNumbers > 0 'totaling @@.yellowgreen;¤1,500,000@@' else 'totaling @@.yellowgreen;¤1500000@@'
+
+ isFloat() - Checks if value is float.
+
+ isInt() - Checks if value is an interger.
+
+ numberWithCommas() - Currently unsed.
+
+ jsRandom() - JS equivalent of sugarcube's random().
+
+ jsRandomMany() - JS equivalent of sugarcube's randomMany().
+ jsEither() - This function wants an array - which explains why it works like array.random(). Give it one or you'll face a NaN. JS equivalent of sugarcube's either() and array.random().
+ deepCopy() - This function is alternative to clone - usage needed if nested objects present. Slower but result is separate object tree, not with reference to source object.
+ hashChoice() - hashes provided input.
+
+ hashSum() - totals provided input and then hashes.
+
+ arr2obj() - Converts an array to an object. e.g. line 250 of :: init Nationalities [silently]
+ <<set $nationalities = arr2obj(setup.baseNationalities)>>
+
+ hashPush() //Note really shure where input is being pushed to.
+
+ weightedArray2HashMap()
+
+ between(a, low, high) - outputs the value down the middle of two inputs e.g.
+ between($trees, 1, 3) returns $trees = 2
Core Slave Functions:
@@ -194,8 +242,29 @@ SoftenBehavioralFlaw(slave) - Rplaces the slave's behavioral flaw with the corre
SoftenSexualFlaw(slave) - Rplaces the slave's sexual flaw with the corresponding quirk.
+UtilJS [script]
+ Height.mean(nationality, race, genes, age) - returns the mean height for the given combination and age in years (>=2).
+ Height.mean(nationality, race, genes) - returns the mean adult height for the given combination.
+ Height.mean(slave) - returns the mean (expected) height for the given slave.
+
+ Height.random(nationality, race, genes, age) - returns a random height using the skew-normal distribution around the mean height for the given arguments.
+ Height.random(nationality, race, genes) - returns a random height for the given combination of an adult, as above.
+ Height.random(slave[, options]) - returns a random height for the given slave, as above.
+
+ Height.forAge(height, age, genes) - returns the height adapted to the age and genes.
+ Height.forAge(height, slave) - returns the height adapted to the slave's age and genes.
+
+ heightToEitherUnit() - takes an int in centimetres e.g. $activeSlave.height, returns a string in the format of either `200cm (6'7")`, `6'7"`, or `200cm`
+ Height.config(configuration) - configures the random height generator globally and returns the current configuration.
+ Intelligence.random(options) - returns a random intelligence. If no options are passed, the generated number will be on a normal distribution with mean 0 and standard deviation 45.
+
+ getSlaveDevotionClass(slave) - returns the trust of the target as text. e.g. if ('mindbroken' == slave.fetish) return 'mindbroken';
+
+ getSlaveTrustClass(slave) - returns the trust of the target as text. e.g. if (slave.trust < -95) return 'extremely-terrified';
+
+
Sex Functions:
@@ -217,7 +286,19 @@ SimpleSlaveFucking(slave, count) - Runs a slave on slave sex act count times. (r
SimpleSlaveSlaveFucking(slave1, slave2, count) - Runs a slave2 on slave1 sex act count times. (randomly chooses hole based off availability.)
+UtilJS [script]
+
+ dickToInchString() - takes a dick value e.g. $activeSlave.dick, returns a string in the format 6 inches
+
+ dickToCM() - takes a dick value e.g. $activeSlave.dick, returns an int of the dick length in cm
+ ballsToInchString() - takes a ball value e.g. $activeSlave.balls, returns a string in the format 3 inches
+
+ ballsToCM() - takes a ball value e.g. $activeSlave.balls, returns an int of the ball size in cm
+
+ dickToEitherUnit() - takes a dick value e.g. $activeSlave.dick, returns a string in the format of either `20cm (8 inches)`, `8 inches`, or `20cm`
+
+ ballsToEitherUnit() - takes a ball value e.g. $activeSlave.balls, returns a string in the format of either `20cm (8 inches)`, `8 inches`, or `20cm`
Pregnancy Functions:
@@ -242,3 +323,24 @@ $slave.bellyPreg = WombGetWolume($slave) - return double, with current womb volu
Other Functions:
isItemAccessible(itemName) - Returns if the string is available for use. Defaults to true.
+
+UtilJS [script]
+ arraySwap() - swapps inputted array.
+
+ html5passage(passage_function) - circumvents sugarcube, allowing a plain HTML5 UI within it
+
+ capFirstChar() - Capitalizes the first character of a given string.
+
+ cmToInchString() - takes an integer e.g. $activeSlave.hLength, returns a string in the format 10 inches
+
+ cmToFootInchString() - takes an integer e.g. $activeSlave.height, returns a string in the format 6'5"
+
+ lengthToEitherUnit() - takes an int in centimetres e.g. $activeSlave.hLength, returns a string in the format of either `30cm (12 inches)`, `12 inches`, or `30cm`
+
+ ValidateFacilityDecoration() - checks the value of the assoicated variable and it if it infinite i.e NA the text description is reset back to standard.
+ /* decoration should be passed as "facilityDecoration" in quotes. For example, ValidateFacilityDecoration("brothelDecoration"). The quotes are important, do not pass it as a story variable. */
+
+ FSChangePorn() - //Currently unused, widget version routes directly through FSChange()
+
+ ordinalSuffix(i) - takes a value as an input and then appends the appoperiate suffix. e.g.$Day === 1 "today is the <<print ordinalSuffix($Day)>> of the month"
+ would print "today is the 1st of the month"
\ No newline at end of file
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 07811937800b0a7833fcdfdb049f99aa1ca813b2..7c2ebbfc6ef73c773b42463b4fe5a71b305fd13c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,34 @@
0.10.7.1-0.10.x
+11/04/2018
+
+ 44
+ -more pronoun work
+ -fixes to possible issues with .pluck()
+ -optimized dairyReport a bit and condensed four for loops into a single one
+
+11/03/2018
+
+ 43
+ -anon's new RESS event added
+ -fixes
+ -RA now can set chooses own job
+
+11/02/2018
+
+ 42
+ -fixes
+ -new random non-individual event added
+ -some more JS conversion
+ -starting Sup/Sub arcologies now retain their racial choice
+
+11/01/2018
+
+ 41
+ -fixes
+ -traitor slave no longer exists outside the realm of time
+
10/31/2018
40
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 61ee520b3db06b6bb206bebce5b0fd6571d0814d..be73806c9c547d66e68e435b31a230f94bebaec2 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -5892,6 +5892,12 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if(eventSlave.devotion >= 50) {
+ if(eventSlave.trust <= 20) {
+ State.variables.RESSevent.push("devoted fearful slave");
+ }
+ }
+
if(eventSlave.prestige == 0) {
if(eventSlave.devotion > 50) {
if(eventSlave.trust > 50) {
@@ -7043,6 +7049,12 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if(eventSlave.devotion >= 50) {
+ if(eventSlave.trust <= 20) {
+ State.variables.RESSevent.push("devoted fearful slave");
+ }
+ }
+
if(eventSlave.relationship == 4) {
if(eventSlave.devotion > 20) {
if(eventSlave.trust > 20) {
@@ -7445,29 +7457,7 @@ window.newSlave = function newSlave(slave) {
V.REReductionCheckinIDs.push(slave.ID);
}
- if (slave.fuckdoll > 0) {
- slave.pronoun = "it";
- slave.possessivePronoun = "its";
- slave.possessive = "its";
- slave.object = "it";
- slave.objectReflexive = "itself";
- slave.noun = "toy";
- } else if (slave.dick > 0 && slave.vagina === -1 && V.diversePronouns === 1) {
- slave.pronoun = "he";
- slave.possessivePronoun = "his";
- slave.possessive = "his";
- slave.object = "him";
- slave.objectReflexive = "himself";
- slave.noun = "boy";
- } else {
- slave.pronoun = "she";
- slave.possessivePronoun = "hers";
- slave.possessive = "her";
- slave.object = "her";
- slave.objectReflexive = "herself";
- slave.noun = "girl";
- }
-
+ generatePronouns(slave);
SetBellySize(slave);
addSlave(slave);
@@ -9120,6 +9110,43 @@ window.faceIncrease = function faceIncrease(slave, amount) {
return r;
};
+/*:: relationshipChecks [script]*/
+window.rivalryTerm = function(id) {
+ if (id.rivalry === 1) {
+ return `growing rival`;
+ } else if (id.rivalry === 2) {
+ return `rival`;
+ } else {
+ return `bitter rival`;
+ }
+}
+window.relationshipTerm = function(id) {
+ if (id.relationship === 1) {
+ return `friend`;
+ } else if (id.relationship === 2) {
+ return `best friend`;
+ } else if (id.relationship === 3) {
+ return `friend with benefits`;
+ } else if (id.relationship === 4) {
+ return `lover`;
+ } else {
+ return `slave wife`;
+ }
+}
+window.relationshipTermShort = function(id) {
+ if (id.relationship === 1) {
+ return `friend`;
+ } else if (id.relationship === 2) {
+ return `BFF`;
+ } else if (id.relationship === 3) {
+ return `FWB`;
+ } else if (id.relationship === 4) {
+ return `lover`;
+ } else {
+ return `wife`;
+ }
+}
+
/*:: Summary Widgets JS [script]*/
window.SlaveStatClamp = function SlaveStatClamp(slave) {
@@ -12825,6 +12852,7 @@ window.DefaultRules = (function() {
case "rest":
case "please you":
+ case "choose her own job":
// slaves always qualify for this assignment
break;
@@ -18547,7 +18575,8 @@ window.rulesAssistantOptions = (function() {
["Public Servant", "serve the public"],
["Classes", "take classes"],
["Milked", "get milked"],
- ["Gloryhole", "work a glory hole"]
+ ["Gloryhole", "work a glory hole"],
+ ["Choose Her Own", "choose her own job"]
];
if (V.HGSuite > 0) items.push(["Head Girl Suite", "live with your Head Girl"]);
@@ -23482,17 +23511,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -23517,17 +23537,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID && handled !== 1) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -23552,17 +23563,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s mother`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -23573,17 +23575,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s father`;
if (slave.relationshipTarget === V.slaves[_ssj].ID && handled !== 1) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -23598,17 +23591,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s sister`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += `& ${friendShipShort}`;
handled = 1;
}
}
@@ -23622,23 +23606,8 @@ window.SlaveSummaryUncached = (function(){
});
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- switch (slave.relationship) {
- case 1:
- r += ` friend`;
- break;
- case 2:
- r += ` BFF`;
- break;
- case 3:
- r += ` FWB`;
- break;
- case 4:
- r += ` lover`;
- break;
- case 5:
- r += ` wife`;
- break;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` ${friendShipShort}`;
}
} else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1) {
r += `Your wife`;
@@ -23664,50 +23633,15 @@ window.SlaveSummaryUncached = (function(){
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
- switch (slave.relationship) {
- case 1:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` friend`;
- break;
- case 2:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` BFF`;
- break;
- case 3:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` FWB`;
- break;
- case 4:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` lover`;
- break;
- case 5:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` wife`;
- break;
- }
+ var friendship = relationshipTerm(slave)
+ if (slave.relationshipTarget !== slave.relationTarget) {
+ r += `${SlaveFullName(V.slaves[_ssj])}'s`;
+ } else {
+ r += ` &`;
+ }
+ r += ` ${friendship}`;
}
- } else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1) {
+ } else if (slave.relationship === -3) {
r += `Your wife`;
} else if (slave.relationship === -2) {
r += `E Bonded`;
@@ -23745,17 +23679,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -23781,17 +23706,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -23817,17 +23733,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">mother`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -23838,17 +23745,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">father`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -23869,17 +23767,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">sister`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -23898,26 +23787,11 @@ window.SlaveSummaryUncached = (function(){
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
+ var friendship = relationshipTerm(slave)
r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- switch (slave.relationship) {
- case 1:
- r += `<span class="lightgreen">friend.</span> `;
- break;
- case 2:
- r += `<span class="lightgreen">best friend.</span> `;
- break;
- case 3:
- r += `<span class="lightgreen">FWB.</span> `;
- break;
- case 4:
- r += `<span class="lightgreen">lover.</span> `;
- break;
- case 5:
- r += `<span class="lightgreen">slave wife.</span> `;
- break;
- }
+ r += `<span class="lightgreen">${friendship}.</span> `;
}
- } else if (slave.relationship === -3) {
+ } else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1) {
r += `<span class="lightgreen">Your wife.</span> `;
} else if (slave.relationship === -2) {
r += `<span class="lightgreen">Emotionally bonded to you.</span> `;
@@ -23948,48 +23822,13 @@ window.SlaveSummaryUncached = (function(){
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
- switch (slave.relationship) {
- case 1:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">friend.</span> `;
- break;
- case 2:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">best friend.</span> `;
- break;
- case 3:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">FWB.</span> `;
- break;
- case 4:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">lover.</span> `;
- break;
- case 5:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">slave wife.</span> `;
- break;
+ var friendship = relationshipTerm(slave)
+ if (slave.relationshipTarget !== slave.relationTarget) {
+ r += `${SlaveFullName(V.slaves[_ssj])}'s `;
+ } else {
+ r += ` and `;
}
+ r += `<span class="lightgreen">${friendship}.</span> `;
}
} else if (slave.relationship === -3) {
r += `<span class="lightgreen">Your wife.</span> `;
@@ -24785,11 +24624,11 @@ window.removeActiveSlave = function removeActiveSlave() {
if (missing) {
V.missingTable[V.missingParentID] = { slaveName: V.activeSlave.slaveName,
- slaveSurname: V.activeSlave.slaveSurname,
- fullName: SlaveFullName(V.activeSlave),
- dick : V.activeSlave.dick,
- vagina : V.activeSlave.vagina,
- ID : V.missingParentID };
+ slaveSurname: V.activeSlave.slaveSurname,
+ fullName: SlaveFullName(V.activeSlave),
+ dick : V.activeSlave.dick,
+ vagina : V.activeSlave.vagina,
+ ID : V.missingParentID };
V.missingParentID--;
}
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 0172502eff27dfab18e5bd036d894a2c011ad05c..a7ce3dab9606614ff3aa62dafd18c916ad82d222 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -376,7 +376,7 @@ how many slaves you've gotten pregnant
intelligence:
-3
+100
face:
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index e815290adabd1c062e9cb2dd015ff2f1ab2caffd..bcc25a9850c37ca2307ab82c1e172d39f64ba52b 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1244,7 +1244,7 @@ hStyle:
hair style
accepts string
-"shaved bald"
+"shaved"
"buzzcut"
"trimmed"
"afro"
diff --git a/src/art/vector/Leg.tw b/src/art/vector/Leg.tw
index c9b935383c6b9997c5bee76aed43adc1bd94858a..3d6c4fbed20b7f105ab56e7e297194507fe447a5 100644
--- a/src/art/vector/Leg.tw
+++ b/src/art/vector/Leg.tw
@@ -90,7 +90,7 @@
<<include _art>>
<</if>>
/* Changed next line for no attached limbs regardless of the PLimb state */
-/* <<if _artSlave.amp == 1 && _artSlave.PLimb == 0>> */
+/* <<if _artSlave.amp == 1 && _artSlave.PLimb == 0>> <</if>> */
<<if _artSlave.amp == 1>>
<<include Art_Vector_Stump>>
<</if>>
\ No newline at end of file
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 921bbeac8e8225b1ff82219074f8276d8aa60e1a..a3f503701614737f9477ffa75d06b89ff3d629af 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -254,13 +254,21 @@
<<if ndef $customVariety>>
<<set $nationalities = arr2obj(setup.baseNationalities)>>
<</if>>
- <<set $arcologies[0].FSSupremacistRace = "white">>
- <<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "white">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+ <</if>>
<<else>>
<<switch $continent>>
<<case "North America">>
- <<set $arcologies[0].FSSupremacistRace = "white">>
- <<set $arcologies[0].FSSubjugationistRace = "black">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "white">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "black">>
+ <</if>>
<<if ndef $customVariety>> /* If non-custom variety, adds regional $nationalities */
<<set hashPush($nationalities, "American", "American", "American", "American", "American", "American")>>
<<set hashPush($nationalities, "Antiguan")>>
@@ -291,8 +299,12 @@
<<set hashPush($nationalities, "Vincentian")>>
<</if>>
<<case "South America">>
- <<set $arcologies[0].FSSupremacistRace = "latina">>
- <<set $arcologies[0].FSSubjugationistRace = "black">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "latina">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "black">>
+ <</if>>
<<if ndef $customVariety>>
<<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian")>>
<<set hashPush($nationalities, "Bolivian", "Bolivian")>>
@@ -309,8 +321,12 @@
<<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
<</if>>
<<case "Brazil">>
- <<set $arcologies[0].FSSupremacistRace = "white">>
- <<set $arcologies[0].FSSubjugationistRace = "black">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "white">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "black">>
+ <</if>>
<<if ndef $customVariety>>
<<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian", "Argentinian")>>
<<set hashPush($nationalities, "Bolivian", "Bolivian")>>
@@ -327,8 +343,12 @@
<<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
<</if>>
<<case "the Middle East">>
- <<set $arcologies[0].FSSupremacistRace = "middle eastern">>
- <<set $arcologies[0].FSSubjugationistRace = "asian">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "middle eastern">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "asian">>
+ <</if>>
<<if ndef $customVariety>>
<<set hashPush($nationalities, "Afghan", "Afghan")>>
<<set hashPush($nationalities, "Armenian", "Armenian")>>
@@ -354,8 +374,12 @@
<<set hashPush($nationalities, "Yemeni", "Yemeni")>>
<</if>>
<<case "Africa">>
- <<set $arcologies[0].FSSupremacistRace = "black">>
- <<set $arcologies[0].FSSubjugationistRace = "white">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "black">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "white">>
+ <</if>>
<<if ndef $customVariety>>
<<set hashPush($nationalities, "Algerian", "Algerian", "Algerian")>>
<<set hashPush($nationalities, "Angolan")>>
@@ -413,8 +437,12 @@
<<set hashPush($nationalities, "Zimbabwean", "Zimbabwean")>>
<</if>>
<<case "Asia">>
- <<set $arcologies[0].FSSupremacistRace = "asian">>
- <<set $arcologies[0].FSSubjugationistRace = "indo-aryan">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "asian">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "indo-aryan">>
+ <</if>>
<<if ndef $customVariety>>
<<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
<<set hashPush($nationalities, "Bhutanese")>>
@@ -447,8 +475,12 @@
<<set hashPush($nationalities, "Vietnamese", "Vietnamese", "Vietnamese")>>
<</if>>
<<case "Europe">>
- <<set $arcologies[0].FSSupremacistRace = "white">>
- <<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "white">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+ <</if>>
<<if ndef $customVariety>>
<<set hashPush($nationalities, "Albanian")>>
<<set hashPush($nationalities, "Andorran")>>
@@ -499,8 +531,12 @@
<<set hashPush($nationalities, "Vatican")>>
<</if>>
<<case "Australia">>
- <<set $arcologies[0].FSSupremacistRace = "white">>
- <<set $arcologies[0].FSSubjugationistRace = "asian">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "white">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "asian">>
+ <</if>>
<<set hashPush($nationalities, "Australian", "Australian", "Australian")>>
<<set hashPush($nationalities, "a Cook Islander")>>
<<set hashPush($nationalities, "Fijian")>>
@@ -521,8 +557,12 @@
<<set hashPush($nationalities, "Tongan")>>
<<set hashPush($nationalities, "Tuvaluan")>>
<<case "Japan">>
- <<set $arcologies[0].FSSupremacistRace = "asian">>
- <<set $arcologies[0].FSSubjugationistRace = "asian">>
+ <<if $targetArcology.type != "Supremacist">>
+ <<set $arcologies[0].FSSupremacistRace = "asian">>
+ <</if>>
+ <<if $targetArcology.type != "Subjugationist">>
+ <<set $arcologies[0].FSSubjugationistRace = "asian">>
+ <</if>>
<<if ndef $customVariety>>
<<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
<</if>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 363124a3a6543f10af2ffb56602aeb955f7236f5..d6a0fcc9a9fe41453f654a41b2ba962ec6f7ede9 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -108,19 +108,6 @@ You should have received a copy of the GNU General Public License along with thi
<<else>>
<<set $missingTable = ngUpdateMissingTable($missingTable)>>
<</if>>
- /*
- <<for $i = 0; $i < $genePool.length; $i++>>
- <<for $k = 0; $k < $slaves.length; $k++>>
- <<if $genePool[$i].ID+1200000 == $slaves[$k].ID>>
- <<set $genePool[$i].ID += 1200000>>
- <<break>>
- <</if>>
- <</for>>
- <<if $k == $slaves.length>>
- <<set $dump = $genePool.pluck([$i], [$i])>><<set $i-->>
- <</if>>
- <</for>>
- */
<<for _i = 0; _i < _SL; _i++>>
<<if $slaves[_i].relation != 0>>
<<set _seed = 0, _rt = $slaves[_i].relationTarget, _ID = $slaves[_i].ID>>
@@ -1018,6 +1005,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $collaboration = 0>>
<<set $traitor = 0>>
+<<set $traitorWeeks = 0>>
<<set $hackerSupport = 0>>
<<set $hostage = 0>>
<<set $hostageAnnounced = 0>>
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 7148316c64707efcf6fcbc14618f68cd80cc6202..8ef94f2cf210f9049c3a9c6b8842917c58401dec 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -80,6 +80,7 @@ window.DefaultRules = (function() {
case "rest":
case "please you":
+ case "choose her own job":
// slaves always qualify for this assignment
break;
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index f56a72a7d9264fd55cd8b0c3fd451d52039084ff..309257eaeac979a7eb46ff36f3da3380b63b78c3 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -337,29 +337,7 @@ window.newSlave = function newSlave(slave) {
V.REReductionCheckinIDs.push(slave.ID);
}
- if (slave.fuckdoll > 0) {
- slave.pronoun = "it";
- slave.possessivePronoun = "its";
- slave.possessive = "its";
- slave.object = "it";
- slave.objectReflexive = "itself";
- slave.noun = "toy";
- } else if (slave.dick > 0 && slave.vagina === -1 && V.diversePronouns === 1) {
- slave.pronoun = "he";
- slave.possessivePronoun = "his";
- slave.possessive = "his";
- slave.object = "him";
- slave.objectReflexive = "himself";
- slave.noun = "boy";
- } else {
- slave.pronoun = "she";
- slave.possessivePronoun = "hers";
- slave.possessive = "her";
- slave.object = "her";
- slave.objectReflexive = "herself";
- slave.noun = "girl";
- }
-
+ generatePronouns(slave);
SetBellySize(slave);
addSlave(slave);
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index 0a11c06ae9a402c2de4198535f8f0d5076da3860..828f4902f75975be167a3ff5725bb1c43c991913 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1758,6 +1758,12 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if(eventSlave.devotion >= 50) {
+ if(eventSlave.trust <= 20) {
+ State.variables.RESSevent.push("devoted fearful slave");
+ }
+ }
+
if(eventSlave.prestige == 0) {
if(eventSlave.devotion > 50) {
if(eventSlave.trust > 50) {
@@ -2909,6 +2915,12 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if(eventSlave.devotion >= 50) {
+ if(eventSlave.trust <= 20) {
+ State.variables.RESSevent.push("devoted fearful slave");
+ }
+ }
+
if(eventSlave.relationship == 4) {
if(eventSlave.devotion > 20) {
if(eventSlave.trust > 20) {
diff --git a/src/js/relationshipChecks.tw b/src/js/relationshipChecks.tw
new file mode 100644
index 0000000000000000000000000000000000000000..765e2fea22caadd97c46490f100482591d3d35f3
--- /dev/null
+++ b/src/js/relationshipChecks.tw
@@ -0,0 +1,36 @@
+:: relationshipChecks [script]
+window.rivalryTerm = function(id) {
+ if (id.rivalry === 1) {
+ return `growing rival`;
+ } else if (id.rivalry === 2) {
+ return `rival`;
+ } else {
+ return `bitter rival`;
+ }
+}
+window.relationshipTerm = function(id) {
+ if (id.relationship === 1) {
+ return `friend`;
+ } else if (id.relationship === 2) {
+ return `best friend`;
+ } else if (id.relationship === 3) {
+ return `friend with benefits`;
+ } else if (id.relationship === 4) {
+ return `lover`;
+ } else {
+ return `slave wife`;
+ }
+}
+window.relationshipTermShort = function(id) {
+ if (id.relationship === 1) {
+ return `friend`;
+ } else if (id.relationship === 2) {
+ return `BFF`;
+ } else if (id.relationship === 3) {
+ return `FWB`;
+ } else if (id.relationship === 4) {
+ return `lover`;
+ } else {
+ return `wife`;
+ }
+}
\ No newline at end of file
diff --git a/src/js/removeActiveSlave.tw b/src/js/removeActiveSlave.tw
index 4cd6a98b06287343cd0c686f1b674d4fdd8c8211..9202be0dbd8ca724358147099509cb6d3f1e27e0 100644
--- a/src/js/removeActiveSlave.tw
+++ b/src/js/removeActiveSlave.tw
@@ -223,11 +223,11 @@ window.removeActiveSlave = function removeActiveSlave() {
if (missing) {
V.missingTable[V.missingParentID] = { slaveName: V.activeSlave.slaveName,
- slaveSurname: V.activeSlave.slaveSurname,
- fullName: SlaveFullName(V.activeSlave),
- dick : V.activeSlave.dick,
- vagina : V.activeSlave.vagina,
- ID : V.missingParentID };
+ slaveSurname: V.activeSlave.slaveSurname,
+ fullName: SlaveFullName(V.activeSlave),
+ dick : V.activeSlave.dick,
+ vagina : V.activeSlave.vagina,
+ ID : V.missingParentID };
V.missingParentID--;
}
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 59328fdccb27cce1adfa755b922969e390186466..d1d00ca4ffd1505d8a273779877e4afb2828aa7b 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -3364,7 +3364,8 @@ window.rulesAssistantOptions = (function() {
["Public Servant", "serve the public"],
["Classes", "take classes"],
["Milked", "get milked"],
- ["Gloryhole", "work a glory hole"]
+ ["Gloryhole", "work a glory hole"],
+ ["Choose Her Own", "choose her own job"]
];
if (V.HGSuite > 0) items.push(["Head Girl Suite", "live with your Head Girl"]);
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index 0bf2907d0528146c2e8e09ff554baa3dacae29cb..271f157a5811c69bfbba69941df48c1a4916847d 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -3651,17 +3651,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -3686,17 +3677,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID && handled !== 1) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -3721,17 +3703,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s mother`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -3742,17 +3715,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s father`;
if (slave.relationshipTarget === V.slaves[_ssj].ID && handled !== 1) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` & ${friendShipShort}`;
handled = 1;
}
}
@@ -3767,17 +3731,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s sister`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` & friend`;
- } else if (slave.relationship === 2) {
- r += ` & BFF`;
- } else if (slave.relationship === 3) {
- r += ` & FWB`;
- } else if (slave.relationship === 4) {
- r += ` & lover`;
- } else {
- r += ` & wife`;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += `& ${friendShipShort}`;
handled = 1;
}
}
@@ -3791,23 +3746,8 @@ window.SlaveSummaryUncached = (function(){
});
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- switch (slave.relationship) {
- case 1:
- r += ` friend`;
- break;
- case 2:
- r += ` BFF`;
- break;
- case 3:
- r += ` FWB`;
- break;
- case 4:
- r += ` lover`;
- break;
- case 5:
- r += ` wife`;
- break;
- }
+ var friendShipShort = relationshipTermShort(slave)
+ r += ` ${friendShipShort}`;
}
} else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1) {
r += `Your wife`;
@@ -3833,48 +3773,13 @@ window.SlaveSummaryUncached = (function(){
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
- switch (slave.relationship) {
- case 1:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` friend`;
- break;
- case 2:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` BFF`;
- break;
- case 3:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` FWB`;
- break;
- case 4:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` lover`;
- break;
- case 5:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` wife`;
- break;
- }
+ var friendship = relationshipTerm(slave)
+ if (slave.relationshipTarget !== slave.relationTarget) {
+ r += `${SlaveFullName(V.slaves[_ssj])}'s`;
+ } else {
+ r += ` &`;
+ }
+ r += ` ${friendship}`;
}
} else if (slave.relationship === -3) {
r += `Your wife`;
@@ -3914,17 +3819,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -3950,17 +3846,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">daughter`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -3986,17 +3873,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">mother`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -4007,17 +3885,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">father`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -4038,17 +3907,8 @@ window.SlaveSummaryUncached = (function(){
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">sister`;
if (slave.relationshipTarget === V.slaves[_ssj].ID) {
- if (slave.relationship === 1) {
- r += ` and friend`;
- } else if (slave.relationship === 2) {
- r += ` and best friend`;
- } else if (slave.relationship === 3) {
- r += ` and FWB`;
- } else if (slave.relationship === 4) {
- r += ` and lover`;
- } else {
- r += ` and wife`;
- }
+ var friendShipShort = relationshipTerm(slave)
+ r += ` and ${friendShipShort}`;
handled = 1;
}
r += `.</span> `;
@@ -4067,24 +3927,9 @@ window.SlaveSummaryUncached = (function(){
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
+ var friendship = relationshipTerm(slave)
r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- switch (slave.relationship) {
- case 1:
- r += `<span class="lightgreen">friend.</span> `;
- break;
- case 2:
- r += `<span class="lightgreen">best friend.</span> `;
- break;
- case 3:
- r += `<span class="lightgreen">FWB.</span> `;
- break;
- case 4:
- r += `<span class="lightgreen">lover.</span> `;
- break;
- case 5:
- r += `<span class="lightgreen">slave wife.</span> `;
- break;
- }
+ r += `<span class="lightgreen">${friendship}.</span> `;
}
} else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1) {
r += `<span class="lightgreen">Your wife.</span> `;
@@ -4117,48 +3962,13 @@ window.SlaveSummaryUncached = (function(){
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
- switch (slave.relationship) {
- case 1:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">friend.</span> `;
- break;
- case 2:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">best friend.</span> `;
- break;
- case 3:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">FWB.</span> `;
- break;
- case 4:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">lover.</span> `;
- break;
- case 5:
- if (slave.relationshipTarget !== slave.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">slave wife.</span> `;
- break;
+ var friendship = relationshipTerm(slave)
+ if (slave.relationshipTarget !== slave.relationTarget) {
+ r += `${SlaveFullName(V.slaves[_ssj])}'s `;
+ } else {
+ r += ` and `;
}
+ r += `<span class="lightgreen">${friendship}.</span> `;
}
} else if (slave.relationship === -3) {
r += `<span class="lightgreen">Your wife.</span> `;
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 47b88b611edccf97b502c3f074211429a9841609..f0d2d761d428c07bdfdf307efbe6b0c7db7e3404 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -579,7 +579,7 @@ The previous owner seems to have left in something of a hurry.
<<break>>
<</if>>
<<set $activeSlave = getHeroSlave($heroSlaves[$j], $baseHeroSlave)>>
- <<set $dump = $heroSlaves.pluck($j,$j)>>
+ <<run $heroSlaves.splice($j,1)>>
<<slaveCost $activeSlave>>
<<if _valueGiven + $slaveCost < _valueOwed*2>>
<<run nationalityToAccent($activeSlave)>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 73c7f2fb8c2c3b76f71b831fd6c2fce28833c5ca..32ae69f18ed74321884ab1d4b279bdacf8f38ec8 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -435,7 +435,8 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<br>''Cheatmode:''
<<link "Retrieve immediately">>
<<set $incubatorOldID = $tanks[$i].ID>>
- <<set $readySlave = $tanks.pluck([$i], [$i])>>
+ <<set $readySlave = $tanks[$i]>>
+ <<run $tanks.splice($i, 1)>>
<<goto "Incubator Retrieval Workaround">>
<</link>>
<</if>>
@@ -574,7 +575,8 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<for $i = 0; $i < $incubatorSlaves; $i++>>
<<if $tanks[$i].growTime <= 0>>
<<set $incubatorOldID = $tanks[$i].ID>>
- <<set $readySlave = $tanks.pluck([$i], [$i])>>
+ <<set $readySlave = $tanks[$i]>>
+ <<run $tanks.splice($i, 1)>>
<<break>>
<</if>>
<</for>>
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
new file mode 100644
index 0000000000000000000000000000000000000000..c48ec886185ea80beff6ee94c11e03c38c3bc5ac
--- /dev/null
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -0,0 +1,54 @@
+:: P associates public slut [nobr]
+
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", _num = random(1,99)>>
+
+The Promenade is especially vibrant today, humming with activity as the wealthier of '' $arcologies[0].name''s citizens go about their business and pleasure. You are a regular sight here, leisurely strolling amidst the bustle of the many shops, boutiques and eateries that line the wide thoroughfare. These regular strolls are, of course, timed in order to allow the citizenry, particularly high society, to feel your presence. Its not all about optics though, there are frequent opportunities for pleasure during these outings, be it shopping, dining or more unique kinds of distraction. One such opportunity presents itself today.
+
+<br><br>
+
+You take a detour down one of the minor byways that feed into the Promenade proper. The centre of the street is divided by a row of public benches and carefully manicured trees, interspersed by simple metal railings that are set into the ground, coming up to about waist height. They look like bicycle stands, and are indeed occasionally used as such, but their primary function is for restraining slaves for public use, as punishment for some and reward for others. The scene playing out before you is most assuredly the former. A petite slave is being restrained.
+
+<<if _num < $seeDicks>>
+ His pink minidress is scrunched up around his waist, having been peeled back from his flat chest and hiked up to reveal his rather small genitals and his butt. He is bent over the railing at the waist, his hands and legs both shackled at either end of the rail, and a ring gag keeps him relatively quiet, while simultaneously keeping his mouth available for use.
+<<else>>
+ Her pink minidress is scrunched up around her waist, having been peeled back from her buxom chest and hiked up to reveal her lewd pussy and ass. She is bent over the railing at the waist, her hands and legs both shackled at either end of the rail, while a ring gag keeps her relatively quiet, while simultaneously keeping her mouth available for use.
+<</if>>
+
+<br><br>
+
+<<if _num < $seeDicks>>
+ The one restraining him is a business associate of yours. She's a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blond hair. Her eyes light up as her gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks. "<<if $dick>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked him!".
+
+ You consider the slaves anus. Your associate has clearly spent all day customising her new toy, it looks freshly bleached, and is smooth and inviting. It effectively has been transformed into a sex organ.
+<<else>>
+ The one restraining her is a business associate of yours. Hes a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free woman. Since he owned her debt, it took only a few formalities to turn her into his property as revenge. "She was already a slut, Ive simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "<<if $dick>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked her! Ive had her hymen restored just a few hours ago, first time is all yours if you want it.".
+
+ You consider the slaves pussy. Your associate has clearly spent all day customising his new toy, it looks tight and inviting. Surprisingly, she's quite moist, indicating that in spite of her struggling, she's actually rather aroused, seems she has a bit of a fetish for humiliation. She'll assuredly make an excellent slave if thats the case.
+<</if>>
+
+<br><br>
+
+<span id="result">
+<<link "Give <<if _num < $seeDicks>>him his<<else>>her the<</if>> first taste of slave life">>
+ <<replace "#result">>
+ <<if _num < $seeDicks>>
+ Taking a slaves anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $dick == 0>>. You also reach for one of the brand new strapons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $dick == 0>>The slave climaxes, and while you dont quite join him, watching him squirm helplessly underneath you as you used his ass has left you instensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's faced is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very very fashionable.
+ <<else>>
+ Taking a slaves virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet.<<if $dick == 0>>. You do however reach for one of the brand new strapons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<<else>>.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering hes new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very very fashionable.
+ <</if>>
+ Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while.
+ <<set $rep += 100>>
+ <</replace>>
+<</link>>
+<br><<link "Decline, but suggest Coffee in the Cafe across the street">>
+ <<replace "#result">>
+ <<if _num < $seeDicks>>
+ You decline her offer, but instead offer to buy her coffee at the nearby cafe. You enjoy some especially delicious coffee together while admiring the view of her slaves ass being broken in by a trickle of curious parties, who also occasionally walk around to the other side of the helpless sissy to use his mouth.
+ <<else>>
+ You decline his offer, but instead offer to buy him coffee at the nearby cafe. You enjoy some especially delicious coffee together while admiring the view of his slaves pussy being broken in by a trickle of curious parties, who also occasionally avail of her ass or walk around to the other side of the helpless slut to use her mouth.
+ <</if>>
+ You trade friendly chit-chat and end up discussing business after a while, eventually striking a minor bargain over some outstanding orders that were causing some grief to your holdings, earning you some @@.yellowgreen;extra cash.@@
+ <<set $cash += random(250,1000)>>
+ <</replace>>
+<</link>>
+</span>
\ No newline at end of file
diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw
index 45772a6b7945248eaa0f80b85f671881f53f7ed5..21b3659e3483bc655e0813626b1686caa097021c 100644
--- a/src/pregmod/saClothes.tw
+++ b/src/pregmod/saClothes.tw
@@ -559,63 +559,72 @@
<</if>>
<</if>>
-<<if ($slaves[$i].shoes == "heels")>>
- <<if ($slaves[$i].amp < 0)>>
- $His P-Limb legs work just as well in heels as they do out of them.
- <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if $slaves[$i].devotion < -20>>
- $He @@.mediumorchid;resents being forced@@ to wear high heels.
- <<set $slaves[$i].devotion -= 2>>
+<<if $slaves[$i].amp < 1>>
+ <<if ($slaves[$i].shoes == "heels")>>
+ <<if ($slaves[$i].amp < 0)>>
+ $His P-Limb legs work just as well in heels as they do out of them.
+ <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].devotion < -20>>
+ $He @@.mediumorchid;resents being forced@@ to wear high heels.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
<</if>>
- <</if>>
-<<elseif ($slaves[$i].shoes == "boots")>>
- <<if ($slaves[$i].amp < 0)>>
- $His P-Limb legs work just as well in boots as they do out of them.
- <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if $slaves[$i].devotion < -20>>
- $He @@.mediumorchid;resents being forced@@ to wear high heeled boots.
- <<set $slaves[$i].devotion -= 2>>
+ <<elseif ($slaves[$i].shoes == "boots")>>
+ <<if ($slaves[$i].amp < 0)>>
+ $His P-Limb legs work just as well in boots as they do out of them.
+ <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].devotion < -20>>
+ $He @@.mediumorchid;resents being forced@@ to wear high heeled boots.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
<</if>>
- <</if>>
-<<elseif ($slaves[$i].shoes == "extreme heels")>>
- <<if ($slaves[$i].amp < 0)>>
- $His P-Limb legs work just as well in extreme heels as they do out of them.
- <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if $slaves[$i].devotion < -20>>
- $He @@.mediumorchid;resents being forced@@ to wear @@.gold;painfully@@ high heels.
- <<set $slaves[$i].devotion -= 2>>
- <<set $slaves[$i].trust -= 2>>
- <<elseif ($slaves[$i].fetish == "masochist")>>
- It is difficult to walk in $his extreme heels, but $he
- <<if ($slaves[$i].fetishKnown == 0)>>
- seems to enjoy every painful step; $he's a @@.lightcoral;natural masochist.@@
- <<set $slaves[$i].fetishKnown = 1>>
+ <<elseif ($slaves[$i].shoes == "extreme heels")>>
+ <<if ($slaves[$i].amp < 0)>>
+ $His P-Limb legs work just as well in extreme heels as they do out of them.
+ <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].devotion < -20>>
+ $He @@.mediumorchid;resents being forced@@ to wear @@.gold;painfully@@ high heels.
+ <<set $slaves[$i].devotion -= 2>>
+ <<set $slaves[$i].trust -= 2>>
+ <<elseif ($slaves[$i].fetish == "masochist")>>
+ It is difficult to walk in $his extreme heels, but $he
+ <<if ($slaves[$i].fetishKnown == 0)>>
+ seems to enjoy every painful step; $he's a @@.lightcoral;natural masochist.@@
+ <<set $slaves[$i].fetishKnown = 1>>
+ <<else>>
+ @@.hotpink;appreciates@@ every painful step $he gets to take.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
<<else>>
- @@.hotpink;appreciates@@ every painful step $he gets to take.
+ $He is kept @@.hotpink;mindful@@ and @@.gold;fearful@@ by the difficulty of walking in $his extreme heels.
<<set $slaves[$i].devotion += 1>>
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ They're so high they're a bit @@.red;unhealthy@@ for $his legs.
+ <<set $slaves[$i].health -= 2>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].heels == 1) && !canWalk($slaves[$i]) && ($slaves[$i].fetish != "mindbroken")>>
+ <<if $slaves[$i].shoes == "pumps">>
+ While $he can barely stand with $his heeled pumps, $he is incapable of taking a step in them.
+ <</if>>
+ <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "submissive") && ($slaves[$i].fetishKnown == 1)>>
+ $He @@.hotpink;loves being forced@@ to crawl around like some kind of animal.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].devotion > 50>>
+ $He accepts being forced to crawl around on all fours.
+ <<else>>
+ $He @@.mediumorchid;resents being forced@@ to crawl around like some kind of animal, but it keeps $him properly @@.gold;afraid.@@
+ <<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 4>>
<</if>>
- <<else>>
- $He is kept @@.hotpink;mindful@@ and @@.gold;fearful@@ by the difficulty of walking in $his extreme heels.
- <<set $slaves[$i].devotion += 1>>
- <<set $slaves[$i].trust -= 1>>
<</if>>
- They're so high they're a bit @@.red;unhealthy@@ for $his legs.
- <<set $slaves[$i].health -= 2>>
<</if>>
<<else>>
- <<if ($slaves[$i].heels == 1) && !canWalk($slaves[$i]) && ($slaves[$i].fetish != "mindbroken")>>
- <<if $slaves[$i].shoes == "pumps">>
- While $he can barely stand with $his heeled pumps, $he is incapable of taking a step in them.
- <</if>>
- <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "submissive") && ($slaves[$i].fetishKnown == 1)>>
- $He @@.hotpink;loves being forced@@ to crawl around like some kind of animal.
- <<set $slaves[$i].devotion += 1>>
- <<elseif $slaves[$i].devotion > 50>>
- $He accepts being forced to crawl around on all fours.
- <<else>>
- $He @@.mediumorchid;resents being forced@@ to crawl around like some kind of animal, but it keeps $him properly @@.gold;afraid.@@
- <<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 4>>
- <</if>>
+ <<if $slaves[$i].shoes != "none">>
+ <<set $slaves[$i].shoes = "none">>
+ <</if>>
+ <<if $slaves[$i].legAccessory != "none">>
+ <<set $slaves[$i].legAccessory = "none">>
<</if>>
<</if>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 11b6fc18fd5163c3d7569f6cb6e4255af62ee01d..5e73f351eb0f3f98c480d01581e6d1ab43fe624c 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -219,11 +219,11 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<if $ImplantProductionUpgrade == 1>>
<<if $surgeryUpgrade == 1>>
<<if $cash >= 20000>>
- [[Purchase documents about the broodmother implant firmware hack|The Black Market][$cash -= 20000, $PGHack = 1, _dump = $merchantIllegalWares.delete("PGHack")]] //@@.yellowgreen;<<print cashFormat(20000)>>.@@//
+ [[Purchase documents regarding the broodmother implant firmware hack|The Black Market][$cash -= 20000, $PGHack = 1, _dump = $merchantIllegalWares.delete("PGHack")]] //@@.yellowgreen;<<print cashFormat(20000)>>.@@//
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(20000)>>@@ for the broodmoter implant firmware data.
+ You cannot afford the asking price of @@.red;<<print cashFormat(20000)>>@@ for the broodmother implant firmware data.
<</if>>
- "I might have something for you, if interested. Some time ago a hacker manage to crack the firmware of the publicly available broodmother implant and found how to manipulate it through the radio channel normally used for monitoring. His goal was to take revenge on an arcology owner who's loved concubine had this implant, but this plan failed as he couldn't hide his hacking attempt - to send something to the implant you need to be very close to it. In a fact, you need a special actuator inserted up to the cervix, which just so happens to be included in this deal. And it is very much advised to use it in a surgical suite, in case of complications, such as the sudden activation of the birthing process. But anyway, the hack, if applied appropriately, can interfere with original logic of the implant, forcing it to release more than one ova every week. Originally, the hacker made it about dozen, but after we tweaked his initial code, now it will be just two or three ova. You will get all the needed data and schematics for the autosurgery upgrade, but you will need to make and install it on your own."
+ "I might have something for you, if you're interested. Some time ago a hacker manage to crack the firmware of the publicly available broodmother implant and found how to manipulate it through the radio channel normally used for monitoring. His goal was to take revenge on an arcology owner who's beloved concubine had this implant, but this plan failed as he couldn't hide his hacking attempt; to send something to the implant you need to be very close to it. In fact, you need a special actuator inserted up to the cervix, which just so happens to be included in this deal. It is very much advised to use it from within a surgical suite, in case of complications, such as the sudden activation of the birthing process. But anyway, the hack, if applied appropriately, can interfere with the original logic of the implant, forcing it to release more than one ovum every week. Originally, the hacker made it about a dozen, but after we tweaked his initial code, now it will be just two or three ova. You will get all the required data and schematics for the autosurgery upgrade, but you will need to make and install it on your own."
<<else>>
The autosurgery lacks the needed actuators, so applying the broodmother implant hack complex is impossible.
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5cbaacfd6a260848706443ea2c7e1ca4e8c540b7..95b9bd29e92f99ea563b6b75353d135d049ea71e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2199,6 +2199,9 @@ Setting missing global variables:
<<if ndef $pregInventions>>
<<set $pregInventions = 0>>
<</if>>
+<<if ndef $traitorWeeks>>
+ <<set $traitorWeeks = 0>>
+<</if>>
/* Job Fulfillment Center */
<<if ndef $JFCOrder>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 60386720649882c64111e60347c1be5246c420a5..95f0b0bb92c09d1ffb091b002b16f11d2af546e1 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1,4 +1,4 @@
-:: RESS [nobr]
+:: RESS [nobr]
/* This is one of several files that contains and organizes many different events. */
/* genericPlotEvents.tw */
@@ -4282,6 +4282,26 @@ squeezed painfully by the inadequate doorway and framing the attractive rear vie
<br><br>
$He cranes $his neck, glancing over $his shoulder to give you a pleading look.
+<<case "devoted fearful slave">>
+
+You are working late tonight, poring over some particularly troublesome business documents, though thankfully the end appears to be in sight. The sun has all but completely slipped below the horizon, drowning your office in moody twilight. $assistantName, seeing that you are finally approaching the end of a long day, takes the liberty of having a
+<<if $PC.refreshmentType == 0>>
+ $PC.refreshment
+<<elseif $PC.refreshmentType == 1>>
+ glass of $PC.refreshment
+<<elseif $PC.refreshmentType == 2>>
+ plate of $PC.refreshment
+<<elseif $PC.refreshmentType == 3>>
+ line of $PC.refreshment
+<<elseif $PC.refreshmentType == 4>>
+ syringe of $PC.refreshment
+<<elseif $PC.refreshmentType == 5>>
+ pill of $PC.refreshment
+<<elseif $PC.refreshmentType == 6>>
+ tab of $PC.refreshment
+<</if>>
+brought in to you. This time <<EventNameLink $activeSlave>> has been sent to deliver it. $He loves you, but fears you simultaneously. Such relationships were not uncommon before the advent of modern slavery, but they are especially prevalent in its wake, as fear has proven a highly effective control method for those slave owners with the inclination and relative lack of conscience to utilize it as such. You hurriedly put the finishing touches on your work, eager to be done, and then reach for your $PC.refreshment. $activeSlave.slaveName flinches at your sudden movement, taking a few frightened steps back, nearly dropping the serving tray and leaving you grasping at thin air. It was a simple fear response, $he didn't realize you were ready for your treat and instinctively thought you were reaching out to strike $him. Tears swell up in $his eyes as $he apologizes profusely.
+
<<default>>
<br>ERROR: bad RESS event $RESSevent
<</switch>>
@@ -20474,6 +20494,33 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<</replace>>
<</link>>
+<<case "devoted fearful slave">>
+
+<<link "Comfort $him">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You set the $PC.refreshment aside on your desk for now, and take $him gently by the hand. You lead $him out onto the balcony of the Penthouse over to the railing. $He obediently assumes a position for you, bracing $his arms on the railing, arching $his back and sticking $his bottom out to present $himself for use. Much to $his surprise, your hand guides $him back into a comfortable position, and simply pulls $him close into you. You explain to $him that $he is a good $girl who tries $his best, and that you don't want $him to fear you. After a little coddling, you fall silent, and simply hold $him tight, watching the street lights of $arcologies[0].name blink to life one after the other, slowly transforming the arcology into a vibrant, elegant light show. $activeSlave.slaveName can hardly believe whats happening, but eventually is able to relax fully, melting into your arms like butter into a hot pan. $He rests $his head lovingly against your chest and silently appreciates the view with you. When $he eventually departs, $he does so with @@.hotpink;tears of joy@@, @@.mediumaquamarine;rather than fear@@, welling behind $his eyes.
+ <<set $activeSlave.devotion += 15>>
+ <<set $activeSlave.trust += 15>>
+ <</replace>>
+<</link>>
+<br><<link "Gently reassure $him">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You set the $PC.refreshment aside on your desk for now, and take $him gently by the shoulders. You assure $him that $he is a good $girl who tries $his best, and that $he wont be hurt so long as $he remains well behaved. You affectionately stroke $his shoulders with your thumbs as you speak in a further attempt to calm $him down. $He is highly receptive to your soothing touch and kind words. $He drys $his eyes, gives you an @@.hotpink;affectionate kiss@@ and @@.mediumaquamarine;thanks you prettily@@ before departing.
+ <<set $activeSlave.devotion += 10>>
+ <<set $activeSlave.trust += 10>>
+ <</replace>>
+<</link>>
+<br><<link "Vindicate $his fears">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You set the $PC.refreshment aside on your desk, then spin around as the slave least expects it, delivering a fierce backhand slap to $his <<if $activeSlave.face >= -10>>pretty<<else>>homely<</if>> face that nearly sends $him to the ground. You instruct $him to be more careful in future, and that you wont tolerate slaves that shy away from you for any reason, nor ones that are clumsy enough to nearly drop a serving tray while standing still. $He all but begs upon $his hands and knees for your forgiveness. You dismiss $him without further comment, and sit down to enjoy your evening refreshments. The battered, dejected slave slinks away, @@.gold;choking down tears@@. $He will be @@.hotpink;less careless@@ in future.
+ <<set $activeSlave.devotion += 10>>
+ <<set $activeSlave.trust -= 10>>
+ <</replace>>
+<</link>>
+
<<default>>
<br>ERROR: bad RESS event $RESSevent
<</switch>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 0d0292525d0265f4d05def5d790912f1a470573a..f535a5ae6a58f6cb01cf4e72777af2aa5f4dc08e 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1166,7 +1166,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<else>>
_He2 orgasms powerfully, _his2 abs tightening. When $activeSlave.slaveName lets _him2 up,
<</if>>
- _he2 looks pleased with _himself, and @@.mediumaquamarine;a little more confident,@@ too.
+ _he2 looks pleased with _himself2, and @@.mediumaquamarine;a little more confident,@@ too.
<<set $subSlave.devotion += 2, $subSlave.trust += 2, $subSlave.analCount++>>
<<set $analTotal++>>
<<set $activeSlave.penetrativeCount++>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 28e56a6bc0185e8840fe5edc4fd4035e6d42893f..596f9594d949542c49384a911d601594f45d9e5e 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -539,6 +539,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
<</if>>
+<<if $cash >= 500000>>
<br><<link "Offer a generous amount of cash in exchange for both the Queen and her court ladies.">>
<<replace "#result">>
<<set $cash -= 500000>>
@@ -592,6 +593,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> // It will cost about <<print cashFormat(500000)>> to enslave the Queen and her court ladies.//
+<<else>>
+<</if>>
<<if $securityForceActive == 1>>
<br><<link "Dispatch $securityForceName on a night time raid to acquire the Queen and her court ladies.">>
<<replace "#result">>
@@ -647,6 +650,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
+ <br>//You lack the necessary funds to enslave the Queen and her ladies.//
<</if>>
<<if $cash >= 2500000 && $familyTesting == 1>>
diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw
index b0807898274c776e8cca2346154c200d148a6e45..350709a4dd7f51f2c874b8efe3890415e74b219c 100644
--- a/src/uncategorized/addCustomDescriptors.tw
+++ b/src/uncategorized/addCustomDescriptors.tw
@@ -7,33 +7,33 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo
<br><br>
<<if $activeSlave.devotion >= -50>>
- <<if $activeSlave.customTitle != "">>You have instructed her to always refer to you as $activeSlave.customTitle, which, should she lisp, comes out as $activeSlave.customTitleLisp<<else>>You expect her to refer to you as all your other slaves do<</if>>.
+ <<if $activeSlave.customTitle != "">>You have instructed $him to always refer to you as $activeSlave.customTitle, which, should $he lisp, comes out as $activeSlave.customTitleLisp<<else>>You expect $him to refer to you as all your other slaves do<</if>>.
<br>
<span id="result">
<<if $activeSlave.customTitle == "">>
- <<link "Set a custom title for her to address you as">>
+ <<link "Set a custom title for $him to address you as">>
<<replace "#result">>
Custom title: <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>>
<<link "Apply">>
<<replace "#result">>
- She'll try her best to call you $activeSlave.customTitle.
+ $He'll try $his best to call you $activeSlave.customTitle.
<<set $activeSlave.customTitleLisp = lispReplace($activeSlave.customTitle)>>
<</replace>>
<</link>>
<</replace>>
<</link>>
<<else>>
- She's trying her best to call you <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>>
+ $He's trying $his best to call you <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>>
<br>
<<link "Apply">>
<<replace "#result">>
- She'll try her best to call you $activeSlave.customTitle.
+ $He'll try $his best to call you $activeSlave.customTitle.
<<set $activeSlave.customTitleLisp = lispReplace($activeSlave.customTitle)>>
<</replace>>
<</link>> |
<<link "Stop using a custom title">>
<<replace "#result">>
- She will no longer refer to you with a special title.
+ $He will no longer refer to you with a special title.
<<set $activeSlave.customTitle = "">>
<<set $activeSlave.customTitleLisp = "">>
<</replace>>
@@ -41,39 +41,39 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo
<</if>>
</span>
<<else>>
- //You must break her will further before she will refer to you by a new title.<<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $activeSlave.customTitleLisp && $activeSlave.customTitleLisp != "">> For now, she intends to keep calling you "<<print $activeSlave.customTitleLisp>>".<</if>><<else>><<if def $activeSlave.customTitle && $activeSlave.customTitle != "">> For now, she intends to keep calling you "<<print $activeSlave.customTitle>>".<</if>><</if>>//
+ //You must break $his will further before $he will refer to you by a new title.<<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $activeSlave.customTitleLisp && $activeSlave.customTitleLisp != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitleLisp>>".<</if>><<else>><<if def $activeSlave.customTitle && $activeSlave.customTitle != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitle>>".<</if>><</if>>//
<</if>>
<br><br>
<<if ((($activeSlave.devotion >= -50) || ($activeSlave.trust < -20)) && ($activeSlave.birthName != $activeSlave.slaveName)) || (($activeSlave.devotion > 20) || ($activeSlave.trust < -20))>>
- Change her given name<<if $activeSlave.birthName != $activeSlave.slaveName>> (her birth name was $activeSlave.birthName)<</if>>: <<textbox "$activeSlave.slaveName" $activeSlave.slaveName "Rename">>
- <<link "Restore her birth name">><<set $activeSlave.slaveName = $activeSlave.birthName>><<goto "Rename">><</link>>
+ Change $his given name<<if $activeSlave.birthName != $activeSlave.slaveName>> ($his birth name was $activeSlave.birthName)<</if>>: <<textbox "$activeSlave.slaveName" $activeSlave.slaveName "Rename">>
+ <<link "Restore $his birth name" "Rename">><<set $activeSlave.slaveName = $activeSlave.birthName>><</link>>
<<if $arcologies[0].FSPastoralist != "unset">>
- <<if $activeSlave.lactation > 0>>
- | <<link "Give her a random cow given name">><<set $activeSlave.slaveName = setup.cowSlaveNames.random()>><<goto "Rename">><</link>>
- <</if>>
+ <<if $activeSlave.lactation > 0>>
+ | <<link "Give $him a random cow given name" "Rename">><<set $activeSlave.slaveName = setup.cowSlaveNames.random()>><</link>>
+ <</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
- | <<link "Give her a random devotional given name">><<set $activeSlave.slaveName = setup.chattelReligionistSlaveNames.random()>><<goto "Rename">><</link>>
+ | <<link "Give $him a random devotional given name" "Rename">><<set $activeSlave.slaveName = setup.chattelReligionistSlaveNames.random()>><</link>>
<</if>>
<br><br>
- Change her surname<<if $activeSlave.birthSurname != $activeSlave.slaveSurname>> (her birth surname was $activeSlave.birthSurname)<</if>>:
+ Change $his surname<<if $activeSlave.birthSurname != $activeSlave.slaveSurname>> ($his birth surname was $activeSlave.birthSurname)<</if>>:
<<if $activeSlave.slaveSurname>>
<<textbox "$activeSlave.slaveSurname" $activeSlave.slaveSurname "Rename">>
<<else>>
<<textbox "$activeSlave.slaveSurname" "" "Rename">>
<</if>>
- <<link "Restore her birth surname">><<set $activeSlave.slaveSurname = $activeSlave.birthSurname>><<goto "Rename">><</link>>
+ <<link "Restore $his birth surname" "Rename">><<set $activeSlave.slaveSurname = $activeSlave.birthSurname>><</link>>
<<if $activeSlave.slaveSurname>>
- | <<link "Take her surname away">><<set $activeSlave.slaveSurname = 0>><<goto "Rename">><</link>>
+ | <<link "Take $his surname away" "Rename">><<set $activeSlave.slaveSurname = 0>><</link>>
<</if>>
<<if $activeSlave.relationship >= 5>>
<<for _i = 0; _i < $slaves.length; _i++>>
<<if $activeSlave.relationshipTarget == $slaves[_i].ID>>
<<if $slaves[_i].slaveSurname>>
<<if $activeSlave.slaveSurname != $slaves[_i].slaveSurname>>
- | <<link "Give her her wife's surname">><<set $activeSlave.slaveSurname = $slaves[_i].slaveSurname>><<goto "Rename">><</link>>
+ | <<link "Give $him $his wife's surname" "Rename">><<set $activeSlave.slaveSurname = $slaves[_i].slaveSurname>><</link>>
<<break>>
<</if>>
<</if>>
@@ -83,76 +83,76 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo
<<if $activeSlave.relationship == -3>>
<<if $PC.surname>>
<<if $activeSlave.slaveSurname != $PC.surname>>
- | <<link "Give her your surname">><<set $activeSlave.slaveSurname = $PC.surname>><<goto "Rename">><</link>>
+ | <<link "Give $him your surname" "Rename">><<set $activeSlave.slaveSurname = $PC.surname>><</link>>
<</if>>
<</if>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
- | <<link "Give her a random full Roman name">><<set $activeSlave.slaveName = setup.romanSlaveNames.random(), $activeSlave.slaveSurname = setup.romanSlaveSurnames.random()>><<goto "Rename">><</link>>
+ | <<link "Give $him a random full Roman name" "Rename">><<set $activeSlave.slaveName = setup.romanSlaveNames.random(), $activeSlave.slaveSurname = setup.romanSlaveSurnames.random()>><</link>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
- | <<link "Give her a random full Aztec name">><<set $activeSlave.slaveName = setup.aztecSlaveNames.random(), $activeSlave.slaveSurname = 0>><<goto "Rename">><</link>>
+ | <<link "Give $him a random full Aztec name" "Rename">><<set $activeSlave.slaveName = setup.aztecSlaveNames.random(), $activeSlave.slaveSurname = 0>><</link>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- | <<link "Give her a random full ancient Egyptian name">><<set $activeSlave.slaveName = setup.ancientEgyptianSlaveNames.random(), $activeSlave.slaveSurname = 0>><<goto "Rename">><</link>>
+ | <<link "Give $him a random full ancient Egyptian name" "Rename">><<set $activeSlave.slaveName = setup.ancientEgyptianSlaveNames.random(), $activeSlave.slaveSurname = 0>><</link>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- | <<link "Give her a random full feudal Japanese name">><<set $activeSlave.slaveName = setup.edoSlaveNames.random(), $activeSlave.slaveSurname = setup.edoSlaveSurnames.random()>><<goto "Rename">><</link>>
+ | <<link "Give $him a random full feudal Japanese name" "Rename">><<set $activeSlave.slaveName = setup.edoSlaveNames.random(), $activeSlave.slaveSurname = setup.edoSlaveSurnames.random()>><</link>>
<</if>>
<<if $arcologies[0].FSDegradationist > -1>>
- | <<link "Give her a degrading full name">><<run DegradingName($activeSlave)>><<goto "Rename">><</link>>
+ | <<link "Give $him a degrading full name" "Rename">><<run DegradingName($activeSlave)>><</link>>
<</if>>
<<else>>
- //You must break her will further before you can successfully force a new name on her.//
+ //You must break $his will further before you can successfully force a new name on $him.//
<</if>>
<br><br>
<<switch $activeSlave.hStyle>>
<<case "tails" "dreadlocks" "cornrows">>
-Her hair is in $activeSlave.hStyle.
+$His hair is in $activeSlave.hStyle.
<<case "ponytail">>
-Her hair is in a $activeSlave.hStyle.
+$His hair is in a $activeSlave.hStyle.
<<default>>
-Her hair is $activeSlave.hStyle.
+$His hair is $activeSlave.hStyle.
<</switch>>
Custom hair description: <<textbox "$activeSlave.hStyle" $activeSlave.hStyle "Add custom descriptors">>
<br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'back in a ponytail'//
<br><br>
-Her hair is $activeSlave.hColor in color.
+$His hair is $activeSlave.hColor in color.
Custom hair color: <<textbox "$activeSlave.hColor" $activeSlave.hColor "Add custom descriptors">>
<br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'black with purple highlights'//
<br><br>
<<if $activeSlave.eyeColor != $activeSlave.origEye>>
- She is wearing $activeSlave.eyeColor lenses.
+ $He is wearing $activeSlave.eyeColor lenses.
<<else>>
- She has $activeSlave.eyeColor eyes.
+ $He has $activeSlave.eyeColor eyes.
<</if>>
Custom eye color: <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "Add custom descriptors">>
<br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'blue'//
<br><br>
-Change her custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Add custom descriptors">> <br> //For best results, use complete sentences; for example: 'She has blue stars tattooed along her cheekbones.'//
+Change $his custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Add custom descriptors">> <br> //For best results, use complete sentences; for example: 'She has blue stars tattooed along her cheekbones.'//
<br><br>
-Change her origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "Add custom descriptors">>
+Change $his origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "Add custom descriptors">>
<br> //For best results, use complete, capitalized and punctuated sentences; for example: 'She followed you home from the pet store.'//
<br><br>
-Change her custom description: <<textbox "$activeSlave.customDesc" $activeSlave.customDesc "Add custom descriptors">>
+Change $his custom description: <<textbox "$activeSlave.customDesc" $activeSlave.customDesc "Add custom descriptors">>
<br> //For best results, use complete, capitalized and punctuated sentences; for example: 'She has a beauty mark above her left nipple.'//
<br><br>
-Change her custom label: <<textbox "$activeSlave.customLabel" $activeSlave.customLabel "Add custom descriptors">>
+Change $his custom label: <<textbox "$activeSlave.customLabel" $activeSlave.customLabel "Add custom descriptors">>
<br> //For best results, use a short phrase; for example: 'Breeder.'//
<br><br>
<<if ndef $activeSlave.customImage>><<set $activeSlave.customImage = 0>><</if>>
-Assign her a custom image:
+Assign $him a custom image:
<<if $activeSlave.customImage != 0>>
<<textbox "$activeSlave.customImage" $activeSlave.customImage "Add custom descriptors">>
<<else>>
<<textbox "$activeSlave.customImage" "" "Add custom descriptors">>
<</if>>
-<<link "Reset">><<set $activeSlave.customImage = 0, $activeSlave.customImageFormat = "png">><<goto "Add custom descriptors">><</link>>
+<<link "Reset" "Add custom descriptors">><<set $activeSlave.customImage = 0, $activeSlave.customImageFormat = "png">><</link>>
<br> //File must be in// <tt><select id="customImageFormatSelector" style="border: none;"><option value="png">PNG</option><option value="jpg">JPG</option><option value="gif">GIF</option><option value="webm">WEBM</option></select></tt> //format. Place file in the \resources folder. Enter the filename without the extension. For example, for a file with the path// <tt>\bin\resources\headgirl.<span id="customImageFormatValue">png</span></tt>, //enter //<tt>headgirl</tt>.
<<script>>
jQuery(function() {
@@ -168,11 +168,11 @@ jQuery(function() {
<<if $seeImages == 1 && $imageChoice == 1>>
<br><br>
<<if ndef $activeSlave.customHairVector>><<set $activeSlave.customHairVector = 0>><</if>>
- Assign her a custom hair SVG image:
+ Assign $him a custom hair SVG image:
<<if $activeSlave.customHairVector != 0>>
<<textbox "$activeSlave.customHairVector" $activeSlave.customHairVector "Add custom descriptors">>
<<else>>
<<textbox "$activeSlave.customHairVector" "" "Add custom descriptors">>
<</if>>
- <<link "Reset">><<set $activeSlave.customHairVector = 0>><<goto "Add custom descriptors">><</link>>
+ <<link "Reset" "Add custom descriptors">><<set $activeSlave.customHairVector = 0>><</link>>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 3035e0e49c119ddcf0a7b2901f5216c43cc38e09..34edfde6d531caaa5eca20508ea071e76a8d301d 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -27,6 +27,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$ArcadeiIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i]>>
/* Perform facility based rule changes */
<<set $slaves[$i].clothes = "no clothing">>
@@ -228,7 +229,8 @@
<<elseif _Con > -1>>
<<set $activeSlave = $slaves[_Con]>>
<</if>>
- <br> $activeSlave.slaveName is low-quality and surplus to the needs of the arcade, so she has been converted into a Fuckdoll.
+ <<setLocalPronouns $activeSlave>>
+ <br> $activeSlave.slaveName is low-quality and surplus to the needs of the arcade, so $he has been converted into a Fuckdoll.
<<include "Remove activeSlave">>
<<if $activeSlave == 0>> /% if not zero then technically there was an error INVALID SLAVE %/
<<set $fuckdolls++, _SL-->>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 78932083516b8ddac900c9566bf5c0c92fa1820a..fafe1d9f27edf42affc29b61cf8aa75379a2c8cf 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -40,7 +40,8 @@ One morning, after seeing to an immense pile of business with $assistantName pro
<<break>>
<</if>>
<</for>>
-One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. She's become very helpful monitoring, training, and disciplining slaves. Tonight, she's added an unmistakable tone of sexual satiation in her voice. "<<= properTitle()>>, I enjoyed my duties today," she purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked her earlier?" That's how she refers to a slave having one of the penthouse's advanced sex toys used on her, since $assistantName controls them.
+<<setLocalPronouns $activeSlave>>
+One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. She's become very helpful monitoring, training, and disciplining slaves. Tonight, she's added an unmistakable tone of sexual satiation in her voice. "<<= properTitle()>>, I enjoyed my duties today," she purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked $him earlier?" That's how she refers to a slave having one of the penthouse's advanced sex toys used on $him, since $assistantName controls them.
<br><br>
She continues more seriously,
<<if _smartPiercings == 0>>
diff --git a/src/uncategorized/attendantSelect.tw b/src/uncategorized/attendantSelect.tw
index 0073f42da6e80f774e283d9600d2c674382f67ec..77c148e8886f0ef66359b309ad0761c62de20817 100644
--- a/src/uncategorized/attendantSelect.tw
+++ b/src/uncategorized/attendantSelect.tw
@@ -3,7 +3,8 @@
<<set $nextButton = "Back", $nextLink = "Spa", $showEncyclopedia = 1, $encyclopedia = "Attendant">>
<<showallAssignmentFilter>>
<<if ($Attendant != 0)>>
- ''__@@.pink;<<= SlaveFullName($Attendant)>>@@__'' is serving as your Attendant.<br><br>She will help pamper and counsel your slaves.
+ <<setLocalPronouns $Attendant>>
+ ''__@@.pink;<<= SlaveFullName($Attendant)>>@@__'' is serving as your Attendant.<br><br>$He will help pamper and counsel your slaves.
<<else>>
You have not selected an Attendant.
<</if>>
diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw
index 2c003271d0344aff9eb1a13811ede73913c23028..f500a46ffa0a8cb79625759ac95650ffcf39d0bc 100644
--- a/src/uncategorized/bgSelect.tw
+++ b/src/uncategorized/bgSelect.tw
@@ -3,7 +3,8 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Bodyguard">>
<<showallAssignmentFilter>>
<<if ($Bodyguard != 0)>>
- ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard.<br><br>She will remain close to you at all times and guard your person.
+ <<setLocalPronouns $Bodyguard>>
+ ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard.<br><br>$He will remain close to you at all times and guard your person.
<<else>>
You have not selected a bodyguard.
<</if>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index d7dc5a1df3d2b4aef338259b45c3a7a36df83535..ff651eb0c1c3d2b0053339e9c2fbdded1527563a 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -46,18 +46,19 @@
/% Make sure we have registered living expenses as for any other slave %/
<<run getSlaveStatisticData($Madam, $facility.brothel)>>
<<set $Madam = $slaves[_FLs]>>
+ <<setLocalPronouns $Madam>>
<<= SlaveFullName($Madam)>> is serving as the Madam.
<<if $Madam.relationship == -3 && $Madam.devotion > 50>>
- As your loving wife, she does her best to attract attention to your brothel.
+ As your loving wife, $he does $his best to attract attention to your brothel.
<<set $madamCashBonus += 0.25>>
<</if>>
<<if (_FLsFetish == 1)>>
- She isn't above sampling the merchandise herself; before long it's obvious to her girls that she @@.lightcoral;really likes fucking them.@@
+ $He isn't above sampling the merchandise herself; before long it's obvious to $his girls that $he @@.lightcoral;really likes fucking them.@@
<<elseif (_FLsFetish == 2)>>
- She's careful that all of the whores under her supervision are all warmed up and ready to get fucked every morning, and she @@.lightsalmon;becomes more dominant.@@
+ $He's careful that all of the whores under $his supervision are all warmed up and ready to get fucked every morning, and $he @@.lightsalmon;becomes more dominant.@@
<</if>>
<<if ($Madam.whoreSkill <= 10)>>
- Though $Madam.slaveName does her best to manage the brothel, with her lack of skill she can do little.
+ Though $Madam.slaveName does $his best to manage the brothel, with $his lack of skill $he can do little.
<<elseif ($Madam.whoreSkill <= 30)>>
$Madam.slaveName's basic skills marginally @@.yellowgreen;improve@@ business at $brothelName.
<<set $madamCashBonus += 0.05>>
@@ -72,32 +73,32 @@
<<set $madamCashBonus += 0.20>>
<</if>>
<<if ($Madam.actualAge > 35)>>
- Her age and experience also contribute.
+ $His age and experience also contribute.
<<set $madamCashBonus += 0.05>>
<<elseif $AgePenalty == 0>>
<<set $madamCashBonus += 0.05>>
<</if>>
<<if setup.madamCareers.includes($Madam.career)>>
- She has experience from her life before she was a slave that helps her in the seedy business of selling other people's bodies for sex.
+ $He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex.
<<set $madamCashBonus += 0.05>>
<<elseif $Madam.skillMD >= $masteredXP>>
- She has experience from working for you that helps her in the seedy business of selling other people's bodies for sex.
+ $He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex.
<<set $madamCashBonus += 0.05>>
<<else>>
<<set $slaves[_FLs].skillMD += random(1,Math.ceil(($Madam.intelligence+$Madam.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Madam.intelligence+$Madam.intelligenceImplant > 15)>>
- She is a clever manager.
+ $He is a clever manager.
<<set $madamCashBonus += 0.05*Math.floor(($Madam.intelligence+$Madam.intelligenceImplant)/32)>>
<</if>>
<<if ($Madam.dick > 2) && (canPenetrate($Madam))>>
- Her turgid dick helps her manage the bitches.
+ $His turgid dick helps $him manage the bitches.
<<set $madamCashBonus += 0.05>>
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$BrothiIDs[_dI]]>>
<<if $Madam.rivalryTarget == $slaves[$i].ID>>
- She forces her <<if $Madam.rivalry == 1>>growing rival<<elseif $Madam.rivalry == 2>>rival<<elseif $Madam.rivalry == 3>>bitter rival<</if>>, to service all the men in the brothel.
+ $He forces $his <<print rivalryTerm($Madam)>>, to service all the men in the brothel.
<<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 2>>
<<if canDoVaginal($slaves[$i])>>
<<set $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>>
@@ -113,79 +114,70 @@
<<set $slaves[_FLs].rivalry++, $Madam.rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Madam.relationshipTarget == $slaves[$i].ID>>
- She dotes over her <<if $Madam.relationship == 1>>friend<<elseif $Madam.relationship == 2>>best friend<<elseif $Madam.relationship == 3>>friend with benefits<<elseif $Madam.relationship == 4>>lover<<elseif $Madam.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making sure she is safe, but unfortunately driving potential customers away from her.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He dotes over $his <<print relationshipTerm($Madam)>>, $slaves[$i].slaveName, making sure _he2 is safe, but unfortunately driving potential customers away from _him2.
<<set $slaves[$i].devotion++, $madamCashBonus -= 0.05>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- <<if $slaves[$i].mother == $Madam.ID || $slaves[$i].father == $Madam.ID>>
- She pays special attention to her daughter, $slaves[$i].slaveName, making sure she is treated well and showing off her skills.
- <<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
- <<elseif $slaves[$i].ID == $Madam.mother>>
- She pays special attention to her mother, $slaves[$i].slaveName, making sure she is treated well and showing off her skills.
- <<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
- <<elseif $slaves[$i].ID == $Madam.father>>
- She pays special attention to her father, $slaves[$i].slaveName, making sure she is treated well and showing off her skills.
- <<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
- <<elseif areSisters($slaves[$i], $Madam) == 1>>
- She pays special attention to her twin sister, $slaves[$i].slaveName, making sure she is treated well and showing off her skills.
- <<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
- <<elseif areSisters($slaves[$i], $Madam) == 2>>
- She pays special attention to her sister, $slaves[$i].slaveName, making sure she is treated well and showing off her skills.
- <<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
- <<elseif areSisters($slaves[$i], $Madam) == 3>>
- She pays special attention to her half-sister, $slaves[$i].slaveName, making sure she is treated well and showing off her skills.
- <<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
- <</if>>
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He pays special attention to $his <<print relativeTerm($Madam.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure _he2 is treated well and showing off _his2 skills.
+ <<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
<<elseif $Madam.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she is treated well and showing off her skills.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He pays special attention to $his $slaves[$i].relation, $slaves[$i].slaveName, making sure _he2 is treated well and showing off _his2 skills.
<<set $slaves[$i].trust++, $madamCashBonus += 0.05>>
<</if>>
<<if $slaves[$i].prestigeDesc == "She is a famed Free Cities whore, and commands top prices.">>
- She makes sure to promote $slaves[$i].slaveName, the famed whore, in order to capitalize on her popularity.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He makes sure to promote $slaves[$i].slaveName, the famed whore, in order to capitalize on _his2 popularity.
<<set $madamCashBonus += 0.15>>
<<elseif $slaves[$i].prestigeDesc == "She is a famed Free Cities slut, and can please anyone.">>
- She makes sure to promote $slaves[$i].slaveName, the famed entertainer, in order to capitalize on her popularity.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He makes sure to promote $slaves[$i].slaveName, the famed entertainer, in order to capitalize on _his2 popularity.
<<set $madamCashBonus += 0.15>>
<<elseif $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a dairy cow.">>
+ <<setLocalPronouns $slaves[$i] 2>>
<<if ($arcologies[0].FSPhysicalIdealist != "unset")>>
<<if ($slaves[$i].muscles > 60) && ($slaves[$i].weight < 30) && ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
- She shows off how even a cow like $slaves[$i].slaveName can achieve physical perfection.
+ $He shows off how even a cow like $slaves[$i].slaveName can achieve physical perfection.
<<set $madamCashBonus += 0.15>>
<<else>>
- A<<if ($slaves[$i].muscles < 30)>>n unmuscled,<</if>><<if ($slaves[$i].weight > 30)>> fat,<</if>> 'prestigious' <<if ($slaves[$i].lactation > 0)>>cow<<elseif (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>mass of titflesh<<else>>slave<</if>> like $slaves[$i].slaveName is woefully out of fashion, so $Milkmaid.slaveName tries to draw attention away from her.
+ A<<if ($slaves[$i].muscles < 30)>>n unmuscled,<</if>><<if ($slaves[$i].weight > 30)>> fat,<</if>> 'prestigious' <<if ($slaves[$i].lactation > 0)>>cow<<elseif (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>mass of titflesh<<else>>slave<</if>> like $slaves[$i].slaveName is woefully out of fashion, so $Milkmaid.slaveName tries to draw attention away from _him2.
<</if>>
<<else>>
<<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
- She makes sure to massage $slaves[$i].slaveName's huge breasts to get the milk flowing before enticing clients to suckle and play with her.
+ $He makes sure to massage $slaves[$i].slaveName's huge breasts to get the milk flowing before enticing clients to suckle and play with _him2.
<<set $madamCashBonus += 0.10>>
<<else>>
- She would like to show off $slaves[$i].slaveName's huge udders, but $slaves[$i].slaveName <<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>> doesn't exactly have huge udders anymore. <</if>>
+ $He would like to show off $slaves[$i].slaveName's huge udders, but $slaves[$i].slaveName <<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>> doesn't exactly have huge udders anymore. <</if>>
<</if>>
<</if>>
<<elseif $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">>
- <<if $arcologies[0].FSGenderFundamentalist != "unset">>
+ <<setLocalPronouns $slaves[$i] 2>>
+ <<if $arcologies[0].FSGenderFundamentalist != "unset">> /* this needs review - doesn't fit right. An XY slave would be expected to be masculine. */
<<if ($slaves[$i].balls == 0) && ($slaves[$i].dick == 0) && ($slaves[$i].vagina > -1)>>
- She uses $slaves[$i].slaveName as an example of how even a huge-balled freak like her can be restored to proper femininity.
+ $He uses $slaves[$i].slaveName as an example of how even a huge-balled freak like _him2 can be restored to proper femininity.
<<set $madamCashBonus += 0.20>>
<<else>>
- She tries to hide $slaves[$i].slaveName, 'her' body being notorious for defiance of conventional femininity.
+ $He tries to hide $slaves[$i].slaveName, 'her' body being notorious for defiance of conventional femininity.
<</if>>
<<else>>
<<if (($slaves[$i].balls > 5) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>>
- She shows off $slaves[$i].slaveName's copious loads by putting a condom over her dick and teasing her till she bursts it. The show draws multiple clients that want to play with her oversized junk and messy orgasms.
+ $He shows off $slaves[$i].slaveName's copious loads by putting a condom over _his2 dick and teasing _him2 till _he2 bursts it. The show draws multiple clients that want to play with _his2 oversized junk and messy orgasms.
<<set $madamCashBonus += 0.15>>
<<else>>
- She would love to show off $slaves[$i].slaveName's copious loads, but $slaves[$i].slaveName<<if $slaves[$i].dick == 0>> doesn't have a dick.<<elseif $slaves[$i].balls == 0>>'s not producing cum. <<else>>'s orgasms just aren't messy enough. <</if>>
+ $He would love to show off $slaves[$i].slaveName's copious loads, but $slaves[$i].slaveName<<if $slaves[$i].dick == 0>> doesn't have a dick.<<elseif $slaves[$i].balls == 0>>'s not producing cum. <<else>>'s orgasms just aren't messy enough. <</if>>
<</if>>
<</if>>
<<elseif $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder.">>
+ <<setLocalPronouns $slaves[$i] 2>>
<<if $slaves[$i].bellyPreg >= 5000>>
- She makes sure $slaves[$i].slaveName's growing pregnancy is well taken care of, even if it means driving away potential customers away when the mother-to-be needs a rest.
+ $He makes sure $slaves[$i].slaveName's growing pregnancy is well taken care of, even if it means driving away potential customers away when the mother-to-be needs a rest.
<<set $madamCashBonus -= 0.05>>
<<elseif canGetPregnant($slaves[$i])>>
- She makes sure to play off $slaves[$i].slaveName's fame and fertility by enticing potential customers to be the one to claim her womb by filling it with their child.
+ $He makes sure to play off $slaves[$i].slaveName's fame and fertility by enticing potential customers to be the one to claim _his2 womb by filling it with their child.
<<set $madamCashBonus += 0.15>>
<<else>>
- She would love to play off of $slaves[$i].slaveName's fame and fertility, but unfortunately she <<if $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 1500>>is already pregnant and not far enough along to show it<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 5000>>already pregnant, but not enough to be exciting<<else>>is unable to get knocked up<</if>>.
+ $He would love to play off of $slaves[$i].slaveName's fame and fertility, but unfortunately _he2 <<if $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 1500>>is already pregnant and not far enough along to show it<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 5000>>already pregnant, but not enough to be exciting<<else>>is unable to get knocked up<</if>>.
<</if>>
<</if>>
<</for>>
@@ -203,12 +195,12 @@
<<if (_DL+$slavesGettingHelp < 5)>>
<<set $i = _FLs>> /* apply following SA passages to facility leader */
<<if $showEWD != 0>>
- <br> She <<include "SA whore">>
+ <br> $He <<include "SA whore">>
<<else>>
<<silently>><<include "SA whore">><</silently>>
<</if>>
<<set _seed = $cash-_oldCash, $cash += Math.trunc(0.5*_seed), _seed = Math.trunc(1.5*_seed), _profits += _seed>>
- <br> Since she doesn't have enough whores to manage to keep her busy, she sees $beauty customers herself (<<print Math.trunc($beauty/7)>> a day), earning you @@.yellowgreen;<<print cashFormat(_seed)>>@@. She can charge more for her time, since many citizens find it erotic to fuck the Madam.
+ <br> Since $he doesn't have enough whores to manage to keep $him busy, $he sees $beauty customers $himself (<<print Math.trunc($beauty/7)>> a day), earning you @@.yellowgreen;<<print cashFormat(_seed)>>@@. $He can charge more for $his time, since many citizens find it erotic to fuck the Madam.
<</if>>
<</if>>
<<if (_DL > 0)>><br><br><</if>>
@@ -295,6 +287,7 @@
<<set _oldCash = $cash>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$BrothiIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i]>>
<<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].broodmother == 0) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
<<set $legendaryWombID = $slaves[$i].ID>>
<</if>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 45f29855436762a558998f13cc2b6beb438221a6..caaa84eda15e963115a48f5128616e01b2e06b65 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -11,6 +11,7 @@
<<if ($Wardeness != 0)>>
<<set _FLs = $slaveIndices[$Wardeness.ID]>>
+ <<setLocalPronouns $Wardeness>>
<<if ($slaves[_FLs].health < -80)>>
<<set $slaves[_FLs].health += 20>>
@@ -49,95 +50,77 @@
<<= SlaveFullName($Wardeness)>> is serving as the Wardeness.
<<if $Wardeness.relationship == -3 && $Wardeness.devotion > 50>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
- As your wife, she tries her best to break the disobedient slaves to your will.
+ As your wife, $he tries $his best to break the disobedient slaves to your will.
<</if>>
<<if (_FLsFetish == 1)>>
- One day she demands obedience. The next day she strikes a slave when it isn't given. The next, she seems more excited than embarrassed when beating a prisoner. Soon, she's looking for an excuse to punish. She's @@.pink;become more of a sadist.@@
+ One day $he demands obedience. The next day $he strikes a slave when it isn't given. The next, $he seems more excited than embarrassed when beating a prisoner. Soon, $he's looking for an excuse to punish. $He's @@.pink;become more of a sadist.@@
<<elseif (_FLsFetish == 2)>>
- Being not only allowed but encouraged to get off while punishing prisoners @@.lightsalmon;deepens her sadism.@@
+ Being not only allowed but encouraged to get off while punishing prisoners @@.lightsalmon;deepens $his sadism.@@
<</if>>
<<if setup.wardenessCareers.includes($Wardeness.career)>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
- She has experience with detecting security issues and grinding down potential miscreants from her life before she was a slave, making her more effective.
+ $He has experience with detecting security issues and grinding down potential miscreants from $his life before $he was a slave, making $him more effective.
<<elseif $Wardeness.skillWA >= $masteredXP>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
- She has experience with detecting security issues and grinding down potential miscreants from working for you, making her more effective.
+ $He has experience with detecting security issues and grinding down potential miscreants from working for you, making $him more effective.
<<else>>
<<set $slaves[_FLs].skillWA += random(1,Math.ceil(($Wardeness.intelligence+$Wardeness.intelligenceImplant)/15) + 8)>>
<</if>>
<<if $Wardeness.fetish == "sadist">>
- She uses the prisoners to gratify her sadism, terrifying them and quickly breaking their resistance.
+ $He uses the prisoners to gratify $his sadism, terrifying them and quickly breaking their resistance.
<<elseif $Wardeness.energy > 95>>
- She is so sexually depraved that she constantly molests the prisoners, breaking them to a life of servitude.
+ $He is so sexually depraved that $he constantly molests the prisoners, breaking them to a life of servitude.
<</if>>
<<if $Wardeness.sexualFlaw == "malicious">>
<<set _devBonus++, _trustMalus += 2, _idleBonus += 2>>
- Sexual abuse of prisoners has become an end for her, not a means. She inspires her prisoners to do everything possible to qualify to get away from her, even as she slowly grinds away their interest in sex to do it.
+ Sexual abuse of prisoners has become an end for $him, not a means. $He inspires $his prisoners to do everything possible to qualify to get away from $him, even as $he slowly grinds away their interest in sex to do it.
<</if>>
<<if ($Wardeness.dick > 2) && (canPenetrate($Wardeness))>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
- Her molestation of the prisoners is more varied and effective because she has a dick to fuck them with.
+ $His molestation of the prisoners is more varied and effective because $he has a dick to fuck them with.
<</if>>
<<if ($Wardeness.muscles > 35)>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
- She is strong enough to restrain anyone that tries anything with her own hands.
+ $He is strong enough to restrain anyone that tries anything with $his own hands.
<</if>>
<<if ($Wardeness.devotion > 95)>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
- Her devotion to you is so absolute that she sees breaking bitches for your service as a noble calling.
+ $His devotion to you is so absolute that $he sees breaking bitches for your service as a noble calling.
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$CellBiIDs[_dI]]>>
<<if $Wardeness.rivalryTarget == $slaves[$i].ID>>
- She greatly enjoys breaking her <<if $Wardeness.rivalry == 1>>growing rival<<elseif $Wardeness.rivalry == 2>>rival<<elseif $Wardeness.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName's will.
+ $He greatly enjoys breaking $his <<print rivalryTerm($Wardeness)>>, $slaves[$i].slaveName's will.
<<set $slaves[$i].devotion++, $slaves[$i].trust -= 3>>
<<if random(1,100) > 30>>
<<set $Wardeness.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Wardeness.relationshipTarget == $slaves[$i].ID>>
- She hates having to break her <<if $Wardeness.relationship == 1>>friend<<elseif $Wardeness.relationship == 2>>best friend<<elseif $Wardeness.relationship == 3>>friend with benefits<<elseif $Wardeness.relationship == 4>>lover<<elseif $Wardeness.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, but her devotion to you wins out in the end.
+ $He hates having to break $his <<print relationshipTerm($Wardeness)>>, $slaves[$i].slaveName, but $his devotion to you wins out in the end.
<<set $slaves[$i].devotion++, $slaves[$i].trust -= 3>>
<<if random(1,100) >= 50>>
- Her and $slaves[$i].slaveName's relationship has been shattered by these events.
+ $His and $slaves[$i].slaveName's relationship has been shattered by these events.
<<set $Wardeness.relationship = 0, $Wardeness.relationshipTarget = 0, $slaves[_FLs].relationship = 0, $slaves[_FLs].relationshipTarget = 0, $slaves[$i].relationship = 0, $slaves[$i].relationshipTarget = 0>>
<</if>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- <<if $slaves[$i].mother == $Wardeness.ID || $slaves[$i].father == $Wardeness.ID>>
- She shows her daughter $slaves[$i].slaveName no mercy, making sure she understands her place.
- <<set $slaves[$i].devotion++, $slaves[$i].trust-->>
- <<elseif $slaves[$i].ID == $Wardeness.mother>>
- She shows her mother $slaves[$i].slaveName no mercy, making sure she understands her place.
- <<set $slaves[$i].devotion++, $slaves[$i].trust-->>
- <<elseif $slaves[$i].ID == $Wardeness.father>>
- She shows her father $slaves[$i].slaveName no mercy, making sure she understands her place.
- <<set $slaves[$i].devotion++, $slaves[$i].trust-->>
- <<else>>
- <<switch areSisters($slaves[$i], $Wardeness)>>
- <<case 1>>
- She shows her twin sister $slaves[$i].slaveName no mercy, making sure she understands her place.
- <<set $slaves[$i].devotion++, $slaves[$i].trust-->>
- <<case 2>>
- She shows her sister $slaves[$i].slaveName no mercy, making sure she understands her place.
- <<set $slaves[$i].devotion++, $slaves[$i].trust-->>
- <<case 3>>
- She shows her half-sister $slaves[$i].slaveName no mercy, making sure she understands her place.
- <<set $slaves[$i].devotion++, $slaves[$i].trust-->>
- <</switch>>
- <</if>>
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He shows $his <<print relativeTerm($Wardeness.ID,$slaves[$i].ID)>> $slaves[$i].slaveName no mercy, making sure _he2 understands _his2 place.
+ <<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<<elseif $Wardeness.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She shows her $slaves[$i].relation $slaves[$i].slaveName no mercy, making sure she understands her place.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He shows $his $slaves[$i].relation $slaves[$i].slaveName no mercy, making sure _he2 understands _his2 place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<</if>>
<</for>>
<<if (_DL < $cellblock)>>
<<set _seed = random(1,10)+(($cellblock-_DL)*(random(150,170)+(_idleBonus*10))), $cash += _seed>>
- <br> Since she doesn't have enough prisoners to manage to keep her busy, she works on citizens' slaves, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
+ <br> Since $he doesn't have enough prisoners to manage to keep $him busy, $he works on citizens' slaves, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<</if>>
<<if (_DL > 0)>><br><br><</if>>
<</if>>
<<if (_DL > 0)>>
- <<if (_DL == 1)>>''One slave is being confined in $cellblockName until she is willing to obey.''<<else>>''_DL slaves are being confined in $cellblockName until they are willing to obey.''<</if>>
+ <<if (_DL == 1)>>''One slave is being confined in $cellblockName until they are willing to obey.''<<else>>''_DL slaves are being confined in $cellblockName until they are willing to obey.''<</if>>
<</if>>
<<if ($Wardeness != 0)>>
@@ -178,6 +161,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$CellBiIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i]>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust >= -20)>>
<<if (($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs") ||($slaves[$i].hears == -2))>>
@@ -296,19 +280,19 @@
<<if (_softenedQuirks > 0)>>
$cellblockNameCaps's advanced compliance systems successfully softened
<<if (_softenedQuirks == 1)>>
- one slave's mental flaw into an @@.green;appealing quirk,@@ though the constant correction caused her @@.mediumorchid;considerable anguish.@@
+ one slave's mental flaw into an @@.green;appealing quirk,@@ though the constant correction caused them @@.mediumorchid;considerable anguish.@@
<<else>>
_softenedQuirks slaves' mental flaws into @@.green;appealing quirks,@@ though the constant correction caused them @@.mediumorchid;considerable anguish.@@
<</if>>
<</if>>
<<if (_brokenSlaves > 0)>>
<<if (_brokenSlaves == 1)>>
- One slave is now willing to @@.hotpink;do as she's told@@ and has been released.
+ One slave is now willing to @@.hotpink;do as they're told@@ and has been released.
<<else>>
_brokenSlaves slaves are now willing to @@.hotpink;do as they're told@@ and have been released.
<</if>>
<<if $cellblockDecoration != "standard">>
- <br><br> $cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on <<if _brokenSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ imprisoned.
+ <br><br> $cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on them while they were@@ imprisoned.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 754f86b6470447f7f89d6460adef367acd6ccf48..068ce849760a5adf6f19a283f9efafe5054ffe60 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -39,39 +39,40 @@
<</if>>
<</if>>
<<set $Nurse = $slaves[_FLs]>>
+ <<setLocalPronouns $Nurse>>
<<= SlaveFullName($Nurse)>> is serving as the clinical nurse.
<<if $Nurse.relationship == -3 && $Nurse.devotion > 50>>
- She does her best to be a caring and nurturing wife.
+ $He does $his best to be a caring and nurturing wife.
<<set _healthBonus += 2>>
<</if>>
<<if (_FLsFetish == 1)>>
- Her job involves giving naked sex slaves orders for their own good. Even though most of these commands are medical rather than sexual, she can be forgiven for not always seeing the difference, and @@.lightsalmon;becomes more dominant.@@
+ $His job involves giving naked sex slaves orders for their own good. Even though most of these commands are medical rather than sexual, $he can be forgiven for not always seeing the difference, and @@.lightsalmon;becomes more dominant.@@
<<elseif (_FLsFetish == 2)>>
- Every new patient in the clinic is a new target for her authority. @@.lightsalmon;She becomes more dominant.@@
+ Every new patient in the clinic is a new target for $his authority. @@.lightsalmon;$He becomes more dominant.@@
<</if>>
<<if setup.nurseCareers.includes($Nurse.career)>>
- She has experience with medicine from her life before she was a slave, and can often recognize conditions before even the medical scanners can.
+ $He has experience with medicine from $his life before $he was a slave, and can often recognize conditions before even the medical scanners can.
<<set _idleBonus++, _healthBonus++>>
<<elseif $Nurse.skillNU >= $masteredXP>>
- She has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can.
+ $He has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can.
<<set _idleBonus++, _healthBonus++>>
<<else>>
<<set $slaves[_FLs].skillNU += random(1,Math.ceil(($Nurse.intelligence+$Nurse.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Nurse.fetish == "dom")>>
- She raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions.
+ $He raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions.
<<set _idleBonus++, _healthBonus++>>
<</if>>
<<if ($Nurse.muscles > 5)>>
- She's strong enough to gently but firmly restrain resistant slaves, allowing her to be sparing with the inescapable but less healthy restraints.
+ $He's strong enough to gently but firmly restrain resistant slaves, allowing $him to be sparing with the inescapable but less healthy restraints.
<<set _idleBonus++>>
<</if>>
<<if ($Nurse.intelligence+$Nurse.intelligenceImplant > 50)>>
- The diagnostic equipment is state-of-the-art, but she's smart and perceptive enough that on occasion, she can add meaningfully to its medical scans.
+ The diagnostic equipment is state-of-the-art, but $he's smart and perceptive enough that on occasion, $he can add meaningfully to its medical scans.
<<set _idleBonus++, _healthBonus++>>
<</if>>
<<if ($Nurse.face > 40)>>
- Patients rarely object to seeing her gorgeous face hovering over them.
+ Patients rarely object to seeing $his gorgeous face hovering over them.
<<set _idleBonus++, _devBonus++>>
<</if>>
<<if ($Nurse.muscles > 5) || ($slaves[_FLs].devotion >= 60)>>
@@ -80,51 +81,36 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$CliniciIDs[_dI]]>>
<<if $Nurse.rivalryTarget == $slaves[$i].ID>>
- She purposefully neglects the needs of her <<if $Nurse.rivalry == 1>>growing rival<<elseif $Nurse.rivalry == 2>>rival<<elseif $Nurse.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, hindering her recovery and deepening their dislike for each other.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He purposefully neglects the needs of $his <<print rivalryTerm($Nurse)>>, $slaves[$i].slaveName, hindering _his2 recovery and deepening their dislike for each other.
<<set $slaves[$i].devotion--, $slaves[$i].trust--, $slaves[$i].health -= 3>>
<<if random(1,100) > 65>>
<<set $Nurse.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Nurse.relationshipTarget == $slaves[$i].ID>>
- She dedicates most of her attention to her <<if $Nurse.relationship == 1>>friend<<elseif $Nurse.relationship == 2>>best friend<<elseif $Nurse.relationship == 3>>friend with benefits<<elseif $Nurse.relationship == 4>>lover<<elseif $Nurse.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making sure she has everything she needs and more. This lavish attention detracts from her overall effectiveness.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He dedicates most of $his attention to $his <<print relationshipTerm($Nurse)>>, $slaves[$i].slaveName, making sure _he2 has everything _he2 needs and more. This lavish attention detracts from $his overall effectiveness.
<<set _idleBonus -= 3, $slaves[$i].devotion++, $slaves[$i].trust++, $slaves[$i].health += 3>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- <<if $slaves[$i].mother == $Nurse.ID || $slaves[$i].father == $Nurse.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<elseif $slaves[$i].ID == $Nurse.mother>>
- She makes sure to spend extra time caring for her mother, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<elseif $slaves[$i].ID == $Nurse.father>>
- She makes sure to spend extra time caring for her father, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<else>>
- <<switch areSisters($slaves[$i], $Nurse)>>
- <<case 1>>
- She makes sure to spend extra time caring for her twin sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<case 2>>
- She makes sure to spend extra time caring for her sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<case 3>>
- She makes sure to spend extra time caring for her half-sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <</switch>>
- <</if>>
+ $He makes sure to spend extra time caring for $his <<print relativeTerm($Nurse.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName.
+ <<set $slaves[$i].trust++, $slaves[$i].health++>>
<<elseif $Nurse.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She makes sure to spend extra time caring for her $slaves[$i].relation, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $his $slaves[$i].relation, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<</if>>
<<switch $slaves[$i].prestigeDesc>>
<<case "She is a famed Free Cities whore, and commands top prices.">>
- She does her best to aid the famous whore, $slaves[$i].slaveName, making sure to pay special attention to her worn holes.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He does $his best to aid the famous whore, $slaves[$i].slaveName, making sure to pay special attention to _his2 worn holes.
<<set $slaves[$i].health += 2>>
<<case "She is a famed Free Cities slut, and can please anyone.">>
- She does her best to aid the famous entertainer, $slaves[$i].slaveName, making sure she can show off as soon as possible.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He does $his best to aid the famous entertainer, $slaves[$i].slaveName, making sure _he2 can show off as soon as possible.
<<set $slaves[$i].health += 2>>
<<case "She is remembered for winning best in show as a cockmilker.">>
+ <<setLocalPronouns $slaves[$i] 2>>
<<if ($slaves[$i].balls > 4) && ($slaves[$i].dick != 0)>>
- She does her best to aid the dribbling $slaves[$i].slaveName, paying special attention to her huge cock and balls as well as making sure to milk her erect dick hourly.
+ $He does $his best to aid the dribbling $slaves[$i].slaveName, paying special attention to _his2 huge cock and balls as well as making sure to milk _his2 <<if canAchieveErection($slaves[$i])>>erect <</if>>dick hourly.
<<set $slaves[$i].health += 4>>
<<if (random(1,100) > 65) && (($Nurse.fetish == "none") || ($Nurse.fetish == "cumslut"))>>
<<if $Nurse.fetish == "none">>
@@ -135,8 +121,9 @@
<</if>>
<</if>>
<<case "She is remembered for winning best in show as a dairy cow.">>
+ <<setLocalPronouns $slaves[$i] 2>>
<<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
- She does her best to aid the leaking $slaves[$i].slaveName, paying special attention to her huge breasts as well as making sure to milk her hourly.
+ $He does $his best to aid the leaking $slaves[$i].slaveName, paying special attention to _his2 huge breasts as well as making sure to milk _him2 hourly.
<<set $slaves[$i].health += 4>>
<<if (random(1,100) > 65) && (($Nurse.fetish == "none") || ($Nurse.fetish == "boobs"))>>
<<if $Nurse.fetish == "none">>
@@ -147,18 +134,20 @@
<</if>>
<</if>>
<<case "She is remembered for winning best in show as a breeder.">>
+ <<setLocalPronouns $slaves[$i] 2>>
<<if $slaves[$i].bellyPreg >= 1500>>
- She does her best to aid the pregnant $slaves[$i].slaveName, paying special attention to her swollen belly and the welfare of the life within.
+ $He does $his best to aid the pregnant $slaves[$i].slaveName, paying special attention to _his2 swollen belly and the welfare of the life within.
<<set $slaves[$i].health += 6>>
<<elseif $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>>
- She does her best to aid the breeder $slaves[$i].slaveName, paying special attention to her fertility and reproductive organs.
+ $He does $his best to aid the breeder $slaves[$i].slaveName, paying special attention to _his2 fertility and reproductive organs.
<<set $slaves[$i].health += 4>>
<<else>>
- She lays out plans on how to restore the breeder $slaves[$i].slaveName to her former gravid glory.
+ $He lays out plans on how to restore the breeder $slaves[$i].slaveName to _his2 former gravid glory.
<</if>>
<</switch>>
<<if $slaves[$i].bellyImplant > -1 && $clinicInflateBelly == 1>>
- <br>''@@.pink;$slaves[$i].slaveName@@'' spent a lot of time during the week under IV-like stands with bags of inert filler steadily flowing into her belly implant, slowly pushing her belly further and further out. Careful attention, along with several drug injections, were used to make sure her body was able to safely adjust to the implant's rapid growth.
+ <<setLocalPronouns $slaves[$i] 2>>
+ <br>''@@.pink;$slaves[$i].slaveName@@'' spent a lot of time during the week under IV-like stands with bags of inert filler steadily flowing into _his2 belly implant, slowly pushing _his2 belly further and further out. Careful attention, along with several drug injections, were used to make sure _his2 body was able to safely adjust to the implant's rapid growth.
<<set $slaves[$i].bellyImplant += 5000, $slaves[$i].health -= 10>>
<<if ($slaves[$i].devotion > 50)>>
<<set $slaves[$i].devotion += 4, $slaves[$i].trust += 3>>
@@ -169,11 +158,12 @@
<</if>>
<<if $slaves[$i].bellyImplant > ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000)>>
<<set $slaves[$i].bellyImplant = ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000)>>
- She is filled to the maximum that her implant can stand.
+ _He2 is filled to the maximum that _his2 implant can stand.
<</if>>
<</if>>
<<if $slaves[$i].pregKnown == 1 && $slaves[$i].preg < 40 && $slaves[$i].pregControl == "speed up">>
- <br>''@@.pink;$slaves[$i].slaveName@@'' spends most of her time on bedrest being filled with rapid gestation agents and concentrated slave food. All she can do is <<if $slaves[$i].amp != 1 && canSee($slaves[$i])>>watch and feel her belly pushing further and further out with life<<elseif $slaves[$i].amp != 1>>watch her belly bulging further and further out with life<<elseif !canSee($slaves[$i])>>feel her belly pushing further and further out with life beneath her fingers<<else>>feel the every growing pressure inside her abdomen<</if>>. Careful attention, along with numerous drug injections, are used to make sure her body is able to safely adjust to her pregnancy's rapid growth.
+ <<setLocalPronouns $slaves[$i] 2>>
+ <br>''@@.pink;$slaves[$i].slaveName@@'' spends most of _his2 time on bedrest being filled with rapid gestation agents and concentrated slave food. All _he2 can do is <<if $slaves[$i].amp != 1 && canSee($slaves[$i])>>watch and feel _his2 belly pushing further and further out with life<<elseif $slaves[$i].amp != 1>>watch _his2 belly bulging further and further out with life<<elseif !canSee($slaves[$i])>>feel _his2 belly pushing further and further out with life beneath _his2 fingers<<else>>feel the every growing pressure inside _his2 abdomen<</if>>. Careful attention, along with numerous drug injections, are used to make sure _his2 body is able to safely adjust to _his2 pregnancy's rapid growth.
<<set $slaves[$i].health -= 10>>
<<if ($slaves[$i].devotion > 50)>>
<<set $slaves[$i].devotion += 2, $slaves[$i].trust += 1>>
@@ -184,16 +174,16 @@
<</if>>
<<if $slaves[$i].preg >= 35 && $slaves[$i].pregControl == "speed up">>
<<set $slaves[$i].pregControl = "none">>
- ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of her womb, ''@@.yellow;her course of rapid gestation agents is finished''.
+ ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of _his2 womb, ''@@.yellow;_his2 course of rapid gestation agents is finished''.
<</if>>
<<elseif $slaves[$i].preg > 2 && $slaves[$i].pregKnown == 0>>
- During her tests, she discovers that $slaves[$i].slaveName @@.lime;is pregnant.@@
+ During $his tests, $he discovers that $slaves[$i].slaveName @@.lime;is pregnant.@@
<<set $slaves[$i].pregKnown = 1>>
<</if>>
<</for>>
<<if (_DL < $clinic)>>
<<set _seed = random(1,10)+(($clinic-_DL)*(random(150,170)+(_idleBonus*10))), $cash += _seed>>
- <br> Since she doesn't have enough girls to occupy all her time, the clinic takes in citizens' slaves on a contract basis and she helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
+ <br> Since $he doesn't have enough girls to occupy all $his time, the clinic takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<</if>>
<<if (_DL > 0)>><br><br><</if>>
<</if>>
@@ -240,6 +230,8 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$CliniciIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i]>>
+
<<if $slaves[$i].devotion < 45>>
<<set $slaves[$i].devotion += 4>>
<</if>>
@@ -275,7 +267,7 @@
<<elseif ($Nurse != 0) && ($slaves[$i].pregKnown == 1) && ($clinicSpeedGestation >= 0 || $slaves[$i].pregControl == "speed up")>>
<<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))>>
<<else>>
- <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' has been returned to health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>, so @@.yellow;her assignment has defaulted to rest.@@
+ <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' has been returned to health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>, so @@.yellow;$his assignment has defaulted to rest.@@
<<= removeJob($slaves[$i], "get treatment in the clinic")>>
<<set _restedSlaves++, _dI--, _DL-->>
<<continue>>
@@ -329,7 +321,7 @@
<</if>>
been returned to @@.green;health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>@@ and will be released from the clinic before the end of the week.
<<if $clinicDecoration != "standard">>
- <br><br> $clinicNameCaps's $clinicDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ getting treatment.
+ <br><br> $clinicNameCaps's $clinicDecoration atmosphere @@.hotpink;had an impact on them while they were@@ getting treatment.
<</if>>
<</if>>
<<if _DL > 0 || $Nurse != 0>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 35580c91c68aaaa6cae9d475c23f8739f032a562..f59e5d9fc85a71e25f28742be6692f5e25acef67 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -46,22 +46,23 @@
/% Make sure we have registered living expenses as for any other slave %/
<<run getSlaveStatisticData($DJ, $facility.club)>>
<<set $DJ = $slaves[_FLs]>>
+ <<setLocalPronouns $DJ>>
<<= SlaveFullName($DJ)>> is performing as the DJ.
<<if $DJ.relationship == -3 && $DJ.devotion > 50>>
- She tries her best to be your energetic, cheerful wife.
+ $He tries $his best to be your energetic, cheerful wife.
<<set $DJRepBonus += 0.1>>
<</if>>
<<if (_FLsFetish == 1)>>
- She's expected to be the innovative, beautiful DJ spinning beats one minute, and come out of her booth to grind on the floor the next; she enjoys the interplay, and finds greater @@.lightcoral;pleasure in exhibitionism.@@
+ $He's expected to be the innovative, beautiful DJ spinning beats one minute, and come out of $his booth to grind on the floor the next; $he enjoys the interplay, and finds greater @@.lightcoral;pleasure in exhibitionism.@@
<<elseif (_FLsFetish == 2)>>
- Every day she gets to enjoy hundreds of stares on her skin, and @@.lightsalmon;becomes more of an exhibitionist.@@
+ Every day $he gets to enjoy hundreds of stares on $his skin, and @@.lightsalmon;becomes more of an exhibitionist.@@
<</if>>
<<if $DJ.eyes == -2>>
- Her lack of eyesight doesn't slow her down; rather, it strengthens her other senses. Her tracks have a distinct sound, since she experiences noise as her sight.
+ $His lack of eyesight doesn't slow $him down; rather, it strengthens $his other senses. $His tracks have a distinct sound, since $he experiences noise as $his sight.
<<set $DJRepBonus += 0.15>>
<</if>>
<<if ($DJ.entertainSkill <= 10)>>
- Though $DJ.slaveName does her best to lead on the club, with her lack of skill she can do little.
+ Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little.
<<elseif ($DJ.entertainSkill <= 30)>>
$DJ.slaveName's basic skills marginally @@.green;improve@@ the atmosphere on $clubName.
<<set $DJRepBonus += 0.05>>
@@ -76,22 +77,22 @@
<<set $DJRepBonus += 0.20>>
<</if>>
<<if ($DJ.muscles > 5) && ($DJ.muscles <= 95)>>
- Her toned body helps her lead her fellow club girls by letting her dance all night.
+ $His toned body helps $him lead $his fellow club girls by letting $him dance all night.
<<set $DJRepBonus += 0.05>>
<</if>>
<<if ($DJ.intelligence+$DJ.intelligenceImplant > 15)>>
- She's smart enough to make an actual contribution to the music, greatly enhancing the entire experience.
+ $He's smart enough to make an actual contribution to the music, greatly enhancing the entire experience.
<<set $DJRepBonus += 0.05*Math.floor(($DJ.intelligence+$DJ.intelligenceImplant)/32)>>
<</if>>
<<if ($DJ.face > 95)>>
- Her great beauty is a further draw, even when she's in her DJ booth, but especially when she comes out to dance.
+ $His great beauty is a further draw, even when $he's in $his DJ booth, but especially when $he comes out to dance.
<<set $DJRepBonus += 0.05>>
<</if>>
<<if setup.DJCareers.includes($DJ.career)>>
- She has musical experience from her life before she was a slave, a grounding that gives her tracks actual depth.
+ $He has musical experience from $his life before $he was a slave, a grounding that gives $his tracks actual depth.
<<set $DJRepBonus += 0.05>>
<<elseif $DJ.skillDJ >= $masteredXP>>
- She has musical experience from working for you, giving her tracks actual depth.
+ $He has musical experience from working for you, giving $his tracks actual depth.
<<set $DJRepBonus += 0.05>>
<<else>>
<<set $slaves[_FLs].skillDJ += random(1,Math.ceil(($DJ.intelligence+$DJ.intelligenceImplant)/15) + 8)>>
@@ -110,7 +111,7 @@
<<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].entertainSkill >= 100) && ($slaves[_FLs].devotion > 50)>>
<<set $legendaryEntertainerID = $slaves[_FLs].ID>>
<</if>>
- <br> Since she doesn't have enough sluts in $clubName to make it worthwhile for her to be on stage 24/7, she spends her extra time slutting it up herself. She has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
+ <br> Since $he doesn't have enough sluts in $clubName to make it worthwhile for $him to be on stage 24/7, $he spends $his extra time slutting it up $himself. $He has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
<<if $showEWD != 0>>
<br> She <<include "SA serve the public">>
<<else>>
@@ -197,6 +198,7 @@
<<if (_DL > 0)>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$ClubiIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i]>>
<<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50)>>
<<set $legendaryEntertainerID = $slaves[$i].ID>>
<</if>>
diff --git a/src/uncategorized/concubineSelect.tw b/src/uncategorized/concubineSelect.tw
index de211911a9a0d7986670809168f0fa6bfae53c95..7ba78201cccf6746fbb3c2760165367ebfc7e824 100644
--- a/src/uncategorized/concubineSelect.tw
+++ b/src/uncategorized/concubineSelect.tw
@@ -3,7 +3,8 @@
<<set $nextButton = "Back", $nextLink = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Concubine">>
<<showallAssignmentFilter>>
<<if ($Concubine != 0)>>
- ''__@@.pink;<<= SlaveFullName($Concubine)>>@@__'' is serving as your Concubine.<br><br>She will take the lead in seeing to your pleasure.
+ <<setLocalPronouns $Concubine>>
+ ''__@@.pink;<<= SlaveFullName($Concubine)>>@@__'' is serving as your Concubine.<br><br>$He will take the lead in seeing to your pleasure.
<<else>>
You have not selected a Concubine.
<</if>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 07e98448df9e852feb196b30347d29abbddf3914..8208a5b8ff1f088f87e3b8410bb9f2993b833bae 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -26,7 +26,8 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<</if>>
<<if ($Milkmaid != 0) && ($dairyRestraintsSetting == 2)>>
- $Milkmaid.slaveName has been removed from her position as Milkmaid, since an industrialized dairy automates her duties.
+ <<setLocalPronouns $Milkmaid>>
+ $Milkmaid.slaveName has been removed from $his position as Milkmaid, since an industrialized dairy automates $his duties.
<<= removeJob($Milkmaid, "be the Milkmaid")>>
<br><br>
<</if>>
@@ -40,8 +41,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if $dairyPregSettingChanged == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
+ <<setLocalPronouns $slaves[_i]>>
<<if ($slaves[_i].vagina > -1) && ($slaves[_i].vagina < 3)>>
- $slaves[_i].slaveName's milking machine ejects her, since it cannot fit the mandated dildo into her tight cunt.
+ $slaves[_i].slaveName's milking machine ejects $him, since it cannot fit the mandated dildo into $his tight cunt.
<<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
@@ -51,7 +53,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $slaves[_i].reservedChildren = 0>>
<<set $slaves[_i].reservedChildrenNursery = 0>>
<<if (($slaves[_i].broodmother > 0) || ($slaves[_i].bellyImplant != -1))>>
- $slaves[_i].slaveName's milking machine ejects her, since it detected a foreign body in her womb blocking its required functions.
+ $slaves[_i].slaveName's milking machine ejects $him, since it detected a foreign body in $his womb blocking its required functions.
<<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
@@ -76,8 +78,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if $dairyStimulatorsSettingChanged == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
+ <<setLocalPronouns $slaves[_i]>>
<<if ($slaves[_i].anus < 3)>>
- $slaves[_i].slaveName's milking machine ejects her, since it cannot fit its massive anal dildo up her tight asshole.
+ $slaves[_i].slaveName's milking machine ejects $him, since it cannot fit its massive anal dildo up $his tight asshole.
<<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
@@ -88,7 +91,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<else>>
they begin to struggle wildly. As the constant assrape that will define their existences for the foreseeable future begins in earnest, their wriggling
<</if>>
- gradually diminishes as each slave is exhausted and slumps within her restraints. The machines take no notice, and continue the relentless sodomy.<br><br>
+ gradually diminishes as each slave is exhausted and slumps within their restraints. The machines take no notice, and continue the relentless sodomy.<br><br>
<<elseif $dairyStimulatorsSettingChanged == -1>>
In unison, the milking machines withdraw their gargantuan dildos from the slaves' loosened anuses.
<<if $dairyFeedersSetting < 2>>
@@ -102,8 +105,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if $dairyRestraintsSetting == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
+ <<setLocalPronouns $slaves[_i]>>
<<if ($slaves[_i].indentureRestrictions >= 2)>>
- $slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from restraint for milking.
+ $slaves[_i].slaveName's milking machine declines to restrain $him, since $he is encoded as an indentured servant protected from restraint for milking.
<<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
@@ -117,8 +121,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if $dairyRestraintsSetting == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
+ <<setLocalPronouns $slaves[_i]>>
<<if ($slaves[_i].indentureRestrictions >= 1)>>
- $slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from being restrained for milking.
+ $slaves[_i].slaveName's milking machine declines to restrain $him, since $he is encoded as an indentured servant protected from being restrained for milking.
<<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
@@ -502,15 +507,16 @@ $dairyNameCaps
<<set $Flag = 2>>
<<include "Slave Summary">>
<<if canAchieveErection($Milkmaid) && $Milkmaid.pubertyXY == 1>>
+ <<setLocalPronouns $Milkmaid>>
<br>
<<if $milkmaidImpregnates == 1>>
- Keeping the cows pregnant is part of her job. [[Order her to stop impregnating|Dairy][$milkmaidImpregnates = 0]]
+ Keeping the cows pregnant is part of $his job. <<link "Order $him to stop impregnating" "Dairy">><<set $milkmaidImpregnates = 0>><</link>>
<<elseif $seePreg != 0>>
- She could be directed to keep the cows pregnant herself. [[Order her to impregnate|Dairy][$milkmaidImpregnates = 1]]
+ $He could be directed to keep the cows pregnant $himself. << "Order $him to impregnate" "Dairy">><<set $milkmaidImpregnates = 1>><</link>>
<</if>>
<</if>>
<<elseif $dairyRestraintsSetting > 1>>
- //Current milking machine settings make a Milkmaid superfluous by replacing her duties with automation//
+ //Current milking machine settings make a Milkmaid superfluous by replacing their duties with automation//
<<else>>
You do not have a slave serving as a Milkmaid. [[Appoint one|Milkmaid Select]]
<</if>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index bf3f5577a580dc0b4ac47d6339883112845c5be1..7110c79c8ebe10ec7fd1aec9f1d360407f63408f 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -13,6 +13,81 @@
<<if ($Milkmaid != 0)>>
<<set _FLs = $slaveIndices[$Milkmaid.ID]>>
+ <<set _milkmaidImpregnated = 0, _milkers = 0, _cummers = 0, _breeders = 0, _prostateStim = 0>>
+
+ <<if (_DL > 0)>>
+ <<for _dI = 0; _dI < _DL; _dI++>>
+ <<set _i = $slaveIndices[$DairyiIDs[_dI]]>>
+ <<if $slaves[_i].lactation > 0>>
+ <<set _milkers++>>
+ <</if>>
+ <<if $slaves[_i].balls > 0 && $slaves[_i].ballType == "human">>
+ <<set _cummers++>>
+ <</if>>
+ <<if ($slaves[_i].bellyPreg >= 500 && $dairyPregSetting > 0)>>
+ <<set _breeders++>>
+ <</if>>
+ <<if ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>>
+ <<if (canImpreg($slaves[_i], $Milkmaid))>>
+ <<set $slaves[_i].preg = 1, $slaves[_i].pregSource = $Milkmaid.ID, $slaves[_i].pregKnown = 1, $slaves[_i].pregWeek = 1, _milkmaidImpregnated++>>
+ <<if $slaves[_i].mpreg == 1>>
+ <<set $slaves[_i].analCount += 10, $analTotal += 10>>
+ <<else>>
+ <<ser $slaves[_i].vaginalCount += 10, $vaginalTotal += 10>>
+ <</if>>
+ <<set $slaves[_i].pregType = setPregType($slaves[_i])>>
+ <<set WombImpregnate($slaves[_i], $slaves[_i].pregType, $Milkmaid.ID, 1)>>
+ <</if>>
+ <</if>>
+ /* how much effort the MM must take to force a slave into a stall */
+ <<if $slaves[_i].devotion <= 20>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].trust < 20>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].muscles >= 30>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].weight >= 70>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].weight >= 160>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].boobs >= 20000>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].balls >= 30>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].belly >= 5000>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if !canWalk($slaves[_i])>> /* big bonus if they can't move themselves and are fat as cows */
+ <<if $slaves[_i].weight >= 70>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <<if $slaves[_i].weight >= 160>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <<if $slaves[_i].boobs >= 20000>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <<if $slaves[_i].balls >= 30>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <<if $slaves[_i].belly >= 5000>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <</if>>
+ <<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid)) && _prostateStim != 1>>
+ <<if ($slaves[_i].balls > 0) && ($slaves[_i].prostate > 0)>>
+ <<set _prostateStim = 1>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <</if>>
<<if $slaves[_FLs].health < 90>>
<<set $slaves[_FLs].curatives = 2>>
@@ -38,109 +113,87 @@
<<set $slaves[_FLs].livingRules = "luxurious">>
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
- <<if $slaves[_FLs].fetish != "boobs">>
- <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">>
+ <<if _milkers >= _cummers && _milkers >= _breeders>>
+ <<if $slaves[_FLs].fetish != "boobs">>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
+ <</if>>
+ <<elseif _cummers >= _breeders>>
+ <<if $slaves[_FLs].fetish != "cumslut">>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
+ <<set _FLsFetish = 3, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "cumslut">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 3, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 4, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <<elseif $slaves[_FLs].fetishKnown == 0>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
<<else>>
- <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
+ <<if $slaves[_FLs].fetish != "pregnancy">>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
+ <<set _FLsFetish = 5, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "pregnancy">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 5, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 6, $slaves[_FLs].fetishStrength += 4>>
+ <</if>>
<</if>>
<</if>>
<<run getSlaveStatisticData($Milkmaid, $facility.dairy)>>
<<set $Milkmaid = $slaves[_FLs], $i = _FLs>>
+ <<setLocalPronouns $Milkmaid>>
<<= SlaveFullName($Milkmaid)>> is serving as your Milkmaid.
<<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>>
<<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
- She tries her best to be your perfect farmwife.
+ $He tries $his best to be your perfect farmwife.
<</if>>
- <<if (_DL > 0) && ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>>
- <<set _milkmaidImpregnated = 0>>
- <<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
- <<if (canImpreg($slaves[$i], $Milkmaid))>>
- <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Milkmaid.ID, $slaves[$i].pregKnown = 1, $slaves[$i].pregWeek = 1, _milkmaidImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>>
- <<set $slaves[$i].pregType = setPregType($slaves[$i])>>
- <<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $Milkmaid.ID, 1)>>
- <</if>>
- <</for>>
- <<if _milkmaidImpregnated > 0>>
- It's her responsibility to keep her charges pregnant, and she constantly
- <<if _milkmaidImpregnated == 1>>
- breeds the one fertile cow.
- <<else>>
- fills the _milkmaidImpregnated cows' cunts with her cum.
- <</if>>
- <<if $Milkmaid.career == "a breeding bull">>
- She was conditioned to fill empty wombs, so she takes a @@.hotpink;deep pleasure@@ in her job.
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <<set _Tmult = (_milkmaidImpregnated * 10), $slaves[_FLs].penetrativeCount += _Tmult, $Milkmaid.penetrativeCount += _Tmult, $penetrativeTotal += _Tmult>>
- <<set $slaves[_FLs].need = 0>>
+ <<if _milkmaidImpregnated > 0>>
+ It's $his responsibility to keep $his charges pregnant, and $he constantly
+ <<if _milkmaidImpregnated == 1>>
+ breeds the one fertile cow.
+ <<else>>
+ fills the _milkmaidImpregnated cows' cunts with $his cum.
<</if>>
+ <<if $Milkmaid.career == "a breeding bull">>
+ $He was conditioned to fill empty wombs, so $he takes a @@.hotpink;deep pleasure@@ in $his job.
+ <<set $slaves[_FLs].devotion++>>
+ <<elseif ($Milkmaid.fetish == "pregnancy" && $Milkmaid.fetishKnown == 1)>>
+ $He has a pregnancy fetish, so $he finds $his job @@.hotpink;quite enjoyable,@@ especially when $he gets to watch the cows swell with $his children.
+ <<set $slaves[_FLs].devotion += Math.ceil($slaves[_FLs].fetishStrength/25)>>
+ <<set $slaves[_FLs].fetishStrength += 2>>
+ <</if>>
+ <<set _Tmult = (_milkmaidImpregnated * 10), $slaves[_FLs].penetrativeCount += _Tmult, $Milkmaid.penetrativeCount += _Tmult, $penetrativeTotal += _Tmult>>
+ <<set $slaves[_FLs].need = 0>>
<</if>>
<<if (_FLsFetish == 1)>>
- In her line of work, she touches more breasts than even you do. She lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when she touches their creamy nipples. She has @@.lightcoral;become more of a breast girl.@@
+ In $his line of work, $he touches more breasts than even you do. $He lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when $he touches their creamy nipples. $He has @@.lightcoral;become more of a breast $girl.@@
<<elseif (_FLsFetish == 2)>>
- It's a hard life, pulling teats and washing cows, but it does @@.lightsalmon;make her more of a breast fetishist.@@
+ It's a hard life, pulling teats and washing cows, but it does @@.lightsalmon;make $him more of a breast fetishist.@@
+ <<elseif (_FLsFetish == 3)>>
+ In $his line of work, $he touches more dicks and balls than most sluts. $He lives in an atmosphere of constant orgasm and ejaculation; of girls who shudder and moan when $he touches their engorged members. $He has @@.lightcoral;become more of a cum $girl.@@
+ <<elseif (_FLsFetish == 4)>>
+ It's a hard life, cupping balls, cleaning dicks, and observing semen quality, but it does @@.lightsalmon;make $him more of a cum fetishist.@@
+ <<elseif (_FLsFetish == 5)>>
+ In $his line of work, $he fondles more pregnancies than most clinics. $He lives in an atmosphere of swollen, hanging, baby-filled bellies; of girls who shudder and moan when $he runs $his hands across their bellies. $He has @@.lightcoral;grown a taste for girls laden with child.@@
+ <<elseif (_FLsFetish == 6)>>
+ It's a hard life, washing bellies and inspecting pussies, but it does @@.lightsalmon;make $him more of a pregnancy fetishist.@@
<</if>>
<<if ($Milkmaid.muscles > 30)>>
<<set $milkmaidHealthBonus++>>
- Her muscles help her handle the fattest or most reluctant cow.
- <</if>>
- <<if $dairyRestraintsSetting != 2>> /* how much effort the MM must take to force a slave into a stall */
- <<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
- <<if $slaves[$i].devotion <= 20>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[$i].trust < 20>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[$i].muscles >= 30>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[$i].weight >= 70>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[$i].weight >= 160>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[$i].boobs >= 20000>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[$i].balls >= 30>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[$i].belly >= 5000>>
- <<set _MMWorkout++>>
- <</if>>
- <<if !canWalk($slaves[$i])>> /* big bonus if they can't move themselves and are fat as cows */
- <<if $slaves[$i].weight >= 70>>
- <<set _MMWorkout += 2>>
- <</if>>
- <<if $slaves[$i].weight >= 160>>
- <<set _MMWorkout += 2>>
- <</if>>
- <<if $slaves[$i].boobs >= 20000>>
- <<set _MMWorkout += 2>>
- <</if>>
- <<if $slaves[$i].balls >= 30>>
- <<set _MMWorkout += 2>>
- <</if>>
- <<if $slaves[$i].belly >= 5000>>
- <<set _MMWorkout += 2>>
- <</if>>
- <</if>>
- <</for>>
+ $His muscles help $him handle the fattest or most reluctant cow.
<</if>>
<<if (_MMWorkout > random(1,30)) && $Milkmaid.muscles < 60>>
- Constantly having to wrestle unruly or aiding heavy cows into their stalls forces her to @@.lime;build muscle.@@
+ Constantly having to wrestle unruly or aiding heavy cows into their stalls forces $him to @@.lime;build muscle.@@
<<set $slaves[_FLs].muscles++>>
<</if>>
<<if ($Milkmaid.oralSkill > 30)>>
- Her skilled tongue helps her keep her girls happy.
+ $His skilled tongue helps $him keep $his girls happy.
<</if>>
<<if ($Milkmaid.oralSkill < 90)>>
<<set $skillIncrease = 3>>
@@ -148,88 +201,67 @@
<</if>>
<<if ($Milkmaid.sexualQuirk == "caring")>>
<<set $milkmaidTrustBonus++>>
- She's very caring, and does her best to get the cows to trust her.
+ $He's very caring, and does $his best to get the cows to trust $him.
<</if>>
<<if ($Milkmaid.behavioralQuirk == "funny")>>
<<set $milkmaidTrustBonus++>>
- She's funny, and does her best to get the cows to trust her by keeping them laughing.
+ $He's funny, and does $his best to get the cows to trust $him by keeping them laughing.
<</if>>
<<if setup.milkmaidCareers.includes($Milkmaid.career)>>
<<set $milkmaidHealthBonus++>>
- She has career experience dealing with milk animals.
+ $He has career experience dealing with milk animals.
<<elseif $Milkmaid.skillMM >= $masteredXP>>
<<set $milkmaidHealthBonus++>>
- She has experience dealing with milk animals from working for you.
+ $He has experience harvesting slave products from working for you.
<<else>>
<<set $slaves[_FLs].skillMM += random(1,Math.ceil(($Milkmaid.intelligence+$Milkmaid.intelligenceImplant)/15) + 8)>>
<</if>>
- <<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>>
- <<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
- <<if ($slaves[$i].balls > 0) && ($slaves[$i].prostate > 0)>>
- She uses her turgid cock to give prostate stimulation to slaves that need help ejaculating.
- <<set $slaves[_FLs].need -= 50>>
- <<break>>
- <</if>>
- <</for>>
+ <<if _prostateStim == 1>>
+ $He uses $his turgid cock to give prostate stimulation to slaves that need help ejaculating.
+ <<set $slaves[_FLs].need -= 50>>
<</if>>
<<set $milkmaidDevotionThreshold += (5*$milkmaidDevotionBonus), $milkmaidTrustThreshold += (5*$milkmaidTrustBonus)>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if $Milkmaid.rivalryTarget == $slaves[$i].ID>>
- She either neglects or harasses her <<if $Milkmaid.rivalry == 1>>growing rival<<elseif $Milkmaid.rivalry == 2>>rival<<elseif $Milkmaid.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, making sure she is unhappy and uncomfortable.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He either neglects or harasses $his <<print rivalryTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure _he2 is unhappy and uncomfortable.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<<if random(1,100) > 65>>
<<set $Milkmaid.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Milkmaid.relationshipTarget == $slaves[$i].ID>>
- She dotes over her <<if $Milkmaid.relationship == 1>>friend<<elseif $Milkmaid.relationship == 2>>best friend<<elseif $Milkmaid.relationship == 3>>friend with benefits<<elseif $Milkmaid.relationship == 4>>lover<<elseif $Milkmaid.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making sure she is happy and comfortable.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He dotes over $his <<print relationshipTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure _he2 is happy and comfortable.
<<set $slaves[$i].devotion++, $slaves[$i].trust++>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- <<if $slaves[$i].mother == $Milkmaid.ID || $slaves[$i].father == $Milkmaid.ID>>
- She pays special attention to her daughter, $slaves[$i].slaveName, making sure she is well kept and happy.
- <<set $slaves[$i].trust++>>
- <<elseif $slaves[$i].ID == $Milkmaid.mother>>
- She pays special attention to her mother, $slaves[$i].slaveName, making sure she is well kept and happy.
- <<set $slaves[$i].trust++>>
- <<elseif $slaves[$i].ID == $Milkmaid.father>>
- She pays special attention to her father, $slaves[$i].slaveName, making sure she is well kept and happy.
- <<set $slaves[$i].trust++>>
- <<else>>
- <<switch areSisters($slaves[$i], $Milkmaid)>>
- <<case 1>>
- She pays special attention to her twin sister, $slaves[$i].slaveName, making sure she is well kept and happy.
- <<set $slaves[$i].trust++>>
- <<case 2>>
- She pays special attention to her sister, $slaves[$i].slaveName, making sure she is well kept and happy.
- <<set $slaves[$i].trust++>>
- <<case 3>>
- She pays special attention to her half-sister, $slaves[$i].slaveName, making sure she is well kept and happy.
- <<set $slaves[$i].trust++>>
- <</switch>>
- <</if>>
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He pays special attention to $his <<print relativeTerm($Milkmaid.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure _he2 is well kept and happy.
+ <<set $slaves[$i].trust++>>
<<elseif $Milkmaid.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she is well kept and happy.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He pays special attention to $his $slaves[$i].relation, $slaves[$i].slaveName, making sure _he2 is well kept and happy.
<<set $slaves[$i].trust++>>
<</if>>
<<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a dairy cow.">>
<<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
- She spends extra time with $slaves[$i].slaveName, the well-known cow. She is fascinated by $slaves[$i].slaveName's massive $slaves[$i].boobs cc breasts and spends extra time massaging and kneading them to maximize production.
+ $He spends extra time with $slaves[$i].slaveName, the well-known cow. $He is fascinated by $slaves[$i].slaveName's massive $slaves[$i].boobs cc breasts and spends extra time massaging and kneading them to maximize production.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<else>>
- She is disappointed that the well-known cow $slaves[$i].slaveName<<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>>'s breasts have shrunken considerably from their heyday.<</if>>
+ $He is disappointed that the well-known cow $slaves[$i].slaveName<<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>>'s breasts have shrunken considerably from their heyday.<</if>>
<</if>>
<</if>>
<<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">>
<<if (($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>>
- She spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
+ $He spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. $He can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<else>>
- She is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>>
+ $He is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>>
<</if>>
<</if>>
<<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder." && $slaves[$i].bellyPreg >= 1500>>
- She spends extra time with $slaves[$i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable.
+ <<setLocalPronouns $slaves[$i] 2>>
+ $He spends extra time with $slaves[$i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by _his2 growing pregnancy and popular womb. $He makes sure _his2 belly and its occupants are nice and comfortable.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<</if>>
<</for>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index d08f0cc1ad2443dd115bf83a3d27e1283fdf5b42..f41b90ca756b2481cd545c623e747575ef8dc8d0 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -1262,13 +1262,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<replace "#result">>
You send your personal VTOL bird to the shop for some immediate and very expensive modifications to its cargo and passenger area. Since this will take several days, you stall the supplicants.
<<if $PAidTarget == "volleyballTeam">>
- A few of the girls decide to leave, but the sight of them pushed against the wall of a nearby building, toned bodies glistening with sweat and seed as their captors rape them into submission, keep the rest happy to stay on the bus. Those that remained
- <<else>>
- Their situation isn't truly dire yet, and they can wait. They
- <</if>>
- are extremely grateful, though they would be less hopeful if they knew the true nature of the aircraft coming to retrieve them.
- <<if $PAidTarget == "volleyballTeam">>
- A few of the girls decide to leave, but watching them pushed against the wall of a nearby building, toned bodies glistening with sweat and seed as their captors rape them into submission, keep the rest happy to stay on the bus. Those that remained
+ A few of the girls decide to leave, but the sight of them pushed against the wall of a nearby building, toned bodies glistening with sweat and seed as their captors rape them into submission, keep the rest happy to stay on the bus. Those that remained
<<else>>
Their situation isn't truly dire yet, and they can wait. They
<</if>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index c8a9e955591c2a6bd7ef6bdbfa8692737766e674..249aa596877391854f1364dc818bf484200ac2e3 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -213,6 +213,9 @@
<<if $slaves[_i].pornTypeMasochist > 0>><<set $pornStarMasochists++>><</if>>
<<if $slaves[_i].pornTypePregnancy > 0>><<set $pornStarPregnancySluts++>><</if>>
<</if>>
+ <<if $slaves[_i].choosesOwnAssignment > 0>>
+ <<= assignJob($slaves[_i], "choose her own job")>>
+ <</if>>
<</for>>
<<if _slavesContributing != 0>>
<<set $averageTrust = $averageTrust/_slavesContributing>>
@@ -354,6 +357,7 @@
<</if>>
<<if $boomerangWeeks>><<set $boomerangWeeks++>><<else>><<set $boomerangSlave = 0>><</if>>
+<<if $traitorWeeks>><<set $traitorWeeks++>><</if>>
<<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
<<set $thisWeeksIllegalWares = $merchantIllegalWares.randomMany(1)>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index aced0544a0cbdb5b8752ed96cd6e1ad1fdf116bf..56222536143b7fbef83b8d6106d4c7bcefc3f8ac 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -2,6 +2,43 @@
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $daughtersVictory = 1>>
+<<if $traitor != 0>>
+ <<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
+
+ <<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+ <<set WombUpdatePregVars($traitor)>>
+ <<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+ <<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <</if>>
+ <<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
+
+ <<if $traitor.bald != 1>>
+ <<if ($traitor.hLength < 150)>>
+ <<set $traitor.hLength += _weeks>>
+ <</if>>
+ <</if>>
+ <<if $seeAge != 0>>
+ <<for _weeks > 0>>
+ <<set $traitor.birthWeek++>>
+ <<if $traitor.birthWeek >= 52>>
+ <<set $traitor.birthWeek = 0>>
+ <<if $seeAge == 1>>
+ <<set $traitor.physicalAge += 1, $traitor.actualAge += 1, $traitor.visualAge += 1>>
+ <<set $traitor.ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>>
+ <<if $traitor.physicalAge <= 18 && $loliGrow == 0>>
+ <<PhysicalDevelopment $traitor>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set _weeks-->>
+ <</for>>
+ <</if>>
+<</if>>
+
You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup. The Daughters of Liberty have more sympathizers in the arcology than even you suspected, and they're well armed and have the element of surprise. <<if $arcologies[0].FSRomanRevivalistLaw == 1>>$arcologies[0].name, however, is home to a society that cannot be surprised, for each and every one of its citizens is armed and trained for instant contribution to the defense of Rome. Even as you do your best to reestablish control, you hear a thunderous, ubiquitous roar from all around you. Your citizens are already getting into the fight.<</if>>
<br><br>
diff --git a/src/uncategorized/pCoupCollaboration.tw b/src/uncategorized/pCoupCollaboration.tw
index ea6b13c5a107d55016be6f3d2acd5913fa1994ad..2c9b37a9b7255213c8e0a01684d1f241f639a081 100644
--- a/src/uncategorized/pCoupCollaboration.tw
+++ b/src/uncategorized/pCoupCollaboration.tw
@@ -1,10 +1,41 @@
-:: P coup collaboration
+:: P coup collaboration [nobr]
+
+<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
+<<setLocalPronouns $traitor>>
+<<run Enunciate($traitor)>>
+
+<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+<<set WombUpdatePregVars($traitor)>>
+<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+<<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+<</if>>
+<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by an odd darkness. All the normal lights of your healthy arcology are out. Main power has gone out, and you claw your way in the darkness to the video feeds, running on emergency backup.
-Armed rebels are running unchecked down the corridors. <<if $mercenaries > 0>>Your mercenaries' quarters is locked down, but from the interior feeds you can see a few of them lying in their beds or slumped in chairs as gas is pumped through the ventilation systems. <</if>>The security drones are actively assisting the rebels. You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
+<br><br>
+
+Armed rebels are running unchecked down the corridors. <<if $mercenaries > 0>>Your mercenaries' quarters is locked down, but from the interior feeds you can see a few of them lying in their beds or slumped in chairs as gas is pumped through the ventilation systems. <</if>>The security drones are actively assisting the rebels. You can see
+<<if $traitor.bellyPreg >= 100000>>
+ the staggeringly pregnant
+<<elseif $traitor.bellyPreg >= 15000>>
+ the heavily pregnant
+<<elseif $traitor.bellyPreg >= 10000>>
+ the very pregnant
+<<elseif $traitor.bellyPreg >= 5000>>
+ the pregnant
+<</if>>
+$traitor.slaveName on one of the feeds, encouraging $his fellow fighters with yells, and when that fails, leading them by example. In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
+
+<br><br>
+
+After half an hour of watching the executions, $traitor.slaveName <<if $traitor.bellyPreg >= 10000>>waddles<<else>>strides<</if>> confidently into your office. You greet $him by name, in response to which $he deals you a vicious open-handed slap that knocks you out of your chair. <<if $traitor.slaveName != $traitor.birthName>>"My name," $he <<say>>s, "i<<s>> <<if SlaveStatsChecker.checkForLisp($traitor)>><<= lispReplace($traitor.birthName)>><<else>>$traitor.birthName<</if>>."<<else>>"You <<s>>tupid fuck," $he <<say>>s.<</if>> Your cause of death is that of many an oppressor - an aneurysm of the cerebellum, in 9mm Parabellum.
-After half an hour of watching the executions, $traitor.slaveName strides confidently into your office. You greet her by name, in response to which she deals you a vicious open-handed slap that knocks you out of your chair. <<if $traitor.slaveName != $traitor.birthName>>"My name," she says, "is $traitor.birthName."<<else>>"You stupid fuck," she says.<</if>> Your cause of death is that of many an oppressor - an aneurysm of the cerebellum, in 9mm Parabellum.
+<br><br>
''GAME OVER''
diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw
index b5aa478051617d75f0f9b3b6242c3c3f1f842e95..7ed6d5372076dd639ddb2105a879da99d8cf7050 100644
--- a/src/uncategorized/pCoupLoss.tw
+++ b/src/uncategorized/pCoupLoss.tw
@@ -1,11 +1,41 @@
-:: P coup loss
+:: P coup loss [nobr]
+
+<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
+<<setLocalPronouns $traitor>>
+
+<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+<<set WombUpdatePregVars($traitor)>>
+<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+<<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+<</if>>
+<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by another, and another, and then the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup.
-<<if $mercenaries > 0>>Sheets of flame are pouring from your mercenaries' quarters; it seems they were among the first targets for bombs. <</if>>Heavy gunfire is bringing down security drones by the scores. The attackers seem to have figured out where the drone hangars are, and are laying down fire on the exits the drones must use to get into action. <<if $traitor != 0>>You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. <</if>> In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua - zzzt -" There is nothing more from the computer systems.<</if>>
+<br><br>
+
+<<if $mercenaries > 0>>Sheets of flame are pouring from your mercenaries' quarters; it seems they were among the first targets for bombs. <</if>>Heavy gunfire is bringing down security drones by the scores. The attackers seem to have figured out where the drone hangars are, and are laying down fire on the exits the drones must use to get into action. <<if $traitor != 0>>You can see
+<<if $traitor.bellyPreg >= 100000>>
+ the staggeringly pregnant
+<<elseif $traitor.bellyPreg >= 15000>>
+ the heavily pregnant
+<<elseif $traitor.bellyPreg >= 10000>>
+ the very pregnant
+<<elseif $traitor.bellyPreg >= 5000>>
+ the pregnant
+<</if>>
+$traitor.slaveName on one of the feeds, encouraging $his fellow fighters with yells, and when that fails, leading them by example<<if $traitor.bellyPreg >= 15000>> as best $he can<</if>>. <</if>> In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua - zzzt -" There is nothing more from the computer systems.<</if>>
+
+<br><br>
<<if $traitor != 0>>If this were a movie, $traitor.slaveName would be the one to kill you after a desperate struggle in your office. Reality does not have such a refined sense of drama. <</if>>If the Daughters had any plans to take you alive, they are lost to the exigencies of combat. Your penthouse remains locked down, forcing them to use breaching charges to make an entrance. These prove entirely too effective, and your last impression is of the floor heaving bodily up toward the ceiling.
+<br><br>
+
''GAME OVER''
<<set $ui = "start">>
diff --git a/src/uncategorized/pTraitorMessage.tw b/src/uncategorized/pTraitorMessage.tw
index 5769db4e381d8bed19a96bf2e32b1fedb564b5a0..377cc4d96a3d7d855e014f3145a4bfbd6500b379 100644
--- a/src/uncategorized/pTraitorMessage.tw
+++ b/src/uncategorized/pTraitorMessage.tw
@@ -1,9 +1,67 @@
:: P traitor message [nobr]
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Random Nonindividual Event">>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
+<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 1>>
+<<setLocalPronouns $traitor>>
-The month after freeing $traitor.slaveName, you receive another message from the Daughters of Liberty. This one contains a video. It shows $traitor.slaveName sitting quietly at a table, wearing comfortable clothes and eating a nice meal. She looks a little bewildered, but there's an obvious happiness to her, it's impossible to deny. She seems unaware she's being recorded.
+/* ------------------ pregnancy setup start here----------------- */
+
+<<if $traitor.preg > 0>>
+ <<set _wasPreg = 1>>
+<<else>>
+ <<set _wasPreg = 0>>
+<</if>>
+
+<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+<<set WombUpdatePregVars($traitor)>>
+<<if $traitor.broodmother > 0>> /* Broodmother implant is assumed as removed.*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 37), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0, $traitor.broodmother == 0, $traitor.broodmotherFetuses = 0>>
+ <<set WombFlush($traitor)>>
+<<elseif WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+<<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+<</if>>
+<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
+
+<<if $traitor.preg > 0>>
+ <<set _isPreg = 1>>
+<<else>>
+ <<set _isPreg = 0>>
+<</if>>
+
+/* ------------------ pregnancy setup end here-----------------
+ As no broodmother cases in code below, it's no need to setup every case of impregnation through new system. Backup mechanic will do it for normal pregnancies.
+*/
+
+<<if $traitor.hStyle == "shaved">>
+ <<set $traitor.hStyle = "strip">>
+<</if>>
+<<if $traitor.bald != 1>>
+ <<if ($traitor.hLength < 150)>>
+ <<set $traitor.hLength += _weeks>>
+ <</if>>
+<</if>>
+<<if $seeAge != 0>>
+ <<for _weeks > 0>>
+ <<set $traitor.birthWeek++>>
+ <<if $traitor.birthWeek >= 52>>
+ <<set $traitor.birthWeek = 0>>
+ <<if $seeAge == 1>>
+ <<set $traitor.physicalAge += 1, $traitor.actualAge += 1, $traitor.visualAge += 1>>
+ <<set $traitor.ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>>
+ <<if $traitor.physicalAge <= 18 && $loliGrow == 0>>
+ <<PhysicalDevelopment $traitor>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set _weeks-->>
+ <</for>>
+<</if>>
+
+The month after freeing $traitor.slaveName, you receive another message from the Daughters of Liberty. This one contains a video. It shows $traitor.slaveName sitting quietly at a table<<if _wasPreg != _isPreg>>, no longer clearly pregnant<</if>>, wearing comfortable clothes and eating a nice meal. $He looks a little bewildered, but there's an obvious happiness to $him, it's impossible to deny. $He seems unaware $he's being recorded.
<br><br>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index c273651108e12a2a79e553bb5efe9fea1c6310cb..c843c1aec773588c0538e0719e121dc00e488c01 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -2,11 +2,14 @@
<<set $nextButton = " ", $nextLink = "Random Nonindividual Event">> /* hide button until user makes a selection */
-<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.amp != 1 && s.devotion < 75 && canTalk(s) && ["whore", "serve the public", "serve in the club", "work in the brothel"].includes(s.assignment); })>>
+<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 75 && s.trust < 75 && s.indunture == -1 && canWalk(s) && canTalk(s) && ["whore", "serve the public", "serve in the club", "work in the brothel"].includes(s.assignment); })>>
<<if (ndef $activeSlave)>> /* search again without assignments limitation */
- <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.amp != 1 && s.devotion < 75 && canTalk(s); })>>
- <<if (ndef $activeSlave)>> /* still no match */
- <<set $activeSlave = $slaves.random()>>
+ <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 75 && s.trust < 75 && s.indunture == -1 && canTalk(s); })>>
+ <<if (ndef $activeSlave)>> /* we will find one */
+ <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 20 && canTalk(s); })>>
+ <<if (ndef $activeSlave)>> /* still no match */
+ <<set $activeSlave = $slaves.random()>>
+ <</if>>
<</if>>
<</if>>
@@ -63,7 +66,7 @@ This is disturbing, to say the least. After close investigation, it appears some
<br><br>
<<run Enunciate($activeSlave)>>
-You call $activeSlave.slaveName in and politely inquire as to whether she knows anything about the matter. She nearly flees in terror, but gathers her courage and
+You call $activeSlave.slaveName in and politely inquire as to whether $he knows anything about the matter. $He nearly flees in terror, but gathers $his courage and
<<if !canTalk($activeSlave)>>
gestures meekly
<<elseif ($activeSlave.lips > 70)>>
@@ -73,9 +76,9 @@ You call $activeSlave.slaveName in and politely inquire as to whether she knows
<<else>>
mumbles meekly
<</if>>
-that several nondescript citizens she sees occasionally at work have passed a few messages to her. Apparently, they simply asked whether she wished to be free. Asked whether she does in fact wish to be free, she
+that several nondescript citizens $he sees occasionally at work have passed a few messages to $him. Apparently, they simply asked whether $he wished to be free. Asked whether $he does in fact wish to be free, $he
<<if !canTalk($activeSlave)>>
- shakily gestures an apology, and admits that she does.
+ shakily gestures an apology, and admits that $he does.
<<else>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
lisps faintly,
@@ -91,14 +94,16 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<link "Free $him">> /* do not set $nextLink to AS Dump for this option because we call Remove activeSlave */
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- You calmly inform $him that $he's free to go. $He almost collapses with shock, but turns and hurries out of the arcology, tears streaming from her eyes. $He wanders down through the arcology, attracting little notice. One moment the monitors have her struggling through a dense-packed crowd, and the next, they don't.
+ You calmly inform $him that $he's free to go. $He almost collapses with shock, but turns and hurries out of the arcology, tears streaming from $his eyes. $He wanders down through the arcology, attracting little notice. One moment the monitors have $him struggling through a dense-packed crowd, and the next, they don't.
<<if $activeSlave.relationship > 0>>
<<set $i = $slaveIndices[$activeSlave.relationshipTarget]>>
<<set $activeSlave.relationshipTarget = 0, $activeSlave.relationship = 0>>
<<if def $i>><<set $slaves[$i].relationshipTarget = 0, $slaves[$i].relationship = 0>><<else>>@@.red;Error, relationshipTarget not found.@@<</if>>
<</if>>
+ <<set $taitorWeeks = 1>>
<<set $traitor = clone($activeSlave)>>
<<set $traitor.assignment = "rest">>
+ <<set $traitor.inflation = 0, $traitor.inflationType = "none", $traitor.inflationMethod = 0, SetBellySize($traitor)>>
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: [], traitorBody: 0}>>
<<if $familyTesting == 1>>
<<if $traitor.ID == $PC.pregSource>>
@@ -165,7 +170,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<br><<link "Tell $him to ignore the Daughters in the future">>
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- $activeSlave.slaveName almost @@.mediumorchid;faints with relief@@ when it becomes apparent you aren't going to punish her for speaking of freedom. All attempts to use your monitoring systems to find the citizens who contacted her fail; it seems their ability to corrupt your systems is considerable. @@.mediumorchid;Whispers of freedom@@ run like wildfire amongst your slaves.
+ $activeSlave.slaveName almost @@.mediumorchid;faints with relief@@ when it becomes apparent you aren't going to punish $him for speaking of freedom. All attempts to use your monitoring systems to find the citizens who contacted $him fail; it seems their ability to corrupt your systems is considerable. @@.mediumorchid;Whispers of freedom@@ run like wildfire amongst your slaves.
<<set $activeSlave.devotion -= 15>>
<<run $slaves.forEach(function(s) { s.devotion -= 10; })>>
<</replace>>
@@ -173,14 +178,14 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<br><<link "Publicly flog $him for treasonous conversation">>
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- You announce that a treasonous slave will be publicly flogged. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and secured to a post. You do your duty; the one that passes the sentence should swing the lash. The ordeal is long and bloody. The populace understand the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The effect on $activeSlave.slaveName's health @@.red;is serious,@@ and she is @@.gold;terrified of failing you again.@@
+ You announce that a treasonous slave will be publicly flogged. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and secured to a post. You do your duty; the one that passes the sentence should swing the lash. The ordeal is long and bloody. The populace understand the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The effect on $activeSlave.slaveName's health @@.red;is serious,@@ and $he is @@.gold;terrified of failing you again.@@
<<set $activeSlave.health -= 30, $activeSlave.trust -= 15, $rep -= 500>>
<</replace>>
<</link>>
<br><<link "Chemically lobotomize $him to extirpate any record of the incident">>
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- You inform $activeSlave.slaveName that she is to return to her duties, which she does, mystified. Later in the day she finds herself scheduled for surgery, and meekly goes. As she feels the cool touch of the injector, loaded with powerful chemical lobotomizing agents, she looks up at the camera above the auto-surgery with a hint of resigned apology in her eyes. When she is released from the surgery's care a few hours later, the hint is gone. @@.red;As is everything.@@
+ You inform $activeSlave.slaveName that $he is to return to $his duties, which $he does, mystified. Later in the day $he finds herself scheduled for surgery, and meekly goes. As $he feels the cool touch of the injector, loaded with powerful chemical lobotomizing agents, $he looks up at the camera above the auto-surgery with a hint of resigned apology in $his eyes. When $he is released from the surgery's care a few hours later, the hint is gone. @@.red;As is everything.@@
<<set $activeSlave.fetish = "mindbroken">>
<</replace>>
<</link>>
@@ -188,7 +193,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<br><<link "Publicly execute $him">>
<<set $nextButton = "Continue", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- You announce that a treasonous slave will be publicly executed. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and <<if $arcologies[0].FSAztecRevivalist !== "unset">>has her heart cut out of her living body<<elseif $arcologies[0].FSEdoRevivalist !== "unset">>is boiled alive<<elseif $arcologies[0].FSRomanRevivalist !== "unset">>is crucified and left hanging until she perishes<<else>>is summarily hanged<</if>>. The populace understands the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The surviving slaves are @@.gold;terrified@@ at the display, but at least you can be sure they will remember the price of failing you.
+ You announce that a treasonous slave will be publicly executed. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and <<if $arcologies[0].FSAztecRevivalist !== "unset">>has $his heart cut out of $his living body<<elseif $arcologies[0].FSEdoRevivalist !== "unset">>is boiled alive<<elseif $arcologies[0].FSRomanRevivalist !== "unset">>is crucified and left hanging until $he perishes<<else>>is summarily hanged<</if>>. The populace understands the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The surviving slaves are @@.gold;terrified@@ at the display, but at least you can be sure they will remember the price of failing you.
<<set $rep -= 500>>
<<run $slaves.forEach(function(s) { s.trust -= 10 + random(10); })>>
<<include "Remove activeSlave">>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index ad035343b1e7395cf3209307d365d3eb505fdc68..89e222f462a30a380819cbd0c44eb572e825abbf 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -59,7 +59,10 @@
<</if>> /* closes no nicknames option */
<</if>> /* CLOSES FUCKDOLL CHECK */
-
+
+ <<if $week >= 10 >>
+ <<set $events.push("P associates public slut")>>
+ <</if>>
<<set $legendaryFacility = 1>>
<<if $legendaryWhoreID != 0>>
<<set $events.push("RE legendary whore")>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 2b0c2fde6ec6ede34f7809aec6044c5693dd9309..8f8d65e0c981b4fe401566b13367a2422fb28fe9 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -1,4 +1,5 @@
:: RE FSEgyptianRevivalist acquisition [nobr]
+
/* Written and coded by Boney M */
<<set $nextButton = "Continue">>
@@ -35,17 +36,17 @@
<<if ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>><<set $activeSlave.balls = random(1,5)>><</if>>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
-
+<br><br>
This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. In this case, however, the story is more unusual - the callers seem stressed, but otherwise normal. They haltingly and quietly explain, with many nervous glances off-camera to ensure they are not overheard, that they are both siblings and lovers, and their attempts to keep the truth of the nature of their relationship from their friends, family, and society at large have failed. They had heard of $arcologies[0].name's reverence for incestuous relationships, and have managed to talk themselves into the questionable conclusion that their only chance to be together was for them to sell themselves to someone who would not just accept but encourage their incest - namely, you.
-
+<br><br>
//Enslaving them will cost <<print cashFormat($contractCost)>>. Selling them immediately will bring in approximately <<print cashFormat($slaveCost*2)>>.//
-
-<<include "Long Slave Description">>\
-
+<br><br>
+<<include "Long Slave Description">>
+<br><br>
<span id="result">
-<<if $cash >= $contractCost>>\
+<<if $cash >= $contractCost>>
[[Enslave the pair|RE FSEgyptianRevivalist acquisition workaround][$sibling = $activeSlave, $cash -= ($contractCost)]]
-<<else>>\
+<<else>>
//You lack the necessary funds to enslave them.//
-<</if>>\
+<</if>>
</span>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 20af77d09a9e9ae70f15d8c0bde1449e8314a75a..cfbd7c3159ab35f027566923912bbd270b726955 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -415,6 +415,7 @@ She waits anxiously for your decision.
<<case "twin">>
<<set $activeSlave.origin = "She was recruited into your service by her twin sister.">>
<<set $activeSlave.birthWeek = $eventSlave.birthWeek>>
+ <<set $activeSlave.actualAge = $eventSlave.actualAge>>
<</switch>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 70a86c4d097cfb1c17a2ee1866921c2812a719a4..69b834fa591ed5d33f743538e2c0ce7ee47e84b5 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -50,7 +50,7 @@
<<= assignJob($slaves[$i], "be a servant")>>
<</if>>
- <<elseif ($universalRulesAssignsSelfFacility == 1) && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45) || ($slaves[$i].sexualQuirk == "caring"))>>
+ <<elseif ($universalRulesAssignsSelfFacility == 1) && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45)) && ($slaves[$i].sexualQuirk == "caring") && $nurseryNannies > $nurserySlaves>>
<<set $slaves[$i].choosesOwnAssignmentText += " enjoys taking care of infants, so $he decides to work in $nurseryName.">>
<<= assignJob($slaves[$i], "work as a nanny")>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index b566909bf5c6473fc6ac12090acf37419d85c593..689de85b23d03107beb46eabdf0626f893bec0bc 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -974,7 +974,7 @@
<<if $showEWD == 0>>
<<silently>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ /*<<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>*/
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -984,7 +984,7 @@
<<include "SA devotion">>
<</silently>>
<<else>>
- <<= saChoosesOwnClothes($slaves[$i])>>
+ /*<<= saChoosesOwnClothes($slaves[$i])>>*/
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 03ad25b2cb359cf5e39c5c9a7294dd539b72196a..d0c578909b04a06219f3b600e1985797033d8f3a 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -527,19 +527,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
<<if $slaves[$i].relationship > 0>>
<<set $j = $slaveIndices[$slaves[$i].relationshipTarget]>>
<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
- $His
- <<if $slaves[$j].relationship <= 1>>
- friend
- <<elseif $slaves[$j].relationship <= 2>>
- best friend
- <<elseif $slaves[$j].relationship <= 3>>
- friend with benefits
- <<elseif $slaves[$j].relationship <= 4>>
- lover
- <<elseif $slaves[$j].relationship > 4>>
- slave wife
- <</if>>
- $slaves[$j].slaveName is also serving the public and they work well together.
+ $His <<print relationshipTerm($slaves[$i])>> $slaves[$j].slaveName is also serving the public and they work well together.
<</if>>
<<elseif $slaves[$i].relationship == -1>>
$He relies on citizens' desire to fuck $him for emotional support, making $him an excellent, if occasionally disturbing, slut.
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 7ac000d53db8c34b47cc226c17e7c295ac09ae7a..60d94b19e1a42b6c9bfdbcb463e6853a4e57f949 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -544,19 +544,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<<if $slaves[$i].relationship > 0>>
<<set $j = $slaveIndices[$slaves[$i].relationshipTarget]>>
<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
- $His
- <<if $slaves[$j].relationship <= 1>>
- friend
- <<elseif $slaves[$j].relationship <= 2>>
- best friend
- <<elseif $slaves[$j].relationship <= 3>>
- friend with benefits
- <<elseif $slaves[$j].relationship <= 4>>
- lover
- <<elseif $slaves[$j].relationship > 4>>
- slave wife
- <</if>>
- $slaves[$j].slaveName is also whoring, so $he earns a bit more.
+ $His <<print relationshipTerm($slaves[$i])>> $slaves[$j].slaveName is also whoring, so $he earns a bit more.
<</if>>
<<elseif $slaves[$i].relationship == -1>>
$He relies on customers' desire to fuck $him for emotional support, making $him an excellent, if occasionally disturbing, whore.
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 2df38e4a63aeba507b2f27bd33bbd7937aa173de..74ea250706aa26c1b9f783edda52aad47324faac 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -77,37 +77,17 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$SchlRiIDs[_dI]]>>
<<if $Schoolteacher.rivalryTarget == $slaves[$i].ID>>
- Ever since her <<if $Schoolteacher.rivalry == 1>>growing rival<<elseif $Schoolteacher.rivalry == 2>>rival<<elseif $Schoolteacher.rivalry == 3>>bitter rival<</if>>, was enrolled, she began stalking the classroom carrying a large paddle, much to $slaves[$i].slaveName's terror.
+ Ever since her <<print rivalryTerm($Schoolteacher)>>, was enrolled, she began stalking the classroom carrying a large paddle, much to $slaves[$i].slaveName's terror.
<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
<<if random(1,100) > 35>>
<<set $Schoolteacher.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Schoolteacher.relationshipTarget == $slaves[$i].ID>>
- She dedicates most of her attention to her <<if $Schoolteacher.relationship == 1>>friend<<elseif $Schoolteacher.relationship == 2>>best friend<<elseif $Schoolteacher.relationship == 3>>friend with benefits<<elseif $Schoolteacher.relationship == 4>>lover<<elseif $Schoolteacher.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making sure she understands that day's lesson.
+ She dedicates most of her attention to her <<print relationshipTerm($Schoolteacher)>>, $slaves[$i].slaveName, making sure she understands that day's lesson.
<<set $slaves[$i].devotion += 2, $slaves[$i].trust += 2>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- <<if $slaves[$i].mother == $Schoolteacher.ID || $slaves[$i].father == $Schoolteacher.ID>>
- She makes sure to spend extra time teaching her daughter, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++>>
- <<elseif $slaves[$i].ID == $Schoolteacher.mother>>
- She makes sure to spend extra time teaching her mother, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++>>
- <<elseif $slaves[$i].ID == $Schoolteacher.father>>
- She makes sure to spend extra time teaching her father, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++>>
- <<else>>
- <<switch areSisters($slaves[$i], $Schoolteacher)>>
- <<case 1>>
- She makes sure to spend extra time teaching her twin sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++>>
- <<case 2>>
- She makes sure to spend extra time teaching her sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++>>
- <<case 3>>
- She makes sure to spend extra time teaching her half-sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++>>
- <</switch>>
- <</if>>
+ She makes sure to spend extra time teaching her <<print relativeTerm($Schoolteacher.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName.
+ <<set $slaves[$i].trust++>>
<<elseif $Schoolteacher.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
She makes sure to spend extra time teaching her $slaves[$i].relation, $slaves[$i].slaveName.
<<set $slaves[$i].trust++>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index 866bf66c0510680bd3edb4037d00f83a5aff62fa..84fe89ee8127aece8700093b420e239c9d2e63fd 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -291,15 +291,15 @@
<<else>>
light pink, since she's an experienced sex slave.
<</if>>
- A filmy veil covers her head and shoulders.
+ A filmy veil covers her head and shoulders. Her lacy bridal bra
<<if ($activeSlave.boobs > 4000)>>
- Her lacy bridal bra is a marvel of engineering, discreetly reinforced to support her gigantic udders.
+ is a marvel of engineering, discreetly reinforced to support her gigantic udders.
<<elseif ($activeSlave.boobs > 1200)>>
- Her lacy bridal bra just barely restrains her huge boobs, leaving the tops of her areolae visible.
+ just barely restrains her huge boobs, leaving the tops of her areolae visible.
<<elseif ($activeSlave.boobs > 400)>>
- Her lacy bridal bra flatters her pretty breasts.
+ flatters her pretty breasts.
<<else>>
- Her lacy bridal bra flatters her pretty chest.
+ flatters her pretty chest.
<</if>>
<<if $activeSlave.bellyPreg >= 600000>>
Her expansive, squirming pregnant belly makes her bridal wear particularly obscene.
@@ -382,17 +382,17 @@
<<link "Give her your surname too">>
<<replace "#surnaming">>
<<set $activeSlave.slaveSurname = $PC.surname>>
- You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname.
+ You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname. The new Mrs. $activeSlave.slaveSurname hears this, of course, and
<<if $activeSlave.fetish == "mindbroken">>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and shows no reaction. Like many things, names mean nothing to her now. Your guests, on the other hand, appreciate the gift.
+ shows no reaction. Like many things, names mean nothing to her now. Your guests, on the other hand, appreciate the gift.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again. Not only is she to be blessed with your child, but she's to take your surname as well.
+ breaks down again. Not only is she to be blessed with your child, but she's to take your surname as well.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly. Just another burden for her to carry; like the child soon to be growing in her womb.
+ scoffs audibly. Just another burden for her to carry; like the child soon to be growing in her womb.
<<elseif $activeSlave.devotion < -20>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again. Not only are you binding her to you with your child, but with your name as well.
+ Tbreaks down again. Not only are you binding her to you with your child, but with your name as well.
<<else>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and nods acceptingly. Your will is her will, after all.
+ nods acceptingly. Your will is her will, after all.
<</if>>
<</replace>>
<</link>>
@@ -554,17 +554,17 @@
<<link "Give her your surname as well">>
<<replace "#surnaming">>
<<set $activeSlave.slaveSurname = $PC.surname>>
- You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname.
+ You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname. The new Mrs. $activeSlave.slaveSurname hears this, of course, and
<<if $activeSlave.fetish == "mindbroken">>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and shows no reaction. Like many things, names mean nothing to her now.
+ shows no reaction. Like many things, names mean nothing to her now.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again.
+ breaks down again.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly.
+ scoffs audibly.
<<elseif $activeSlave.devotion < -20>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again.
+ breaks down again.
<<else>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and nods acceptingly.
+ nods acceptingly.
<</if>>
<</replace>>
<</link>>
@@ -678,15 +678,15 @@
<<else>>
light pink, since she's an experienced sex slave.
<</if>>
- A filmy veil covers her head and shoulders.
+ A filmy veil covers her head and shoulders. Her lacy bridal bra
<<if ($activeSlave.boobs > 4000)>>
- Her lacy bridal bra is a marvel of engineering, discreetly reinforced to support her gigantic udders.
+ is a marvel of engineering, discreetly reinforced to support her gigantic udders.
<<elseif ($activeSlave.boobs > 1200)>>
- Her lacy bridal bra just barely restrains her huge boobs, leaving the tops of her areolae visible.
+ just barely restrains her huge boobs, leaving the tops of her areolae visible.
<<elseif ($activeSlave.boobs > 400)>>
- Her lacy bridal bra flatters her pretty breasts.
+ flatters her pretty breasts.
<<else>>
- Her lacy bridal bra flatters her pretty chest.
+ flatters her pretty chest.
<</if>>
<<if $activeSlave.bellyPreg >= 600000>>
Her expansive, squirming pregnant belly makes her bridal wear particularly obscene.
@@ -746,33 +746,33 @@
<<link "Give her your surname">>
<<replace "#surnaming">>
<<set $activeSlave.slaveSurname = $PC.surname>>
- You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname.
+ You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname. The new Mrs. $activeSlave.slaveSurname hears this, of course, and
<<if $activeSlave.fetish == "mindbroken">>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and shows no reaction. Like many things, names mean nothing to her now. Your guests, on the other hand, appreciate the gift.
+ shows no reaction. Like many things, names mean nothing to her now. Your guests, on the other hand, appreciate the gift.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again; it's like a dream come true.
+ breaks down again; it's like a dream come true.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly; just another burden for her to carry.
+ scoffs audibly; just another burden for her to carry.
<<elseif $activeSlave.devotion < -20>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again; this is nothing more than another unwanted link to you.
+ breaks down again; this is nothing more than another unwanted link to you.
<<else>>
- The new Mrs. $activeSlave.slaveSurname hears this, of course, and nods acceptingly. Your will is her will, after all.
+ nods acceptingly. Your will is her will, after all.
<</if>>
<</replace>>
<</link>>
</span>
<</if>>
- <br><br>
+ <br><br> Then, you flip her veil over her head so she can <<if $PC.dick == 1>>suck your dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> in front of your guests, as the ceremony requires. She approaches her task
<<if $activeSlave.fetish == "mindbroken">>
- Then, you flip her veil over her head so she can <<if $PC.dick == 1>>suck your dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> in front of your guests, as the ceremony requires. She approaches her task with robotic obedience. You climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She absentmindedly rests her head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle her in your arms, gazing up at you with empty eyes.
+ with robotic obedience. You climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She absentmindedly rests her head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle her in your arms, gazing up at you with empty eyes.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- Then, you flip her veil over her head so she can <<if $PC.dick == 1>>suck your dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> in front of your guests, as the ceremony requires. She approaches her task <<if ($activeSlave.fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She rests her head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle her in your arms, staring up at you.
+ <<if ($activeSlave.fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She rests her head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle her in your arms, staring up at you.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- Then, you flip her veil over her head so she can <<if $PC.dick == 1>>suck your dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> in front of your guests, as the ceremony requires. She approaches her task with apprehension, so much so that things are taking too long, so you grab her head and facefuck her instead. She gags and sputters, tears running down her cheeks, as you violate her mouth publicly. You climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She looks up at you with fearful, hate-filled eyes, blaming you for everything that has happened so far.
+ with apprehension, so much so that things are taking too long, so you grab her head and facefuck her instead. She gags and sputters, tears running down her cheeks, as you violate her mouth publicly. You climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She looks up at you with fearful, hate-filled eyes, blaming you for everything that has happened so far.
<<elseif $activeSlave.devotion < -20>>
- Then, you flip her veil over her head so she can <<if $PC.dick == 1>>suck your dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> in front of your guests, as the ceremony requires. She approaches her task with apprehension, so much so that things are taking too long, so you grab her head and facefuck her instead. She gags and sputters, tears running down her cheeks, as you violate her mouth publicly. You climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
+ with apprehension, so much so that things are taking too long, so you grab her head and facefuck her instead. She gags and sputters, tears running down her cheeks, as you violate her mouth publicly. You climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
<<else>>
- Then, you flip her veil over her head so she can <<if $PC.dick == 1>>suck your dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> in front of your guests, as the ceremony requires. She approaches her task with a will. She approaches her task <<if ($activeSlave.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She looks up at you, her eyes unsure.
+ with a will. She approaches her task <<if ($activeSlave.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She looks up at you, her eyes unsure.
<</if>>
<<if $activeSlave.relationship != 0>>
<<if $activeSlave.devotion+$activeSlave.trust >= 175>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index a22031f0ffe0c89e2b3254c8116de9e137c9ea41..e1de90ab3e088e536210467476cadab67c6af4ba 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -112,37 +112,17 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$ServQiIDs[_dI]]>>
<<if $Stewardess.rivalryTarget == $slaves[$i].ID>>
- She bears down on her <<if $Stewardess.rivalry == 1>>growing rival<<elseif $Stewardess.rivalry == 2>>rival<<elseif $Stewardess.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, forcing her to work extra hard or suffer punishment.
+ She bears down on her <<print rivalryTerm($Stewardess)>>, $slaves[$i].slaveName, forcing her to work extra hard or suffer punishment.
<<set $slaves[$i].devotion--, $slaves[$i].trust-->>
<<if random(1,100) > 65>>
<<set $Stewardess.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Stewardess.relationshipTarget == $slaves[$i].ID>>
- She dotes over her <<if $Stewardess.relationship == 1>>friend<<elseif $Stewardess.relationship == 2>>best friend<<elseif $Stewardess.relationship == 3>>friend with benefits<<elseif $Stewardess.relationship == 4>>lover<<elseif $Stewardess.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making sure she knows how to do a good job and keeping her well stocked with everything she needs.
+ She dotes over her <<print relationshipTerm($Stewardess)>>, $slaves[$i].slaveName, making sure she knows how to do a good job and keeping her well stocked with everything she needs.
<<set $slaves[$i].devotion++>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- <<if $slaves[$i].mother == $Stewardess.ID || $slaves[$i].father == $Stewardess.ID>>
- She pays special attention to her daughter, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<elseif $slaves[$i].ID == $Stewardess.mother>>
- She pays special attention to her mother, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<elseif $slaves[$i].ID == $Stewardess.father>>
- She pays special attention to her father, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<else>>
- <<switch areSisters($slaves[$i], $Stewardess)>>
- <<case 1>>
- She pays special attention to her twin sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<case 2>>
- She pays special attention to her sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<case 3>>
- She pays special attention to her half-sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <</switch>>
- <</if>>
+ She pays special attention to her <<print relativeTerm($Stewardess.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[$i].trust++>>
<<elseif $Stewardess.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[$i].trust++>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 4292c4a1db24c264ed6cc6e200ded0758ba727bd..dcec7cd499af6bf3356edc89857f2378a30d5892 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -318,17 +318,7 @@
<<if ($activeSlave.relationship > 0)>>
<<set _si = $slaveIndices[$activeSlave.relationshipTarget]>>
<<if isSlaveAvailable($slaves[_si])>>
- <<if ($activeSlave.relationship == 1)>>
- | <<link `"Fuck $him with $his friend <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeSlave.relationship == 2)>>
- | <<link `"Fuck $him with $his best friend <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeSlave.relationship == 3)>>
- | <<link `"Fuck $him with $his FWB <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeSlave.relationship == 4)>>
- | <<link `"Fuck $him with $his lover <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
- <<else>>
- | <<link `"Fuck $him with $his slave wife <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
- <</if>>
+ | <<link `"Fuck $him with $his <<print relationshipTermShort($activeSlave)>> <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
<<else>>
<<if $slaves[_si].assignment == "be your agent">>
<<if $activeSlave.broodmother < 2>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 0685dd1662f846550574d0bbdcb119e1b9f559a0..3efe499ec9467d605432d4fef90202db05c70b9b 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -657,6 +657,11 @@ will
<<else>>
| Confinement
<</if>>
+ <<if (_Slave.assignment != "choose her own job")>>
+ | <<link "Let _Slave.object choose" "Main">><<= assignJob($slaves[_ssi], "choose her own job")>><</link>>
+ <<else>>
+ | Let _Slave.object choose
+ <</if>>
<</if>> /* CLOSES FUCKDOLL CHECK */
<</if>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 0c4dae3efe4b32131af7073cd6679e9c952c5e2e..1360a445ecb56e5a68f9de673e09f5b8066d8393 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -103,44 +103,29 @@
<<set $slaves[$i].trust++>>
<</if>>
<<if $Attendant.rivalryTarget == $slaves[$i].ID>>
- She constantly harasses her <<if $Attendant.rivalry == 1>>growing rival<<elseif $Attendant.rivalry == 2>>rival<<elseif $Attendant.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
+ She constantly harasses her <<print rivalryTerm($Stewardess)>>, $slaves[$i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
<<if random(1,100) > 35>>
<<set $Attendant.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Attendant.relationshipTarget == $slaves[$i].ID>>
- She dedicates most of her attention to her <<if $Attendant.relationship == 1>>friend<<elseif $Attendant.relationship == 2>>best friend<<elseif $Attendant.relationship == 3>>friend with benefits<<elseif $Attendant.relationship == 4>>lover<<elseif $Attendant.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making her stress, both physical and mental, wash away.
+ She dedicates most of her attention to her <<print relationshipTerm($Attendant)>>, $slaves[$i].slaveName, making her stress, both physical and mental, wash away.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
- <<if $slaves[$i].mother == $Attendant.ID || $slaves[$i].father == $Attendant.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<elseif $slaves[$i].ID == $Attendant.mother>>
- She makes sure to spend extra time caring for her mother, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<elseif $slaves[$i].ID == $Attendant.father>>
- She makes sure to spend extra time caring for her father, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<else>>
- <<switch areSisters($slaves[$i], $Attendant)>>
- <<case 1>>
- She makes sure to spend extra time caring for her twin sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<case 2>>
- She makes sure to spend extra time caring for her sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <<case 3>>
- She makes sure to spend extra time caring for her half-sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust++, $slaves[$i].health++>>
- <</switch>>
- <</if>>
+ She makes sure to spend extra time caring for her <<print relativeTerm($Attendant.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName.
+ <<set $slaves[$i].trust++, $slaves[$i].health++>>
<<elseif $Attendant.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
She makes sure to spend extra time caring for her $slaves[$i].relation, $slaves[$i].slaveName.
<<set $slaves[$i].trust++>>
<</if>>
<<switch $slaves[$i].prestigeDesc>>
<<case "She is a famed Free Cities whore, and commands top prices.">>
- She does her best to relax the famous whore, $slaves[$i].slaveName, making sure to pay special attention to her worn holes.
+ She does her best to relax the famous whore, $slaves[$i].slaveName, making sure to
+ <<if $slaves[$i].vagina > 2 || $slaves[$i].anus > 2>>
+ pay special attention to her worn holes.
+ <<else>>
+ get her clean and relaxed for her next usage.
+ <</if>>
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<case "She is a famed Free Cities slut, and can please anyone.">>
She does her best to soothe the famous entertainer, $slaves[$i].slaveName, letting her relax in blissful peace.
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 8011e176237953e212cfa9e2639587ec78533c61..bbae6494e15c440442295e4f020992536b944f18 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -484,7 +484,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<case "preg1hack">>
- The hacking process is brief, being little more than inserting the actuator in $his vagina, and leaves $him with @@.red;nothing more than minor health effects@@ from the altered implant funcitons. $He leaves the surgery without any specific feeling, but $he knows that something done to $his implant.
+ The hacking process is brief, being little more than inserting the actuator into $his vagina, and leaves $him with @@.red;nothing more than minor health effects@@ from the altered implant functions. $He leaves the surgery without any specific feeling, but $he knows that something has been done to $his implant.
<<set $activeSlave.broodmotherFetuses = either(2,2,2,2,3,3,4)>> /*My testing show that 2 or 3 relatively safe for generic adult slave with effective curvatives or clinic, 4 - high risk of bursting. So there is a catch with it.*/
<<if $activeSlave.fetish == "mindbroken">>
/*nothing*/
@@ -492,14 +492,14 @@ As the remote surgery's long recovery cycle completes,
$He is @@.hotpink; filled with joy@@ about being even more swollen with life and gleefully rubs $his soon-to-be-larger belly. $He's so pleased that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.d;$his health has been slightly affected.@@
<<set $activeSlave.trust += 4, $activeSlave.devotion += 10>>
<<elseif ($activeSlave.devotion > 50)>>
- $He's @@.hotpink;grateful@@ that you think $his offspring are valuable, but is little afraid about how $his body will catch up with $his hacked implant.
+ $He's @@.hotpink;grateful@@ that you think $his offspring are valuable, but is a little afraid about how $his body will catch up with $his hacked implant.
<<set $activeSlave.devotion += 2>>
<<set $activeSlave.trust -= 2>>
<<elseif ($activeSlave.devotion >= -20)>>
$He understands the realities of $his life as a slave, so even this isn't much of a shock. $He is @@.gold;sensibly fearful@@ of your total power over $his body and how big $he will get.
<<set $activeSlave.trust -= 10>>
<<else>>
- $He does not understand the realities of $his life as a slave at a core level, so $he's @@.mediumorchid;terrified and angry@@ that you not just have forced $him to be a broodmother but also messed with the implant, not thinking about $his safety. $He is @@.gold;sensibly fearful@@ of your total power over $his body and $his even more rapidly filling womb.
+ $He does not understand the realities of $his life as a slave at a core level, so $he's @@.mediumorchid;terrified and angry@@ that you not only have forced $him to be a broodmother but also messed with the implant, with no thought for $his safety. $He is @@.gold;sensibly fearful@@ of your total power over $his body and $his even more rapidly filling womb.
<<set $activeSlave.trust -= 15, $activeSlave.devotion -= 15>>
<</if>>
@@ -2349,10 +2349,10 @@ As the remote surgery's long recovery cycle completes,
It's not immediately apparent to $him what kind of surgery $he received, since all $he's left with is a terrible nonspecific ache in $his lower belly. As with all invasive surgery @@.red;$his health has been greatly affected.@@
<<case "elasticity treatment">>
- The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his body entire body, every few inches, leaving a small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $he @@.red;feeling weak and tired.@@
+ The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his entire body, every few inches, leaving small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $him @@.red;feeling weak and tired.@@
<<case "retrograde virus injection NCS">>
- The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his body entire body, every few inches, leaving a small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $he @@.red;feeling weak and tired.@@<br><br>
+ The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his body entire body, every few inches, leaving small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $him @@.red;feeling weak and tired.@@<br><br>
/*
Generate the changes, into variables to set contexts.
*/
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index b286804204bafb8442e764a88cbca5f7ad8e569f..a991b409b80bf4c4975215e2b67f7caa536565ba 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -69,7 +69,6 @@
<<set _validOrgans = 0>>
<<for _dwi = 0; _dwi < $slaves.length; _dwi++>>
<<capture _dwi>>
- <<set $dumped = 0>>
<<set _slaveOrgans = 0>>
<<for _dwj = 0; _dwj < $completedOrgans.length; _dwj++>>
<<if ($completedOrgans[_dwj] != 0) && ($completedOrgans[_dwj].ID == $slaves[_dwi].ID)>>
@@ -108,7 +107,6 @@
<<if $limbsCompleted > 0>>
<<for _dwj = 0; _dwj < $limbs.length; _dwj++>>
<<set _validHost = 0>>
- <<set $dumped = 0>>
<<for _dwi = 0; _dwi < $slaves.length; _dwi++>>
<<set _Slave = $slaves[_dwi]>>
<<if ($limbs[_dwj] != 0) && ($limbs[_dwj].ID == _Slave.ID)>>
@@ -119,7 +117,7 @@
<</if>>
<</for>>
<<if _validHost == 0>>
- <<set $dump = $limbs.deleteAt(_dwj), _dwj-->>
+ <<set _dump = $limbs.deleteAt(_dwj), _dwj-->>
<</if>>
<</for>>
<</if>>