diff --git a/.gitignore b/.gitignore
index 53be0e9f2203e7f3232ef8cdb054cdb46d43ca2e..1fe0ce12683ec4b06928d5696d6b91969095e53c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,11 +99,8 @@ node_modules
package-lock.json
package.json
-# TODO
-TODO.txt
-
-# outlines
-*.outline
-
# misc
fc-pregmod
+*.outline
+*.todo
+TODO.txt
\ No newline at end of file
diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index f5cc80a9a679a5f29b0281c7ddf441ce36462d1e..dab52615a10d3ee0d710483e7596b0be2817d892 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -316,7 +316,7 @@ WombFlush($slave) - clean womb (array). Can be used at broodmother birthstorm or
$slave.bellyPreg = WombGetWolume($slave) - return double, with current womb volume in CC - for updating $slave.bellyPreg, or if need to update individual fetuses sizes.
-
+findFather(ID) - searchs for the ID given and returns an object or undefined
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 1b78bb6c4aaec071f813157e51fbcd0109959332..6f4fa6206917ffa298bba327b44b0343708de95c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,7 +2,15 @@
0.10.7.1-1.0.x
-11/24/2018
+11/25/2018
+
+ 3
+ -fixed an issue with csec and reservations
+
+ 2
+ -fixes
+ -more names and stuff (I think)
+ -citizen enslavements now respect subjugationist laws
1
-fixes
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 052784a3132cf48aefe9be13af1c39d6f0f1c01b..3fe7d35ca5c95dbbef267930a6da1871347f834a 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -203,7 +203,7 @@ if (typeof SlaveStatsChecker == "undefined") {
return false;
}
/* End mod section: toggle whether slaves lisp. */
- return ((slave.lips > 70) || (slave.lipsPiercing + slave.tonguePiercing > 2))
+ return ((slave.lips > 70) || (slave.lipsPiercing + slave.tonguePiercing > 2) || (slave.teeth == "gapped"))
}
};
// Raise namespace scope to Global.
@@ -1857,6 +1857,56 @@ window.getNurseryReserved = function (slaves) {
return FetusGlobalReserveCount("nursery");
}
+window.findFather = function(fatherID) {
+ let father;
+ let V = State.variables;
+
+ father = V.slaves[V.slaveIndices[fatherID]];
+ if (father === undefined) {
+ if (V.incubator > 0) {
+ father = V.tanks.find(function(s) { return s.ID == fatherID; });
+ }
+ }
+ if (father === undefined) {
+ if (V.nursery > 0) {
+ father = V.cribs.find(function(s) { return s.ID == fatherID; });
+ }
+ }
+
+ return father;
+}
+
+window.adjustFatherProperty = function(actor, property, newValue) {
+ let father = findFather(actor.ID);
+ if (father)
+ father[property] = newValue;
+}
+
+/* OLD
+window.adjustFatherProperty = function(actor, property, newValue) {
+ let V = State.variables;
+ let fatherIndex;
+
+ fatherIndex = V.slaves.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex > 0) {
+ V.slaves[fatherIndex][property] = newValue;
+ } else if (V.incubator > 0) {
+ fatherIndex = V.tanks.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex > 0) {
+ V.tanks[fatherIndex][property] = newValue;
+ }
+ }
+ if (fatherIndex === -1) {
+ if (V.nursery > 0) {
+ fatherIndex = V.cribs.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex !== -1) {
+ V.cribs[fatherIndex][property] = newValue;
+ }
+ }
+ }
+}
+*/
+
/* not to be used until that last part is defined. It may become slave.boobWomb.volume or some shit */
window.getBaseBoobs = function(slave) {
return slave.boobs-slave.boobsImplant-slave.boobsWombVolume;
@@ -7518,7 +7568,7 @@ window.inferiorRaceP = function inferiorRaceP(slave) {
window.isLeaderP = function isLeaderP(slave) {
const V = State.variables;
- const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, V.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V.Stewardess, V.Schoolteacher, V.Wardeness];
+ const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, V.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V.Farmer, V.Stewardess, V.Schoolteacher, V.Wardeness];
return leaders.some(leader => leader.ID && leader.ID === slave.ID);
};
@@ -10153,12 +10203,36 @@ window.generateGenetics = (function() {
activeMother = V.PC;
mother = V.PC;
}
- father = (actor2 > 0) ? V.genePool.find(function(s) { return s.ID == actor2; })
- : (actor2 == -1) ? V.PC
- : 0;
- activeFather = (father !== 0 && father.ID > 0) ? V.slaves[V.slaveIndices[actor2]]
- : (father !== 0 && father.ID == -1) ? V.PC
- : 0;
+ if (actor2 > 0) {
+ father = V.genePool.find(function(s) { return s.ID == actor2.ID; });
+ activeFather = V.slaves[V.slaveIndices[actor2]];
+ if (father === undefined) {
+ father = V.slaves[V.slaveIndices[actor2]];
+ activeFather = V.slaves[V.slaveIndices[actor2]];
+ }
+ if (father === undefined) {
+ if (V.incubator > 0) {
+ father = V.tanks.find(function(s) { return s.ID == actor2.ID; });
+ activeFather = 0; // activeFather = father?
+ }
+ }
+ if (father === undefined) {
+ if (V.nursery > 0) {
+ father = V.cribs.find(function(s) { return s.ID == actor2.ID; });
+ activeFather = 0; // activeFather = father?
+ }
+ }
+ if (father === undefined) {
+ father = 0;
+ activeFather = 0;
+ }
+ } else if (actor2 == -1) {
+ father = V.PC;
+ activeFather = V.PC;
+ } else {
+ father = 0;
+ activeFather = 0;
+ }
genes.gender = setGender(father);
genes.name = setName(x);
@@ -10312,7 +10386,7 @@ window.generateGenetics = (function() {
'dark olive': 14,
bronze: 13,
tan: 12,
- natural: 11,
+ tan: 11,
olive: 10,
'light olive': 9,
light: 8,
@@ -10342,6 +10416,7 @@ window.generateGenetics = (function() {
'olive',
'natural',
'tan',
+ 'tan',
'bronze',
'dark olive',
'dark',
@@ -11024,7 +11099,7 @@ window.WombInit = function(actor) {
}
//backward compatibility setup. Fully accurate for normal pregnancy only.
- if (actor.womb.length > 0 && actor.broodmother == 0 && actor.womb[0].genetics == undefined) {
+ if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
var i=0
actor.womb.forEach(function(ft){
ft.genetics = generateGenetics(actor.ID, actor.pregSource, i);
@@ -16060,6 +16135,10 @@ window.DefaultRules = (function() {
slave.teeth = "straightening braces";
V.cash -= V.surgeryCost;
r += `<br>${slave.slaveName} has been given braces for her crooked teeth.`;
+ } else if (slave.teeth == "gapped") {
+ slave.teeth = "straightening braces";
+ V.cash -= V.surgeryCost;
+ r += `<br>${slave.slaveName} has been given braces to close the gap in her teeth.`;
} else if ((slave.teeth == "normal")) {
slave.teeth = "cosmetic braces";
V.cash -= V.surgeryCost;
@@ -16070,6 +16149,10 @@ window.DefaultRules = (function() {
slave.teeth = "straightening braces";
V.cash -= V.surgeryCost;
r += `<br>${slave.slaveName} has been given braces for her crooked teeth.`;
+ } else if (slave.teeth == "gapped") {
+ slave.teeth = "straightening braces";
+ V.cash -= V.surgeryCost;
+ r += `<br>${slave.slaveName} has been given braces to close the gap in her teeth.`;
} else if ((slave.teeth == "cosmetic braces")) {
slave.teeth = "normal";
r += `<br>${slave.slaveName} has gotten her braces off, since her teeth are straight.`;
@@ -23301,6 +23384,8 @@ window.SlaveSummaryUncached = (function(){
function short_teeth(slave) {
if (slave.teeth === "crooked") {
r += `<span class="yellow">Cr Teeth</span>`;
+ } else if (slave.teeth === "gapped") {
+ r += `<span class="yellow">Gap</span>`;
} else if (slave.teeth === "cosmetic braces") {
r += `Cos Braces`;
} else if (slave.teeth === "straightening braces") {
@@ -23619,6 +23704,8 @@ window.SlaveSummaryUncached = (function(){
function long_teeth(slave) {
if (slave.teeth === "crooked") {
r += `<span class="yellow">Crooked teeth.</span>`;
+ } else if (slave.teeth === "gapped") {
+ r += `<span class="yellow">Tooth gap.</span>`;
} else if (slave.teeth === "cosmetic braces") {
r += `Cosmetic braces.`;
} else if (slave.teeth === "straightening braces") {
@@ -33037,6 +33124,7 @@ window.BaseSlave = function BaseSlave() {
skillMT: 0,
skillST: 0,
skillMM: 0,
+ skillFA: 0,
skillWA: 0,
skillS: 0,
skillE: 0,
@@ -34009,7 +34097,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, femaleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = "crooked";
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
}
if (slave.physicalAge < 6) {
@@ -34030,7 +34118,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, maleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = "crooked";
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
}
if (slave.physicalAge < 6) {
@@ -36148,6 +36236,7 @@ window.slaveSkillsDatatypeCleanup = function slaveSkillsDatatypeCleanup(slave) {
slave.skillMT = Math.clamp(+slave.skillMT, 0, 200) || 0;
slave.skillST = Math.clamp(+slave.skillST, 0, 200) || 0;
slave.skillMM = Math.clamp(+slave.skillMM, 0, 200) || 0;
+ slave.skillFA = Math.clamp(+slave.skillFA, 0, 200) || 0;
slave.skillWA = Math.clamp(+slave.skillWA, 0, 200) || 0;
slave.skillS = Math.clamp(+slave.skillS, 0, 200) || 0;
slave.skillE = Math.clamp(+slave.skillE, 0, 200) || 0;
@@ -36272,7 +36361,7 @@ window.slaveMiscellaneousDatatypeCleanup = function slaveMiscellaneousDatatypeCl
}
};
-/* a lot of this may need to be removed */
+/* TODO: a lot of this may need to be removed */
window.ChildDatatypeCleanup = function ChildDatatypeCleanup(child) {
childAgeDatatypeCleanup(child);
childPhysicalDatatypeCleanup(child);
@@ -36696,6 +36785,7 @@ window.childSkillsDatatypeCleanup = function childSkillsDatatypeCleanup(child) {
child.skillMT = Math.clamp(+child.skillMT, 0, 200) || 0;
child.skillST = Math.clamp(+child.skillST, 0, 200) || 0;
child.skillMM = Math.clamp(+child.skillMM, 0, 200) || 0;
+ child.skillFA = Math.clamp(+child.skillFA, 0, 200) || 0;
child.skillWA = Math.clamp(+child.skillWA, 0, 200) || 0;
child.skillS = Math.clamp(+child.skillS, 0, 200) || 0;
child.skillE = Math.clamp(+child.skillE, 0, 200) || 0;
@@ -37081,6 +37171,9 @@ window.Beauty = (function() {
case "crooked":
beauty -= 3;
break;
+ case "gapped":
+ beauty -= 1;
+ break;
case "braces":
case "cosmetic braces":
if (slave.visualAge > 14 && slave.visualAge < 18) {
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index b7f0642165a7226d3bc4a68cf3fea281c12905c1..370d2f3406a20a16bbf8c4be954ee311c5050401 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3342,6 +3342,12 @@ Her skill as a milk maid
accepts int
default cap is 200
+skillFA:
+
+Her skill as a farmer
+accepts int
+default cap is 200
+
skillWA:
Her skill as a wardeness
accepts int
@@ -3410,7 +3416,7 @@ How to set up your own hero slave.
-The default slave template used:
-<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", origRace: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", pupil: "circular", sclerae: "white", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", underArmHColor: "brown", eyebrowHColor: "brown", origSkin: "light", skin: "light", hLength: 60, eyebrowFullness: "natural", hStyle: "short", pubicHStyle: "neat", underArmHStyle: "neat", eyebrowHStyle: "natural", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, areolaeShape: "circle", boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, superfetation: 0, ovaImplant: 0, wombImplant: "none", broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, reservedChildrenNursery: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, prematureBirth: 0, premature: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillMT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, geneMods: {NCS: 0, rapidCellGrowth: 0}, NCSyouthening: 0, override_Race: 0, override_Skin: 0, override_Eye_Color: 0, override_H_Color: 0, override_Pubic_H_Color: 0, override_Arm_H_Color: 0, override_Brow_H_Color: 0, missingEyes: 0, missingArms: 0, missingLegs: 0}>>
+<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", origRace: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", pupil: "circular", sclerae: "white", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", underArmHColor: "brown", eyebrowHColor: "brown", origSkin: "light", skin: "light", hLength: 60, eyebrowFullness: "natural", hStyle: "short", pubicHStyle: "neat", underArmHStyle: "neat", eyebrowHStyle: "natural", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, areolaeShape: "circle", boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, superfetation: 0, ovaImplant: 0, wombImplant: "none", broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, reservedChildrenNursery: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, prematureBirth: 0, premature: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillMT: 0, skillST: 0, skillMM: 0, skillFA: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, geneMods: {NCS: 0, rapidCellGrowth: 0}, NCSyouthening: 0, override_Race: 0, override_Skin: 0, override_Eye_Color: 0, override_H_Color: 0, override_Pubic_H_Color: 0, override_Arm_H_Color: 0, override_Brow_H_Color: 0, missingEyes: 0, missingArms: 0, missingLegs: 0}>>
Making your slave; add their name to the following, then go down the documentation adding in your changes.
-each variable must be separated from the last by a comma followed by a space
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index 2ae8b359d843a36bf1e891cc9757e96b2bbefed1..399d62d0c9c93b72de64b6b822b121916120ae23 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -29,73 +29,73 @@ Despite your direct elevator, interaction with the majority of your security for
<<link "Play it safe">>
<<replace "#bountyresult">>
<<if random(1,100) > 50>>
- Despite your attempts to mitigate risk and play the safest shots possible, it seems lady luck has conspired against you this evening. However, even when your last bullet is shot, your security force pitch you a few bullets to keep you in the game for the rest of the night. You may have lost most of your ¤, but it seems you've @@.green;made some friends.@@
- <<set $rep += 1000, $cash -= 250000>>
+ Despite your attempts to mitigate risk and play the safest shots possible, it seems lady luck has conspired against you this evening. However, even when your last bullet is shot, your security force pitch you a few bullets to keep you in the game for the rest of the night. You may have lost most of your ¤, but it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 250000>>
<<else>>
- While a careful eye for accuracy has buoyed you through the evening, ultimately lady luck is the decider in handing you the win in a number of close shots. Unfortunately your meticulous play limited your chance at a larger payout, and you only come away from the evening with @@.yellowgreen;<<print cashFormat(100000)>>@@ more than you arrived with and @@.green;the respect of your security force.@@
- <<set $rep += 1000, $cash += 100000>>
+ While a careful eye for accuracy has buoyed you through the evening, ultimately lady luck is the decider in handing you the win in a number of close shots. Unfortunately your meticulous play limited your chance at a larger payout, and you only come away from the evening with @@.yellowgreen;<<print cashFormat(100000)>>@@ more than you arrived with and @@.green;the respect of your security force.@@
+ <<set $rep += 1000, $cash += 100000>>
<</if>>
<</replace>>
<</link>>
<br> <<link "Up the ante">>
<<replace "#bountyresult">>
- Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of her fair share of battles on the battlefield and at the firing range. She's short on bullets, however, and she'll have to buy in with something else as collateral.
+ <<set $activeSlaveOneTimeMinAge = 25>>
+ <<set $activeSlaveOneTimeMaxAge = 35>>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<if $arcologies[0].FSSupremacistLawME == 1>>
+ <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+ <<elseif $arcologies[0].FSSubjugationistLawME == 1>>
+ <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
+ <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set $fixedRace = _races.random()>>
+ <</if>>
+ <<include "Generate XX Slave">>
+ <<set $activeSlave.origin = "She put herself up as collateral at a trick shot game, and lost.">>
+ <<set $activeSlave.career = "a soldier">>
+ <<set $activeSlave.indentureRestrictions = 2>>
+ <<set $activeSlave.indenture = 52>>
+ <<if $activeSlave.eyes == -2>>
+ <<set $activeSlave.eyes = -1>>
+ <</if>>
+ <<set $activeSlave.devotion = random(45,60)>>
+ <<set $activeSlave.trust = random(55,65)>>
+ <<set $activeSlave.health = random(60,80)>>
+ <<set $activeSlave.muscles = 60>>
+ <<if $activeSlave.weight > 130>>
+ <<set $activeSlave.weight -= 100>>
+ <<set $activeSlave.waist = random(-10,50)>>
+ <</if>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.behavioralFlaw = "arrogant">>
+ <<set $activeSlave.hStyle = "buzzcut">>
+ Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of $his fair share of battles on the battlefield and at the firing range. $He's short on bullets, however, and $he'll have to buy in with something else as collateral.
<br><br> <span id="aliveresult">
<<link "A year of servitude">>
<<replace "#aliveresult">>
<<if random(1,100) > 50>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up her spoils, the other security force clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
- <<set $rep += 1000, $cash -= 500000>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other security force clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 500000>>
<<else>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin her new life as your sexual servant. She's not young, but she's tough and not distrusting of you due to her service in $SF.Lower.
- <br>
- <<set $activeSlaveOneTimeMinAge = 25>>
- <<set $activeSlaveOneTimeMaxAge = 35>>
- <<set $one_time_age_overrides_pedo_mode = 1>>
- <<if $arcologies[0].FSSupremacistLawME == 1>>
- <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
- <<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
- <<set $fixedRace = _races.random()>>
- <</if>>
- <<include "Generate XX Slave">>
- <<set $activeSlave.origin = "$He put herself up as collateral at a trick shot game, and lost.">>
- <<set $activeSlave.career = "a soldier">>
- <<set $activeSlave.indentureRestrictions = 2>>
- <<set $activeSlave.indenture = 52>>
- <<if $activeSlave.eyes == -2>>
- <<set $activeSlave.eyes = -1>>
- <</if>>
- <<set $activeSlave.devotion = random(45,60)>>
- <<set $activeSlave.trust = random(55,65)>>
- <<set $activeSlave.health = random(60,80)>>
- <<set $activeSlave.muscles = 60>>
- <<if $activeSlave.weight > 130>>
- <<set $activeSlave.weight -= 100>>
- <<set $activeSlave.waist = random(-10,50)>>
- <</if>>
- <<set $activeSlave.anus = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
- <<set $activeSlave.behavioralFlaw = "arrogant">>
- <<set $activeSlave.hStyle = "buzzcut">>
- <<include "New Slave Intro">>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin $his new life as your sexual servant. $He's not young, but $he's tough and not distrusting of you due to $his service in $SF.Lower.
+ <br>
+ <<include "New Slave Intro">>
<</if>>
<</replace>>
<</link>>
- <br> <<link "Dock her wages">>
+ <br> <<link "Dock $his wages">>
<<replace "#aliveresult">>
<<if random(1,100) > 50>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up her spoils, the other security force members clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
- <<set $rep += 1000, $cash -= 500000>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other security force members clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 500000>>
<<else>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts her defeat with grace and jokes to her comrades that she'll be fighting in her underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your security force also @@.green;had a good time fraternizing with you.@@
- <<set $rep += 2000, $cash += 500000>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts $his defeat with grace and jokes to $his comrades that $he'll be fighting in $his underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your security force also @@.green;had a good time fraternizing with you.@@
+ <<set $rep += 2000, $cash += 500000>>
<</if>>
<</replace>>
<</link>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 046a0125d5454034cf9ad7acc424e5a881efd525..cf139d5d63b1420c15e730beb591d81fc38499ca 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -290,6 +290,13 @@ __''Slave age settings''__
<</if>>
Girls appearing in the game will be no younger than <<textbox "$minimumSlaveAge" $minimumSlaveAge "Intro Summary">>
+<br>
+<<if ($extremeUnderage == 0)>>
+Molestation of slaves younger than $minimumSlaveAge is ''forbidden''. [[Allow|Intro Summary][$extremeUnderage = 1]]
+<<else>>
+Molestation of slaves younger than $minimumSlaveAge is ''permitted''. [[Deny|Intro Summary][$extremeUnderage = 0]]
+<</if>>
+
<br>
<<if $retirementAge <= $minimumSlaveAge>>
<<set $retirementAge = $minimumSlaveAge+1>>
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index bc2b3f95269f7c387296076da666bb17c02218d1..55ff0c4ecec739c7ff0e076db08ec91271934207 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -159,11 +159,11 @@
<<if setup.milkmaidCareers.includes($Milkmaid.career)>>
<<set $milkmaidHealthBonus++>>
She has career experience dealing with milk animals.
- <<elseif $Milkmaid.skillMM >= $masteredXP>>
+ <<elseif $Milkmaid.skillFA >= $masteredXP>>
<<set $milkmaidHealthBonus++>>
She has experience dealing with milk animals from working for you.
<<else>>
- <<set $slaves[_FLs].skillMM += random(1,Math.ceil(($Milkmaid.intelligence+$Milkmaid.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skillFA += 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++>>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 448305ed89675221d0919a5956822ee041ce2c3e..8587c55deb7637c47608cffdea40e00b445b86a3 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -1054,7 +1054,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<</if>>
<</if>>
-<<if $nurseryCribs > 0>>
+<<if $nursery > 0>>
<<if $activeSlave.preg > 0 && $activeSlave.broodmother == 0 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">>
<<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>>
<<else>>
@@ -1063,7 +1063,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<<set $reservedChildren = 0>>
//$His children are already reserved for $incubatorName//
<<else>>
- <<set $freeCribs = ($nurseryCribs-$cribs.length)>>
+ <<set $freeCribs = ($nursery-$cribs.length)>>
<<if $activeSlave.reservedChildrenNursery > 0>>
<<if $activeSlave.pregType == 1>>
$His child will be placed in $nurseryName.
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index fdc53a0b27d71fc8fc5836181fc2412df5694b70..633d4fceacec9ffac0a445f7a74fc7c994d0435c 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -1179,7 +1179,7 @@ $he's
<<elseif setup.attendantCareers.includes($activeSlave.career)>>
$activeSlave.career, giving $him potential as an Attendant for <<if $spa == 0>>a Spa<<else>>$spaName<</if>>.
<<elseif setup.matronCareers.includes($activeSlave.career)>>
- $activeSlave.career, giving $him potential as a Matron for <<if $nursery == 0>>a Nursery<<else>>$nurseryName<</if>>.
+ $activeSlave.career, giving $him potential as a Matron for <<if $nursery == 0 && $nurseryNannies == 0>>a Nursery<<else>>$nurseryName<</if>>.
<<elseif setup.nurseCareers.includes($activeSlave.career)>>
$activeSlave.career, giving $him potential as a Nurse for <<if $clinic == 0>>a Clinic<<else>>$clinicName<</if>>.
<<elseif setup.schoolteacherCareers.includes($activeSlave.career)>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 382e1924d0d1460614ddeba90a008c12225ff1e2..3dea18e6ed3a8e022c7380879fa90b8870d854d9 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -8,7 +8,7 @@
<<set $nurseryNameCaps = $nurseryName.replace("the ", "The ")>>
<</if>>
-<<set $nurseryBabies = $cribs.length, $freeCribs = $nurseryCribs - $nurseryBabies, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
+<<set $nurseryBabies = $cribs.length, $freeCribs = $nursery - $nurseryBabies, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
<<nurseryAssignmentFilter>>
$nurseryNameCaps
@@ -74,7 +74,7 @@ $nurseryNameCaps
$Matron.slaveName is alone in $nurseryName, and has nothing to do but keep the place clean and look after the children.
<<set $MatronInfluence = 1>>
<<elseif ($nurserySlaves <= 0) && ($nurseryBabies <= 0)>>
- $nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<set $nurseryCribs = 0, $nursery = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>><<for _i = 0; _i < $slaves.length; _i++>><<set $slaves[_i].reservedChildrenNursery = 0>><</for>><</link>>
+ $nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<set $nursery = 0, $nurseryNannies = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>><<for _i = 0; _i < $slaves.length; _i++>><<set $slaves[_i].reservedChildrenNursery = 0>><</for>><</link>>
<</if>>
<<if $nurserySlaves > 0>>
@@ -94,14 +94,14 @@ $nurseryNameCaps
<</if>>
/*TODO: add a malus for having children without nannies*/
-<<set _Tmult0 = Math.trunc($nursery*1000*$upgradeMultiplierArcology)>>
-<br>It can support $nursery nannies. Currently there <<if $nurserySlaves == 1>>is<<else>>are<</if>> $nurserySlaves nann<<if $nurserySlaves != 1>>ies<<else>>y<</if>> at $nurseryName.
+<<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>>
+<br>It can support $nurseryNannies nannies. Currently there <<if $nurserySlaves == 1>>is<<else>>are<</if>> $nurserySlaves nann<<if $nurserySlaves != 1>>ies<<else>>y<</if>> at $nurseryName.
<<if $nurseryBabies > 0 && ($nurserySlaves < 1 && $Matron < 1)>>
//You must have at least one nanny or Matron to be able to influence the childrens' upbringing//
<br>
<</if>>
-<<if $nursery < 5>>
- [[Expand the nursery|Nursery][$cash -= _Tmult0, $nursery += 1, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
+<<if $nurseryNannies < 5>>
+ [[Expand the nursery|Nursery][$cash -= _Tmult0, $nurseryNannies += 1, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<<else>>
//$nurseryNameCaps can support a maximum of 5 slaves//
<</if>>
@@ -124,7 +124,7 @@ $nurseryNameCaps
<</if>>
<br><br>
-<<if ($nursery <= $nurserySlaves)>>
+<<if ($nurseryNannies <= $nurserySlaves)>>
''$nurseryNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $nurserySlaves)>>
<<link "''Send a slave to $nurseryName''">>
@@ -158,9 +158,9 @@ $nurseryNameCaps
<<resetAssignmentFilter>>
</span><br>
-<br>It can support $nurseryCribs child<<if $nurseryCribs != 1>>ren<</if>>. Currently $nurseryBabies rooms are in use.
-<<if $nurseryCribs < 50>>
- [[Add another room|Nursery][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $nurseryCribs += 5]] //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+<br>It can support $nursery child<<if $nursery != 1>>ren<</if>>. Currently $nurseryBabies rooms are in use.
+<<if $nursery < 50>>
+ [[Add another room|Nursery][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $nursery += 5]] //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
<<if $freeCribs == 0>>
All of the rooms are currently occupied by growing children.
<</if>>
@@ -168,12 +168,12 @@ $nurseryNameCaps
//$nurseryNameCaps can support a maximum of 50 children//
<</if>>
-<<if $nurseryCribs > 1 && $reservedChildrenNursery < $freeCribs>>
- [[Remove a room|Nursery][$cash -= Math.trunc(1000*$upgradeMultiplierArcology), $nurseryCribs -= 5]] //Costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will reduce upkeep costs//
+<<if $nursery > 1 && $reservedChildrenNursery < $freeCribs>>
+ [[Remove a room|Nursery][$cash -= Math.trunc(1000*$upgradeMultiplierArcology), $nursery -= 5]] //Costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will reduce upkeep costs//
<</if>>
<br><br>
-Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $nurseryCribs rooms, <<print $freeCribs>> <<if $freeCribs == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildrenNursery room<<if $reservedChildrenNursery == 1>> is<<else>>s are<</if>> reserved.
+Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $nursery rooms, <<print $freeCribs>> <<if $freeCribs == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildrenNursery room<<if $reservedChildrenNursery == 1>> is<<else>>s are<</if>> reserved.
<<if (0 < _SL)>>
<<set $sortNurseryList = $sortNurseryList || 'Unsorted'>>
diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw
index 4833d24b5dea0525eb6c51b17f864ad57b6f0d2c..22902a2c94f4826ad3d8bcf1049bca85810d88b1 100644
--- a/src/facilities/nursery/nurseryReport.tw
+++ b/src/facilities/nursery/nurseryReport.tw
@@ -209,8 +209,8 @@
<</if>>
<</for>>
*/
- <<if (_DL < $nurseryCribs)>>
- <<set _seed = random(1,10)+(($nurseryCribs-_DL)*(random(150,170)+(_idleBonus*10)))>>
+ <<if (_DL < $nursery)>>
+ <<set _seed = random(1,10)+(($nursery-_DL)*(random(150,170)+(_idleBonus*10)))>>
<<set $cash += _seed>>
<br> Since she doesn't have enough children to occupy all her time, the nursery takes in citizens' children on a contract basis and she cares for them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<<if ($arcologies[0].FSRepopulationFocus > 0) && (_DL == 0)>>
diff --git a/src/facilities/nursery/nurseryWorkaround.tw b/src/facilities/nursery/nurseryWorkaround.tw
index 6d74f647f1d505dee90bde84a1b03099fa5e05f3..bbf6ffbed519891cc6486a0a946c5759dd779cec 100644
--- a/src/facilities/nursery/nurseryWorkaround.tw
+++ b/src/facilities/nursery/nurseryWorkaround.tw
@@ -1,9 +1,10 @@
:: Nursery Workaround [nobr]
-<<if $cribs.length < $nurseryCribs>>
+<<if $cribs.length < $nursery>>
<<run newChild($activeSlave)>>
<<set $activeSlave.growTime = ($targetAgeNursery*52)>>
/* for later
+ TODO: is this going to be used?
<span id="naming">
<<if $activeSlave.mother > 0>>
<<set _tempMom = getSlave($activeSlave.mother)>>
diff --git a/src/facilities/nursery/saCareForChildren.tw b/src/facilities/nursery/saCareForChildren.tw
index e4c312eebb7c5878433ffde674497b07058cb0df..8fa463beb056cd42c250cd62f484059e506f203d 100644
--- a/src/facilities/nursery/saCareForChildren.tw
+++ b/src/facilities/nursery/saCareForChildren.tw
@@ -1,3 +1,3 @@
/*:: SA care for children [nobr]*/
-//For effects on nannies/matron.//
\ No newline at end of file
+//For effects on nannies/matron.//
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index ccdacc01e80a281e9e1a739ac0f561fbc2ce5e3b..b036969187bf46515a7338d103fca24528da5445 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -548,10 +548,10 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $masterSuiteName = "the Master Suite">>
<<set $masterSuiteNameCaps = "The Master Suite">>
-<<set $nursery = 0>> /*counts the number of nannies the nursery can support*/
-<<set $nurseryCribs = 0>> /*counts the number of children the nursery can support*/
-<<set $nurserySlaves = 0>> /*counts thse number of nannies currently assigned to the nursery*/
+<<set $nursery = 0>> /*counts the number of children the nursery can support*/
+<<set $nurseryNannies = 0>> /*counts the number of nannies the nursery can support*/
<<set $nurseryBabies = 0>> /*counts the number of children currently in the nursery*/
+<<set $nurserySlaves = 0>> /*counts the number of nannies currently assigned to the nursery*/
<<set $nurseryDecoration = "standard">>
<<set $MatronInfluence = 0>> /*check for whether the children are influenced by the Matron*/
<<set $nannyInfluence = 0>> /*check for whether the children are influenced by the nannies*/
@@ -572,6 +572,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $childToSlave = -1>>
<<set $farmyard = 0>>
+<<set $farmyardSlaves = 0>>
<<set $farmyardDecoration = "standard">>
<<set $farmyardUpgrade = 0>>
<<set $farmyardUpgradeList = []>>
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 4930dab05c07025f44fb226dba37ecaf64632024..9cac5e730f6431a39ce1812f2ef4b010a082fe8a 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -1847,6 +1847,10 @@ window.DefaultRules = (function() {
slave.teeth = "straightening braces";
V.cash -= V.surgeryCost;
r += `<br>${slave.slaveName} has been given braces for her crooked teeth.`;
+ } else if (slave.teeth == "gapped") {
+ slave.teeth = "straightening braces";
+ V.cash -= V.surgeryCost;
+ r += `<br>${slave.slaveName} has been given braces to close the gap in her teeth.`;
} else if ((slave.teeth == "normal")) {
slave.teeth = "cosmetic braces";
V.cash -= V.surgeryCost;
@@ -1857,6 +1861,10 @@ window.DefaultRules = (function() {
slave.teeth = "straightening braces";
V.cash -= V.surgeryCost;
r += `<br>${slave.slaveName} has been given braces for her crooked teeth.`;
+ } else if (slave.teeth == "gapped") {
+ slave.teeth = "straightening braces";
+ V.cash -= V.surgeryCost;
+ r += `<br>${slave.slaveName} has been given braces to close the gap in her teeth.`;
} else if ((slave.teeth == "cosmetic braces")) {
slave.teeth = "normal";
r += `<br>${slave.slaveName} has gotten her braces off, since her teeth are straight.`;
diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw
index e297f4ec0d462a7a2abe2bb3796a4d1857cd0945..c45b2a15167cdf22a6d89bd6e6839d7cc4fa1948 100644
--- a/src/js/datatypeCleanupJS.tw
+++ b/src/js/datatypeCleanupJS.tw
@@ -472,6 +472,7 @@ window.slaveSkillsDatatypeCleanup = function slaveSkillsDatatypeCleanup(slave) {
slave.skillMT = Math.clamp(+slave.skillMT, 0, 200) || 0;
slave.skillST = Math.clamp(+slave.skillST, 0, 200) || 0;
slave.skillMM = Math.clamp(+slave.skillMM, 0, 200) || 0;
+ slave.skillFA = Math.clamp(+slave.skillFA, 0, 200) || 0;
slave.skillWA = Math.clamp(+slave.skillWA, 0, 200) || 0;
slave.skillS = Math.clamp(+slave.skillS, 0, 200) || 0;
slave.skillE = Math.clamp(+slave.skillE, 0, 200) || 0;
@@ -1020,6 +1021,7 @@ window.childSkillsDatatypeCleanup = function childSkillsDatatypeCleanup(child) {
child.skillMT = Math.clamp(+child.skillMT, 0, 200) || 0;
child.skillST = Math.clamp(+child.skillST, 0, 200) || 0;
child.skillMM = Math.clamp(+child.skillMM, 0, 200) || 0;
+ child.skillFA = Math.clamp(+child.skillFA, 0, 200) || 0;
child.skillWA = Math.clamp(+child.skillWA, 0, 200) || 0;
child.skillS = Math.clamp(+child.skillS, 0, 200) || 0;
child.skillE = Math.clamp(+child.skillE, 0, 200) || 0;
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 48fa83dbfc761fed43a64ae3ab1479bd04bc9e96..03b999980852e0117085f25cd3fda6b3653e6fa7 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -209,7 +209,7 @@ window.generateGenetics = (function() {
'dark olive': 14,
bronze: 13,
tan: 12,
- natural: 11,
+ tan: 11,
olive: 10,
'light olive': 9,
light: 8,
@@ -239,6 +239,7 @@ window.generateGenetics = (function() {
'olive',
'natural',
'tan',
+ 'tan',
'bronze',
'dark olive',
'dark',
diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw
index ef2f543963fee5b5dceaac263c26f70409829799..554fa42f449715da965a66529db29b2d6af6d825 100644
--- a/src/js/generateNewSlaveJS.tw
+++ b/src/js/generateNewSlaveJS.tw
@@ -925,7 +925,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, femaleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = "crooked";
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped"
}
if (slave.physicalAge < 6) {
@@ -946,7 +946,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, maleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = "crooked";
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped"
}
if (slave.physicalAge < 6) {
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 08d85e8d346de0affbdd51a993aff99d958864df..7e17b5554ab6e643ed1176c5a535874f6bd07817 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -240,6 +240,56 @@ window.getNurseryReserved = function (slaves) {
return FetusGlobalReserveCount("nursery");
}
+window.findFather = function(fatherID) {
+ let father;
+ let V = State.variables;
+
+ father = V.slaves[V.slaveIndices[fatherID]];
+ if (father === undefined) {
+ if (V.incubator > 0) {
+ father = V.tanks.find(function(s) { return s.ID == fatherID; });
+ }
+ }
+ if (father === undefined) {
+ if (V.nursery > 0) {
+ father = V.cribs.find(function(s) { return s.ID == fatherID; });
+ }
+ }
+
+ return father;
+}
+
+window.adjustFatherProperty = function(actor, property, newValue) {
+ let father = findFather(actor.ID);
+ if (father)
+ father[property] = newValue;
+}
+
+/* OLD
+window.adjustFatherProperty = function(actor, property, newValue) {
+ let V = State.variables;
+ let fatherIndex;
+
+ fatherIndex = V.slaves.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex > 0) {
+ V.slaves[fatherIndex][property] = newValue;
+ } else if (V.incubator > 0) {
+ fatherIndex = V.tanks.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex > 0) {
+ V.tanks[fatherIndex][property] = newValue;
+ }
+ }
+ if (fatherIndex === -1) {
+ if (V.nursery > 0) {
+ fatherIndex = V.cribs.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex !== -1) {
+ V.cribs[fatherIndex][property] = newValue;
+ }
+ }
+ }
+}
+*/
+
/* not to be used until that last part is defined. It may become slave.boobWomb.volume or some shit */
window.getBaseBoobs = function(slave) {
return slave.boobs-slave.boobsImplant-slave.boobsWombVolume;
diff --git a/src/js/slaveCostJS.tw b/src/js/slaveCostJS.tw
index 30b53971a55767aa9256b971a7c9ef5f59978dcd..0089e34745a4ecba2a63b3336d0fc4d4ed82d80e 100644
--- a/src/js/slaveCostJS.tw
+++ b/src/js/slaveCostJS.tw
@@ -118,6 +118,9 @@ window.Beauty = (function() {
case "crooked":
beauty -= 3;
break;
+ case "gapped":
+ beauty -= 1;
+ break;
case "braces":
case "cosmetic braces":
if (slave.visualAge > 14 && slave.visualAge < 18) {
diff --git a/src/js/slaveGenerationJS.tw b/src/js/slaveGenerationJS.tw
index 9fd39a732a677365563f69360b41e85400bfbc82..4bc705ffe14c014fd7c5c9546ef9f7081786c594 100644
--- a/src/js/slaveGenerationJS.tw
+++ b/src/js/slaveGenerationJS.tw
@@ -1702,6 +1702,7 @@ window.BaseSlave = function BaseSlave() {
skillMT: 0,
skillST: 0,
skillMM: 0,
+ skillFA: 0,
skillWA: 0,
skillS: 0,
skillE: 0,
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index dc26bcf5c594e445e9704ae33a90b471152f2e4a..2957128b33e378e075fcfe228cf30c82041369ad 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -1986,6 +1986,8 @@ window.SlaveSummaryUncached = (function(){
function short_teeth(slave) {
if (slave.teeth === "crooked") {
r += `<span class="yellow">Cr Teeth</span>`;
+ } else if (slave.teeth === "gapped") {
+ r += `<span class="yellow">Gap</span>`;
} else if (slave.teeth === "cosmetic braces") {
r += `Cos Braces`;
} else if (slave.teeth === "straightening braces") {
@@ -2304,6 +2306,8 @@ window.SlaveSummaryUncached = (function(){
function long_teeth(slave) {
if (slave.teeth === "crooked") {
r += `<span class="yellow">Crooked teeth.</span>`;
+ } else if (slave.teeth === "gapped") {
+ r += `<span class="yellow">Tooth gap.</span>`;
} else if (slave.teeth === "cosmetic braces") {
r += `Cosmetic braces.`;
} else if (slave.teeth === "straightening braces") {
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 5ca395259bebcad5a382d9d6aaa9ccd2f126bc8d..658d6c155b80dd54ac7f8104f838c22aa3ef875b 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -200,7 +200,7 @@ if (typeof SlaveStatsChecker == "undefined") {
return false;
}
/* End mod section: toggle whether slaves lisp. */
- return ((slave.lips > 70) || (slave.lipsPiercing + slave.tonguePiercing > 2))
+ return ((slave.lips > 70) || (slave.lipsPiercing + slave.tonguePiercing > 2) || (slave.teeth == "gapped"))
}
};
// Raise namespace scope to Global.
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index d63cce3ce6ec7c82f56f9b24ea632f81ee76e451..3d6942d6787aada24670cdc9362e0d8dcf476475 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -46,7 +46,7 @@ window.WombInit = function(actor) {
}
//backward compatibility setup. Fully accurate for normal pregnancy only.
- if (actor.womb.length > 0 && actor.broodmother == 0 && actor.womb[0].genetics == undefined) {
+ if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
var i=0
actor.womb.forEach(function(ft){
ft.genetics = generateGenetics(actor.ID, actor.pregSource, i);
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 7c3dd28f769afdd6bd12afa458a308bda497f410..22150bbaf280cbccc103cf422665cc03e16a372e 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -83,6 +83,13 @@
<</if>>
<</if>>
+<<if $activeSlave.devotion > 50 && $activeSlave.health < -20>>
+ I feel <<if $activeSlave.health < -50>>really <</if>>sick, <<Master>>.
+ <<if $activeSlave.trust > 20>>
+ I wish you could give me something to ease the pain.
+ <</if>>
+<</if>>
+
<<if ($activeSlave.fetishKnown == 1)>>
<<if ($activeSlave.energy > 95)>>
I love being your nympho <<s>>lut.
@@ -1352,7 +1359,7 @@ My favorite part of my body i<<s>>
<</if>> /* closes FS */
<<if ($activeSlave.devotion > 75)>>
- <<if $activeSlave.tankBaby > 0 || $activeSlave.cribBaby > 0 || $activeSlave.mother == -1 || (areSisters($activeSlave, $PC) && $activeSlave.actualAge <= $PC.actualAge)>>
+ <<if $activeSlave.tankBaby > 0|| $activeSlave.mother == -1 || (areSisters($activeSlave, $PC) && $activeSlave.actualAge <= $PC.actualAge)>>
I've known you my whole life, <<Master>>, I can't really think of any time<<s>> you weren't there for me.
<<elseif (areSisters($activeSlave, $PC) && $activeSlave.actualAge > $PC.actualAge) || $PC.mother == $activeSlave.ID || $PC.father == $activeSlave.ID>>
You're my dear <<Master>>. I've known you <<s>>in<<c>>e you were born, and I will alway<<s>> be watching out for you, no matter what.
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index e9c36a071552bff01f70962c6848de3b3f005b31..158e5492f5bcaf50c38e87c85b367bcd7b81c776 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -41,9 +41,9 @@
<<set _lab++>>
<<set _fathers.push("the gene lab's")>>
<<else>>
- <<set _babyDaddy = $slaveIndices[$activeSlave.curBabies[_cb].fatherID]>>
+ <<set _babyDaddy = findFather($activeSlave.curBabies[_cb].fatherID)>>
<<if def _babyDaddy>>
- <<if $slaves[_babyDaddy].ID == $activeSlave.ID>>
+ <<if _babyDaddy.ID == $activeSlave.ID>>
<<set _fathers.push(String($his + " own"))>>
<<for _cb2 = 0; _cb2 < _babyFatherLink.length; _cb2++>>
<<if _babyFatherLink[_cb2].string == String($his + " own")>>
@@ -53,16 +53,17 @@
<</if>>
<</for>>
<<else>>
- <<set _fathers.push(String($slaves[_babyDaddy].slaveName+ "'s"))>>
+ <<set _fathers.push(String(_babyDaddy.slaveName+ "'s"))>>
<<for _cb2 = 0; _cb2 < _babyFatherLink.length; _cb2++>>
- <<if _babyFatherLink[_cb2].string == String($slaves[_babyDaddy].slaveName+ "'s")>>
+ <<if _babyFatherLink[_cb2].string == String(_babyDaddy.slaveName+ "'s")>>
<<set _babyFatherLink[_cb2].count++>>
<<else>>
- <<set _babyFatherLink[_cb2] = {string: String($slaves[_babyDaddy].slaveName+ "'s"), count: 1}>>
+ <<set _babyFatherLink[_cb2] = {string: String(_babyDaddy.slaveName+ "'s"), count: 1}>>
<</if>>
<</for>>
<</if>>
- <<set $slaves[_babyDaddy].slavesFathered++>>
+ <<set _adjust = _babyDaddy.slavesFathered++>>
+ <<set adjustFatherProperty(_babyDaddy, slavesFathered, _adjust)>>
<<else>>
<<set _others++>>
<<set _fathers.push("some man's")>>
@@ -134,9 +135,9 @@
<<set _cToIncub = 0, _cToNursery = 0>>
<<for _csec = 0; _csec < _curBabies; _csec++>>
- <<if $slaves[$i].curBabies[_csec].reserve === "incubator">>
+ <<if $activeSlave.curBabies[_csec].reserve === "incubator">>
<<set _cToIncub++>>
- <<elseif $slaves[$i].curBabies[_csec].reserve === "nursery">>
+ <<elseif $activeSlave.curBabies[_csec].reserve === "nursery">>
<<set _cToNursery++>>
<</if>>
<</for>>
diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw
index 62c0a2df5ac9b464ebb4f02832067fbb332928b3..d323e60acc7883ac6458c852c3f7a9af77572e7b 100644
--- a/src/pregmod/organFarmOptions.tw
+++ b/src/pregmod/organFarmOptions.tw
@@ -6,7 +6,7 @@
testicles: 0,
scrotum: 0,
pigTesticles: 0,
- dogTesticles: 0,
+ canineTesticles: 0,
horseTesticles: 0,
cowTesticles: 0,
foreskin: 0,
@@ -14,7 +14,7 @@
freshOvaries: 0,
prostate: 0,
pigOvaries: 0,
- dogOvaries: 0,
+ canineOvaries: 0,
horseOvaries: 0,
cowOvaries: 0,
eyes: 0,
@@ -22,7 +22,7 @@
voicebox: 0,
mpreg: 0,
mpregPig: 0,
- mpregDog: 0,
+ mpregCanine: 0,
mpregHorse: 0,
mpregCow: 0}>>
<<for _i = 0; _i < $organs.length; _i++>>
@@ -35,8 +35,8 @@
<<set $slaveOrgans.scrotum = 1>>
<<elseif $organs[_i].type == "pigTesticles">>
<<set $slaveOrgans.pigTesticles = 1>>
- <<elseif $organs[_i].type == "dogTesticles">>
- <<set $slaveOrgans.dogTesticles = 1>>
+ <<elseif $organs[_i].type == "canineTesticles">>
+ <<set $slaveOrgans.canineTesticles = 1>>
<<elseif $organs[_i].type == "horseTesticles">>
<<set $slaveOrgans.horseTesticles = 1>>
<<elseif $organs[_i].type == "cowTesticles">>
@@ -49,8 +49,8 @@
<<set $slaveOrgans.prostate = 1>>
<<elseif $organs[_i].type == "pigOvaries">>
<<set $slaveOrgans.pigOvaries = 1>>
- <<elseif $organs[_i].type == "dogOvaries">>
- <<set $slaveOrgans.dogOvaries = 1>>
+ <<elseif $organs[_i].type == "canineOvaries">>
+ <<set $slaveOrgans.canineOvaries = 1>>
<<elseif $organs[_i].type == "horseOvaries">>
<<set $slaveOrgans.horseOvaries = 1>>
<<elseif $organs[_i].type == "cowOvaries">>
@@ -65,8 +65,8 @@
<<set $slaveOrgans.mpreg = 1>>
<<elseif $organs[_i].type == "mpregPig">>
<<set $slaveOrgans.mpregPig = 1>>
- <<elseif $organs[_i].type == "mpregDog">>
- <<set $slaveOrgans.mpregDog = 1>>
+ <<elseif $organs[_i].type == "mpregCanine">>
+ <<set $slaveOrgans.mpregCanine = 1>>
<<elseif $organs[_i].type == "mpregHorse">>
<<set $slaveOrgans.mpregHorse = 1>>
<<elseif $organs[_i].type == "mpregCow">>
@@ -122,11 +122,11 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<<goto "Remote Surgery">>
<</link>> //Costs <<print cashFormat(5000)>> and requires a penis for successful implantation//
<</if>>
- <<if $slaveOrgans.dogTesticles != 1>>
+ <<if $slaveOrgans.canineTesticles != 1>>
<br>
- <<link "Dog testicles">>
+ <<link "Canine testicles">>
<<set $cash -= 5000>>
- <<set _newOrgan = {type: "dogTesticles", weeksToCompletion: "10", ID: 0}>>
+ <<set _newOrgan = {type: "canineTesticles", weeksToCompletion: "10", ID: 0}>>
<<set _newOrgan.ID = $activeSlave.ID>>
<<set $organs.push(_newOrgan)>>
<<goto "Remote Surgery">>
@@ -197,11 +197,11 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<<goto "Remote Surgery">>
<</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation//
<</if>>
- <<if $slaveOrgans.dogOvaries != 1>>
+ <<if $slaveOrgans.canineOvaries != 1>>
<br>
- <<link "Dog ovaries">>
+ <<link "Canine ovaries">>
<<set $cash -= 10000>>
- <<set _newOrgan = {type: "dogOvaries", weeksToCompletion: "10", ID: 0}>>
+ <<set _newOrgan = {type: "canineOvaries", weeksToCompletion: "10", ID: 0}>>
<<set _newOrgan.ID = $activeSlave.ID>>
<<set $organs.push(_newOrgan)>>
<<goto "Remote Surgery">>
@@ -298,11 +298,11 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<<goto "Remote Surgery">>
<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female reproductive organs for successful implantation//
<</if>>
- <<if $slaveOrgans.mpregDog != 1>>
+ <<if $slaveOrgans.mpregCanine != 1>>
<br>
- <<link "Anal dog womb and ovaries">>
+ <<link "Anal canine womb and ovaries">>
<<set $cash -= 20000>>
- <<set _newOrgan = {type: "mpregDog", weeksToCompletion: "10", ID: 0}>>
+ <<set _newOrgan = {type: "mpregCanine", weeksToCompletion: "10", ID: 0}>>
<<set _newOrgan.ID = $activeSlave.ID>>
<<set $organs.push(_newOrgan)>>
<<goto "Remote Surgery">>
@@ -343,8 +343,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
$organs[_i].type are
<<case "pigTesticles">>
pig testicles are
- <<case "dogTesticles">>
- dog testicles are
+ <<case "canineTesticles">>
+ canine testicles are
<<case "horseTesticles">>
horse testicles are
<<case "cowTesticles">>
@@ -353,8 +353,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
revitalized ovaries are
<<case "pigOvaries">>
pig ovaries are
- <<case "dogOvaries">>
- dog ovaries are
+ <<case "canineOvaries">>
+ canine ovaries are
<<case "horseOvaries">>
horse ovaries are
<<case "cowOvaries">>
@@ -363,8 +363,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
anal womb and ovaries are
<<case "mpregPig">>
anal womb and pig ovaries are
- <<case "mpregDog">>
- anal womb and dog ovaries are
+ <<case "mpregCanine">>
+ anal womb and canine ovaries are
<<case "mpregHorse">>
anal womb and horse ovaries are
<<case "mpregCow">>
@@ -607,7 +607,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addPigBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<elseif $activeSlave.dick == 0>>
<br>
@@ -647,7 +647,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addPigBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<else>>
<br>
@@ -677,7 +677,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addPigBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
@@ -689,12 +689,12 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</link>>
<</if>>
- <<case "dogTesticles">>
- <<if $activeSlave.balls > 0 && $activeSlave.ballType == "dog">>
+ <<case "canineTesticles">>
+ <<if $activeSlave.balls > 0 && $activeSlave.ballType == "canine">>
<br>
ERROR: this slave already has testicles.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogTesticles"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineTesticles"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -705,7 +705,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>
ERROR: this slave already has $activeSlave.ballType testicles.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogTesticles"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineTesticles"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -715,14 +715,14 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>You can replace $his existing testicles with a new pair.
<<link "Implant" "Surgery Degradation">>
<<set $cash -= $surgeryCost>>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogTesticles"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineTesticles"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@.red;Organ not found for deletion!@@
<</if>>
<<set $activeSlave.balls = 2>>
- <<set $activeSlave.ballType = "dog">>
+ <<set $activeSlave.ballType = "canine">>
<<set $activeSlave.health -= 20>>
<<if $organFarmUpgrade == 2>>
<<set $activeSlave.chem += 20>>
@@ -738,13 +738,13 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addDogBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<elseif $activeSlave.dick == 0>>
<br>
ERROR: this slave lacks the penis necessary to accept testicles.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogTesticles"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineTesticles"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -754,7 +754,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>You can forgo standard procedure and implant testicles directly into $his abdomen.
<<link "Implant" "Surgery Degradation">>
<<set $cash -= $surgeryCost>>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogTesticles"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineTesticles"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -762,7 +762,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<<if $activeSlave.prostate < 1>><<set $activeSlave.prostate = 1>><</if>>
<<set $activeSlave.balls = 2>>
- <<set $activeSlave.ballType = "dog">>
+ <<set $activeSlave.ballType = "canine">>
<<set $activeSlave.health -= 20>>
<<if $organFarmUpgrade == 2>>
<<set $activeSlave.chem += 20>>
@@ -778,20 +778,20 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addDogBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<else>>
<br>
<<link "Implant">>
<<set $cash -= $surgeryCost>>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogTesticles"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineTesticles"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@.red;Organ not found for deletion!@@
<</if>>
<<set $activeSlave.balls = 2>>
- <<set $activeSlave.ballType = "dog">>
+ <<set $activeSlave.ballType = "canine">>
<<set $activeSlave.scrotum = 2>>
<<set $activeSlave.health -= 20>>
<<if $organFarmUpgrade == 2>>
@@ -808,12 +808,12 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addDogBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<<goto "Surgery Degradation">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogTesticles"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineTesticles"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -870,7 +870,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addHorseBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<elseif $activeSlave.dick == 0>>
<br>
@@ -910,7 +910,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addHorseBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<else>>
<br>
@@ -940,7 +940,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addHorseBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
@@ -1001,7 +1001,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addCowBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<elseif $activeSlave.dick == 0>>
<br>
@@ -1041,7 +1041,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addCowBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
<<else>>
<br>
@@ -1071,7 +1071,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addCowBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
@@ -1338,7 +1338,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addPigOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
<<elseif $activeSlave.vagina < 0>>
<br>
@@ -1390,7 +1390,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addPigOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
@@ -1402,12 +1402,12 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</link>>
<</if>>
- <<case "dogOvaries">>
- <<if $activeSlave.ovaries > 0 && $activeSlave.eggType == "dog">>
+ <<case "canineOvaries">>
+ <<if $activeSlave.ovaries > 0 && $activeSlave.eggType == "canine">>
<br>
ERROR: this slave already has ovaries.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogOvaries"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineOvaries"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -1418,7 +1418,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>
ERROR: this slave already has $activeSlave.eggType ovaries.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogOvaries"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineOvaries"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -1428,13 +1428,13 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>You can replace $his existing ovaries with a new pair.
<<link "Implant" "Surgery Degradation">>
<<set $cash -= $surgeryCost>>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogOvaries"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineOvaries"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@.red;Organ not found for deletion!@@
<</if>>
- <<set $activeSlave.eggType = "dog">>
+ <<set $activeSlave.eggType = "canine">>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.health -= 20>>
<<if $organFarmUpgrade == 2>>
@@ -1451,13 +1451,13 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addDogOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
<<elseif $activeSlave.vagina < 0>>
<br>
ERROR: this slave lacks the vagina necessary to accept ovaries.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogOvaries"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineOvaries"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -1468,7 +1468,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>
ERROR: this slave's body cavity is filled with another organ.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogOvaries"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineOvaries"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -1479,14 +1479,14 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>
<<link "Implant" "Surgery Degradation">>
<<set $cash -= $surgeryCost>>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogOvaries"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineOvaries"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@.red;Organ not found for deletion!@@
<</if>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.eggType = "dog">>
+ <<set $activeSlave.eggType = "canine">>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.health -= 20>>
<<if $organFarmUpgrade == 2>>
@@ -1503,11 +1503,11 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addDogOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "dogOvaries"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "canineOvaries"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -1564,7 +1564,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addHorseOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
<<elseif $activeSlave.vagina < 0>>
<br>
@@ -1616,7 +1616,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addHorseOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
@@ -1677,7 +1677,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addCowOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
<<elseif $activeSlave.vagina < 0>>
<br>
@@ -1729,7 +1729,7 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addCowOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
@@ -2088,12 +2088,12 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</link>>
<</if>>
- <<case "mpregDog">>
+ <<case "mpregCanine">>
<<if ($activeSlave.ovaries != 0) && ($activeSlave.vagina > -1) && ($activeSlave.mpreg != 0)>>
<br>
ERROR: this slave has existing reproductive completedOrgans.
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregDog"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregCanine"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@ -2104,14 +2104,14 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<br>
<<link "Implant" "Surgery Degradation">>
<<set $cash -= $surgeryCost>>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregDog"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregCanine"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
@@.red;Organ not found for deletion!@@
<</if>>
<<set $activeSlave.mpreg = 1>>
- <<set $activeSlave.eggType = "dog">>
+ <<set $activeSlave.eggType = "canine">>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.health -= 40>>
<<if $organFarmUpgrade == 2>>
@@ -2128,11 +2128,11 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "mpregDog">>
+ <<set $surgeryType = "mpregCanine">>
<</link>>
|
<<link "Discard" "Remote Surgery">>
- <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregDog"; })>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregCanine"; })>>
<<if _ofo != -1>>
<<set $completedOrgans.deleteAt(_ofo)>>
<<else>>
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index 14851ff45f8cacb6c7b2ff931b6e25c3f15c0622..839f760d0a3721c785b6e7676a88b81cdb9c9adc 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", _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. It's not all about optics though, as 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.
+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. It's not all about optics though, as 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>
diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw
index f338098741be0d0cc6fbdc7ffc5c9d0a12798ece..a19f10c5fd180db2eb8341b606aff713df3e8eba 100644
--- a/src/pregmod/saAgent.tw
+++ b/src/pregmod/saAgent.tw
@@ -121,8 +121,11 @@
<<if $slaves[$i].pregSource == -1>>
<<set $PC.slavesKnockedUp++>>
<<elseif $slaves[$i].pregSource > 0>>
- <<set _babyDaddy = $slaveIndices[$slaves[$i].pregSource]>>
- <<set $slaves[_babyDaddy].slavesKnockedUp++>>
+ <<set _babyDaddy = findFather($slaves[$i].pregSource)>>
+ <<if def _babyDaddy>>
+ <<set _adjust = _babyDaddy.slavesKnockedUp++>>
+ <<set adjustFatherProperty(_babyDaddy, slavesKnockedUp, _adjust)>>
+ <</if>>
<</if>>
<</if>>
<<if ($slaves[$i].preg >= 10)>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 1a4814937ce87f57241d22fdc7252870d4e27494..53d2ae9d8d359a5373501210c2885976c6ed449d 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -551,7 +551,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if $PC.pregSource > 0 && _curBabies > 0>>
- <<set _pb = $slaveIndices[$PC.pregSource]>>
+ <<set _pb = findFather($PC.pregSource)>>
<<if def _pb>>
<<if $arcologies[0].FSRestartDecoration == 100 && $eugenicsFullControl != 1>>
Word spreads fast through your peers that you gave birth to <<if _curBabies > 1>>low class infants<<else>>a low class child<</if>> @@.red;utterly devastating your standing among the Elite.@@
@@ -559,13 +559,13 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<elseif $arcologies[0].FSChattelReligionistLaw == 1>>
Rumors spread that The Prophet gave birth to a slave's child<<if _curBabies > 1>>ren<</if>>.
<<if $arcologies[0].FSSupremacist != "unset">>
- <<if $slaves[_pb].race != $arcologies[0].FSSupremacistRace>>
+ <<if _pb.race != $arcologies[0].FSSupremacistRace>>
Word is that your child<<if _curBabies > 1>>ren were<<else>> was<</if>> not $arcologies[0].FSSupremacistRace. As The Prophet saw fit to bear such a child, society views it as a sign to @@.red;reject $arcologies[0].FSSupremacistRace supremacy.@@
<<set $arcologies[0].FSSupremacist -= 120>>
<</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
- <<if $slaves[_pb].race == $arcologies[0].FSSubjugationistRace>>
+ <<if _pb.race == $arcologies[0].FSSubjugationistRace>>
In addition, The Prophet's womb bore <<if _curBabies == 1>>a <</if>>$arcologies[0].FSSubjugationistRace child<<if _curBabies > 1>>ren<</if>>, surely a sign to end @@.red;reject $arcologies[0].FSSubjugationistRace subjugation.@@
<<set $arcologies[0].FSSubjugationist -= 120>>
<</if>>
@@ -574,13 +574,13 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
Rumors spread that your child<<if _curBabies > 1>>ren were<<else>> was<</if>> fathered by a slave, @@.red;harming your lasting reputation.@@
<<set $PC.degeneracy += 20>>
<<if $arcologies[0].FSSupremacist != "unset">>
- <<if $slaves[_pb].race != $arcologies[0].FSSupremacistRace>>
+ <<if _pb.race != $arcologies[0].FSSupremacistRace>>
Furthermore, word is that your child<<if _curBabies > 1>>ren were<<else>> was<</if>> not $arcologies[0].FSSupremacistRace, @@.red;further hurting your lasting reputation.@@
<<set $PC.degeneracy += 10>>
<</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
- <<if $slaves[_pb].race == $arcologies[0].FSSubjugationistRace>>
+ <<if _pb.race == $arcologies[0].FSSubjugationistRace>>
In addition, there is a nasty rumor that you gave birth to <<if _curBabies == 1>>a <</if>>$arcologies[0].FSSubjugationistRace child<<if _curBabies > 1>>ren<</if>>, @@.red;devastating your lasting reputation.@@
<<set $PC.degeneracy += 50>>
<</if>>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index a5ee364c832be1e262b4854de9c428d5f2b33f3b..879259fede1136f915962f194510aeb63dfb5f38 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -370,9 +370,11 @@
<<elseif $PC.preg == 22>>
Something startling happened this week; while enjoying a slave, your belly button popped out!
<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
- <<set _babyDaddy = $slaveIndices[$PC.pregSource]>>
- <<set $slaves[_babyDaddy].PCKnockedUp++>>
- Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <<set _babyDaddy = findFather($PC.pregSource)>>
+ <<set _babyDaddy.PCKnockedUp++>>
+ <<if def $slaveIndices[$PC.pregSource]>>
+ Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <</if>>
<</if>>
<</if>>
<<elseif $PC.career == "escort">>
@@ -437,9 +439,11 @@
<<elseif $PC.preg == 22>>
Something startling happened this week; while enjoying a slave, your belly button popped out!
<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
- <<set _babyDaddy = $slaveIndices[$PC.pregSource]>>
- <<set $slaves[_babyDaddy].PCKnockedUp++>>
- Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <<set _babyDaddy = findFather($PC.pregSource)>>
+ <<set _babyDaddy.PCKnockedUp++>>
+ <<if def $slaveIndices[$PC.pregSource]>>
+ Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <</if>>
<</if>>
<</if>>
<<else>>
@@ -504,15 +508,17 @@
<<elseif $PC.preg == 22>>
Something startling happened this week; while enjoying a slave, your belly button popped out!
<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
- <<set _babyDaddy = $slaveIndices[$PC.pregSource]>>
- <<set $slaves[_babyDaddy].PCKnockedUp++>>
- Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <<set _babyDaddy = findFather($PC.pregSource)>>
+ <<set _babyDaddy.PCKnockedUp++>>
+ <<if def $slaveIndices[$PC.pregSource]>>
+ Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <</if>>
<</if>>
<</if>>
<</if>>
<<elseif _passage == "Analyze PC Pregnancy">>
<<if $PC.belly >= 120000>>
- You shudder at the cool touch of the sensor running along the curve of your sensitve pregnancy. While you've devised a way to scan the distant peak of your navel and the depths of your underbelly, you failed to take into account just how excited your children would get over the attention. Every pass is a battle against your kicking brood.
+ You shudder at the cool touch of the sensor running along the curve of your sensitive pregnancy. While you've devised a way to scan the distant peak of your navel and the depths of your underbelly, you failed to take into account just how excited your children would get over the attention. Every pass is a battle against your kicking brood.
<<elseif $PC.belly >= 90000>>
You shudder at the cool touch of the sensor running along the curve of your pregnancy. It takes some stretching, but you can just barely scan yourself without assistance. If you grow much larger, you'll have to call in help for those places that elude your reach.
<<elseif $PC.belly >= 45000>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index d699037e8ef1d6298923a5a1d7a08cb1e82fe722..3dcea780f014834686fefbf4dcfd51e6f8a9f484 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -314,9 +314,10 @@
<<if $slaves[$i].curBabies[_cb].fatherID == -1>>
<<set $PC.slavesFathered++>>
<<elseif $slaves[$i].curBabies[_cb].fatherID > 0>>
- <<set _babyDaddy = $slaveIndices[$slaves[$i].curBabies[_cb].fatherID]>>
+ <<set _babyDaddy = findFather($slaves[$i].curBabies[_cb].fatherID)>>
<<if def _babyDaddy>>
- <<set $slaves[_babyDaddy].slavesFathered++>>
+ <<set _adjust = _babyDaddy.slavesFathered++>>
+ <<set adjustFatherProperty(_babyDaddy, slavesFathered, _adjust)>>
<</if>>
<</if>>
<</for>>
@@ -411,12 +412,12 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<elseif $slaves[$i].curBabies[_seb].fatherID == -7>>
<<set _fathers.push("your own design")>>
<<else>>
- <<set _babyDaddy = $slaveIndices[$slaves[$i].curBabies[_seb].fatherID]>>
+ <<set _babyDaddy = findFather($slaves[$i].curBabies[_seb].fatherID)>>
<<if def _babyDaddy>>
- <<if $slaves[_babyDaddy].ID == $slaves[$i].ID>>
+ <<if _babyDaddy.ID == $slaves[$i].ID>>
<<set _fathers.push(String($his + " own curiosity over if " + $he + " could fuck " + $himself))>>
<<else>>
- <<set _fathers.push(String($slaves[_babyDaddy].slaveName+ "'s virile cock and balls"))>>
+ <<set _fathers.push(String(_babyDaddy.slaveName+ "'s virile cock and balls"))>>
<</if>>
<<else>>
<<set _fathers.push("an unknown father")>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 13406528d666de3136f50854f86d7be7d6d60a93..9fea8d86b7b0de554dd787167c64bd90a4f5bc8c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -680,21 +680,24 @@
<<if ndef $nursery>>
<<set $nursery = 0>>
<</if>>
-<<if ndef $nurseryCribs>>
- <<set $nurseryCribs = 0>>
-<</if>>
-<<if ndef $nurserySlaves>>
- <<set $nurserySlaves = 0>>
+<<if ndef $nurseryNannies>>
+ <<set $nurseryNannies = 0>>
<</if>>
<<if ndef $nurseryBabies>>
<<set $nurseryBabies = 0>>
<</if>>
+<<if ndef $nurserySlaves>>
+ <<set $nurserySlaves = 0>>
+<</if>>
<<if ndef $NurseryiIDs>>
<<set $NurseryiIDs = []>>
<</if>>
<<if $NurseryiIDs.length > 0 && typeof $NurseryiIDs[0] === 'object'>>
<<set $NurseryiIDs = $NurseryiIDs.map(function(a) { return a.ID; })>>
<</if>>
+<<if ndef $Matron>>
+ <<set $Matron = 0>>
+<</if>>
<<if ndef $nannyInfluence>>
<<set $nannyInfluence = 0>>
<</if>>
@@ -750,6 +753,9 @@
<<if $FarmyardiIDs.length > 0 && typeof $FarmyardiIDs[0] === 'object'>>
<<set $FarmyardiIDs = $FarmyardiIDs.map(function(a) { return a.ID; })>>
<</if>>
+<<if ndef $Farmer>>
+ <<set $Farmer = 0>>
+<</if>>
<<if ndef $farmyardName>>
<<set $farmyardName = "the Farmyard">>
<</if>>
@@ -3484,7 +3490,7 @@ Setting missing slave variables:
<</for>>
<</if>>
-<<if $nursery > 0>>
+<<if $nurseryNannies > 0>>
<<for _bcn = 0; _bcn < $cribs.length; _bcn++>>
<<set _incubatedSlave = $cribs[_bcn]>>
<<PMODinit _incubatedSlave>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 0dc906bf42845f3557aabf076b4798f759f66e12..1fcf66389fc21ab32deb37f4be0f93fd0ab68fe4 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1742,7 +1742,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<</if>>
$activeSlave.slaveName pulls out, sits $his bare butt down on the floor, and hauls a struggling $subSlave.slaveName onto $his lap, shoving $his stiff prick back where it belongs. Then $activeSlave.slaveName hauls $subSlave.slaveName's legs back, offering you _his2 already-occupied hole.
<<if $subSlave.vagina != 0 && _vaginal == 0>>$subSlave.slaveName has another hole, and _he2 tearfully begs you to use it, but in vain.<</if>>
- You jam yourself inside, enjoying $subSlave.slaveName's wriggling<<if !_fit>> and the extreme tightness of _his2 overfilled insides. _He2 spasms with pain as you force your way inside _him2<</if>>. $activeSlave.slaveName can't thrust much from where $he is, and serves mostly to tighten $subSlave.slaveName for you, but $he <<if canSee($activeSlave)>>stares into your eyes lovingly<<else>>lovingly smiles at you<</if>>. Playing such an equal sexual role with you definitely @@.mediumaquamarine;builds $his trust@@ in #his role. For _his2 part, $subSlave.slaveName is @@.gold;thoroughly degraded,@@ <<if _fit>>but physically unhurt.<<else>>and @@.orange;stretched out.@@<</if>>
+ You jam yourself inside, enjoying $subSlave.slaveName's wriggling<<if !_fit>> and the extreme tightness of _his2 overfilled insides. _He2 spasms with pain as you force your way inside _him2<</if>>. $activeSlave.slaveName can't thrust much from where $he is, and serves mostly to tighten $subSlave.slaveName for you, but $he <<if canSee($activeSlave)>>stares into your eyes lovingly<<else>>lovingly smiles at you<</if>>. Playing such an equal sexual role with you definitely @@.mediumaquamarine;builds $his trust@@ in $his role. For _his2 part, $subSlave.slaveName is @@.gold;thoroughly degraded,@@ <<if _fit>>but physically unhurt.<<else>>and @@.orange;stretched out.@@<</if>>
<<set $activeSlave.trust += 4, $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<<set $subSlave.trust -= 4>>
<<if _vaginal>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index d1f11877a2a7b5150d7da4e2ca9b9b64a056e8cd..e798d04b03a442929c2eb6dacb8e79aec9ab301e 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -84,7 +84,7 @@ if(!Macro.has('sectorblock')) {
transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
Barracks: { base: 'Barracks', name: 'Garrison', extra: ' of $mercenariesTitle' },
Farmyard: { extra: ' <<if $farmyardNameCaps != "The Farmyard">>$farmyardNameCaps<</if>> ($farmyardSlaves/<<print $farmyard>><<if $Farmer>>, L<</if>>)'},
- Nursery: { extra: ' <<if $nurseryNameCaps != "The Nursery">>$nurseryNameCaps<</if>> ($nurseryBabies babies, $nurserySlaves/<<print $nursery>><<if $Matron>>,L<</if>>)'},
+ Nursery: { extra: ' <<if $nurseryNameCaps != "The Nursery">>$nurseryNameCaps<</if>> ($nurseryBabies babies, $nurserySlaves/<<print $nurseryNannies>><<if $Matron>>,L<</if>>)'},
/* speciality shop types */
'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
'Supremacist': { base: 'Shops', name: 'Supremacist Shops', cls: 'FSShops' },
@@ -144,7 +144,7 @@ if(!Macro.has('sectorblock')) {
<<if $dojo > 1>>[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>> <</if>>
<<if $servantsQuarters>> <<print ServantQuartersUIName()>> ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
<<if $spa>> <<print SpaUIName()>> ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
- <<if $nursery>> <<print NurseryUIName()>> (<<if $nurseryCribs-$nurseryBabies == 0>>No empty rooms<<elseif $nurseryCribs-$nurseryBabies == 1>>1 empty room<<else>><<print $nurseryCribs-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nursery<<if $Matron>>, L<</if>>)<</if>>
+ <<if $nursery>> <<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nurseryNannies<<if $Matron>>, L<</if>>)<</if>>
<<if $clinic>> <<print ClinicUIName()>> ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>>
<<if $schoolroom>> <<print SchoolRoomUIName()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
<<if $cellblock>> <<print CellblockUIName()>> ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 53997bc65360e940dfc1e4b6d6900b6746a01349..b5b576f40a49e6ec4147b33c4cf7dc8f7b01d95c 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -96,7 +96,7 @@ your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+
<br>__Servants' Quarters__ maintenance: <<print cashFormat((0.2*$servantsQuartersUpgradeMonitoring*$servantsQuarters*$facilityCost))>>
<</if>>
<<if $nursery > 0>> /*TODO: this will definitely need to be expanded to take into account the number of children and other factors*/
- <br>__Nursery maintenance: <<print cashFormat($nursery*$facilityCost)>>
+ <br>__Nursery maintenance: <<print cashFormat($nurseryNannies*$facilityCost)>>
<</if>>
<<if $farmyard > 0>> /*TODO: this will also need to be expanded*/
<br>__Farmyard__ maintenance: <<print cashFormat($farmyard*$facilityCost)>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index bf532877e5e8c2a4c0e955cf05d7968be2e3e7d4..3fd698baf33e02674cdc1b6e666a572f8d9197e0 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1286,7 +1286,7 @@ is
<<elseif setup.attendantCareers.includes($activeSlave.career)>>
$activeSlave.career, giving $him potential as an Attendant for <<if $spa == 0>>a Spa<<else>>$spaName<</if>>.
<<elseif setup.matronCareers.includes($activeSlave.career)>>
- $activeSlave.career, giving $him potential as a Matron for <<if $nursery == 0>>a Nursery<<else>>$nurseryName<</if>>.
+ $activeSlave.career, giving $him potential as a Matron for <<if $nursery == 0 && $nurseryNannies == 0>>a Nursery<<else>>$nurseryName<</if>>.
<<elseif setup.nurseCareers.includes($activeSlave.career)>>
$activeSlave.career, giving $him potential as a Nurse for <<if $clinic == 0>>a Clinic<<else>>$clinicName<</if>>.
<<elseif setup.schoolteacherCareers.includes($activeSlave.career)>>
@@ -1431,6 +1431,9 @@ is
<<if ($activeSlave.skillMM >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
+<<if ($activeSlave.skillFA >= $masteredXP)>>
+ <<set _numCareers += 1>>
+<</if>>
<<if ($activeSlave.skillWA >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
@@ -1544,6 +1547,14 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
+ <<if $activeSlave.skillFA >= $masteredXP>>
+ <<if _numCareers == 1>>
+ Farmer.
+ <<else>>
+ Farmer and
+ <</if>>
+ <<set _numCareers -= 1>>
+ <</if>>
<<if $activeSlave.skillWA >= $masteredXP>>
Wardeness.
<</if>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index a27f144e0ea922ddc28d2c9a0e282d336962e475..46c51ea9a6a8b986f63d0f8cfb7a78bf299d4ebb 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -76,7 +76,7 @@ __Penthouse Facilities__
<<if $familyTesting == 1 && $seePreg != 0>>
<br>
<<if $nursery == 0>>
- [[Build a nursery to raise children from birth|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $nurseryCribs = 5, $nursery = 1, $PC.engineering += 1]]
+ [[Build a nursery to raise children from birth|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $nursery = 5, $nurseryNannies = 1, $PC.engineering += 1]]
//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
<<else>>
The penthouse has a nursery built where infants can be brought up.
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 4a7cbc0f8b050fa971a5301d2c12450e9184e688..f784a38f5991fe79696dbe5f318192aab43289d6 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -19,9 +19,9 @@
You order $eventSlave.slaveName to come to your office. The <<if $eventSlave.relationship == -2>>worshipful<<else>>slutty<</if>> $desc arrives promptly, greets you correctly, and waits <<if $eventSlave.relationship == -2>>adoringly for a command<<else>>eagerly for you to fuck $him<</if>>. You consider the situation carefully.
<<if $eventSlave.relationship == -2>>
- She's emotionally bonded to you, and loves you with all $his heart. $He would probably do anything you command and love you all the more for it. If you were to decide that you were tired of $his adoration, you could probably set $him up with another similarly broken slave. If you ordered them to love each other like they love you, they'd obey.
+ $He's emotionally bonded to you, and loves you with all $his heart. $He would probably do anything you command and love you all the more for it. If you were to decide that you were tired of $his adoration, you could probably set $him up with another similarly broken slave. If you ordered them to love each other like they love you, they'd obey.
<<else>>
- $He's an emotional slut, and worships you and values herself primarily in terms of sex. $He's such a perfect sex slave that $he'd probably fuck anyone or anything you told $him to, and love you all the more for giving $him the chance. If you were to decide that even a sex slave like $him needs a little more structure than constant omnisexual lust, you could probably set $him up with another universal slut.
+ $He's an emotional slut, and worships you and values $himself primarily in terms of sex. $He's such a perfect sex slave that $he'd probably fuck anyone or anything you told $him to, and love you all the more for giving $him the chance. If you were to decide that even a sex slave like $him needs a little more structure than constant omnisexual lust, you could probably set $him up with another universal slut.
<</if>>
Their relationship would probably be somewhat artificial at first, and they'd have to struggle at it, but after a period of adjustment, you'd have two worshipful slaves again, except that they'd be together. It'd definitely help if they had compatible behavioral quirks and sexual fetishes.
<br><br>
@@ -252,7 +252,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
$His lacy g-string is starting to look a bit moist in front.
<</if>>
<</if>>
- <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a simple steel ring on $his finger; she does not reciprocate, since this marriage does not bind you.
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a simple steel ring on $his finger; $he does not reciprocate, since this marriage does not bind you.
<<if $assistant == 0>>
"The marriage protocol now requires you to <<if $PC.dick == 1>>fellate<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he hurries to obey.
<<else>>
@@ -329,7 +329,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
<<replace "#surnaming">>
<<set $eventSlave.slaveSurname = $PC.surname, $eventSlave.devotion += 5, $eventSlave.trust += 5>>
Before you get too distracted, you tell your lovely new wife that $he's now to be known as $eventSlave.slaveName $eventSlave.slaveSurname. It would be an understatement to say $he's delighted. $He's a good $desc, but even $he has to retain a kernel of doubt about whether a marriage between an owner and a piece of property is really worth much. This @@.mediumaquamarine;reassures $him@@ that it is. $His special day probably wasn't exactly like $he might once have imagined it, but $he obviously thinks it's been @@.hotpink;very nice,@@ all things considered.
- <<if canTalk($eventSlave)>>"$eventSlave.slaveName $eventSlave.slaveSurname," $he murmurs to herself occasionally, smiling.<</if>>
+ <<if canTalk($eventSlave)>>"$eventSlave.slaveName $eventSlave.slaveSurname," $he murmurs to $himself occasionally, smiling.<</if>>
<<set $activeSlave = $eventSlave>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index c8487bc761c06b4346db70794404f8fef432eca8..9a577e4bf0bf0647479da1d5b2165798715d99e7 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -10,7 +10,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
testicles: 0,
scrotum: 0,
pigTesticles: 0,
- dogTesticles: 0,
+ canineTesticles: 0,
horseTesticles: 0,
cowTesticles: 0,
foreskin: 0,
@@ -18,7 +18,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
freshOvaries: 0,
prostate: 0,
pigOvaries: 0,
- dogOvaries: 0,
+ canineOvaries: 0,
horseOvaries: 0,
cowOvaries: 0,
eyes: 0,
@@ -26,7 +26,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
voicebox: 0,
mpreg: 0,
mpregPig: 0,
- mpregDog: 0,
+ mpregCanine: 0,
mpregHorse: 0,
mpregCow: 0
}>>
@@ -44,8 +44,8 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $completedOrgans[_j].type == "pigTesticles">>
<<set _slaveOrgans.pigTesticles = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
- <<elseif $completedOrgans[_j].type == "dogTesticles">>
- <<set _slaveOrgans.dogTesticles = $completedOrgans[_j]>>
+ <<elseif $completedOrgans[_j].type == "canineTesticles">>
+ <<set _slaveOrgans.canineTesticles = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
<<elseif $completedOrgans[_j].type == "horseTesticles">>
<<set _slaveOrgans.horseTesticles = $completedOrgans[_j]>>
@@ -68,8 +68,8 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $completedOrgans[_j].type == "pigOvaries">>
<<set _slaveOrgans.pigOvaries = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
- <<elseif $completedOrgans[_j].type == "dogOvaries">>
- <<set _slaveOrgans.dogOvaries = $completedOrgans[_j]>>
+ <<elseif $completedOrgans[_j].type == "canineOvaries">>
+ <<set _slaveOrgans.canineOvaries = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
<<elseif $completedOrgans[_j].type == "horseOvaries">>
<<set _slaveOrgans.horseOvaries = $completedOrgans[_j]>>
@@ -92,8 +92,8 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $completedOrgans[_j].type == "mpregPig">>
<<set _slaveOrgans.mpregPig = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
- <<elseif $completedOrgans[_j].type == "mpregDog">>
- <<set _slaveOrgans.mpregDog = $completedOrgans[_j]>>
+ <<elseif $completedOrgans[_j].type == "mpregCanine">>
+ <<set _slaveOrgans.mpregCanine = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
<<elseif $completedOrgans[_j].type == "mpregHorse">>
<<set _slaveOrgans.mpregHorse = $completedOrgans[_j]>>
@@ -299,7 +299,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addPigOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
@@ -321,7 +321,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
/* dog ovaries */
- <<if _slaveOrgans.dogOvaries != 0>>
+ <<if _slaveOrgans.canineOvaries != 0>>
<<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == -1)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.ovaries = 1>>
@@ -342,25 +342,25 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addDogOvaries">>
+ <<set $surgeryType = "addAAnimalOvaries">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
@@.red;Could not implant dog ovaries on $activeSlave.slaveName: she already has ovaries.@@
- <<set $completedOrgans.push(_slaveOrgans.dogOvaries)>>
+ <<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
@@.red;Could not implant dog ovaries on $activeSlave.slaveName: she lacks a vagina.@@
- <<set $completedOrgans.push(_slaveOrgans.dogOvaries)>>
+ <<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
@@.red;Could not implant dog ovaries on $activeSlave.slaveName: she has a fillable abdominal implant.@@
- <<set $completedOrgans.push(_slaveOrgans.dogOvaries)>>
+ <<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
@@.red;Could not implant dog ovaries on $activeSlave.slaveName: she has an anal womb.@@
- <<set $completedOrgans.push(_slaveOrgans.dogOvaries)>>
+ <<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<</if>>
<</if>>
/* horse ovaries */
@@ -385,7 +385,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addHorseOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
@@ -428,7 +428,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addCowOvaries">>
+ <<set $surgeryType = "addAnimalOvaries">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
@@ -514,7 +514,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "mpregPig">>
+ <<set $surgeryType = "mpregAnimal">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
@@ -536,7 +536,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
/* male dog preg */
- <<if _slaveOrgans.mpregDog != 0>>
+ <<if _slaveOrgans.mpregCanine != 0>>
<<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == -1)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.mpreg = 1>>
@@ -557,25 +557,25 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "mpregDog">>
+ <<set $surgeryType = "mpregAnimal">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
@@.red;Could not implant dog anal womb on $activeSlave.slaveName: she has ovaries.@@
- <<set $completedOrgans.push(_slaveOrgans.mpregDog)>>
+ <<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
@@.red;Could not implant dog anal womb on $activeSlave.slaveName: she has a vagina.@@
- <<set $completedOrgans.push(_slaveOrgans.mpregDog)>>
+ <<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
@@.red;Could not implant dog anal womb on $activeSlave.slaveName: she has a fillable abdominal implant.@@
- <<set $completedOrgans.push(_slaveOrgans.mpregDog)>>
+ <<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
@@.red;Could not implant dog anal womb on $activeSlave.slaveName: she already has an anal womb.@@
- <<set $completedOrgans.push(_slaveOrgans.mpregDog)>>
+ <<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<</if>>
<</if>>
/* male horse preg */
@@ -600,7 +600,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "mpregHorse">>
+ <<set $surgeryType = "mpregAnimal">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
@@ -643,7 +643,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "mpregCow">>
+ <<set $surgeryType = "mpregAnimal">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
@@ -782,7 +782,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addPigBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
@@ -796,7 +796,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
/* dog testicles */
- <<if _slaveOrgans.dogTesticles != 0>>
+ <<if _slaveOrgans.canineTesticles != 0>>
<<if ($activeSlave.dick >= 0) && ($activeSlave.balls == 0)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.balls = 2>>
@@ -818,17 +818,17 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<br><hr>
- <<set $surgeryType = "addDogBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
<br><hr>
@@.red;Could not implant dog testicles on $activeSlave.slaveName: she lacks a penis.@@
- <<set $completedOrgans.push(_slaveOrgans.dogTesticles)>>
+ <<set $completedOrgans.push(_slaveOrgans.canineTesticles)>>
<<else>>
<br><hr>
@@.red;Could not implant dog testicles on $activeSlave.slaveName: she already has testicles.@@
- <<set $completedOrgans.push(_slaveOrgans.dogTesticles)>>
+ <<set $completedOrgans.push(_slaveOrgans.canineTesticles)>>
<</if>>
<</if>>
/* horse testicles */
@@ -853,7 +853,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addHorseBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
@@ -888,7 +888,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<</if>>
<</if>>
- <<set $surgeryType = "addCowBalls">>
+ <<set $surgeryType = "addAnimalBalls">>
<br><hr>
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index e83d76ef9570537a894cff1780b81792b8db4500..5f8e94b3abbe0cbc3ebec51c292933e2e3a7224b 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -138,7 +138,8 @@ An older woman comes to see you representing her family business. She's pretty e
<<set $activeSlave.pregSource = $activeSlave.ID + 1000>>
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
-<<run SetBellySize($activeSlave)>>
+<<set $activeSlave.belly = 8000>>
+<<set $activeSlave.bellyPreg = 8000>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.birthsTotal += 1>>
<<set $activeSlave.face = 15>>
@@ -234,7 +235,8 @@ It would cost <<print cashFormat($contractCost)>> to enslave the two of them.
<<set $activeSlave.pregSource = $activeSlave.ID + 1000>>
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
-<<run SetBellySize($activeSlave)>>
+<<set $activeSlave.belly = 8000>>
+<<set $activeSlave.bellyPreg = 8000>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.face = random(15,40)>>
<<set $activeSlave.vaginalSkill = 15>>
@@ -791,7 +793,8 @@ One of them speaks up. "We're twins, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>
<<set $activeSlave.pregSource = $activeSlave.ID + 1000>>
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
-<<run SetBellySize($activeSlave)>>
+<<set $activeSlave.belly = 14000>>
+<<set $activeSlave.bellyPreg = 14000>>
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.pubertyXY = 1>>
<<set $activeSlave.hStyle = "in twin tails">>
@@ -1017,7 +1020,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<</link>>
<</if>>
-<<case "incest mother son" "incest father daughter" "incest brother sister" "incest sister sister" "incest brother brother" "incest twin sister" "incest twin brother" "incest twins mixed" "incest mother daughter" "incest father son">>
+<<case "incest father daughter" "incest sister sister" "incest brother brother" "incest twin sister" "incest twin brother" "incest twins mixed" "incest mother daughter" "incest father son">>
<<link "Buy both">>
<<set $sissy = $activeSlave, $cash -= $contractCost>>
@@ -1025,7 +1028,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<goto "RecETS workaround">>
<</link>>
-<<case "matched pair" "identical pair" "identical herm pair">>
+<<case "matched pair" "identical pair">>
<<link "Buy both">>
<<set $sissy = $activeSlave, $cash -= $contractCost>>
@@ -1033,6 +1036,12 @@ This call is coming from a public kiosk, which is usually an indication that the
<<goto "RecETS workaround">>
<</link>>
+<<case "identical herm pair" "incest mother son" "incest brother sister">>
+<<link "Buy both">>
+ <<set $sissy = $activeSlave, $cash -= $contractCost>>
+ <<goto "RecETS workaround">>
+<</link>>
+
<<default>>
<br>ERROR: bad recETS event $RecETSevent <<print "[[Go back to previous passage '" + previous() +"'][previous()]]">>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 71a00eb527777057a52eea84f35647230305e383..096b80cb9a0c0cdd908ed0688dfbd3164928760b 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -705,6 +705,13 @@ You turn to the child clutching her mother's grotesque belly.
<<run newSlave($activeSlave)>>
+<<switch $RecETSevent>>
+ <<case "identical herm pair" "incest mother son" "incest brother sister">>
+ <<run newSlave($sissy)>>
+ <<default>>
+ /* do nothing */
+<</switch>>
+
<<switch $RecETSevent>>
<<case "incest mother son" "incest father daughter" "incest brother sister" "incest sister sister" "incest brother brother" "incest mother daughter" "incest father son" "incest twin sister" "incest twins mixed" "incest twin brother">>
<<include "newSlaveIncestSex">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 8a4e51c68fed1116fecdc75a96ddf866c787bcea..a867084f1cd8c5dcbab4a250ec7aea1094cbab7f 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -774,7 +774,7 @@ $He's got a
<</if>>
<br><br>
-Work on her sex:
+Work on $his sex:
<<if $activeSlave.vagina > -1>>
<br>
@@ -1115,7 +1115,7 @@ Work on her sex:
<br><br>
-Work on her asshole:
+Work on $his asshole:
<br>
$He has
<<if $activeSlave.anus == 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index af5d833daac88ff99ffdee82a82e6c170794bb28..a809641a9778ff80abd51bc7815e9cad94915d63 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2922,8 +2922,11 @@
<<if $slaves[$i].pregSource == -1>>
<<set $PC.slavesKnockedUp++>>
<<elseif $slaves[$i].pregSource > 0>>
- <<set _babyDaddy = $slaveIndices[$slaves[$i].pregSource]>>
- <<set $slaves[_babyDaddy].slavesKnockedUp++>>
+ <<set _babyDaddy = findFather($slaves[$i].pregSource)>>
+ <<if def _babyDaddy>>
+ <<set _adjust = _babyDaddy.slavesKnockedUp++>>
+ <<set adjustFatherProperty(_babyDaddy, slavesKnockedUp, _adjust)>>
+ <</if>>
<</if>>
<</if>>
<<if $slaves[$i].bellyFluid > 2000>>
@@ -4256,7 +4259,7 @@
<</if>>
<<if $slaves[$i].pregKnown == 1>>
<<if $slaves[$i].pregSource > 0>>
- <<set _saLTE = getSlave($slaves[$i].pregSource)>>
+ <<set _saLTE = findFather($slaves[$i].pregSource)>>
<<if def _saLTE>>
<<if $slaves[$i].race != _saLTE.race>>
Society @@.red;strongly disapproves@@ of your allowing a pure $arcologies[0].FSSupremacistRace slave to be miscegenated by _saLTE.slaveName.
@@ -4306,10 +4309,10 @@
<</if>>
<<else>>
<<if $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource > 0>>
- <<set _lte = $slaveIndices[$slaves[$i].pregSource]>>
+ <<set _lte = findFather($slaves[$i].pregSource)>>
<<if ndef _lte>>@@.red;Error, pregSource not found.@@<</if>>
- <<if $slaves[_lte].race == $arcologies[0].FSSubjugationistRace>>
- Society @@.red;strongly disapproves@@ of your allowing $slaves[$i].slaveName to be miscegenated by a $arcologies[0].FSSubjugationistRace subhuman like $slaves[_lte].slaveName.
+ <<if _lte.race == $arcologies[0].FSSubjugationistRace>>
+ Society @@.red;strongly disapproves@@ of your allowing $slaves[$i].slaveName to be miscegenated by a $arcologies[0].FSSubjugationistRace subhuman like _lte.slaveName.
<<= FSChangePorn("Subjugationist", -2)>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 9a11a3c8cb51b84ab3eadeb149de285e2795c6d7..e7dbef613a1455f561a137b077787f3c12d833ff 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -48,7 +48,11 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the
<<set _origins.push("lawyer")>>
<</if>>
<<if $seeDicks != 0>>
- <<set _origins.push("male military officer")>>
+ <<if $seeDicks == 100>>
+ <<set _origins = ["male military officer", "male military officer", "male military officer"]>> /*todo: add more XY targets so this isn't necessary*/
+ <<else>>
+ <<set _origins.push("male military officer")>>
+ <</if>>
<</if>>
<<for _ser = 0; _ser < 3; _ser++>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index c6f32955b773d81b3ed1f25e8e3d9502a26e7dad..e260846898b6e2478bc33f13f90397ef622fe2b1 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -53,7 +53,7 @@
<<set $activeSlave.vaginalCount += _randomVag, $activeSlave.oralCount += _randomOral, $vaginalTotal += _randomVag, $oralTotal += _randomOral>>
By week's end, $he's managed to ruin $his body out of spite. $He can barely move; trapped on $his back as cum steadily drips from $his prolapsed, gaping, destroyed cunt.
<<if $activeSlave.vagina == 0>>
- Her actions robbed you of @@.lime;$his virginity.@@
+ $His actions robbed you of @@.lime;$his virginity.@@
<</if>>
<<if $activeSlave.vagina < 4>><<set $activeSlave.vagina = 4>><</if>>
<<if canGetPregnant($activeSlave) && (random(1,100) > 70) && $activeSlave.eggType == "human">>
@@ -68,7 +68,7 @@
<<set $activeSlave.analCount += _randomAnal, $activeSlave.oralCount += _randomOral, $analTotal += _randomAnal, $oralTotal += _randomOral>>
By week's end, $he's managed to ruin $his body out of spite. $He can barely move; trapped on $his back as cum steadily drips from $his prolapsed, gaping, destroyed anus.
<<if $activeSlave.anus == 0>>
- Her actions robbed you of @@.lime;$his anal virginity.@@
+ $His actions robbed you of @@.lime;$his anal virginity.@@
<</if>>
<<set $activeSlave.anus = 4>>
<<if canGetPregnant($activeSlave) && (random(1,100) > 70) && $activeSlave.eggType == "human">>
@@ -80,7 +80,7 @@
<<else>>
<<set _randomOral = random(60,100)>>
<<set $activeSlave.oralCount += _randomOral, $oralTotal += _randomOral>>
- By week's end, $he's managed to make herself sick from sucking down so much sexual fluid. Luckily inducing vomiting will save your wedding from making the tabloids.
+ By week's end, $he's managed to make $himself sick from sucking down so much sexual fluid. Luckily inducing vomiting will save your wedding from making the tabloids.
<</if>>
<<elseif $activeSlave.relationship == 4>>
fucking $his love, $slaves[_m].slaveName, as often as possible while ignoring you.
@@ -134,7 +134,7 @@
<<else>>
<<set _randomOral = random(15,20)>>
<<set $activeSlave.oralCount += _randomOral, $oralTotal += _randomOral>>
- By week's end, $he's managed to make herself sick from going down on $slaves[_m].slaveName so often. Luckily inducing vomiting will save your wedding from making the tabloids.
+ By week's end, $he's managed to make $himself sick from going down on $slaves[_m].slaveName so often. Luckily inducing vomiting will save your wedding from making the tabloids.
<</if>>
<<elseif $activeSlave.relationship == 3>>
fucking $his lover, $slaves[_m].slaveName, as often as possible while ignoring you.
@@ -188,7 +188,7 @@
<<else>>
<<set _randomOral = random(15,20)>>
<<set $activeSlave.oralCount += _randomOral, $oralTotal += _randomOral>>
- By week's end, $he's managed to make herself sick from going down on $slaves[_m].slaveName so often. Luckily inducing vomiting will save your wedding from making the tabloids.
+ By week's end, $he's managed to make $himself sick from going down on $slaves[_m].slaveName so often. Luckily inducing vomiting will save your wedding from making the tabloids.
<</if>>
<<elseif $activeSlave.relationship > 0>>
spending time away from you with $slaves[_m].slaveName.
@@ -277,23 +277,23 @@
<<if $weddingPlanned == 3>>
The ceremony to bind <<= SlaveFullName($activeSlave)>> to you as your slave wife, and $his womb to you as your private breeding ground, is a polite affair which you host in the lower floor of your penthouse. <<if $arcologies[0].FSRestart != "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0)>>Barely anyone is there, mostly lower-class citizens, several accompanied by their slaves. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. There is a distinct air of unrest in the room, as if the absent Elites' distaste of your actions came in their place.<<else>>All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.<</if>>
<br><br>
- $activeSlave.slaveName appears after everyone has had a chance to socialize,<<if ($activeSlave.amp == 1)>> carried by another slave since she's a quadruple amputee and she cannot walk,<</if>> wearing beautiful bridal lingerie in
+ $activeSlave.slaveName appears after everyone has had a chance to socialize,<<if ($activeSlave.amp == 1)>> carried by another slave since $he's a quadruple amputee and $he cannot walk,<</if>> wearing beautiful bridal lingerie in
<<if ($activeSlave.vagina == 0)>>
- white, since she's a virgin.
+ white, since $he's a virgin.
<<elseif ($activeSlave.pregKnown == 1)>>
- light pink, since she's pregnant.
+ light pink, since $he's pregnant.
<<elseif ($activeSlave.vagina < 0) && ($activeSlave.anus == 0)>>
- white, since she's an anal virgin.
+ white, since $he's an anal virgin.
<<elseif ($activeSlave.vagina < 0) && ($activeSlave.boobs > 500)>>
- electric blue, since she's a shemale.
+ electric blue, since $he's a shemale.
<<elseif ($activeSlave.vagina < 0)>>
- pale blue, since she's a sissy slave.
+ pale blue, since $he's a sissy slave.
<<elseif ($activeSlave.dick > 0)>>
- hot pink, since she's a futa slave.
+ hot pink, since $he's a futa slave.
<<else>>
- light pink, since she's an experienced sex slave.
+ light pink, since $he's an experienced sex slave.
<</if>>
- A filmy veil covers $his head and shoulders. Her lacy bridal bra
+ A filmy veil covers $his head and shoulders. $His lacy bridal bra
<<if ($activeSlave.boobs > 4000)>>
is a marvel of engineering, discreetly reinforced to support $his gigantic udders.
<<elseif ($activeSlave.boobs > 1200)>>
@@ -304,76 +304,76 @@
flatters $his pretty chest.
<</if>>
<<if $activeSlave.bellyPreg >= 600000>>
- Her expansive, squirming pregnant belly makes $his bridal wear particularly obscene.
+ $His expansive, squirming pregnant belly makes $his bridal wear particularly obscene.
<<elseif ($activeSlave.bellyPreg >= 1500)>>
- Her _belly pregnant belly protrudes out the front of $his bridal wear.
+ $His _belly pregnant belly protrudes out the front of $his bridal wear.
<<elseif ($activeSlave.bellyImplant >= 1500)>>
- Her _belly <<print $activeSlave.bellyImplant>>cc belly implant protrudes her middle out the front of $his bridal wear.
+ $His _belly <<print $activeSlave.bellyImplant>>cc belly implant protrudes $his middle out the front of $his bridal wear.
<<elseif ($activeSlave.bellyFluid >= 10000)>>
- Her hugely bloated, <<print $activeSlave.inflationType>>-filled belly protrudes out the front of $his bridal wear.
+ $His hugely bloated, <<print $activeSlave.inflationType>>-filled belly protrudes out the front of $his bridal wear.
<<elseif ($activeSlave.bellyFluid >= 5000)>>
- Her bloated, <<print $activeSlave.inflationType>>-stuffed belly protrudes out the front of $his bridal wear.
+ $His bloated, <<print $activeSlave.inflationType>>-stuffed belly protrudes out the front of $his bridal wear.
<<elseif ($activeSlave.bellyFluid >= 1500)>>
- Her distended, <<print $activeSlave.inflationType>>-belly protrudes out the front of $his bridal wear.
+ $His distended, <<print $activeSlave.inflationType>>-belly protrudes out the front of $his bridal wear.
<</if>>
<<if $activeSlave.dickAccessory == ("chastity") || $activeSlave.dickAccessory == ("combined chastity")>>
- Her slave dick is hidden by its chastity cage.
+ $His slave dick is hidden by its chastity cage.
<<elseif canAchieveErection($activeSlave)>>
<<if ($activeSlave.dick > 4) && ($activeSlave.belly >= 5000)>>
$He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly.
<<elseif $activeSlave.dick > 4>>
$He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
<<else>>
- Her erection tents the front of $his lacy g-string.
+ $His erection tents the front of $his lacy g-string.
<</if>>
<<elseif ($activeSlave.dick > 0)>>
<<if $activeSlave.dick > 10>>
- Her huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
+ $His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
<<elseif $activeSlave.dick > 4>>
- Her big soft cock forms a lewd mass, stuffed into $his lacy g-string.
+ $His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
<<else>>
- Her lacy g-string perfectly conceals $his soft dick.
+ $His lacy g-string perfectly conceals $his soft dick.
<</if>>
<<else>>
<<if $activeSlave.clit > 1>>
- Her huge clit is quite hard, making her shift uncomfortably as $his lacy g-string stimulates it.
+ $His huge clit is quite hard, making $his shift uncomfortably as $his lacy g-string stimulates it.
<<else>>
- Her lacy g-string covers $his womanhood demurely.
+ $His lacy g-string covers $his womanhood demurely.
<</if>>
<</if>>
- There is no aisle for her to <<if $activeSlave.amp == 1>>be carried<<else>>walk<</if>> down, just a small space at the head of the room where you're standing alone, and there's no one to <<if $activeSlave.amp == 1>>walk alongside the slave carrying<<else>>walk<</if>> her there; this symbolizes $his submission to you
+ There is no aisle for $him to <<if $activeSlave.amp == 1>>be carried<<else>>walk<</if>> down, just a small space at the head of the room where you're standing alone, and there's no one to <<if $activeSlave.amp == 1>>walk alongside the slave carrying<<else>>walk<</if>> $him there; this symbolizes $his submission to you
<<if $activeSlave.fetish == "mindbroken">>
- despite the fact that she had to be pushed into walking towards you.
+ despite the fact that $he had to be pushed into walking towards you.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- of $his own choice, and she does so with a smile.
+ of $his own choice, and $he does so with a smile.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- of $his own choice, and she does so with hesitation.
+ of $his own choice, and $he does so with hesitation.
<<elseif $activeSlave.devotion < -20>>
- of $his own (forced) choice, and she does so with wavering steps.
+ of $his own (forced) choice, and $he does so with wavering steps.
<<else>>
- of $his own choice, and she does so willingly.
+ of $his own choice, and $he does so willingly.
<</if>>
<br><br>
- When she's in front of you,
+ When $he's in front of you,
<<if $activeSlave.amp == 1>>
- the slave carrying $his limbless torso sets her down on the floor in front of you and props her up so $his head is level with your crotch.
+ the slave carrying $his limbless torso sets $him down on the floor in front of you and props $him up so $his head is level with your crotch.
<<else>>
<<if $activeSlave.fetish == "mindbroken">>
- you push her onto $his knees so $his head
+ you push $him onto $his knees so $his head
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- she happily gets down on $his knees so $his head
+ $he happily gets down on $his knees so $his head
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- she slowly lowers herself onto $his knees so $his head
+ $he slowly lowers $himself onto $his knees so $his head
<<elseif $activeSlave.devotion < -20>>
- she quickly lowers herself onto $his knees so $his tear-streaked face
+ $he quickly lowers $himself onto $his knees so $his tear-streaked face
<<else>>
- she gets down on $his knees so $his head
+ $he gets down on $his knees so $his head
<</if>>
<</if>>
is level with your crotch.
- <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring
<<if $activeSlave.amp == 1>>
- on a cord around $his neck, since she lacks fingers to wear it on.
+ on a cord around $his neck, since $he lacks fingers to wear it on.
<<else>>
on $his <<if $activeSlave.devotion < -20 && $activeSlave.trust <= 20>>trembling <</if>>finger.
<</if>>
@@ -381,18 +381,18 @@
<br>
<<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
<br><br><span id="surnaming">
- <<link "Give her your surname too">>
+ <<link "Give $him your surname too">>
<<replace "#surnaming">>
<<set $activeSlave.slaveSurname = $PC.surname>>
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">>
- 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 $him now. Your guests, on the other hand, appreciate the gift.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- 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 $he to be blessed with your child, but $he's to take your surname as well.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- scoffs audibly. Just another burden for her to carry; like the child soon to be growing in $his womb.
+ scoffs audibly. Just another burden for $him to carry; like the child soon to be growing in $his womb.
<<elseif $activeSlave.devotion < -20>>
- breaks down again. Not only are you binding her to you with your child, but with your name as well.
+ breaks down again. Not only are you binding $him to you with your child, but with your name as well.
<<else>>
nods acceptingly. Your will is $his will, after all.
<</if>>
@@ -402,15 +402,15 @@
<</if>>
<br><br>
<<if $activeSlave.fetish == "mindbroken">>
- $activeSlave.slaveName is mindbroken, so you gather $him up and hold $him in front of you, pulling $his panties off as you do. $He follows your motions like a ragdoll. You maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>. Then you pull $his knees up to give your guests a good view as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. $He is left to face them, staring off into space. Though she faces the crowd, $his mind is empty; this might as well be any other fucking to $him. $He twitches ever so slightly when your seed flows into $him, orgasming robotically to @@.green;applause from your guests.@@ You'll fuck $him repeatedly over the next few days, ensuring impregnation.
+ $activeSlave.slaveName is mindbroken, so you gather $him up and hold $him in front of you, pulling $his panties off as you do. $He follows your motions like a ragdoll. You maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>. Then you pull $his knees up to give your guests a good view as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. $He is left to face them, staring off into space. Though $he faces the crowd, $his mind is empty; this might as well be any other fucking to $him. $He twitches ever so slightly when your seed flows into $him, orgasming robotically to @@.green;applause from your guests.@@ You'll fuck $him repeatedly over the next few days, ensuring impregnation.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- Then, you <<if $activeSlave.amp == 1>>gather $him up and hold $him in front of you, pulling $his panties off as you do. Showing considerable dexterity, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>><<else>>take $his hand and pull $him to $his feet while she shimmies out of $his panties. $He cocks $his hips for you and you slide your cock inside $him before taking $his knees and drawing them up to hold $him in midair, impaled on you<</if>>. $He is left to face your guests, watching raptly as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, it's @@.mediumaquamarine;concrete proof that she's special to you.@@ $He gasps when your seed flows into $him, orgasming herself to @@.green;applause from your guests.@@ You'll fuck $him repeatedly over the next few days, ensuring impregnation.
+ Then, you <<if $activeSlave.amp == 1>>gather $him up and hold $him in front of you, pulling $his panties off as you do. Showing considerable dexterity, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>><<else>>take $his hand and pull $him to $his feet while $he shimmies out of $his panties. $He cocks $his hips for you and you slide your cock inside $him before taking $his knees and drawing them up to hold $him in midair, impaled on you<</if>>. $He is left to face your guests, watching raptly as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, it's @@.mediumaquamarine;concrete proof that $he's special to you.@@ $He gasps when your seed flows into $him, orgasming $himself to @@.green;applause from your guests.@@ You'll fuck $him repeatedly over the next few days, ensuring impregnation.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- $activeSlave.slaveName is unwilling, so you gather $him up and hold $him in front of you, pulling $his panties off as you do. $He was crying before, but this causes $him to tremble and tear up in anticipation of what's next. Ignoring this, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>.<<if $activeSlave.amp != 1>> Then you pull $his knees up to give your guests a good view of the consummation.<</if>> $He is left to face them, watching sullenly as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, this is torture. $He gasps when your seed flows into $him, faking an orgasm to @@.green;applause from your guests.@@ At this, she shoots you a dirty look, blaming you for this indignity. You'll fuck $him repeatedly over the next few days, ensuring impregnation, despite $his efforts to defy you.
+ $activeSlave.slaveName is unwilling, so you gather $him up and hold $him in front of you, pulling $his panties off as you do. $He was crying before, but this causes $him to tremble and tear up in anticipation of what's next. Ignoring this, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>.<<if $activeSlave.amp != 1>> Then you pull $his knees up to give your guests a good view of the consummation.<</if>> $He is left to face them, watching sullenly as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, this is torture. $He gasps when your seed flows into $him, faking an orgasm to @@.green;applause from your guests.@@ At this, $he shoots you a dirty look, blaming you for this indignity. You'll fuck $him repeatedly over the next few days, ensuring impregnation, despite $his efforts to defy you.
<<elseif $activeSlave.devotion < -20>>
- $activeSlave.slaveName is unwilling, so you gather $him up and hold $him in front of you, pulling $his panties off as you do. $He was crying before, but this causes $him to tremble and sob loudly in anticipation of what's next. Ignoring this, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>.<<if $activeSlave.amp != 1>> Then you pull $his knees up to give your guests a good view of the consummation.<</if>> $He is left to face them, watching sullenly as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, this is torture. $He gasps when your seed flows into $him, orgasming unwillingly @@.green;applause from your guests.@@ At this, she completely breaks down, blubbering like a child at the unwelcome warmth in $his lower belly. You'll fuck $him repeatedly over the next few days, ensuring impregnation, despite $his protesting.
+ $activeSlave.slaveName is unwilling, so you gather $him up and hold $him in front of you, pulling $his panties off as you do. $He was crying before, but this causes $him to tremble and sob loudly in anticipation of what's next. Ignoring this, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>.<<if $activeSlave.amp != 1>> Then you pull $his knees up to give your guests a good view of the consummation.<</if>> $He is left to face them, watching sullenly as you fuck $his fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, this is torture. $He gasps when your seed flows into $him, orgasming unwillingly @@.green;applause from your guests.@@ At this, $he completely breaks down, blubbering like a child at the unwelcome warmth in $his lower belly. You'll fuck $him repeatedly over the next few days, ensuring impregnation, despite $his protesting.
<<else>>
- $activeSlave.slaveName isn't particularly excited about what's coming, but she's fully prepared for it and accepted it as a fact of life. There are worse things one can be than the slave-wife of a wealthy arcology owner. You <<if $activeSlave.amp == 1>>gather $him up and hold $him in front of you, pulling $his panties off as you do. Showing considerable dexterity, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>><<else>>take $his hand and pull $him to $his feet while she shimmies out of $his panties. $He cocks $his hips for you and you slide your cock inside $him before taking $his knees and drawing them up to hold $him in midair, impaled on you<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, it is what it is. $He gasps when your seed flows into $him, orgasming shortly after to @@.green;applause from your guests.@@ You'll fuck $him repeatedly over the next few days, ensuring impregnation.
+ $activeSlave.slaveName isn't particularly excited about what's coming, but $he's fully prepared for it and accepted it as a fact of life. There are worse things one can be than the slave-wife of a wealthy arcology owner. You <<if $activeSlave.amp == 1>>gather $him up and hold $him in front of you, pulling $his panties off as you do. Showing considerable dexterity, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>><<else>>take $his hand and pull $him to $his feet while $he shimmies out of $his panties. $He cocks $his hips for you and you slide your cock inside $him before taking $his knees and drawing them up to hold $him in midair, impaled on you<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, it is what it is. $He gasps when your seed flows into $him, orgasming shortly after to @@.green;applause from your guests.@@ You'll fuck $him repeatedly over the next few days, ensuring impregnation.
<</if>>
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1>>
<<set $activeSlave.pregType = setPregType($activeSlave)>>
@@ -419,15 +419,15 @@
<<if ($activeSlave.vagina == 0) || ($activeSlave.mpreg == 1 && $activeSlave.anus == 0)>>
Naturally, the ceremony @@.lime;took $his virginity;@@
<<if $activeSlave.fetish == "mindbroken">>
- she didn't notice.
+ $he didn't notice.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- she was so happy @@.hotpink;$his first time was with you and so special.@@
+ $he was so happy @@.hotpink;$his first time was with you and so special.@@
<<set $activeSlave.devotion += 5>>
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- she was @@.mediumorchid;saving that for someone special.@@
+ $he was @@.mediumorchid;saving that for someone special.@@
<<set $activeSlave.devotion -= 5>>
<<elseif $activeSlave.devotion < -20>>
- she weeped at the sight of cum pooling from $his @@.mediumorchid;defiled <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>>.@@
+ $he weeped at the sight of cum pooling from $his @@.mediumorchid;defiled <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>>.@@
<<set $activeSlave.devotion -= 10>>
<<else>>
you made it @@.hotpink;enjoyable@@ at least.
@@ -520,35 +520,35 @@
<<elseif $weddingPlanned == 2>>
The ceremony to bind <<= SlaveFullName($activeSlave)>> to you as your slave wife is an all day affair.
<<if $activeSlave.fetish == "mindbroken">>
- $He spent the day before resting and preparing herself, if you can call sitting around mindlessly preparing. $He spends most of the daylong party at the center of a nonstop gangbang, occasionally moaning as more of physical reaction than anything. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside her, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
+ $He spent the day before resting and preparing $himself, if you can call sitting around mindlessly preparing. $He spends most of the daylong party at the center of a nonstop gangbang, occasionally moaning as more of physical reaction than anything. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
- $He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $activeSlave.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+ $He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $activeSlave.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
- Once the ceremony is complete, you scoop up your new slave wife to carry her back into the master bedroom. $He rests $his 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, and by the time $he's home, $he's fast asleep. You set her gently down on the bed and curl up behind her, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
+ Once the ceremony is complete, you scoop up your new slave wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- $He spent the day before resting and preparing herself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside her, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
+ $He spent the day before resting and preparing $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
- $He returns shortly, looking exhausted but rather proud of herself for getting through all that. $He's naked still, $his skin clean and $activeSlave.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+ $He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and $activeSlave.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
- Once the ceremony is complete, you scoop up your new slave wife to carry her back into the master bedroom. $He rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set her gently down on the bed and curl up behind her, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
+ Once the ceremony is complete, you scoop up your new slave wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- $He spent the day before resting and trying to ready herself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside her, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
+ $He spent the day before resting and trying to ready $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
- $He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+ $He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
- Once the ceremony is complete, you scoop up your new, protesting, slave wife to carry her back into the master bedroom. $He rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set her gently down on the bed and curl up behind her, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around her.
+ Once the ceremony is complete, you scoop up your new, protesting, slave wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
<<elseif $activeSlave.devotion < -20>>
- $He spent the day before resting and crying to herself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside her, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
+ $He spent the day before resting and crying to $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
- $He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+ $He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
- Once the ceremony is complete, you scoop up your new slave wife to carry her back into the master bedroom. $He rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set her gently down on the bed and curl up behind her, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
+ Once the ceremony is complete, you scoop up your new slave wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
<<else>>
- $He spent the day before resting and reluctantly preparing herself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside her, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
+ $He spent the day before resting and reluctantly preparing $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
- $He returns shortly, looking exhausted. $He's naked still, $his skin clean and $activeSlave.skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+ $He returns shortly, looking exhausted. $He's naked still, $his skin clean and $activeSlave.skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
- Once the ceremony is complete, you scoop up your new slave wife to carry her back into the master bedroom. $He rests $his head against you, so tired that $he's grateful for the break from standing. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
+ Once the ceremony is complete, you scoop up your new slave wife to carry $him back into the master bedroom. $He rests $his head against you, so tired that $he's grateful for the break from standing. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
<</if>>
<br>
<<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
@@ -729,18 +729,18 @@
<</if>>
There is no aisle for $him to <<if $activeSlave.amp == 1>>be carried<<else>>walk<</if>> down, just a small space at the head of the room where you're standing alone, and there's no one to <<if $activeSlave.amp == 1>>walk alongside the slave carrying<<else>>walk<</if>> $him there; this symbolizes $his submission to you
<<if $activeSlave.fetish == "mindbroken">>
- despite the fact that she had to be pushed into walking towards you.
+ despite the fact that $he had to be pushed into walking towards you.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- of $his own choice, and she does so with a smile.
+ of $his own choice, and $he does so with a smile.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- of $his own choice, and she does so with hesitation.
+ of $his own choice, and $he does so with hesitation.
<<elseif $activeSlave.devotion < -20>>
- of $his own (forced) choice, and she does so with wavering steps.
+ of $his own (forced) choice, and $he does so with wavering steps.
<<else>>
- of $his own choice, and she does so willingly.
+ of $his own choice, and $he does so willingly.
<</if>>
<br><br>
- When she's in front of you, <<if $activeSlave.amp == 1>>the slave carrying $his limbless torso sets $him down on the floor in front of you and props $him up so $his head is level with your crotch<<else>>she gets down on $his knees so $his head is level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since she lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+ When $he's in front of you, <<if $activeSlave.amp == 1>>the slave carrying $his limbless torso sets $him down on the floor in front of you and props $him up so $his head is level with your crotch<<else>>$he gets down on $his knees so $his head is level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br>
<<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
<br><br><span id="surnaming">
@@ -763,7 +763,7 @@
<</link>>
</span>
<</if>>
- <br><br> Then, you flip $his veil over $his 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. $He approaches $his task
+ <br><br> Then, you flip $his veil over $his head so $he 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. $He approaches $his task
<<if $activeSlave.fetish == "mindbroken">>
with robotic obedience. You climax promptly, <<if $PC.dick == 1>>shooting your cum down $his throat<<else>>covering $his 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 $him back into the master bedroom. $He absentmindedly rests $his head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, gazing up at you with empty eyes.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 52715e7c4a65677096c3a7cd87d04c09f16a0b2e..058facc5f3ce0fe69fdfecec3ee4ce4c3199143f 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -572,7 +572,7 @@
["Farmyard Report", $farmyardNameCaps, $farmyard, $farmyardSlaves, $Farmer, "Farmer"],
["Schoolroom Report", $schoolroomNameCaps, $schoolroom, $schoolroomSlaves, $Schoolteacher, "Schoolteacher"],
["Spa Report", $spaNameCaps, $spa, $spaSlaves, $Attendant, "Attendant"],
- ["Nursery Report", $nurseryNameCaps, $nursery, $nurserySlaves, $Matron, "Matron"],
+ ["Nursery Report", $nurseryNameCaps, $nurseryNannies, $nurserySlaves, $Matron, "Matron"],
/** ["Lab Report"], "Research Lab", $researchLab.built, $researchLab.hired + $researchLab.menials, -1, -1], **/
["Servants' Quarters Report", $servantsQuartersNameCaps, $servantsQuarters, $servantsQuartersSlaves, $Stewardess, "Stewardess"],
["Incubator Report", $incubatorNameCaps, $incubator, $incubatorSlaves, -1, -1],
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 7470805ce30e32ca481a334dd0b341a456c47eef..8a845c06c8a862681848f710f97b1cc41067330d 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -216,7 +216,7 @@
<<if $farmyardKennels > 0 && $activeCanine != 0>>
| <<link "Have a $activeCanine.species mount $him">><<set $animalType = "canine">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
<</if>>
- <<if $farmyardStable > 0 && $activeHooved.species != 0>>
+ <<if $farmyardStable > 0 && $activeHooved != 0>>
| <<link "Let a $activeHooved.species mount $him">><<set $animalType = "hooved">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
<</if>>
<<if $farmyardCages > 0 && $activeFeline != 0>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 78e6a0970f1b70a03a5e720dd7ec21d6352454b3..2205707d3317460a6c9c1c8ee76439d317807281 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -281,7 +281,7 @@
[[_slaveName|Attendant Workaround][$i = _ssi]]
<<case "Nursery">>
<<if $Flag == 0>>
- <<if $nursery <= $nurserySlaves>><<continue>><</if>>
+ <<if $nurseryNannies <= $nurserySlaves>><<continue>><</if>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
@@ -785,7 +785,7 @@ will
<</if>>
<<if $nursery != 0>>
- <<if $nursery > $nurserySlaves && (_Slave.devotion > 20 || _Slave.trust > 20 || _Slave.fetish == "mindbroken")>>
+ <<if $nurseryNannies > $nurserySlaves && (_Slave.devotion > 20 || _Slave.trust > 20 || _Slave.fetish == "mindbroken")>>
[[Nursery|Assign][$assignTo = "Nursery", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
<<else>>Nursery<</if>>
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index a0c69fafb059c33e45a950dab58cc1865ce030e9..40bf66e814ea6e7bb1abf47c66ff6bb1ebe474fe 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -479,9 +479,9 @@
<<if ($nursery)>>
<br> <<link "$nurseryNameCaps""Nursery">><</link>>
<<if $abbreviateSidebar == 2>>
- (<<if $nurseryCribs-$nurseryBabies == 0>>No empty rooms<<elseif $nurseryCribs-$nurseryBabies == 1>>1 empty room<<else>><<print $nurseryCribs-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nursery <<if $nurserySlaves != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>)
+ (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nurseryNannies <<if $nurserySlaves != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>)
<<else>>
- ($nurseryBabies/$nurseryCribs, $nurserySlaves/$nursery<<if $Matron>>, L<</if>>)
+ ($nurseryBabies/$nursery, $nurserySlaves/$nurseryNannies<<if $Matron>>, L<</if>>)
<</if>>
<</if>>
<<if ($clinic)>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 1e6eb76b879b2c0df138d7fb468a25a831c341bf..48a381cc54d0167a992adec9103c1a34df4fad1e 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -15235,19 +15235,19 @@ $He has
<<widget "pregnancyDescription">>
<<if $activeSlave.pregSource > 0>>
- <<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.pregSource; })>>
- <<if _lsd != -1>>
+ <<set _lsd = findFather($activeSlave.pregSource)>>
+ <<if def _lsd>>
<<if $surnameOrder != 1>>
- <<switch $slaves[_lsd].nationality>>
+ <<switch _lsd.nationality>>
<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
- <<if $slaves[_lsd].slaveSurname>><<set _daddy = $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveName>><<else>><<set _daddy = $slaves[_lsd].slaveName>><</if>>
+ <<if _lsd.slaveSurname>><<set _daddy = _lsd.slaveSurname>><<set _daddy += " " + _lsd.slaveName>><<else>><<set _daddy = _lsd.slaveName>><</if>>
<<default>>
- <<set _daddy = $slaves[_lsd].slaveName>>
- <<if $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveSurname>><</if>>
+ <<set _daddy = _lsd.slaveName>>
+ <<if _lsd.slaveSurname>><<set _daddy += " " + _lsd.slaveSurname>><</if>>
<</switch>>
<<else>>
- <<set _daddy = $slaves[_lsd].slaveName>>
- <<if $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveSurname>><</if>>
+ <<set _daddy = _lsd.slaveName>>
+ <<if _lsd.slaveSurname>><<set _daddy += " " + _lsd.slaveSurname>><</if>>
<</if>>
<<else>>
<<set _daddy = "partner">>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index b73da8f1d4ce53d184c27a083ee3dc0f4abb363c..7dc0c1d86c3370143502e2fc44d2a9b3892d1509 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -3506,7 +3506,7 @@ $His
$He is wearing a sturdy leather collar that continues up to restrict $his jaw as well. It acts as an anchor for an enormous inward-facing dildo that reaches deep down $his throat. The sheer size of the phallus forces $his mouth as wide as it will go and considerably bulges $his throat. Fortunately for $him, it is designed to allow $him to be able to breathe through $his nose; though when removed, the poor girl finds $himself incapable of closing $his mouth for some time.
<<case "preg biometrics">>
<<if $activeSlave.pregSource > 0>>
- <<set _daddy = $slaves.find(function(s) { return s.ID == $activeSlave.pregSource; }), _daddy = _daddy.slaveName>>
+ <<set _daddy = findFather($activeSlave.pregSource), _daddy = _daddy.slaveName>>
<</if>>
<<set _pregCollar = either(1, 2, 3)>>
$He is wearing a heavy metal collar with a digital display; it currently reads:
@@ -3531,10 +3531,10 @@ $His
<<if $activeSlave.preg > 37>>
"I'm crowning as you read this!"
<<else>>
- "<<print 38-$activeSlave.preg>> weeks till I pop!"
+ "<<print 38-Math.ceil($activeSlave.preg)>> weeks till I pop!"
<</if>>
<<elseif $activeSlave.broodmother == 1>>
- "<<print 38-$activeSlave.preg>> weeks till I pop!"
+ "<<print 38-Math.ceil($activeSlave.preg)>> weeks till I pop!"
<<else>>
"<<print 40-$activeSlave.preg>> weeks till I pop!"
<</if>>