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/twine JS.txt b/devNotes/twine JS.txt
index ef17eb180bfe899de96357b28e0b546bc6d5a245..3fe7d35ca5c95dbbef267930a6da1871347f834a 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -7568,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);
};
@@ -33124,6 +33124,7 @@ window.BaseSlave = function BaseSlave() {
skillMT: 0,
skillST: 0,
skillMM: 0,
+ skillFA: 0,
skillWA: 0,
skillS: 0,
skillE: 0,
@@ -36235,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;
@@ -36359,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);
@@ -36783,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;
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/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/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/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/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/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/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/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/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/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/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)>>