From 406b3aec908a6ff8edc2e2bd9b4cd7aa42a2ca99 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 6 Apr 2017 03:00:54 -0400
Subject: [PATCH] Cybermod and other vanilla content. Why do I have to fix
others mods? .origHColor and .origEye will get messed up the second anything
outside of generic slavegen changes them.
---
slave variables documentation - Pregmod.txt | 18 +-
src/events/intro/initNationalities.tw | 2 +-
src/events/intro/introSummary.tw | 52 ++-
src/init/storyInit.tw | 45 +-
src/interaction/cyberConfig.tw | 115 ++++++
src/interaction/researchLab.tw | 235 +++++++++++
src/npc/databases/cheatmodeDatabase.tw | 4 +-
src/npc/databases/ddSlavesDatabase.tw | 2 +-
src/npc/startingGirls/moreCustomOptions.tw | 2 +
src/npc/startingGirls/startingGirls.tw | 8 +
src/pregmod/widgets/pregmodWidgets.tw | 3 +
src/uncategorized/RESS.tw | 6 +-
src/uncategorized/arcadeReport.tw | 11 +-
src/uncategorized/assistantAutosurgery.tw | 46 +--
src/uncategorized/bodyModification.tw | 47 ++-
src/uncategorized/brothelReport.tw | 32 +-
src/uncategorized/cellblockReport.tw | 26 +-
src/uncategorized/clinicReport.tw | 11 +-
src/uncategorized/clubReport.tw | 27 +-
src/uncategorized/costs.tw | 6 +-
src/uncategorized/costsReport.tw | 9 +-
src/uncategorized/dairyReport.tw | 24 +-
src/uncategorized/economics.tw | 36 +-
src/uncategorized/endWeek.tw | 14 +-
src/uncategorized/generateXXSlave.tw | 4 +-
src/uncategorized/generateXYSlave.tw | 4 +-
src/uncategorized/labReport.tw | 67 +++
src/uncategorized/lawCompliance.tw | 4 +-
src/uncategorized/longSlaveDescription.tw | 6 +-
src/uncategorized/manageArcology.tw | 13 +-
src/uncategorized/managePenthouse.tw | 31 ++
src/uncategorized/masterSuiteReport.tw | 17 +-
src/uncategorized/options.tw | 8 +
src/uncategorized/pCitizensAndCivilians.tw | 22 +-
src/uncategorized/pDefenseFears.tw | 2 +-
src/uncategorized/pMercenaries.tw | 4 +-
src/uncategorized/personalAttentionSelect.tw | 51 ++-
src/uncategorized/policies.tw | 2 +-
src/uncategorized/reRelativeRecruiter.tw | 8 +
src/uncategorized/recruiterSelect.tw | 8 +-
src/uncategorized/remoteSurgery.tw | 65 ++-
src/uncategorized/rulesAutosurgery.tw | 60 +--
src/uncategorized/saHormoneEffects.tw | 4 +-
src/uncategorized/saLiveWithHG.tw | 53 ++-
src/uncategorized/saLongTermEffects.tw | 32 +-
src/uncategorized/salon.tw | 411 ++++++++++++++++---
src/uncategorized/scheduledEvent.tw | 4 +-
src/uncategorized/schoolroomReport.tw | 21 +-
src/uncategorized/seRecruiterSuccess.tw | 57 +++
src/uncategorized/servantsQuartersReport.tw | 37 +-
src/uncategorized/slaveAssignmentsReport.tw | 4 +
src/uncategorized/slaveInteract.tw | 6 +
src/uncategorized/spaReport.tw | 22 +-
src/uncategorized/storyCaption.tw | 6 +-
src/uncategorized/surgeryDegradation.tw | 204 ++++++++-
src/utility/descriptionWidgets.tw | 5 +
src/utility/miscWidgets.tw | 2 +-
57 files changed, 1665 insertions(+), 360 deletions(-)
create mode 100644 src/interaction/cyberConfig.tw
create mode 100644 src/interaction/researchLab.tw
create mode 100644 src/uncategorized/labReport.tw
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 6ffbb5b36e6..81e0fc46c09 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -11,6 +11,12 @@ birthName:
slave's original name
accepts string
+genes:
+
+slave sex
+"XX"
+"XY"
+
weekAcquired:
game week slave was acquired
@@ -645,6 +651,9 @@ slave eyesight
-1 - nearsighted
1 - normal
+origEye:
+
+slave's original eye color, defaults to their initial eye color.
eyeColor:
@@ -679,6 +688,10 @@ Accepts String
"blurring contacts"
"corrective contacts"
+origHColor:
+
+slave's original hair color, defaults to their initial hair color.
+
hColor:
hair color
@@ -764,7 +777,6 @@ series of rings up the back that can be tied together
0 - no
1 - yes
-
amp:
is slave amputee
@@ -776,6 +788,10 @@ is slave amputee
0 - no
1 - yes
+PLimb:
+
+something to do with cyberneticsmod. What PLimb she has installed?
+
heels:
are heels clipped
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 0617c0b26ac..246c2062771 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -65,7 +65,7 @@
/* SET HEROES */
<<set $heroSlaves = []>>
-<<set $activeSlave = {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 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, 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", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, areolae: 0, areolaePiercing: 0, 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, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
+<<set $activeSlave = {slaveName: "blank", birthName: "blank", genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 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, 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", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", 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, areolae: 0, areolaePiercing: 0, 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, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
<<if ($seeDicks > 0) && ($seeDicks < 100)>>
<<include "D Slaves Database">>
<<include "DD Slaves Database">>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 3f437dc4474..032d541f2e9 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -21,7 +21,7 @@ You may review your settings before clicking "Continue" to begin.
<<if $freshPC == 1 || $saveImported == 0>>
<<set $PC.origRace = $PC.race>>
<<set $PC.origSkin = $PC.skin>>
- <<set $PC.origEyeColor = $PC.eyeColor>>
+ <<set $PC.origEye = $PC.eyeColor>>
<<set $PC.origHColor = $PC.hColor>>
<</if>>
@@ -800,10 +800,56 @@ Image display
// This mod from anon1888 offers a lategame security force, triggered around week 80. It is non-canon where it conflicts with canonical updates to the base game.//
<br><br>
-[[Continue|init Nationalities][$girls = 2]]
+
+<<if $cyberMod == 1>>
+ Cybernetics mod is ''enabled.''
+[[Disable|Intro Summary][$cyberMod to 0]]
+<<else>>
+ Cybernetics mod is ''disabled.''
+[[Enable|Intro Summary][$cyberMod to 1]]
+<</if>>
+<br>
+// This mod alters how prosthetics system works and adds some content.//
+
+<br><br>
+<<link "Continue">>
+ <<if $freshPC == 1 || $saveImported == 0>>
+ <<if $PC.career == "capitalist">>
+ <<set $PC.trading = 100>>
+ <<elseif $PC.career == "mercenary">>
+ <<set $PC.warfare = 100>>
+ <<elseif $PC.career == "slaver">>
+ <<set $PC.slaving = 100>>
+ <<elseif $PC.career == "engineer">>
+ <<set $PC.engineering = 100>>
+ <<elseif $PC.career == "medicine">>
+ <<set $PC.medicine = 100>>
+ <<elseif $PC.career == "escort">>
+ <<set $PC.trading = 50>>
+ <<set $PC.warfare = -100>>
+ <<set $PC.slaving = -100>>
+ <<set $PC.engineering = -100>>
+ <<set $PC.medicine = 10>>
+ <<elseif $PC.career == "servant">>
+ <<set $PC.trading = -100>>
+ <<set $PC.warfare = -100>>
+ <<set $PC.slaving = -100>>
+ <<set $PC.engineering = -100>>
+ <<set $PC.medicine = -100>>
+ <<elseif $PC.career == "gang">>
+ <<set $PC.trading = 50>>
+ <<set $PC.warfare = 50>>
+ <<set $PC.slaving = 50>>
+ <<set $PC.engineering = -100>>
+ <<set $PC.medicine = 0>>
+ <</if>>
+ <</if>>
+ <<set $girls = 2>>
+ <<goto "init Nationalities">>
+<</link>>
<br><br>
-[[Cheat Start|init Nationalities][$cash += 1000000,$girls = 3,$rep += 10000,$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2]] | //Intended for debugging: may have unexpected effects//
+[[Cheat Start|init Nationalities][$cash += 1000000,$girls = 3,$rep += 10000,$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.trading = 100,$PC.warafare = 100,$PC.slaving = 100,$PC.engineering = 100,$PC.medicine = 100]] | //Intended for debugging: may have unexpected effects//
/*
<br><br>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 9e3501f1dc9..86e12ce3a71 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -169,7 +169,7 @@
<<set $cheater = 0>>
<<set $PCName = "Anonymous">>
-<<set $PC = {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", eyeColor: "blue", origEyeColor: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birtharcOwner: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>>
+<<set $PC = {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warafare: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birtharcOwner: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>>
<<set $cash = 10000>>
<<set $normalizedEvents = 0>>
<<set $autosave = 1>>
@@ -238,7 +238,7 @@
<<set $abbreviateSkills = 2>>
<<set $abbreviateMental = 2>>
<<set $abbreviateSidebar = 2>>
-<<set $summaryStats to 1>>
+<<set $summaryStats = 1>>
<<set $nicknamesAllowed = 1>>
<<set $modRequestsAllowed = 1>>
<<set $expansionRequestsAllowed = 1>>
@@ -264,7 +264,7 @@
<<else>>
<<set $cheater = 0>>
<<set $PCName = "Anonymous">>
- <<set $PC = {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", eyeColor: "blue", origEyeColor: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birtharcOwner: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>>
+ <<set $PC = {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warafare: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birtharcOwner: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>>
<</if>>
<</if>>
@@ -1244,13 +1244,12 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nextLink = "EW Slaves">>
<<set $customSlaveOrdered = 0>>
-<<set $customSlave = {slaveName: "custom", birthName: "custom", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", markings: "none", eyes: 1, eyeColor: "brown", eyeWear: "none", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 1, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
+
+<<set $customSlave = {slaveName: "custom", birthName: "custom", genes: "XX", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", markings: "none", eyes: 1, origEye: "brown", eyeColor: "brown", eyeWear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, PLimb: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 1, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
<<set $huskSlaveOrdered = 0>>
<<set $huskSlave = {age: 18, nationality: "slave", race: "white", sex: 1, virgin: 0}>>
-<<set $familyObject = {ID: 0, slaveName: "blank", actualAge: 0, birthWeek: 0}>>
-
/non-vanilla shit/
<<set $pedo_mode = 0>>
<<set $one_time_age_overrides_pedo_mode = 0>>
@@ -1359,4 +1358,38 @@ FertilityAge($fertilityAge)
<<set $securityForceArcologyUpgrades = 0>> /* How many militarized arcology upgrades has the player bought? */
<<set $securityForceMissionEfficiency = 1>> /* How efficient is the SF at completing its assigned task? (Upgrades*Drug Multiplier) */
+/* Misc mod variables */
+<<set $recruiterEugenics = 0>>
+<<set $cyberMod = 0>>
+<<set $stockpile = {
+basicPLimbInterface: 0,
+advPLimbInterface: 0,
+basicPLimb: 0,
+advSexPLimb: 0,
+advGracePLimb: 0,
+advCombatPLimb: 0,
+cyberneticPLimb: 0,
+ocularImplant: 0,
+erectileImplant: 0
+} >>
+<<set $researchLab = {
+built: "false",
+aiModule: 1,
+productionTime: 0,
+research: "none",
+manufacture: "none",
+maxSpace: 0,
+hired: 0,
+menials: 0,
+basicPLimbInterface: 0,
+advPLimbInterface: 0,
+basicPLimb: 0,
+advSexPLimb: 0,
+advGracePLimb: 0,
+advCombatPLimb: 0,
+cyberneticPLimb: 0,
+ocularImplant: 0,
+erectileImplant: 0
+} >>
+
<<goto "Alpha disclaimer">>
diff --git a/src/interaction/cyberConfig.tw b/src/interaction/cyberConfig.tw
new file mode 100644
index 00000000000..31e385d9ca2
--- /dev/null
+++ b/src/interaction/cyberConfig.tw
@@ -0,0 +1,115 @@
+:: cyberConfig [nobr]
+
+<<switch $temp>>
+
+<<case 0>>
+ This room is lined with shelves and cabinets, it could be easily mistaken for a storage room if it were not for examination table in its center.<br>
+ <<set $nextButton to "Back", $nextLink to "Slave Interact">>
+ <<if $activeSlave.amp != 1>>
+ Your slave $activeSlave.slaveName is obediently waiting for your instructions.
+ <<else>>
+ Your slave $activeSlave.slaveName is lying on the table, waiting for your instructions.
+ <</if>>
+
+ <<if $activeSlave.origEye == "implant">><br><br>
+ $pronounCap has an ocular implant installed.
+ <<if $activeSlave.eyes == 1>>
+ They are operating normally.3
+ <<elseif $activeSlave.eyes == -1>>
+ They are set to blur her vision.
+ <<else>>
+ They are turned off.
+ <</if>>
+ <br><br>
+ <<if $activeSlave.eyes != 1>>[[Restore vision|cyberConfig][$activeSlave.eyes to 1,$temp to 3]] | <</if>>
+ <<if $activeSlave.eyes != -1>>[[Blur|cyberConfig][$activeSlave.eyes to -1,$temp to 3]] | <</if>>
+ <<if $activeSlave.eyes != -2>>[[Disable|cyberConfig][$activeSlave.eyes to -2,$temp to 3]]<</if>>
+
+ $pronounCap currently has $activeSlave.eyeColor lenses equipped.
+
+ <br>
+
+ Swap out $possessive lenses:
+ [[Blue|cyberConfig][$activeSlave.eyeColor to "blue",$temp to 2,$cash -= $modCost]]
+ | [[Black|cyberConfig][$activeSlave.eyeColor to "black",$temp to 2,$cash -= $modCost]]
+ | [[Brown|cyberConfig][$activeSlave.eyeColor to "brown",$temp to 2,$cash -= $modCost]]
+ | [[Green|cyberConfig][$activeSlave.eyeColor to "green",$temp to 2,$cash -= $modCost]]
+ | [[Turquoise|cyberConfig][$activeSlave.eyeColor to "turquoise",$temp to 2,$cash -= $modCost]]
+ | [[Sky-blue|cyberConfig][$activeSlave.eyeColor to "sky-blue",$temp to 2,$cash -= $modCost]]
+ | [[Hazel|cyberConfig][$activeSlave.eyeColor to "hazel",$temp to 2,$cash -= $modCost]]
+ | [[Pale-grey|cyberConfig][$activeSlave.eyeColor to "pale-grey",$temp to 2,$cash -= $modCost]]
+ | [[White|cyberConfig][$activeSlave.eyeColor to "white",$temp to 2,$cash -= $modCost]]
+ | [[Pink|cyberConfig][$activeSlave.eyeColor to "pink",$temp to 2,$cash -= $modCost]]
+ | [[Amber|cyberConfig][$activeSlave.eyeColor to "amber",$temp to 2,$cash -= $modCost]]
+ | [[Red|cyberConfig][$activeSlave.eyeColor to "red",$temp to 2,$cash -= $modCost]]
+ | [[Catlike|cyberConfig][$activeSlave.eyeColor to "catlike",$temp to 2,$cash -= $modCost]]
+ | [[Serpent-like|cyberConfig][$activeSlave.eyeColor to "serpent-like",$temp to 2,$cash -= $modCost]]
+ | [[Devilish|cyberConfig][$activeSlave.eyeColor to "devilish",$temp to 2,$cash -= $modCost]]
+ | [[Demonic|cyberConfig][$activeSlave.eyeColor to "demonic",$temp to 2,$cash -= $modCost]]
+ | [[Hypnotic|cyberConfig][$activeSlave.eyeColor to "hypnotic",$temp to 2,$cash -= $modCost]]
+ | [[Heart-shaped|cyberConfig][$activeSlave.eyeColor to "heart-shaped",$temp to 2,$cash -= $modCost]]
+ <</if>>
+
+ <<if $activeSlave.PLimb > 0>><br><br>
+ $pronounCap has PLimb interface installed. You can assign and adjust $possessive prosthetics here.
+ <<if $activeSlave.amp <= -1>><br>
+ $possessiveCap prosthetics are currently attached, if you wish to change them you will first need to detach them.<br>
+ [[Detach|cyberConfig][$temp to 1,$nextButton to "Continue", $nextLink to "cyberConfig"]]
+ <<else>><br>
+ <<if $stockpile.basicPLimb > 0>>[[Attach basic limbs|cyberConfig][$temp to 4, $activeSlave.amp to -1, $stockpile.basicPLimb -= 1]]<</if>>
+ <<if $stockpile.advSexPLimb > 0>>[[Attach sex limbs|cyberConfig][$temp to 4, $activeSlave.amp to -2, $stockpile.advSexPLimb -= 1]]<</if>>
+ <<if $stockpile.advGracePLimb > 0>>[[Attach beauty limbs|cyberConfig][$temp to 4, $activeSlave.amp to -3, $stockpile.advGracePLimb -= 1]]<</if>>
+ <<if $stockpile.advCombatPLimb > 0>>[[Attach combat limbs|cyberConfig][$temp to 4, $activeSlave.amp to -4, $stockpile.advCombatPLimb -= 1]]<</if>>
+ <<if $activeSlave.PLimb == 2>>
+ <<if $stockpile.cyberneticPLimb > 0>>[[Attach cybernetic limbs|cyberConfig][$temp to 4, $activeSlave.amp to -5, $stockpile.cyberneticPLimb -= 1]]<</if>>
+ <<else>>
+ //To equip more advanced prosthetics you will need to upgrade your slaves' PLimb interface.//
+ <</if>>
+ <</if>>
+
+ <<else>>
+ <<if $activeSlave.amp == 0>><br>
+ $pronounCap has healthy limbs so there is no need for prosthetics.
+ <<else>><br>
+ $pronounCap does not have a PLimb interface installed so you can't give $possessive any prosthetics.
+ <</if>>
+ <</if>>
+
+<<case 1>>
+ <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
+ <<if $activeSlave.amp is -1>><<set $stockpile.basicPLimb += 1>>
+ <<elseif $activeSlave.amp is -2>><<set $stockpile.advSexPLimb += 1>>
+ <<elseif $activeSlave.amp is -3>><<set $stockpile.advGracePLimb += 1>>
+ <<elseif $activeSlave.amp is -4>><<set $stockpile.advCombatPLimb += 1>>
+ <<elseif $activeSlave.amp is -5>><<set $stockpile.cyberneticPLimb += 1>>
+ <</if>>
+ <<set $activeSlave.amp to 1>>
+ Due to built-in safeties it is neccessary to remove each limb separately, first releasing the lock and then waiting for automated seal release.<br>
+ <<if ($activeSlave.devotion > 20)>>
+ You instruct $possessive to lie down on the table and proceed to remove $possessive limbs. $pronounCap <<if canSee($activeSlave)>>watches<<else>>listens<</if>> with interest as you work.<<if ($activeSlave.devotion > 50)>> As you remove the last limb $pronoun playfully wiggles $possessive stumps at you.<</if>>
+ <<else>>
+ You order $possessive to lie down on the table and proceed to remove $possessive limbs. $pronounCap <<if canSee($activeSlave)>>watches<<else>>listens<</if>> with a bitter expression as you work.
+ <</if>>
+
+<<case 2>>
+ <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
+ <<if $activeSlave.amp != 1>>You have $possessive lie down and<<else>>You<</if>> use speculum to keep $possessive eyes open while you disengage $possessive lenses remotely and swap them out with $possessive new $activeSlave.eyeColor lenses.
+<<case 3>>
+ <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
+ <<if $activeSlave.eyes == 1>>
+ $pronounCap blinks as $possessive vision returns.
+ <<elseif $activeSlave.eyes == -1>>
+ $pronounCap squints at you as $possessive vision becomes a blur.
+ <<else>>
+ $pronounCap has a panicked expression when $possessive vision suddenly goes out.
+ <</if>>
+<<case 4>>
+ <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
+ Attaching $possessive limbs is a simple procedure, simply push connector on each limb into the socket in $possessive implants until lock engages.<<if $activeSlave.PLimb == 2>> $pronounCap jumps a bit as limbs connect to $possessive nerves.<</if>> When you are done, $pronoun sits up and
+ <<if $activeSlave.amp == -2>>experimentally engages the vibe function in $possessive fingers.
+ <<elseif $activeSlave.amp == -3>>runs a hand over the smooth skin of $possessive new legs.
+ <<elseif $activeSlave.amp == -4>>engages and disengages the blade in $possessive forearm.
+ <<elseif $activeSlave.amp == -5>>experimentally flexes the muscles in $possessive artificial arm.
+ <<else>>catches $possessive balance.
+ <</if>>
+<</switch>>
diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw
new file mode 100644
index 00000000000..402ee1dca68
--- /dev/null
+++ b/src/interaction/researchLab.tw
@@ -0,0 +1,235 @@
+:: Research Lab [nobr]
+
+<<switch $temp>>
+
+<<case 0>>
+
+ <<set $nextButton to "Back", $nextLink to "Manage Arcology">>
+
+ //You switch one of the screens in your office to the feed from research facility.//<br><br>
+
+ <br>[[Decomission facility|Manage Arcology][$researchLab.built to "false",$researchLab.hired to 0,$helots += $researchLab.menials,$researchLab.menials to 0,$researchLab.research to "none",$researchLab.manufacture to "none",$researchLab.productionTime to 0]] //Warning! This will cancel all projects, remove all staff and shut down this facility.//
+
+ <br><br>[[Purchase cybernetics|Research Lab][$temp to 1]]
+<br><br>
+ __Personnel__<br><br>
+
+<br>
+ <<if $researchLab.aiModule == 1>>
+ [[Buy and install research module|Research Lab][$cash -= 35000, $researchLab.aiModule to 2]] //This module enables your assistant to assist staff and direct menials assigned to your research facility, increasing efficiency. It costs ¤35000//<br>
+ <</if>>
+ <<if ($researchLab.hired + $researchLab.menials) == 0>>
+ //Facility is currently unstaffed.//
+ <<else>>
+ //You have
+ <<if $researchLab.hired == 1>>
+ one scientist
+ <<elseif $researchLab.hired > 1>>
+ $researchLab.hired scientists
+ <</if>>
+ <<if $researchLab.menials != 0>> and<</if>>
+ <<if $researchLab.menials == 0>>
+ <<elseif $researchLab.menials == 1>>
+ one menial slave
+ <<elseif $researchLab.menials > 1>>
+ $researchLab.menials menials
+ <</if>>
+ working in your lab.
+ <<if $researchLab.aiModule != 0>>Occasionally you hear voice of your assistant as it helps direct and organize work.<</if>>//
+ <</if>>
+ <br>
+
+ Currently, this facility can employ $researchLab.maxSpace people.
+ <<if $researchLab.maxSpace == 5>>
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 10]]
+ //Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
+ <<elseif $researchLab.maxSpace == 10>>
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 20]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <<elseif $researchLab.maxSpace == 20>>
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 30]]
+ //Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>//
+ <<elseif $researchLab.maxSpace == 30>>
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 40]]
+ //Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
+ <<elseif $researchLab.maxSpace == 40>>
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 50]]
+ //Costs ¤<<print Math.trunc(25000*$upgradeMultiplierArcology)>>//
+ <<elseif $researchLab.maxSpace == 50>>
+ //Facility is fully expanded.//
+ <</if>>
+ <br><br>
+
+
+
+ <<if ($researchLab.hired + $researchLab.menials) < $researchLab.maxSpace>>
+ Hire [[x1|Research Lab][$researchLab.hired += 1,$cash -= 5000]]
+ <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5>>
+ | [[x5|Research Lab][$researchLab.hired += 5,$cash -= 25000]]
+ <</if>>
+ <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10>>
+ | [[x10|Research Lab][$researchLab.hired += 10,$cash -= 50000]]
+ <</if>>
+ scientists.<br>
+ //Each scientist will require an initial fee of ¤5000 and incur ¤300 weekly.//
+ <br>
+ <<if $helots > 0>>
+ Assign [[x1|Research Lab][$researchLab.menials += 1,$helots -= 1]]
+ <<if ($researchLab.maxSpace - ($researchLab.menials + $researchLab.menials)) >= 5 && $helots >= 5>>
+ | [[x5|Research Lab][$researchLab.menials += 5,$helots -= 5]]
+ <</if>>
+ <<if ($researchLab.maxSpace - ($researchLab.menials + $researchLab.menials)) >= 10 && $helots >= 10>>
+ | [[x10|Research Lab][$researchLab.menials += 10,$helots -= 10]]
+ <</if>>
+ menial slaves to lab.<br>
+ <<else>>You do not own any <<if $researchLab.menials != 0>>unassigned <</if>>menial slaves.<br>
+ <</if>>
+ //Using menial slaves is much cheaper than hiring scientists, but they are less effective. ¤100 per slave each week.//<br>
+ <<else>>
+ //Facility is fully staffed.//
+ <</if>>
+ <br>
+ <<if $researchLab.hired > 0>>
+ Fire [[x1|Research Lab][$researchLab.hired -= 1]]
+ <<if $researchLab.hired >= 5>>
+ | [[x5|Research Lab][$researchLab.hired -= 5]]
+ <</if>>
+ <<if $researchLab.hired >= 10>>
+ | [[x10|Research Lab][$researchLab.hired -= 10]]
+ <</if>>
+ | [[All|Research Lab][$researchLab.hired to 0]]
+ scientists.
+ <</if>>
+ <<if $researchLab.menials > 0>><br>
+ Dismiss [[x1|Research Lab][$researchLab.menials -= 1,$helots += 1]]
+ <<if $researchLab.menials >= 5>>
+ | [[x5|Research Lab][$researchLab.menials -= 5,$helots += 5]]
+ <</if>>
+ <<if $researchLab.menials >= 10>>
+ | [[x10|Research Lab][$researchLab.menials -= 10,$helots += 10]]
+ <</if>>
+ | [[All|Research Lab][$helots += $researchLab.menials,$researchLab.menials to 0]]
+ menial slaves.
+ <</if>>
+
+ <br><br>
+ __Research__
+ <br><br>
+ <<if $researchLab.research != "none">>
+ //Your lab staff is currently researching @@color:yellow;$researchLab.research@@.//
+ <<elseif $researchLab.manufacture != "none">>
+ //Your lab staff is currently busy with other projects.//
+ <<else>>
+ //No research active.//<br>
+ <<if $researchLab.basicPLimbInterface == 0 && $stockpile.basicPLimbInterface > 0>><br>
+ [[Reverse engineer basic prosthetics interface|Research Lab][$researchLab.productionTime to 80,$researchLab.research to "Basic prosthetics interface"]]
+ <</if>>
+ <<if $researchLab.basicPLimbInterface != 0 && $researchLab.advPLimbInterface == 0 && $stockpile.advPLimbInterface > 0>><br>
+ [[Reverse engineer advanced prosthetics interface|Research Lab][$researchLab.productionTime to 120,$researchLab.research to "Advanced prosthetics interface"]]
+ <</if>>
+ <<if $researchLab.basicPLimb == 0 && $stockpile.basicPLimb > 0>><br>
+ [[Reverse engineer basic prosthetic limbs|Research Lab][$researchLab.productionTime to 80,$researchLab.research to "Basic prosthetic limbs"]]
+ <</if>>
+ <<if $researchLab.advSexPLimb == 0 && $stockpile.advSexPLimb > 0>><br>
+ [[Reverse engineer advanced sex limbs|Research Lab][$stockpile.advSexPLimb -= 1,$researchLab.productionTime to 100,$researchLab.research to "Advanced sex limbs"]]
+ <</if>>
+ <<if $researchLab.advGracePLimb == 0 && $stockpile.advGracePLimb > 0>><br>
+ [[Reverse engineer advanced beauty limbs|Research Lab][$stockpile.advGracePLimb -= 1,$researchLab.productionTime to 100,$researchLab.research to "Advanced beauty limbs"]]
+ <</if>>
+ <<if $researchLab.advCombatPLimb == 0 && $stockpile.advCombatPLimb > 0>><br>
+ [[Reverse engineer advanced combat limbs|Research Lab][$stockpile.advCombatPLimb -= 1,$researchLab.productionTime to 100,$researchLab.research to "Advanced combat limbs"]]
+ <</if>>
+ <<if $researchLab.cyberneticPLimb == 0 && $researchLab.advPLimbInterface == 1 && ($researchLab.advGracePLimb + $researchLab.advGracePLimb + $researchLab.advCombatPLimb) >= 1>><br>
+ [[Develop cybernetic limbs|Research Lab][$researchLab.productionTime to 300,$researchLab.research to "Cybernetic limbs"]]
+ <</if>>
+ <<if $researchLab.ocularImplant == 0 && $stockpile.ocularImplant > 0>><br>
+ [[Reverse engineer ocular implants|Research Lab][$stockpile.ocularImplant -= 1,$researchLab.productionTime to 100,$researchLab.research to "Ocular implants"]]
+ <</if>>
+ <<if $researchLab.erectileImplant == 0 && $stockpile.erectileImplant > 0>><br>
+ [[Reverse engineer erectile implant|Research Lab][$stockpile.erectileImplant -= 1,$researchLab.productionTime to 100,$researchLab.research to "Erectile implant"]]
+ <</if>>
+ <</if>>
+
+ <br><br>
+ __Manufacture__
+ <br><br>
+ <<if $researchLab.research != "none">>
+ //Your lab staff is currently busy with research.//
+ <<elseif $researchLab.manufacture != "none">>
+ //Your lab staff is currently building @@color:yellow;$researchLab.manufacture@@.//
+ <<else>>
+ //No projects currently active.//<br>
+ <<if $researchLab.basicPLimbInterface == 1>><br>
+ [[Build basic prosthetics interface|Research Lab][$researchLab.productionTime to 50,$researchLab.manufacture to "Basic prosthetics interface"]]
+ <</if>>
+ <<if $researchLab.advPLimbInterface == 1>><br>
+ [[Build advanced prosthetics interface|Research Lab][$researchLab.productionTime to 80,$researchLab.manufacture to "Advanced prosthetics interface"]]
+ <</if>>
+ <<if $researchLab.basicPLimb == 1>><br>
+ [[Build basic prosthetic limbs|Research Lab][$researchLab.productionTime to 20,$researchLab.manufacture to "Basic prosthetic limbs"]]
+ <</if>>
+ <<if $researchLab.advSexPLimb == 1>><br>
+ [[Build advanced sex limbs|Research Lab][$researchLab.productionTime to 100,$researchLab.manufacture to "Advanced sex limbs"]]
+ <</if>>
+ <<if $researchLab.advGracePLimb == 1>><br>
+ [[Build advanced beauty limbs|Research Lab][$researchLab.productionTime to 100,$researchLab.manufacture to "Advanced beauty limbs"]]
+ <</if>>
+ <<if $researchLab.advCombatPLimb == 1>><br>
+ [[Build advanced combat limbs|Research Lab][$researchLab.productionTime to 100,$researchLab.manufacture to "Advanced combat limbs"]]
+ <</if>>
+ <<if $researchLab.cyberneticPLimb == 1>><br>
+ [[Build cybernetic limbs|Research Lab][$researchLab.productionTime to 150,$researchLab.manufacture to "Cybernetic limbs"]]
+ <</if>>
+ <<if $researchLab.ocularImplant == 1>><br>
+ [[Build ocular implants|Research Lab][$researchLab.productionTime to 80,$researchLab.manufacture to "Ocular implants"]]
+ <</if>>
+ <<if $researchLab.erectileImplant == 1>><br>
+ [[Build Erectile implant|Research Lab][$researchLab.productionTime to 50,$researchLab.manufacture to "Erectile implant"]]
+ <</if>>
+ <</if>>
+
+
+<<case 1>>
+ <<set $temp to 0>>
+ <<set $nextLink to "Research Lab">>
+ //You contact representative of one of the larger cybernetics companies and inquired about their products.<br> This is what they have to offer://<br><br>
+
+ __Hardware__<br>
+ [[Basic prosthetics interface|Research Lab][$temp to 1, $cash -= 25000, $stockpile.basicPLimbInterface += 1]] //Costs ¤25000. Currently have: $stockpile.basicPLimbInterface//<br>
+ [[Advanced prosthetics interface|Research Lab][$temp to 1, $cash -= 60000, $stockpile.advPLimbInterface += 1]] //Costs ¤60000. Currently have: $stockpile.advPLimbInterface//<br>
+ [[Basic prosthetic limbs|Research Lab][$temp to 1, $cash -= 15000, $stockpile.basicPLimb += 1]] //Costs ¤15000. Currently have: $stockpile.basicPLimb//<br>
+ [[Advanced sex limbs|Research Lab][$temp to 1, $cash -= 30000, $stockpile.advSexPLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advSexPLimb//<br>
+ [[Advanced beauty limbs|Research Lab][$temp to 1, $cash -= 30000, $stockpile.advGracePLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advGracePLimb//<br>
+ [[Advanced combat limbs|Research Lab][$temp to 1, $cash -= 30000, $stockpile.advCombatPLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advCombatPLimb//<br>
+ [[Ocular implants|Research Lab][$temp to 1, $cash -= 35000, $stockpile.ocularImplant += 1]] //Costs ¤35000. Currently have: $stockpile.ocularImplant//<br>
+ /*[[Erectile implant|Research Lab][$temp to 1, $cash -= 25000, $stockpile.erectileImplant += 1]] //Costs ¤25000. Currently have: $stockpile.erectileImplant//*/
+
+ <br><br>__Schematics__<br>
+ <<if $researchLab.basicPLimbInterface != 1 && $researchLab.research != "Basic prosthetics interface">>
+ [[Basic prosthetics interface|Research Lab][$temp to 1, $cash -= 85000, $researchLab.basicPLimbInterface to 1]] //Costs ¤85000.//<br>
+ <</if>>
+ <<if $researchLab.advPLimbInterface != 1 && $researchLab.research != "Advanced prosthetics interface">>
+ [[Advanced prosthetics interface|Research Lab][$temp to 1, $cash -= 260000, $researchLab.advPLimbInterface to 1]] //Costs ¤260000.//<br>
+ <</if>>
+ <<if $researchLab.basicPLimb != 1 && $researchLab.research != "Basic prosthetic limbs">>
+ [[Basic prosthetic limbs|Research Lab][$temp to 1, $cash -= 60000, $researchLab.basicPLimb to 1]] //Costs ¤60000.//<br>
+ <</if>>
+ <<if $researchLab.advSexPLimb != 1 && $researchLab.research != "Advanced sex limbs">>
+ [[Advanced sex limbs|Research Lab][$temp to 1, $cash -= 120000, $researchLab.advSexPLimb to 1]] //Costs ¤30000.//<br>
+ <</if>>
+ <<if $researchLab.advGracePLimb != 1 && $researchLab.research != "Advanced beauty limbs">>
+ [[Advanced beauty limbs|Research Lab][$temp to 1, $cash -= 120000, $researchLab.advGracePLimb to 1]] //Costs ¤30000.//<br>
+ <</if>>
+ <<if $researchLab.advCombatPLimb != 1 && $researchLab.research != "Advanced combat limbs">>
+ [[Advanced combat limbs|Research Lab][$temp to 1, $cash -= 120000, $researchLab.advCombatPLimb to 1]] //Costs ¤30000.//<br>
+ <</if>>
+ <<if $researchLab.ocularImplant != 1 && $researchLab.research != "Ocular implants">>
+ [[Ocular implants|Research Lab][$temp to 1, $cash -= 160000, $researchLab.ocularImplant to 1]] //Costs ¤35000.//<br>
+ <</if>>
+ /*<<if $researchLab.erectileImplant != 1 && $researchLab.research != "Erectile implant">>
+ [[Erectile implant|Research Lab][$temp to 1, $cash -= 95000, $researchLab.erectileImplant to 1]] //Costs ¤95000.//
+ <</if>>*/
+
+
+<</switch>>
+
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index a369a4e7b31..9b5314edbbc 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -1,6 +1,6 @@
:: Cheatmode Database [nobr]
-<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 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, physicalAge: 18, visualAge: 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", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, areolae: 0, areolaePiercing: 0, 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, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
+<<set $activeSlave = {slaveName: "blank", birthName: "blank", genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 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, physicalAge: 18, visualAge: 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", markings: "none", eyes: 1, origEye: "brown", eyeColor: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, PLimb: 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, areolae: 0, areolaePiercing: 0, 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, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relation = "mother", _HS.relationTarget = 990004, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ageImplant = 1, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.lips = 35, _HS.vagina = 2, _HS.anus = 1, _HS.ovaries = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.intelligence = 3, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She speaks with the rich accent of the Old South.">>
@@ -30,7 +30,7 @@
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.relation = "daughter", _HS.relationTarget = 990000, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 30, _HS.muscles = 50, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "straw blonde", _HS.skin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "'Miss Lily' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
<<AddSlave _HS>>
-<<set $Bodyguard to clone(_HS)>>
+<<set $Bodyguard = clone(_HS)>>
<<set _dump = $heroSlaves.pluck(0)>>
//_HS.slaveName,//
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 443d0f36170..aa4882f10a9 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -85,7 +85,7 @@
<<set $heroSlaves.push(clone(_HS))>>
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Nikole", _HS.birthName = "Nikole", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 80, _HS.devotion = 100, _HS._HS.markings = "freckled", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "long and in a ponytail", _HS.pubicHStyle = "waxed", _HS.boobs = 200, _HS.butt = 5, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.balls = 3, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.analSkill = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a tattoo of a black widow's hourglass pattern on her ballsack.">>
+<<set _HS.slaveName = "Nikole", _HS.birthName = "Nikole", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 80, _HS.devotion = 100, _HS.markings = "freckled", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "long and in a ponytail", _HS.pubicHStyle = "waxed", _HS.boobs = 200, _HS.butt = 5, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.balls = 3, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.analSkill = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a tattoo of a black widow's hourglass pattern on her ballsack.">>
<<set $heroSlaves.push(clone(_HS))>>
/% Put the freckles from custDesc to markings Bane70 %/
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index 4eb11be267c..b84d5eeecdc 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -4,6 +4,8 @@
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
+<<set $activeSlave.origHColor = $activeSlave.hColor>>
+<<set $activeSlave.origEye = $activeSlave.eyeColor>>
<</nobr>>\
\
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 0363b30d138..fdd3f80a55b 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -486,6 +486,14 @@ __You are customizing this slave:__
<<textbox "$activeSlave.birthWeek" $activeSlave.birthWeek "Starting Girls">>
</span>
+<br>
+
+''Genes:''
+@@color:yellow;<span id="originalSex">$activeSlave.genes</span>.@@
+<<link "XX">><<set $activeSlave.genes = "XX">><<replace "#originalSex">>$activeSlave.genes<</replace>><</link>>
+ |
+<<link "XY">><<set $activeSlave.genes = "XY">><<replace "#originalSex">>$activeSlave.genes<</replace>><</link>>
+
<<if $familyTesting == 1>>
<br>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 406ec911c50..0c28ec3f53a 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -121,6 +121,9 @@
<<if ndef $args[0].readyLimbs>>
<<set $args[0].readyLimbs = []>>
<</if>>
+<<if ndef $args[0].ageAdjust>>
+ <<set $args[0].ageAdjust = 0>>
+<</if>>
<<if ndef $args[0].pubertyXX>>
<<if $args[0].physicalAge >= $args[0].pubertyAgeXX>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index cbb7bd5f25d..acb9dab5c6b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1531,7 +1531,7 @@ She's a good $desc, and remains obediently before your desk, filling your office
<<case "breast expansion blues">>
-During her routine weekly inspection, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> cradles her huge breasts with her arms whenever the maneuvers of being inspected allow her to do so. It's not an unusual gesture for a $desc on breast growth drugs, since slaves whose tits are expanding are, by definition, not used to their weight yet. But $activeSlave.slaveName is more than just uncomfortable. She seems to regard her weighty mammaries with distaste. <<if $activeSlave.intelligence > -1>>She's not stupid, and quickly realizes<<else>>She's an idiot, but she's not dumb enough to completely miss<</if>> that you've noticed her feelings about her boobs. She bites her lower lip, not sure if she should say anything, so you follow your usual policy during slave inspections and ask her about it. <<if $PC.career == "slaver">>If you learned one thing from your long career of slave training, it's that it's<<else>>It's<</if>> typically best to suss these things out.
+During her routine weekly inspection, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> cradles her huge breasts with her arms whenever the maneuvers of being inspected allow her to do so. It's not an unusual gesture for a $desc on breast growth drugs, since slaves whose tits are expanding are, by definition, not used to their weight yet. But $activeSlave.slaveName is more than just uncomfortable. She seems to regard her weighty mammaries with distaste. <<if $activeSlave.intelligence > -1>>She's not stupid, and quickly realizes<<else>>She's an idiot, but she's not dumb enough to completely miss<</if>> that you've noticed her feelings about her boobs. She bites her lower lip, not sure if she should say anything, so you follow your usual policy during slave inspections and ask her about it. <<if $PC.slaving >= 100>>If you learned one thing from your long career of slave training, it's that it's<<else>>It's<</if>> typically best to suss these things out.
<br><br>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
"<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>," she lisps, "can I pleathe be taken off boob drugth?" She swallows, nervous that she's crossed a line, but she presses on, hefting her tits a little higher to show she's talking about them. "They're tho heavy and awkward. I'm thore every night, and my back hurts. I feel like a cow with boobth thith big,
@@ -3536,7 +3536,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<br><<link "Perform a health exam personally">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- She gets a weekly health exam from the automated systems, which also do their best to monitor her well-being, but she does not protest as you take her to the surgery and give her a <<if $PC.career == "medicine">>professional examination. It feels good to put the old skills to use on an attractive patient<<else>>thorough examination<</if>>. There's nothing the matter other than that she hasn't been 18 for a long time. She looks a little sad at some of the results, but whenever she does, you place a hand on her cheek and give her a kiss. She gets the idea. <<if SlaveStatsChecker.checkForLisp($activeSlave)>>"I underthtand, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>. I can thtill therve you," she lisps.<<else>>"I understand, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. I can still serve you," she says.<</if>> You adjust her diet and exercise a little, which should @@color:green;slightly improve@@ her health<<if $PC.career == "medicine">>, and prescribe some new supplements that might help her @@color:green;feel her best@@ all the time<<set $activeSlave.health += 10>><</if>>. As she gets up from the chair and makes to resume her duties, you give her a light swat across the buttocks. She squeaks and turns to @@color:mediumaquamarine;giggle at you,@@ giving you a broad wink and shaking her tits a little for you.
+ She gets a weekly health exam from the automated systems, which also do their best to monitor her well-being, but she does not protest as you take her to the surgery and give her a <<if $PC.medicine >= 100>>professional examination. It feels good to put the old skills to use on an attractive patient<<else>>thorough examination<</if>>. There's nothing the matter other than that she hasn't been 18 for a long time. She looks a little sad at some of the results, but whenever she does, you place a hand on her cheek and give her a kiss. She gets the idea. <<if SlaveStatsChecker.checkForLisp($activeSlave)>>"I underthtand, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>. I can thtill therve you," she lisps.<<else>>"I understand, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. I can still serve you," she says.<</if>> You adjust her diet and exercise a little, which should @@color:green;slightly improve@@ her health<<if $PC.medicine >= 100>>, and prescribe some new supplements that might help her @@color:green;feel her best@@ all the time<<set $activeSlave.health += 10>><</if>>. As she gets up from the chair and makes to resume her duties, you give her a light swat across the buttocks. She squeaks and turns to @@color:mediumaquamarine;giggle at you,@@ giving you a broad wink and shaking her tits a little for you.
<<set $activeSlave.health += 10>>
<<set $activeSlave.trust += 4>>
<</replace>>
@@ -7873,7 +7873,7 @@ By the time you've finished with her sensitive ass, it shines red, and she is cr
<<else>>
purring that she'd love to.
<</if>>
- You talk through the $activeSlave.slaveName's medical condition with her, and give her a <<if $PC.career == "medicine">>personal examination with the speed and accuracy of years of general practice<<else>>thorough exam<</if>>. Once this is done, you give $assistantName technical directions to make minor changes to $activeSlave.slaveName's drug regime, designed to make her @@color:lime;breasts grow just slightly faster.@@ The effect is minimal, but the point is made. She's still not happy to be transformed into a big-breasted sex slave, but she's relieved that was her only punishment for expressing her unhappiness about it.
+ You talk through the $activeSlave.slaveName's medical condition with her, and give her a <<if $PC.medicine >= 100>>personal examination with the speed and accuracy of years of general practice<<else>>thorough exam<</if>>. Once this is done, you give $assistantName technical directions to make minor changes to $activeSlave.slaveName's drug regime, designed to make her @@color:lime;breasts grow just slightly faster.@@ The effect is minimal, but the point is made. She's still not happy to be transformed into a big-breasted sex slave, but she's relieved that was her only punishment for expressing her unhappiness about it.
<<set $activeSlave.boobs += 100>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 48e95441576..ab81c42b8d9 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -19,7 +19,6 @@
<<if $arcadeDecoration != "standard">>
<br> $arcadeNameCaps's customers enjoy @@color:green;getting off in $arcadeDecoration surroundings.@@
<</if>>
- <br><br>
<<SlaveSort $ArcadeiIDs>>
<<for _dI = 0; _dI < _DL; _dI++>>
@@ -54,6 +53,7 @@
<<set $slaves[_i].trust -= 5>>
<</if>>
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -98,14 +98,13 @@
<</if>>
<<set _profits += $cash-$oldCash>>
<<if $showEWD != 0>>
- <br>
+ <br>
<<include "SA drugs">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<include "SA drugs">>
@@ -117,7 +116,7 @@
<</silently>>
<</if>>
<</for>>
-
+ <br><br>
<<if _milked == 1>>
One of them is lactating and spends her time in $arcadeName being simultaneously milked and fucked.
<<elseif _milked > 1>>
@@ -176,7 +175,5 @@
<<set $fuckdolls++>>
<</if>>
<</if>>
-<<else>>
- ''$arcadeNameCaps is empty.''
+ <br><br>
<</if>>
-<br><br>
diff --git a/src/uncategorized/assistantAutosurgery.tw b/src/uncategorized/assistantAutosurgery.tw
index d65650ccd83..53ac58e0bc4 100644
--- a/src/uncategorized/assistantAutosurgery.tw
+++ b/src/uncategorized/assistantAutosurgery.tw
@@ -22,7 +22,7 @@
<<set $surgeries.push("lactation inducing implanted drugs")>>
<<set $slaves[$i].lactation = 2>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].anus > 3) && ($thisSurgery.cosmetic > 0)>>
<<set $surgeries.push("a restored anus")>>
<<set $slaves[$i].anus = 3>>
@@ -30,7 +30,7 @@
<<set $slaves[$i].analSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].vagina > 3) && ($thisSurgery.cosmetic > 0)>>
<<set $surgeries.push("a restored pussy")>>
<<set $slaves[$i].vagina = 3>>
@@ -38,14 +38,14 @@
<<set $slaves[$i].vaginalSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].faceImplant == 0) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a nicer face")>>
<<if $slaves[$i].faceShape is "masculine">><<set $slaves[$i].faceShape = "androgynous">><</if>>
<<set $slaves[$i].faceImplant = 1>>
<<set $slaves[$i].face = Math.trunc($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].ageImplant != 1) && ($slaves[$i].physicalAge >= 25) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("an age lift")>>
<<set $slaves[$i].ageImplant = 1>>
@@ -61,18 +61,18 @@
<<set $slaves[$i].visualAge -= 5>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].waist >= -10) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a narrower waist")>>
<<set $slaves[$i].waist -= 20>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].voice == 1) && ($slaves[$i].voiceImplant == 0) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a feminine voice")>>
<<set $slaves[$i].voice += 1>>
<<set $slaves[$i].voiceImplant += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].lips < $thisSurgery.lips)>>
<<set $surgeries.push("bigger lips")>>
<<set $slaves[$i].lipsImplant += 10>>
@@ -81,62 +81,62 @@
<<set $slaves[$i].oralSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].faceImplant == 1) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic is 2)>>
<<set $surgeries.push("a nicer face")>>
<<if $slaves[$i].faceShape is "masculine">><<set $slaves[$i].faceShape to "androgynous">><</if>>
<<set $slaves[$i].faceImplant to 2>>
<<set $slaves[$i].face = Math.trunc($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].faceImplant > 0) && ($slaves[$i].face <= 95) && ($surgeryUpgrade == 1) && ($thisSurgery.cosmetic is 2)>>
<<set $surgeries.push("a nicer face")>>
<<if $slaves[$i].faceShape is "masculine">><<set $slaves[$i].faceShape to "androgynous">><</if>>
<<set $slaves[$i].faceImplant to 2>>
<<set $slaves[$i].face = Math.trunc($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].waist >= -95) && ($thisSurgery.cosmetic is 2) && ($seeExtreme == 1)>>
<<set $surgeries.push("a narrower waist")>>
<<set $slaves[$i].waist = Math.trunc($slaves[$i].waist-20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 30.5>><<else>><<set $slaves[$i].health -= 4>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 30.5>><<else>><<set $slaves[$i].health -= 4>><</if>>
<<elseif ($slaves[$i].voice < 3) && ($slaves[$i].voiceImplant == 0) && ($thisSurgery.cosmetic == 2)>>
<<set $surgeries.push("a bimbo's voice")>>
<<set $slaves[$i].voice += 1>>
<<set $slaves[$i].voiceImplant += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].butt <= 3) && ($slaves[$i].butt < $thisSurgery.butt)>>
<<set $surgeries.push("a bigger butt")>>
<<set $slaves[$i].buttImplant = 1>>
<<set $slaves[$i].butt += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].boobs <= 600) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs+400 <= $thisSurgery.boobs)>>
<<set $surgeries.push("bigger boobs")>>
<<set $slaves[$i].boobsImplant += 400>>
<<set $slaves[$i].boobs += 400>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].boobs <= 600) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs+200 <= $thisSurgery.boobs)>>
<<set $surgeries.push("modestly bigger boobs")>>
<<set $slaves[$i].boobsImplant += 200>>
<<set $slaves[$i].boobs += 200>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].butt <= 5) && ($slaves[$i].butt < $thisSurgery.butt)>>
<<set $surgeries.push("a bigger butt")>>
<<set $slaves[$i].buttImplant = 1>>
<<set $slaves[$i].butt += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].boobs <= 2000) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs+400 < $thisSurgery.boobs)>>
<<set $surgeries.push("bigger boobs")>>
<<set $slaves[$i].boobsImplant += 400>>
<<set $slaves[$i].boobs += 400>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].anus > 0) && ($surgeryUpgrade == 1) && ($thisSurgery.holes == 2)>>
<<set $surgeries.push("a virgin anus")>>
<<set $slaves[$i].anus = 0>>
@@ -144,7 +144,7 @@
<<set $slaves[$i].analSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].vagina > 0) && ($surgeryUpgrade == 1) && ($thisSurgery.holes == 2)>>
<<set $surgeries.push("a virgin pussy")>>
<<set $slaves[$i].vagina = 0>>
@@ -152,7 +152,7 @@
<<set $slaves[$i].vaginalSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].anus > 1) && ($thisSurgery.holes == 1)>>
<<set $surgeries.push("a tighter anus")>>
<<set $slaves[$i].anus = 1>>
@@ -160,7 +160,7 @@
<<set $slaves[$i].analSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].vagina > 1) && ($thisSurgery.holes == 1)>>
<<set $surgeries.push("a tighter pussy")>>
<<set $slaves[$i].vagina = 1>>
@@ -168,19 +168,19 @@
<<set $slaves[$i].vaginalSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].butt <= 8) && ($slaves[$i].butt < $thisSurgery.butt)>>
<<set $surgeries.push("a bigger butt")>>
<<set $slaves[$i].buttImplant = 1>>
<<set $slaves[$i].butt += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].boobs <= 9000) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs < $thisSurgery.boobs)>>
<<set $surgeries.push("bigger boobs")>>
<<set $slaves[$i].boobsImplant += 200>>
<<set $slaves[$i].boobs += 200>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<else>>
<<set $seed = 1>>
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 3baaec93104..bf127624f80 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -12,7 +12,7 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica
<<if ($activeSlave.nipplesPiercing + $activeSlave.lipsPiercing + $activeSlave.vaginaPiercing + $activeSlave.anusPiercing + $activeSlave.clitPiercing) < 10>>
<br>
- [[Add piercings wherever possible|Increment Piercings]]
+ [[Add piercings wherever possible|Increment Piercings]]
<</if>>
<br>
@@ -267,39 +267,45 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica
<br><br>
Your preferred location for brands is the ''$brandTarget.''
-[[Right buttock|Body Modification][$brandTarget = "right buttock"]]
-| [[Right thigh|Body Modification][$brandTarget = "right thigh"]]
-| [[Right calf|Body Modification][$brandTarget = "right calf"]]
-| [[Right ankle|Body Modification][$brandTarget = "right ankle"]]
-| [[Right foot|Body Modification][$brandTarget = "right foot"]]
-| [[Left buttock|Body Modification][$brandTarget = "left buttock"]]
+
+<<if $activeSlave.amp == 0>>
+
+[[Right thigh|Body Modification][$brandTarget = "right thigh"]]
| [[Left thigh|Body Modification][$brandTarget = "left thigh"]]
+| [[Right calf|Body Modification][$brandTarget = "right calf"]]
| [[Left calf|Body Modification][$brandTarget = "left calf"]]
+| [[Right ankle|Body Modification][$brandTarget = "right ankle"]]
| [[Left ankle|Body Modification][$brandTarget = "left ankle"]]
+| [[Right foot|Body Modification][$brandTarget = "right foot"]]
| [[Left foot|Body Modification][$brandTarget = "left foot"]]
-| [[Both buttocks|Body Modification][$brandTarget = "buttocks"]]
| [[Both thighs|Body Modification][$brandTarget = "thighs"]]
| [[Both calves|Body Modification][$brandTarget = "calves"]]
| [[Both ankles|Body Modification][$brandTarget = "ankles"]]
| [[Both feet|Body Modification][$brandTarget = "feet"]]
-| [[Right breast|Body Modification][$brandTarget = "right breast"]]
-| [[Right shoulder|Body Modification][$brandTarget = "right shoulder"]]
| [[Right upper arm|Body Modification][$brandTarget = "right upper arm"]]
-| [[Right lower arm|Body Modification][$brandTarget = "right lower arm"]]
-| [[Right wrist|Body Modification][$brandTarget = "right wrist"]]
-| [[Right hand|Body Modification][$brandTarget = "right hand"]]
-| [[Left breast|Body Modification][$brandTarget = "left breast"]]
-| [[Left shoulder|Body Modification][$brandTarget = "left shoulder"]]
| [[Left upper arm|Body Modification][$brandTarget = "left upper arm"]]
+| [[Both upper arms|Body Modification][$brandTarget = "upper arms"]]
+| [[Right lower arm|Body Modification][$brandTarget = "right lower arm"]]
| [[Left lower arm|Body Modification][$brandTarget = "left lower arm"]]
+| [[Both lower arms|Body Modification][$brandTarget = "lower arms"]]
| [[Left wrist|Body Modification][$brandTarget = "left wrist"]]
+| [[Right wrist|Body Modification][$brandTarget = "right wrist"]]
+| [[Both wrists|Body Modification][$brandTarget = "wrists"]]
+| [[Right hand|Body Modification][$brandTarget = "right hand"]]
| [[Left hand|Body Modification][$brandTarget = "left hand"]]
-| [[Both breasts|Body Modification][$brandTarget = "breasts"]]
+| [[Both hands|Body Modification][$brandTarget = "hands"]] |
+
+<</if>>
+
+[[Right buttock|Body Modification][$brandTarget = "right buttock"]]
+| [[Left buttock|Body Modification][$brandTarget = "left buttock"]]
+| [[Right shoulder|Body Modification][$brandTarget = "right shoulder"]]
+| [[Left shoulder|Body Modification][$brandTarget = "left shoulder"]]
| [[Both shoulders|Body Modification][$brandTarget = "shoulders"]]
-| [[Both upper arms|Body Modification][$brandTarget = "upper arms"]]
-| [[Both lower arms|Body Modification][$brandTarget = "lower arms"]]
-| [[Both wrists|Body Modification][$brandTarget = "wrists"]]
-| [[Both hands|Body Modification][$brandTarget = "hands"]]
+| [[Both buttocks|Body Modification][$brandTarget = "buttocks"]]
+| [[Right breast|Body Modification][$brandTarget = "right breast"]]
+| [[Left breast|Body Modification][$brandTarget = "left breast"]]
+| [[Both breasts|Body Modification][$brandTarget = "breasts"]]
| [[Back|Body Modification][$brandTarget = "back"]]
| [[Chest|Body Modification][$brandTarget = "chest"]]
| [[Right cheek|Body Modification][$brandTarget = "right cheek"]]
@@ -311,6 +317,7 @@ Your preferred location for brands is the ''$brandTarget.''
| [[Both ears|Body Modification][$brandTarget = "ears"]]
| [[Belly|Body Modification][$brandTarget = "belly"]]
| [[Pubic Mound|Body Modification][$brandTarget = "pubic mound"]]
+
/* Branding expansion contributed by Anon1888 */
<br>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 0aa349c158c..2425211ce99 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -7,7 +7,6 @@
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.brothel = initFacilityStatistics($facility.brothel)>>
-<<if $brothelSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $BrothiIDs[_dI].Index, _ID = $BrothiIDs[_dI].ID>>
<<if _ID != $slaves[_i].ID>>
@@ -21,7 +20,6 @@
<</if>>
<</for>>
<<SlaveSort $BrothiIDs>>
-<</if>>
<<if ($Madam != 0)>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
@@ -204,16 +202,16 @@
<br> Since she doesn't have enough whores to manage to keep her busy, she sees $beauty customers herself (<<print Math.trunc($beauty/7)>> a day), earning you @@color:yellowgreen;¤_seed@@. She can charge more for her time, since many citizens find it erotic to fuck the Madam.
<</if>>
<</if>>
- <br>
+ <<if ($brothelSlaves > 0)>><br><</if>>
<</if>>
<<if ($brothelSlaves > 0)>>
<<if $brothelSlaves != 1>>''There are $brothelSlaves slave whores working out of $brothelName.''<<else>>''There is one slave whore working out of $brothelName.''<</if>>
<</if>>
-<br><br>
<<if $Madam != 0>>
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -222,7 +220,7 @@
<</if>>
/* 000-250-006 */
''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as the madam.
- <br>
+ <br>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[_FLs].devotion <= 20)>>
@@ -237,7 +235,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
@@ -260,7 +257,6 @@
<</if>>
<<if ($brothelSlaves > 0)>>
- /% stuff that does not need to be in the for loop %/
<<set _healthBonus = 0, _aphrod = 0>>
<<if ($brothelUpgradeDrugs == 1)>>
<<set _healthBonus += 3, _aphrod = 2>>
@@ -279,6 +275,7 @@
<</if>>
<<set $slaves[_i].health += _healthBonus, $slaves[_i].aphrodisiacs = _aphrod>>
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -288,7 +285,7 @@
/* 000-250-006 */
''__@@color:pink;$slaves[$i].slaveName@@__'' is working out of $brothelName.
<br> She <<include "SA whore">>
- <br>
+ <br>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -303,7 +300,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<include "SA whore">>
@@ -423,10 +419,9 @@
<<set $slaves[_i].energy++>>
<</if>>
<</for>>
- <<set _profits += $cash-$oldCash>>
+ <<set _profits += $cash-$oldCash, $oldCash = $cash, _possibleBonuses = 0, _brothelBonuses = 0>>
-
- <<set $oldCash = $cash, _possibleBonuses = 0, _brothelBonuses = 0>>
+ <br><br>
<<if $brothelAdsSpending != 0>>
An ad campaign is supporting business there, and whores that match it make more ¤.
<</if>>
@@ -512,20 +507,21 @@
<</script>>
$brothelNameCaps makes you @@color:yellowgreen;¤_profits@@ this week.
+ <<if $brothelDecoration != "standard">>
+ $brothelNameCaps's customers enjoy @@color:green;fucking whores in $brothelDecoration surroundings.@@
+ <</if>>
+
<<if $brothel <= $brothelSlaves>>
<<set $brothelSpots = 0>>
<<else>>
<<set $brothelSpots = $brothel - $brothelSlaves>>
<</if>>
- <<if $brothelDecoration != "standard">>
- $brothelNameCaps's customers enjoy @@color:green;fucking whores in $brothelDecoration surroundings.@@
- <</if>>
-
<!-- Statistics output -->
<<BrothelStatistics 0>>
<<else>>
- ''$brothelNameCaps is empty''<<if (_FLs > -1)>> except for the Madam<</if>>.
<<set $brothelSpots = $brothel>>
<</if>>
-<br><br>
+<<if $brothelSlaves || $Madam>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 87636ebe9cf..67fbf2b365b 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -2,7 +2,6 @@
<<set _brokenSlaves = 0, _idleBonus = 0, _softenedQuirks = 0, _trustMalis = 0, _FLsFetish = 0, _DL = $CellBiIDs.length, $cellblockSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
-<<if $cellblockSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $CellBiIDs[_dI].Index, _ID = $CellBiIDs[_dI].ID>>
<<if _ID != $slaves[_i].ID>>
@@ -16,7 +15,6 @@
<</if>>
<</for>>
<<SlaveSort $CellBiIDs>>
-<</if>>
<<if $cellblockDecoration != "standard">>
<<set _devBonus = 1>>
@@ -154,7 +152,7 @@
<<set _seed = random(1,10)+(($cellblock-$cellblockSlaves)*(random(150,170)+(_idleBonus*10))), $cash += _seed>>
<br> Since she doesn't have enough prisoners to manage to keep her busy, she works on citizens' slaves, earning @@color:yellowgreen;¤_seed.@@
<</if>>
- <<if ($cellblockSlaves > 0)>><br><</if>>
+ <<if ($cellblockSlaves)>><br><</if>>
<</if>>
<<if ($cellblockSlaves > 0)>>
@@ -172,7 +170,7 @@
<</if>>
/* 000-250-006 */
''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Wardeness in $cellblockName.
- <br>
+ <br>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -187,7 +185,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[$i].choosesOwnClothes == 1>>
@@ -210,9 +207,6 @@
<</if>>
<<if ($cellblockSlaves > 0)>>
-<<if ($Wardeness == 0)>>
- <br><br>
-<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $CellBiIDs[_dI].Index, $i = _i>>
<<if ($slaves[_i].devotion <= 20)>>
@@ -290,6 +284,7 @@
<<continue>> /% Stops slave from appearing in this summary and as resting in main at same time. %/
<</if>>
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -298,15 +293,14 @@
<</if>>
/* 000-250-006 */
''__@@color:pink;$slaves[$i].slaveName@@__'' is confined in $cellblockName.
- She <<include "SA stay confined">>
- <br>
+ <br> She <<include "SA stay confined">>
+ <br>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<include "SA stay confined">>
@@ -319,7 +313,9 @@
<</silently>>
<</if>>
<</for>>
-
+ <<if (_softenedQuirks) || (_brokenSlaves)>>
+ <br><br>
+ <</if>>
<<if (_softenedQuirks > 0)>>
$cellblockName's advanced compliance systems successfully softened
<<if (_softenedQuirks == 1)>>
@@ -338,7 +334,7 @@
$cellblockNameCaps's $cellblockDecoration atmosphere @@color:hotpink;had an impact on <<if _brokenSlaves == 1>>her while she<<else>>them while they<</if>>@@ were imprisoned.
<</if>>
<</if>>
-<<else>>
- ''$cellblockNameCaps is empty''.
<</if>>
-<br><br>
+<<if $cellblockSlaves || $Wardeness>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 1682dfd6cee..4e4809917c8 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -2,7 +2,6 @@
<<set _healthBonus = 0, _idleBonus = 0, _FLsFetish = 0, _restedSlaves = 0, _DL = $CliniciIDs.length, $clinicSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
-<<if $clinicSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $CliniciIDs[_dI].Index, _ID = $CliniciIDs[_dI].ID>>
<<if _ID != $slaves[_i].ID>>
@@ -16,7 +15,6 @@
<</if>>
<</for>>
<<SlaveSort $CliniciIDs>>
-<</if>>
<<if $clinicDecoration != "standard">>
<<set _devBonus = 1>>
@@ -215,8 +213,8 @@
<<if ($Nurse != 0)>>
<<set $i = _FLs>>
- <br><br>''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as the clinical nurse.
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -224,6 +222,7 @@
</div>
<</if>>
/* 000-250-006 */
+ ''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as the clinical nurse.
<br>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
@@ -369,7 +368,7 @@
$clinicNameCaps's $clinicDecoration atmosphere @@color:hotpink;had an impact on <<if _restedSlaves == 1>>her while she<<else>>them while they<</if>>@@ were getting treatment.
<</if>>
<</if>>
-<<else>>
- ''$clinicNameCaps is empty.''
<</if>>
-<br><br>
+<<if $clinicSlaves || $Nurse>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 80cff261932..cd51da298d4 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -116,7 +116,7 @@
<<if ($DJ != 0)>>
<<if $showEWD != 0>>
- <br><br>''__@@color:pink;$slaves[_FLs].slaveName@@__'' is performing as the DJ in the club.
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -124,7 +124,8 @@
</div>
<</if>>
/* 000-250-006 */
- <br>
+ ''__@@color:pink;$slaves[_FLs].slaveName@@__'' is performing as the DJ in the club.
+ <br>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[_FLs].devotion <= 20)>>
@@ -139,7 +140,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
@@ -162,7 +162,6 @@
<</if>>
<<if $clubSlaves > 0>>
- <<if $DJ == 0>><br><br><</if>>
<<SlaveSort $ClubiIDs>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $ClubiIDs[_dI].Index, _ID = $ClubiIDs[_dI].ID>>
@@ -203,7 +202,7 @@
<<set $slaves[_i].health += 7>>
<</if>>
<<if $showEWD != 0>>
- ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving in the club.
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -211,8 +210,9 @@
</div>
<</if>>
/* 000-250-006 */
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving in the club.
<br> She <<include "SA serve the public">>
- <br>
+ <br>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -227,7 +227,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<include "SA serve the public">>
@@ -248,7 +247,7 @@
<</silently>>
<</if>>
<</for>>
-
+ <br><br>
<<if $clubAdsSpending != 0>>
An ad campaign is getting citizens into the club every night, and sluts that match it gratify patrons.
<</if>>
@@ -312,18 +311,18 @@
<<set $repGain += $clubSlaves*random(10,15)>>
There is a ''@@color:green;perfect variety@@'' of slaves serving the public from the club.
<</if>>
+ <<if $clubDecoration != "standard">>
+ $clubNameCaps's customers enjoy @@color:green;having sex in $clubDecoration surroundings.@@
+ <</if>>
<<if ($club <= $clubSlaves)>>
<<set $clubSpots = 0>>
<<else>>
<<set $clubSpots = $club - $clubSlaves>>
<</if>>
-
- <<if $clubDecoration != "standard">>
- $clubNameCaps's customers enjoy @@color:green;having sex in $clubDecoration surroundings.@@
- <</if>>
<<else>>
- ''Business in $clubName is normal.''
<<set $clubSpots = $club>>
<</if>>
-<br><br>
+<<if $clubSlaves || $DJ>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index c586d827320..79d97ecfacc 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -32,7 +32,7 @@
<<set $costs -= 500>>
<</if>>
-<<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
+<<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>
<<set $costs += ($mercenaries*500)>>
<<else>>
<<set $costs += ($mercenaries*1000)>>
@@ -308,6 +308,10 @@
<<set $costs += 1000>>
<</if>>
+<<if $cyberMod != 0 && $researchLab.built == "true">>
+ <<set $costs += ((100*$researchLab.maxSpace)+(300*$researchLab.hired)+(100*$researchLab.hired))>>
+<</if>>
+
<<if $PC.preg == -1>>
<<set $costs += 25>>
<<elseif $PC.preg >= 16>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 41faab4f99b..a21adc7dce0 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -24,7 +24,7 @@
<br>Increased living expenses due to being pregnant : ¤100>>
<</if>>
<<if $mercenaries > 0>>
- <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
+ <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>
<br>__Mercenary__ expenses: ¤<<print ($mercenaries*500)>> //Reduced by your @@color:springgreen;mercenary contacts@@//
<<else>>
<br>__Mercenary__ expenses: ¤<<print ($mercenaries*1000)>>
@@ -68,6 +68,13 @@
<<if ($masterSuiteUpgradePregnancy == 1)>>
<br>__Master Suite__ maintenance: ¤<<print ((500*$masterSuiteUpgradePregnancy) + (1000*$masterSuitePregnancyFertilitySupplements))>>
<</if>>
+<<if $cyberMod != 0>>
+ <<if ($researchLab.built == "true")>>
+ <br>__Research Lab__ maintenance: ¤<<print (100*$researchLab.maxSpace)>>
+ <<if $researchLab.hired != 0>> __Scientists__: ¤<<print (300*$researchLab.hired)>><</if>>
+ <<if $researchLab.menials != 0>> __Menial slaves__: ¤<<print (100*$researchLab.hired)>><</if>>
+ <</if>>
+<</if>>
<<if $FSSpending != 0>>
<br>__Society Shaping__ expenses: ¤$FSSpending
<</if>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 0dd8cda3c5d..02f0e6abbb2 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -2,7 +2,6 @@
<<set $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length, _FLs = -1>>
-<<if $dairySlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $DairyiIDs[_dI].Index, _ID = $DairyiIDs[_dI].ID>>
<<if _ID != $slaves[_i].ID>>
@@ -16,7 +15,6 @@
<</if>>
<</for>>
<<SlaveSort $DairyiIDs>>
-<</if>>
<<if ($Milkmaid != 0)>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
@@ -240,7 +238,7 @@
<<if ($Milkmaid != 0)>>
<<set $i = _FLs>>
<<if $showEWD != 0>>
- <br><br>''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as your milkmaid.
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -248,7 +246,8 @@
</div>
<</if>>
/* 000-250-006 */
- <br>
+ ''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as your milkmaid.
+ <br>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[_FLs].devotion <= 20)>>
@@ -263,7 +262,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
@@ -287,9 +285,6 @@
<<set $oldCash = $cash>>
<<if $dairySlaves > 0>>
-<<if ($Milkmaid == 0)>>
- <br><br>
-<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $DairyiIDs[_dI].Index, $i = _i>>
/* Special attention section */
@@ -309,6 +304,7 @@
/* General End of Week effects */
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -318,14 +314,13 @@
/* 000-250-006 */
''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as a cow in $dairyName.
<br> She <<include "SA get milked">>
- <br>
+ <br>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<include "SA get milked">>
@@ -667,7 +662,7 @@
<</if>>
<<set _profits = $cash-$oldCash>>
-
+<br><br>
<<if _chemSevere > 1>>
_chemSevere cows' productivity is being reduced by the long term effects of industrial use.
<<elseif _chemSevere > 0>>
@@ -781,7 +776,7 @@ These products sell for @@color:yellowgreen;¤_profits@@.
<</if>>
<<if ($dairySlimMaintainUpgrade == 1 && $dairySlimMaintain == 1)>>
- <br>
+ <br>
<<if $arcologies[0].FSSlimnessEnthusiast > 80>>
Because of your arcology's great enthusiasm for small breasted slaves, the dairy's milking systems have been carefully overhauled and optimized for maximum milk extraction from slaves with smaller endowments--providing a significant boost to their otherwise modest output. This also prevents unfashionable breast expansion of already slim slaves through the milking process.
<<elseif $arcologies[0].FSSlimnessEnthusiast > 20>>
@@ -830,7 +825,8 @@ These products sell for @@color:yellowgreen;¤_profits@@.
$dairyNameCaps's @@color:green;$dairyDecoration style is well known.@@
<</if>>
<<else>>
- ''$dairyNameCaps is empty.''
<<set $dairySpots = $dairy>>
<</if>>
-<br><br>
+<<if ($dairySlaves + _Tadd) || $Milkmaid>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 697db8c9cff..46c7f398b84 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -211,7 +211,7 @@ __Personal Business__
<<else>>
<<set $seed = random(1000,1500)>>
<</if>>
- <<if $PC.career == "capitalist">>
+ <<if $PC.trading >= 100>>
You focus on business and leverage your @@color:springgreen;venture capital experience@@ to make good money:
<<set $seed += random(500,1000)>>
<<elseif $PC.career == "arcology owner">>
@@ -818,21 +818,21 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<<if $Cash4Babies == 1>>
-<<if $arcologies[0].FSDegradationist != "unset">>
- Society @@color:green;approves@@ of your poor treatment of slave infants.
- <<set $rep += 5*$FSSingleSlaveRep*($arcologies[0].FSDegradationist/$FSLockinLevel)>>
-<<elseif $arcologies[0].FSRestart != "unset">>
-<<elseif $arcologies[0].FSPaternalist != "unset">>
- Society @@color:red;greatly despises@@ your poor treatment of slave infants.
- <<set $rep -= (25*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel))+($rep/20)>>
-<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
- Society @@color:red;disapproves@@ of your poor treatment of your future population, holding back acceptance of your new society.
- <<set $arcologies[0].FSRepopulationFocus -= 0.05*$FSSingleSlaveRep>>
- <<set $rep -= (5*$FSSingleSlaveRep*($arcologies[0].FSRepopulationFocus/$FSLockinLevel))+($rep/20)>>
-<<else>>
- Your citizens @@color:red;disapprove@@ of your poor treatment of slave children.
- <<set $rep -= ($rep/20)>>
-<</if>>
+ <<if $arcologies[0].FSDegradationist != "unset">>
+ Society @@color:green;approves@@ of your poor treatment of slave infants.
+ <<set $rep += 5*$FSSingleSlaveRep*($arcologies[0].FSDegradationist/$FSLockinLevel)>>
+ <<elseif $arcologies[0].FSRestart != "unset">>
+ <<elseif $arcologies[0].FSPaternalist != "unset">>
+ Society @@color:red;greatly despises@@ your poor treatment of slave infants.
+ <<set $rep -= (25*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel))+($rep/20)>>
+ <<elseif $arcologies[0].FSRepopulationFocus != "unset">>
+ Society @@color:red;disapproves@@ of your poor treatment of your future population, holding back acceptance of your new society.
+ <<set $arcologies[0].FSRepopulationFocus -= 0.05*$FSSingleSlaveRep>>
+ <<set $rep -= (5*$FSSingleSlaveRep*($arcologies[0].FSRepopulationFocus/$FSLockinLevel))+($rep/20)>>
+ <<else>>
+ Your citizens @@color:red;disapprove@@ of your poor treatment of slave children.
+ <<set $rep -= ($rep/20)>>
+ <</if>>
<</if>>
<<if $MixedMarriage == 1>>
@@ -1475,7 +1475,7 @@ earning you @@color:yellowgreen;¤$seed.@@
<<set _AWeekGrowth-->>
<</if>>
<<if $personalAttention == "business">>
- <<if ($PC.career == "capitalist") || ($PC.career == "arcology owner")>>
+ <<if ($PC.trading >= 100) || ($PC.career == "arcology owner")>>
Your @@color:springgreen;business focus and your experience@@ allow you to greatly assist in advancing the arcology's prosperity.
<<set _AWeekGrowth += 2>>
<<else>>
@@ -1521,7 +1521,7 @@ earning you @@color:yellowgreen;¤$seed.@@
<<set _AWeekGrowth += 2>>
<</if>>
<</if>>
- <<if $PC.career == "capitalist">>
+ <<if $PC.trading >= 100>>
Your @@color:springgreen;business skills@@ drive increased prosperity.
<<set _AWeekGrowth++>>
<<elseif $PC.career == "arcology owner">>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 7232ab93ee5..76a5fecc053 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -121,7 +121,19 @@
<<set $PC.preg++>>
<</if>>
-<<set $HGEnergy to 0, $HGCum = 0, $HGSlaveSuccess to 0, $HeadGirl to 0, $HGBalls to 0, $HGRelease to 1, $Recruiter to 0, $Madam to 0, $madamCashBonus to 0, $DJ to 0, $DJRepBonus to 0, $Milkmaid to 0, $Collectrix to 0, $Stewardess to 0, $Schoolteacher to 0, $Wardeness to 0, $Concubine to 0, $Attendant to 0, $Nurse to 0, $Bodyguard to 0, $bedSlaves to 0, $fuckSlaves to 0, $freeSexualEnergy to 0, $publicServants to 0, $cumSlaves to 0, $averageDick to 0, $slavesWithWorkingDicks to 0>>
+<<if ($personalAttention == "trading")>>
+ <<set $PC.trading += random(5,10), $cash -= 10000>><<if $PC.trading >= 100>><<set $personalAttention = "sex">><</if>>
+<<elseif ($personalAttention == "warfare")>>
+ <<set $PC.warafare += random(5,10), $cash -= 10000>><<if $PC.warafare >= 100>><<set $personalAttention = "sex">><</if>>
+<<elseif ($personalAttention == "slaving")>>
+ <<set $PC.slaving += random(5,10), $cash -= 10000>><<if $PC.slaving >= 100>><<set $personalAttention = "sex">><</if>>
+<<elseif ($personalAttention == "engineering")>>
+ <<set $PC.engineering += random(5,10), $cash -= 10000>><<if $PC.engineering >= 100>><<set $personalAttention = "sex">><</if>>
+<<elseif ($personalAttention == "medicine")>>
+ <<set $PC.medicine += random(5,10), $cash -= 10000>><<if $PC.medicine >= 100>><<set $personalAttention = "sex">><</if>>
+<</if>>
+
+<<set $HGEnergy = 0, $HGCum = 0, $HGSlaveSuccess = 0, $HeadGirl = 0, $HGBalls = 0, $HGRelease = 1, $Recruiter = 0, $Madam = 0, $madamCashBonus = 0, $DJ = 0, $DJRepBonus = 0, $Milkmaid = 0, $Collectrix = 0, $Stewardess = 0, $Schoolteacher = 0, $Wardeness = 0, $Concubine = 0, $Attendant = 0, $Nurse = 0, $Bodyguard = 0, $bedSlaves = 0, $fuckSlaves = 0, $freeSexualEnergy = 0, $publicServants = 0, $cumSlaves = 0, $averageDick = 0, $slavesWithWorkingDicks = 0>>
/* GAMEOVERS */
<<if $slaves.length < 1>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 8180d47f769..69bb6b432cc 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -1,6 +1,6 @@
:: Generate XX Slave [nobr]
-<<set $activeSlave = {slaveName: "blank", birthName: "blank", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, areolae: 0, areolaePiercing: 0, 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: 1, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 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: 1, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
+<<set $activeSlave = {slaveName: "blank", birthName: "blank", genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", markings: "none", eyes: 1, origEye: "brown", eyeColor: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, PLimb: 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, areolae: 0, areolaePiercing: 0, 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: 1, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 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: 1, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
<<set $activeSlave.publicCount = 0>>
<<if $activeSlaveOneTimeMaxAge > 998>>
@@ -483,6 +483,8 @@
<</if>>
<</if>>
+<<set $activeSlave.origEye = $activeSlave.eyeColor>>
+<<set $activeSlave.origHColor = $activeSlave.hColor>>
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
<<set $activeSlave.pubicHStyle = either("waxed","in a strip","neat","bushy")>>
<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index b73320e5e1b..dfe41404828 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -1,6 +1,6 @@
:: Generate XY Slave [nobr]
-<<set $activeSlave = {slaveName: "blank", birthName: "blank", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 10, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, areolae: 0, areolaePiercing: 0, 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, 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: 1, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
+<<set $activeSlave = {slaveName: "blank", birthName: "blank", genes: "XY", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", markings: "none", eyes: 1, origEye: "brown", eyeColor: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 10, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, PLimb: 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, areolae: 0, areolaePiercing: 0, 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, 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: 1, 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", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0}>>
<<set $activeSlave.publicCount = 0>>
<<if $activeSlaveOneTimeMaxAge > 998>>
@@ -484,6 +484,8 @@
<</if>>
<</if>>
+<<set $activeSlave.origEye = $activeSlave.eyeColor>>
+<<set $activeSlave.origHColor = $activeSlave.hColor>>
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
<<set $activeSlave.pubicHStyle = either("hairless","waxed","in a strip","neat","bushy")>>
<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
diff --git a/src/uncategorized/labReport.tw b/src/uncategorized/labReport.tw
new file mode 100644
index 00000000000..43f3b2d0561
--- /dev/null
+++ b/src/uncategorized/labReport.tw
@@ -0,0 +1,67 @@
+:: Lab Report [nobr]
+
+''Lab Report''<hr style="margin:0">
+<br>
+<<if ($researchLab.hired += $researchLab.menials) != 0>>
+ <<if $researchLab.research == "none" && $researchLab.manufacture == "none">>
+ Since lab is currently not working on any projects they take contract work and earn you @@color:yellowgreen;¤<<print (($researchLab.hired * 3 + $researchLab.menials) * $researchLab.aiModule * 20)>>.@@
+ <<set $cash + (($researchLab.hired * 3 + $researchLab.menials) * $researchLab.aiModule * 20)>>
+ <<elseif $researchLab.research != "none">>
+ <<set $researchLab.productionTime - (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>>
+ <<if $researchLab.productionTime <= 0>>
+ Your lab staff have @@color:green;completed@@ their project.
+ <<if $researchLab.research == "Basic prosthetics interface">>
+ <<set $researchLab.basicPLimbInterface to 1>>
+ <<else $researchLab.research == "Advanced prosthetics interface">>
+ <<set $researchLab.advPLimbInterface to 1>>
+ <<elseif $researchLab.research == "Basic prosthetic limbs">>
+ <<set $researchLab.basicPLimb to 1>>
+ <<elseif $researchLab.research == "Advanced sex limbs">>
+ <<set $researchLab.advSexPLimb to 1>>
+ <<elseif $researchLab.research == "Advanced beauty limbs">>
+ <<set $researchLab.advGracePLimb to 1>>
+ <<elseif $researchLab.research == "Advanced combat limbs">>
+ <<set $researchLab.advCombatPLimb to 1>>
+ <<elseif $researchLab.research == "Cybernetic limbs">>
+ <<set $researchLab.cyberneticPLimb to 1>>
+ <<elseif $researchLab.research == "Ocular implants">>
+ <<set $researchLab.ocularImplant to 1>>
+ /*<<elseif $researchLab.research == "Erectile implant">>
+ <<set $researchLab.erectileImplant to 1>>*/
+ <</if>>
+ <<set $researchLab.productionTime to 0>>
+ <<else>>
+ Your lab staff are currently researching @@color:yellow;$researchLab.research@@.
+
+ <</if>>
+ <<elseif $researchLab.manufacture != "none">>
+ <<set $researchLab.productionTime - (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>>
+ <<if $researchLab.productionTime <= 0>>
+ Your lab staff have @@color:green;completed@@ their project.
+ <<if $researchLab.manufacture == "Basic prosthetics interface">>
+ <<set $stockpile.basicPLimbInterface += 1>>
+ <<elseif $researchLab.manufacture == "Advanced prosthetics interface">>
+ <<set $stockpile.advPLimbInterface += 1>>
+ <<elseif $researchLab.manufacture == "Basic prosthetic limbs">>
+ <<set $stockpile.basicPLimb += 1>>
+ <<elseif $researchLab.manufacture == "Advanced sex limbs">>
+ <<set $stockpile.advSexPLimb += 1>>
+ <<elseif $researchLab.manufacture == "Advanced beauty limbs">>
+ <<set $stockpile.advGracePLimb += 1>>
+ <<elseif $researchLab.manufacture == "Advanced combat limbs">>
+ <<set $stockpile.advCombatPLimb += 1>>
+ <<elseif $researchLab.manufacture == "Cybernetic limbs">>
+ <<set $stockpile.cyberneticPLimb += 1>>
+ <<elseif $researchLab.manufacture == "Ocular implants">>
+ <<set $stockpile.ocularImplant += 1>>
+ /*<<elseif>>
+ <<if $researchLab.manufacture == "Erectile implant">>
+ <<set $stockpile.erectileImplant += 1>>*/
+ <</if>>
+ <<set $researchLab.productionTime to 0>>
+ <<else>>
+ Your lab staff are currently working on @@color:yellow;$researchLab.manufacture@@.
+ <</if>>
+ <</if>>
+<</if>>
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index 502d2800d51..e5cc6a11d61 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -37,10 +37,10 @@
<<set $activeSlave.fetishKnown = 1>>
<<set $activeSlave.fetishStrength = 65>>
<</if>>
- <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
+ <<if ($PC.slaving >= 100) || ($PC.career == "arcology owner")>>
<<set $gingeringDetected = 1>>
<<set $gingeringDetection = "slaver">>
- <<elseif ($PC.career == "mercenary") && (random(1,2) == 1)>>
+ <<elseif ($PC.warfare >= 100) && (random(1,2) == 1)>>
<<set $gingeringDetected = 1>>
<<set $gingeringDetection = "mercenary">>
<<elseif ($PC.rumor == "force") && (random(1,2) == 1)>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index bcc802fc0d0..903da176c95 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -596,7 +596,11 @@ $pronounCap has been with you
<<if $activeSlave.fuckdoll == 0>> /* NORMAL NON-FUCKDOLL MENTAL REPORT */
<<if $activeSlave.eyes == -2>>
- Her eyes are dull and unfocused,
+ <<if $activeSlave.eyeColor != "empty">>
+ Her eyes are dull and unfocused,
+ <<else>>
+ Her gaze is empty,
+ <</if>>
<<if ($activeSlave.intelligence >= 3)>>
but her facial expressions reveal she is incisive, quick, cunning;
<<if ($activeSlave.intelligenceImplant != 1)>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index ae26064d3f6..a8c5b9a30b5 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -74,7 +74,7 @@ __Construction__
<<else>>
//The arcology's public areas are fully upgraded.//
<</if>>
-<<if ($PC.career == "engineer") || ($PC.career == "arcology owner")>>
+<<if ($PC.engineering >= 100) || ($PC.career == "arcology owner")>>
<<if $AProsperityCap < 360>>
//Arcology upgrades are less expensive due to your @@color:springgreen;<<if $PC.career == "arcology owner">>experience in the Free Cities<<else>>arcology engineering career<</if>>.@@//
<</if>>
@@ -177,9 +177,18 @@ __Facilities__
The lower level of the penthouse includes a hallway of cells to confine slaves in.
<</if>>
-<br>
+<<if $cyberMod == 1>>
+ <br>
+ <<if $researchLab.built == "true">>
+ Your penthouse is now equipped with a research lab.
+ <<else>>
+ [[Clear out one of the floors and install research equipment|Manage Arcology][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $researchLab.built = "true", $researchLab.maxSpace = 5]]
+ //Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
<<if $familyTesting == 1>>
+<br>
<<if $AProsperityCap > 120>>
<<if $incubator == 0>>
[[Install an incubation chamber to rapidly age children|Manage Arcology][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $incubator = 1]]
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index d555742189a..f488f465254 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -226,6 +226,37 @@ __Penthouse Improvements__
<br>
+
+<<if $cyberMod == 0>>
+ <<switch $prostheticsUpgrade>>
+ <<case 1>>
+ There is a facility to construct mechanical prosthetic limbs for amputated slaves.
+ <<if ($rep > 14000)>>
+ [[Research advanced prototype prosthetics|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 2]]
+ //Costs ¤<<print Math.trunc(100000*$upgradeMultiplierArcology)>>//
+ <<else>>
+ //You lack the reputation to research and produce prototype prosthetics.//
+ <</if>>
+ <<case 2>>
+ There is a prosthetics facility upgraded to use advanced materials and designs.
+ <<if ($rep > 16000)>>
+ [[Research high-tech cybernetic limbs|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 3]]
+ //Costs ¤<<print Math.trunc(100000*$upgradeMultiplierArcology)>>//
+ <<else>>
+ //You lack the reputation to research and produce prototype cybernetic limbs.//
+ <</if>>
+ <<case 3>>
+ There is a high-tech facility to build prosthetics and state-of-the-art cybernetic replacement limbs.
+ <<default>>
+ <<if ($rep > 12000)>>
+ [[Construct a mechanical prosthetics facility|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 1]]
+ //Costs ¤<<print Math.trunc(100000*$upgradeMultiplierArcology)>>//
+ <<else>>
+ //You lack the reputation to construct a prosthetics facility.//
+ <</if>>
+ <</switch>>
+<</if>>
+
<<switch $prostheticsUpgrade>>
<<case 1>>
There is a facility to construct mechanical prosthetic limbs for amputated slaves.
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index f61795102ca..077da567d7a 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -18,7 +18,8 @@
<<if $Concubine != 0>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
<<if $slaves[_FLs].ID == $Concubine.ID>>
- <<set $MastSiIDs.push({ID: $Concubine.ID, Index: _FLs}), _DL++, $masterSuiteSlaves++>>
+ /% Add the Concubine to the $MastSiIDs list at the front of the array, so that she displays first. %/
+ <<set $MastSiIDs.unshift({ID: $Concubine.ID, Index: _FLs}), _DL++, $masterSuiteSlaves++>>
<<break>>
<</if>>
<</for>>
@@ -291,7 +292,7 @@ The level of sexual energy in the suite is
<<if $verboseDescriptions == 1>>
<br> She <<include "SA please you">>
- <br>
+ <br>
<<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[_i].devotion <= 20)>>
@@ -381,8 +382,9 @@ The level of sexual energy in the suite is
<</for>>
-<<if _FLs > -1>>
- <<set $Concubine = $slaves[_FLs], _dump = $MastSiIDs.deleteAt(_DL-1), _DL--, $masterSuiteSlaves-->>
+<<if $Concubine>>
+ /% Remove the Concubine from the $MastSiIDs list %/
+ <<set $Concubine = $slaves[_FLs], _dump = $MastSiIDs.deleteAt(0), _DL--, $masterSuiteSlaves-->>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
@@ -397,8 +399,7 @@ The level of sexual energy in the suite is
<<if $masterSuiteDecoration != "standard">>
$masterSuiteNameCaps's $masterSuiteDecoration atmosphere @@color:hotpink;has a minor impact on your fucktoys.@@
<</if>>
-
-<<else>>
- ''The Master Suite is empty.''
<</if>>
-<br><br>
+<<if $masterSuiteSlaves || $Concubine>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 6df32adb782..ad35d84029b 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -247,6 +247,14 @@ Curative side effects are @@color:red;DISABLED@@. [[Enable|Options][$curativeSid
The Security Force Mod is currently @@color:cyan;ENABLED@@. [[Disable|Options][$SFMODToggle = 0]]
<</if>> //Will not affect mod content that has already been encountered.//
+<br>
+
+<<if ($cyberMod == 0)>>
+ Cybernetics Mod is currently @@color:red;DISABLED@@. [[Enable|Options][$cyberMod = 1]]
+<<else>>
+ Cybernetics Mod is currently @@color:cyan;ENABLED@@. [[Disable|Options][$cyberMod = 0]]
+<</if>>
+
<br><br>
Other options:
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 0e13744f991..9f9198ee938 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -28,7 +28,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Knights">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<<if $arcologies[0].FSRomanRevivalist >= 10>>\
<<link "They shall be my Evocati">>
<<replace "#result">>
@@ -39,7 +39,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Evocati">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSEgyptianRevivalist >= 10>>\
<<link "They shall be my Medjay">>
@@ -51,7 +51,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Medjay">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSEdoRevivalist >= 10>>\
<<link "Naturally, they shall be the Samurai">>
@@ -63,7 +63,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Samurai">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSArabianRevivalist >= 10>>\
<<link "They shall be my Janissaries">>
@@ -75,7 +75,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Janissaries">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSChattelReligionist >= 10>>\
<<link "They shall be the Knights Templar">>
@@ -87,7 +87,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Knights Templar">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSDegradationist >= 10>>\
<<link "They shall be my Immortals">>
@@ -99,7 +99,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Immortals">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSAssetExpansionist >= 10>>\
<</if>>\
@@ -123,7 +123,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Asgardians">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSSupremacist >= 10>>\
<<link "They shall be the Knights of the Blood">>
@@ -135,7 +135,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Knights of the Blood">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSSubjugationist >= 10>>\
<</if>>\
@@ -149,7 +149,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Wardens">>
<</replace>>
-<</link>> <<if $PC.career == "mercenary" || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if $PC.warfare >= 100 || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSBodyPurist >= 10>>\
<</if>>\
@@ -165,6 +165,6 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Rangers">>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
</span>
diff --git a/src/uncategorized/pDefenseFears.tw b/src/uncategorized/pDefenseFears.tw
index 8d1c4999021..86fcb60ec4f 100644
--- a/src/uncategorized/pDefenseFears.tw
+++ b/src/uncategorized/pDefenseFears.tw
@@ -30,7 +30,7 @@ A deputation of slaveowning citizens comes to see you. Though they haven't exper
<<set $cash -= 10000>>
<<set $mercenaries = 3>>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
<<link "Refuse to quarter so many troops in your arcology">>
<<replace "#result">>
The consensus that the arcology is vulnerable triggers an @@color:red;exodus@@ of your most wealthy and valuable citizens, and your reputation @@color:red;suffers@@ grievously.
diff --git a/src/uncategorized/pMercenaries.tw b/src/uncategorized/pMercenaries.tw
index 2dbe637f270..8675aa2a663 100644
--- a/src/uncategorized/pMercenaries.tw
+++ b/src/uncategorized/pMercenaries.tw
@@ -26,7 +26,7 @@ The budgetary difficulty many old world countries are in has resulted in unemplo
<<set $cash -= 5000>>
<<set $mercenaries = 1>>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤5000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤5000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤5000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤5000 and incur significant upkeep costs//<</if>>
<<link "Install a full platoon">>
<<replace "#result">>
You hire a full platoon of reputable mercenaries and a veteran officer to command them, kit them in excellent gear, and quarter them in $arcologies[0].name. The sight of many armed men on patrol has @@color:red;deeply offended some of the more free-spirited citizens@@ of $arcologies[0].name.
@@ -35,7 +35,7 @@ The budgetary difficulty many old world countries are in has resulted in unemplo
<<set $cash -= 10000>>
<<set $mercenaries = 3>>
<</replace>>
-<</link>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
<<link "Do not quarter troops in your arcology">>
<<replace "#result">>
Having armed men on permanent watch is a step too far. $arcologies[0].name's security systems are formidable and will have to serve.
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index fb857146706..77c8e9edc2f 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -3,6 +3,44 @@
<<set $nextButton = "Back to Main">>
<<set $nextLink = "Main">>
+<<if $PC.career == "escort">>
+[[Focus on "connecting"|Main][$personalAttention = "whoring", $personalAttentionChanged = 1]]
+<<elseif $PC.career == "servant">>
+[[Maintain your home|Main][$personalAttention = "upkeep", $personalAttentionChanged = 1]]
+<<else>>
+[[Focus on business|Main][$personalAttention = "business", $personalAttentionChanged = 1]]
+<</if>>
+<<if $HeadGirl != 0>>
+ <br>[[Support your Head Girl|Main][$personalAttention = "HG", $personalAttentionChanged = 1]]
+<</if>>
+<br>[[Have as much sex with your slaves as possible|Main][$personalAttention = "sex", $personalAttentionChanged = 1]]<br><br>
+<<if $PC.trading >= 100>>
+ //You are a master trader.//
+<<else>>
+ [[Hire a merchant to train you in commerce|Main][$personalAttention = "trading", $personalAttentionChanged = 1]]
+<</if>><br>
+<<if $PC.warafare >= 100>>
+ //You are a master tactician.//
+<<else>>
+ [[Hire a mercenary to train you in warfare|Main][$personalAttention = "warfare", $personalAttentionChanged = 1]]
+<</if>><br>
+<<if $PC.slaving >= 100>>
+ //You are a master slaver.//
+<<else>>
+ [[Hire a slaver to train you in slaving|Main][$personalAttention = "slaving", $personalAttentionChanged = 1]]
+<</if>><br>
+<<if $PC.engineering >= 100>>
+ //You are a master engineer.//
+<<else>>
+ [[Hire an engineer to train you in engineering|Main][$personalAttention = "engineering", $personalAttentionChanged = 1]]
+<</if>><br>
+<<if $PC.medicine >= 100>>
+ //You are a master surgeon.//
+<<else>>
+ [[Hire a doctor to train you in medicine|Main][$personalAttention = "medicine", $personalAttentionChanged = 1]]
+<</if>><br>
+//Training will cost you ¤10000 per week.//<br><br>
+
<<if ($personalAttentionChanged == 1)>>
<<if ($activeSlave.health < -20)>>
<<set $trainingRegimen = "look after her">>
@@ -260,15 +298,4 @@ Induce a flaw:
<br><br>__Select a slave to train:__
<<include "Slave Summary">>
-<br><br>
-<<if $PC.career == "escort">>
-[[Focus on "connecting"|Main][$personalAttention = "whoring", $personalAttentionChanged = 1]]
-<<elseif $PC.career == "servant">>
-[[Maintain your home|Main][$personalAttention = "upkeep", $personalAttentionChanged = 1]]
-<<else>>
-[[Focus on business|Main][$personalAttention = "business", $personalAttentionChanged = 1]]
-<</if>>
-<<if $HeadGirl != 0>>
- <br>[[Support your Head Girl|Main][$personalAttention = "HG", $personalAttentionChanged = 1]]
-<</if>>
-<br>[[Have as much sex with your slaves as possible|Main][$personalAttention = "sex", $personalAttentionChanged = 1]]
+<br>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 69f8ee638ca..f53f6a8e0e4 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -195,7 +195,7 @@
[[Repeal|Policies][$Cash4Babies = 0]]
<</if>>
-<<if $RegularParties == 0>>
+<<if $RegularParties == 1>>
<br>''Regular Entertainments:'' you are hosting regular parties for prominent citizens, an expected social duty of an arcology owner.
[[Repeal|Policies][$RegularParties = 0]]
<<if $rep > 18000>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index cd80f7d042d..4352ae97b22 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -226,6 +226,7 @@ She waits anxiously for your decision.
<<case "mother">>
<<set $activeSlave.origin = "She was recruited into your service by her daughter.">>
+ <<set $activeSlave.genes = "XX">>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 3>>
<<set $activeSlave.ovaries = 1>>
@@ -259,6 +260,7 @@ She waits anxiously for your decision.
<<case "father">>
<<set $activeSlave.origin = "She was recruited into your service by her daughter.">>
+ <<set $activeSlave.genes = "XY">>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.weight = random(70,100)>>
@@ -278,6 +280,7 @@ She waits anxiously for your decision.
<<case "daughter">>
<<set $activeSlave.origin = "She was recruited into your service by her parent.">>
+ <<set $activeSlave.genes = "XX">>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.boobs = (random(8,10)*100)>>
@@ -305,6 +308,7 @@ She waits anxiously for your decision.
<<case "son">>
<<set $activeSlave.origin = "She was recruited into your service by her parent.">>
+ <<set $activeSlave.genes = "XY">>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.boobs = (random(6,8)*100)>>
@@ -331,6 +335,7 @@ She waits anxiously for your decision.
<<case "older sister">>
<<set $activeSlave.origin = "She was recruited into your service by little sis.">>
+ <<set $activeSlave.genes = "XX">>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.boobs += 200>>
<<set $activeSlave.butt += 1>>
@@ -346,6 +351,7 @@ She waits anxiously for your decision.
<<case "younger sister">>
<<set $activeSlave.origin = "She was recruited into your service by her big sis.">>
+ <<set $activeSlave.genes = "XX">>
<<set $activeSlave.boobs = (random(1,4)*100)>>
<<set $activeSlave.butt = random(1,2)>>
<<set $activeSlave.hips = random(-2,0)>>
@@ -359,6 +365,7 @@ She waits anxiously for your decision.
<<case "older brother">>
<<set $activeSlave.origin = "She was recruited into your service by her little sis.">>
+ <<set $activeSlave.genes = "XY">>
<<set $activeSlave.dick = 5>>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.balls = 4>>
@@ -376,6 +383,7 @@ She waits anxiously for your decision.
<<case "younger brother">>
<<set $activeSlave.origin = "She was recruited into your service by her big sis.">>
+ <<set $activeSlave.genes = "XY">>
<<set $activeSlave.boobs = (random(20,40)*100)>>
<<set $activeSlave.boobsImplant = $activeSlave.boobs - 100>>
<<set $activeSlave.boobsImplantType = 1>>
diff --git a/src/uncategorized/recruiterSelect.tw b/src/uncategorized/recruiterSelect.tw
index 81ccbe76312..1d6cd03d5fe 100644
--- a/src/uncategorized/recruiterSelect.tw
+++ b/src/uncategorized/recruiterSelect.tw
@@ -27,6 +27,12 @@
<br> [[Reassignment candidates|Recruiter Select][$recruiterTarget = "reassignment candidates"]] //Will be born male//
<</if>>
+<br><br>Target only individuals that can pass eugenics SMR.
+<<if $recruiterEugenics < 1>>[[Target|Recruiter Select][$recruiterEugenics = 1]]
+ <<else>>[[Stop targeting|Recruiter Select][$recruiterEugenics = 0]]
+<</if>>
+<br> //This option will increase time it takes to recruit depending on how many eugenics SMR are active.//
+
/* sum for "facilities & leadership" */
<<set _idleTarget = (2 + $brothel + $club + $arcade + $dairy + $servantsQuarters + $masterSuite)>>
<<if $HGSuite>><<set _idleTarget++>><</if>>
@@ -41,7 +47,7 @@
<<if $clinic>><<set _idleTarget++>><</if>>
<<if $cellblock>><<set _idleTarget++>><</if>>
-<br><br>Suspend active recruiting and focus on publicity when: <span id="idleRule"><<switch $recruiterIdleRule>><<case "number">>''$recruiterIdleNumber sex slaves owned''<<case "facility">>''match facility expansion'', currently <<if _idleTarget >=20>>_idleTarget positions<<else>>20 positions (rule minimum)<</if>><<default>>''always recruit''<</switch>></span>
+<br><br>Suspend active recruiting and focus on publicity when: <span id="idleRule"><<switch $recruiterIdleRule>><<case "number">>''$recruiterIdleNumber sex slaves owned''<<case "facility">>''match facility expansion'', currently <<if _idleTarget >= 20>>_idleTarget positions<<else>>20 positions (rule minimum)<</if>><<default>>''always recruit''<</switch>></span>
<br> <<link "Always recruit">><<set $recruiterIdleRule = "always">><<replace "#idleRule">>''always recruit''<</replace>><</link>> | <<link "Facilities & leadership">><<set $recruiterIdleRule = "facility">><<replace "#idleRule">>''match facility expansion'', currently <<if _idleTarget >=20>>_idleTarget positions<<else>>20 positions (rule minimum)<</if>><</replace>><</link>> | <<link "Set to this many slaves:">><<set $recruiterIdleRule = "number", $recruiterIdleNumber = Math.max(Math.trunc(Number($seed) || 20), 20)>><<replace "#idleRule">>''$recruiterIdleNumber sex slaves owned''<</replace>><<replace "#numberBox">><<textbox "$seed" $recruiterIdleNumber>><</replace>><</link>> <span id="numberBox"><<textbox "$seed" $recruiterIdleNumber>></span> /* use of $seed in conjunction with <<link>> prevents NaN error */
<br> //"Facilities" doesn't include training slots in cellblock, schoolroom, spa, clinic (but does include those leaders)//
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 6c82ea020d6..eab11e43eaf 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -6,7 +6,7 @@
<<set $surgeryType = 0>>
<<set $showEncyclopedia = 1>><<set $encyclopedia = "The Remote Surgery">>
-$activeSlave.slaveName is lying strapped down on the table in your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery.<<else>>remote surgery.<</if>> The surgical equipment reads <<if $activeSlave.health < -20>>@@color:red;SLAVE UNHEALTHY, SURGERY NOT RECOMMENDED.@@<<elseif $activeSlave.health <= 20>>@@color:yellow;SLAVE HEALTHY, SURGERY SAFE.@@<<else>>@@color:green;SLAVE HEALTHY, SURGERY ENCOURAGED.@@<</if>><<if $PC.career == "medicine">> The remote surgery mechanisms that allow a surgeon to be brought in by telepresence are inactive, and the autosurgery is ready for your control inputs. Surgery on your slaves is a challenge and a pleasure you wouldn't dream of sharing.<</if>>
+$activeSlave.slaveName is lying strapped down on the table in your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery.<<else>>remote surgery.<</if>> The surgical equipment reads <<if $activeSlave.health < -20>>@@color:red;SLAVE UNHEALTHY, SURGERY NOT RECOMMENDED.@@<<elseif $activeSlave.health <= 20>>@@color:yellow;SLAVE HEALTHY, SURGERY SAFE.@@<<else>>@@color:green;SLAVE HEALTHY, SURGERY ENCOURAGED.@@<</if>><<if $PC.medicine >= 100>> The remote surgery mechanisms that allow a surgeon to be brought in by telepresence are inactive, and the autosurgery is ready for your control inputs. Surgery on your slaves is a challenge and a pleasure you wouldn't dream of sharing.<</if>>
<br><br>
$possessiveCap
@@ -757,7 +757,7 @@ The fabricator is not currently growing an organ for $object. Extract tissue to
<<goto "Remote Surgery">>
<</link>> //Costs ¤10000 and requires a vagina for successful implantation//
<</if>>
-<<if $activeSlave.eyes is -2>>
+<<if $activeSlave.eyes <= -2 && $activeSlave.eyes != "implant">>
<br>
<<link "Eyes">>
<<set $cash -= 10000>>
@@ -1155,7 +1155,7 @@ The fabricator has completed $possessive $activeOrgan.type.
<<link "Discard">><<for $i to 0; $i < $organs.length; $i++>><<if $activeSlave.ID == $organs[$i].ID>><<set $dump to $organs.pluck([$i], [$i])>><<break>><</if>><</for>><<goto "Remote Surgery">><</link>>
<</if>>
<<elseif $activeOrgan.type == "eyes">>
- <<if $activeSlave.eyes > -2>>
+ <<if $activeSlave.eyes > -2 || $activeSlave.origEye == "implant">>
<br>
ERROR: this slave has working eyes.
<<link "Discard">><<for $i to 0; $i < $organs.length; $i++>><<if $activeSlave.ID == $organs[$i].ID>><<set $dump to $organs.pluck([$i], [$i])>><<break>><</if>><</for>><<goto "Remote Surgery">><</link>>
@@ -1327,7 +1327,8 @@ The fabricator has completed $possessive $activeOrgan.type.
<<set $limbs = []>>
<</if>>
-<<if $prostheticsUpgrade > 0>>
+<<if $cyberMod == 0>> /* CyberMod Toggle */
+<<if $prostheticsUpgrade > 0>> /* PROSTHESIS FACTORY */
<<if $activeSlave.indentureRestrictions < 2>>
<br><br>
@@ -1628,9 +1629,10 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<</if>>
<</if>>
<</if>> /* CLOSES PROSTHESIS FACTORY */
+<</if>> /* CyberMod Toggle */
<br><br>
-<<if $activeSlave.eyes == -1>>
+<<if $activeSlave.eyes == -1 && $activeSlave.eyes != "implant">>
$pronounCap is nearsighted.
[[Correct eyesight|Surgery Degradation][$activeSlave.eyes = 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "eyeFix"]]
<br>
@@ -1641,20 +1643,33 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<br>
<</if>>
<</if>>
-<<if ($activeSlave.eyes == -2)>>
+
+<<if $activeSlave.origEye == "implant">>
+ $pronounCap has artificial eyes.
+<<elseif ($activeSlave.eyes <= -2)>>
$pronounCap is blind.
- <br>
<<else>>
$pronounCap has working eyes.
- <<if ($seeExtreme == 1)>>
+<</if>>
+<<if ($seeExtreme == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
- <<if ($activeSlave.eyes != -2)>>
- [[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.eyeColor,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "blind"]] //This will greatly restrict $possessive//
+ <<if $activeSlave.origEye != "implant">>
+ <<if ($activeSlave.eyes > -2)>>
+ [[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "blind"]]
<</if>>
+ /*<<if ($activeSlave.eyes != -3)>>
+ <<if ($activeSlave.eyes >= -2)>> | <</if>>
+ [[Remove eyes|Surgery Degradation][$activeSlave.eyeColor = "empty",$activeSlave.origEye = "none",$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "remove eyes"]]
+ <<if ($activeSlave.eyes != -2)>>//This will greatly restrict $possessive//<</if>>
+ <</if>>*/
<</if>>
+ <<if $cyberMod == 1 && $stockpile.ocularImplant > 0>>
+ <<if ($activeSlave.eyes != -3)>> | <</if>>
+ [[Give her ocular implants|Surgery Degradation][$activeSlave.origEye = "implant",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
<</if>>
<br>
<</if>>
+<</if>>
<<set $toSearch = $activeSlave.race>>
<<if $toSearch.indexOf("surgically") == -1>>
@@ -1852,7 +1867,11 @@ $pronounCap has doorway-jamming hips.
$pronounCap has healthy limbs.
<<else>>
$pronounCap is a quadruple amputee
- <<if $activeSlave.amp == -1>>
+ <<if $activeSlave.PLimb == 1 && $activeSlave.amp == 1>>
+ and has been implanted with basic PLimb interface.
+ <<elseif $activeSlave.PLimb == 2 && $activeSlave.amp == 1>>
+ and has been implanted with advanced PLimb interface.
+ <<elseif $activeSlave.amp == -1>>
and has been equipped with modern prosthetics.
<<elseif $activeSlave.amp == -2>>
and has been equipped with advanced, sex-focused prosthetics.
@@ -1866,14 +1885,32 @@ $pronounCap has doorway-jamming hips.
and has not been equipped with prosthetics.
<</if>>
<</if>>
+
+<<if $cyberMod == 0>>
<<if $activeSlave.amp == 0>>
<<if ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1)>>
- [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.entertainSkill = 0,$activeSlave.nails = 0,$surgeryType = "amp"]] //This will greatly restrict $possessive//
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp"]] //This will greatly restrict $possessive//
<</if>>
<<elseif $activeSlave.amp != 1>>
<<if ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1)>>
- [[Detach artificial limbs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.entertainSkill = 0,$activeSlave.nails = 0,$surgeryType = "removeLimbs"]] //This will greatly restrict $possessive//
- <</if>>
+ [[Detach artificial limbs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "removeLimbs"]] //This will greatly restrict $possessive//
+ <</if>>
+<<else>>
+ <<if $activeSlave.amp == 0>>
+ <<if ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1) && (($stockpile.basicPLimbInterface + $stockpile.advPLimbInterface) == 0)>>
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp"]] //This will greatly restrict $possessive//
+ <<elseif ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1)>>
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp1"]] //This will greatly restrict $possessive//
+ <</if>>
+ <<elseif $activeSlave.amp == 1 && $activeSlave.PLimb == 0 && $stockpile.basicPLimbInterface > 0>>
+ [[Install basic prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 1,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface1"]]
+ <<if $stockpile.advPLimbInterface > 0>>
+ [[Install advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface2"]]
+ <</if>>
+ <<elseif $activeSlave.amp == 1 && $activeSlave.PLimb == 1 && $stockpile.advPLimbInterface > 0>>
+ [[Upgrade = advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 5,$surgeryType = "PLimb interface3"]]
+ <</if>>
+<</if>>
<</if>>
<br>
diff --git a/src/uncategorized/rulesAutosurgery.tw b/src/uncategorized/rulesAutosurgery.tw
index 135f15b7da5..efb3a4dabf7 100644
--- a/src/uncategorized/rulesAutosurgery.tw
+++ b/src/uncategorized/rulesAutosurgery.tw
@@ -59,12 +59,12 @@
<<set $surgeries.push("surgery to remove her lactation implants")>>
<<set $slaves[$i].lactation = 0>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].lactation != 2) && ($thisSurgery.lactation == 1)>>
<<set $surgeries.push("lactation inducing implanted drugs")>>
<<set $slaves[$i].lactation = 2>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].anus > 3) && ($thisSurgery.cosmetic > 0)>>
<<set $surgeries.push("a restored anus")>>
<<set $slaves[$i].anus = 3>>
@@ -72,7 +72,7 @@
<<set $slaves[$i].analSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].vagina > 3) && ($thisSurgery.cosmetic > 0)>>
<<set $surgeries.push("a restored pussy")>>
<<set $slaves[$i].vagina = 3>>
@@ -80,15 +80,15 @@
<<set $slaves[$i].vaginalSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].faceImplant == 0) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a nicer face")>>
<<if $slaves[$i].faceShape is "masculine">><<set $slaves[$i].faceShape to "androgynous">><</if>>
<<set $slaves[$i].faceImplant to 1>>
<<set $slaves[$i].face = Math.trunc($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
-<<elseif ($slaves[$i].ageImplant != 1) && ($slaves[$i].physicalAge >= 25) && ($thisSurgery.cosmetic != 0)>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+<<elseif ($slaves[$i].ageImplant != 1) && ($slaves[$i].age >= 25) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("an age lift")>>
<<set $slaves[$i].ageImplant = 1>>
<<if $slaves[$i].visualAge > 80>>
@@ -103,23 +103,23 @@
<<set $slaves[$i].visualAge -= 5>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].voice == 1) && ($slaves[$i].voiceImplant == 0) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a feminine voice")>>
<<set $slaves[$i].voice += 1>>
<<set $slaves[$i].voiceImplant += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].waist >= -10) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a narrower waist")>>
<<set $slaves[$i].waist -= 20>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif (($slaves[$i].boobShape == "saggy") || ($slaves[$i].boobShape == "downward-facing")) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a breast lift")>>
<<set $slaves[$i].boobShape = "normal">>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif (($slaves[$i].boobShape == "normal") || ($slaves[$i].boobShape == "wide-set")) && ($thisSurgery.cosmetic != 0)>>
<<if $slaves[$i].boobs > 800>>
<<set $slaves[$i].boobShape = "torpedo-shaped">>
@@ -128,7 +128,7 @@
<</if>>
<<set $surgeries.push("more interestingly shaped breasts")>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($thisSurgery.lips == 0) && ($slaves[$i].lipsImplant > 0)>>
<<set $surgeries.push("surgery to remove her lip implants")>>
<<set $slaves[$i].lips -= $slaves[$i].lipsImplant>>
@@ -137,7 +137,7 @@
<<set $slaves[$i].oralSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].lips <= 95) && ($slaves[$i].lips < $thisSurgery.lips)>>
<<if $thisSurgery.lips !== "no default setting">>
<<set $surgeries.push("bigger lips")>>
@@ -147,7 +147,7 @@
<<set $slaves[$i].oralSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<elseif ($slaves[$i].faceImplant == 1) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic is 2)>>
<<set $surgeries.push("a nicer face")>>
@@ -155,43 +155,43 @@
<<set $slaves[$i].faceImplant to 2>>
<<set $slaves[$i].face = Math.trunc($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].faceImplant > 0) && ($slaves[$i].face <= 95) && ($surgeryUpgrade == 1) && ($thisSurgery.cosmetic is 2)>>
<<set $surgeries.push("a nicer face")>>
<<if $slaves[$i].faceShape is "masculine">><<set $slaves[$i].faceShape to "androgynous">><</if>>
<<set $slaves[$i].faceImplant to 2>>
<<set $slaves[$i].face = Math.trunc($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career is "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].waist >= -95) && ($thisSurgery.cosmetic is 2) && ($seeExtreme == 1)>>
<<set $surgeries.push("a narrower waist")>>
<<set $slaves[$i].waist = Math.trunc($slaves[$i].waist-20,-100,100)>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 30.5>><<else>><<set $slaves[$i].health -= 4>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 30.5>><<else>><<set $slaves[$i].health -= 4>><</if>>
<<elseif ($slaves[$i].voice < 3) && ($slaves[$i].voiceImplant == 0) && ($thisSurgery.cosmetic == 2)>>
<<set $surgeries.push("a bimbo's voice")>>
<<set $slaves[$i].voice += 1>>
<<set $slaves[$i].voiceImplant += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($thisSurgery.butt == 0) && ($slaves[$i].buttImplant > 0)>>
<<set $surgeries.push("surgery to remove her butt implants")>>
<<set $slaves[$i].butt -= $slaves[$i].buttImplant>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($thisSurgery.boobs == 0) && ($slaves[$i].boobsImplant > 0)>>
<<set $surgeries.push("surgery to remove her boob implants")>>
<<set $slaves[$i].boobs -= $slaves[$i].boobsImplant>>
<<set $slaves[$i].boobsImplant = 0>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].butt <= 3) && ($slaves[$i].butt < $thisSurgery.butt)>>
<<if $thisSurgery.butt !== "no default setting">>
<<set $surgeries.push("a bigger butt")>>
<<set $slaves[$i].buttImplant = 1>>
<<set $slaves[$i].butt += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<elseif ($slaves[$i].boobs <= 600) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs+400 <= $thisSurgery.boobs)>>
<<if $thisSurgery.boobs !== "no default setting">>
@@ -199,7 +199,7 @@
<<set $slaves[$i].boobsImplant += 400>>
<<set $slaves[$i].boobs += 400>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">>
+ <<if $PC.medicine >= 100>>
<<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<elseif ($slaves[$i].boobs <= 600) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs+200 <= $thisSurgery.boobs)>>
@@ -208,7 +208,7 @@
<<set $slaves[$i].boobsImplant += 200>>
<<set $slaves[$i].boobs += 200>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<elseif ($slaves[$i].butt <= 5) && ($slaves[$i].butt < $thisSurgery.butt)>>
<<if $thisSurgery.butt !== "no default setting">>
@@ -216,7 +216,7 @@
<<set $slaves[$i].buttImplant = 1>>
<<set $slaves[$i].butt += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<elseif ($slaves[$i].boobs <= 2000) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs+400 < $thisSurgery.boobs)>>
<<if $thisSurgery.boobs !== "no default setting">>
@@ -224,7 +224,7 @@
<<set $slaves[$i].boobsImplant += 400>>
<<set $slaves[$i].boobs += 400>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<elseif ($slaves[$i].anus > 0) && ($surgeryUpgrade == 1) && ($thisSurgery.holes == 2)>>
<<set $surgeries.push("a virgin anus")>>
@@ -233,7 +233,7 @@
<<set $slaves[$i].analSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].vagina > 0) && ($surgeryUpgrade == 1) && ($thisSurgery.holes == 2)>>
<<set $surgeries.push("a virgin pussy")>>
<<set $slaves[$i].vagina = 0>>
@@ -241,7 +241,7 @@
<<set $slaves[$i].vaginalSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].anus > 1) && ($thisSurgery.holes == 1)>>
<<set $surgeries.push("a tighter anus")>>
<<set $slaves[$i].anus = 1>>
@@ -249,7 +249,7 @@
<<set $slaves[$i].analSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].vagina > 1) && ($thisSurgery.holes == 1)>>
<<set $surgeries.push("a tighter pussy")>>
<<set $slaves[$i].vagina = 1>>
@@ -257,14 +257,14 @@
<<set $slaves[$i].vaginalSkill -= 10>>
<</if>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].butt <= 8) && ($slaves[$i].butt < $thisSurgery.butt)>>
<<if $thisSurgery.butt !== "no default setting">>
<<set $surgeries.push("a bigger butt")>>
<<set $slaves[$i].buttImplant = 1>>
<<set $slaves[$i].butt += 1>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<elseif ($slaves[$i].boobs <= 9000) && ($slaves[$i].lactation < 2) && ($slaves[$i].boobs < $thisSurgery.boobs)>>
<<if $thisSurgery.boobs !== "no default setting">>
@@ -272,7 +272,7 @@
<<set $slaves[$i].boobsImplant += 200>>
<<set $slaves[$i].boobs += 200>>
<<set $cash -= $surgeryCost>>
- <<if $PC.career == "medicine">><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
+ <<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<</if>>
<<else>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 387378bd244..bba9c5e6424 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -29,7 +29,7 @@
<</if>>
<<if $hormoneUpgradeMood == 0>>
-<<if $slaves[$i].$hormones > 0>>
+<<if $slaves[$i].hormones > 0>>
<<if $slaves[$i].balls != 0>>
$possessiveCap <<if $hormoneUpgradeMood == 0>>feminine treatments have to fight<<else>>advanced treatments brutally overpower<</if>> $possessive natural hormones,
<<if $slaves[$i].devotion > 50>>
@@ -40,7 +40,7 @@
<</if>>
<</if>>
<</if>>
-<<if $slaves[$i].$hormones < 0>>
+<<if $slaves[$i].hormones < 0>>
<<if $slaves[$i].ovaries != 0>>
$possessiveCap <<if $hormoneUpgradeMood == 0>>masculine treatments have to fight<<else>>advanced treatments brutally overpower<</if>> $possessive natural hormones,
<<if $slaves[$i].devotion > 50>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 69cc1a5e0a1..3eee8f496f5 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -607,6 +607,58 @@
<<if $HeadGirl.fetishKnown == 1>>
<<if $HeadGirl.energy > 95>>
+
+ <<if $slaves[$i].origHColor != "bald">>
+ <<if !hasHColorRule($slaves[$i],$defaultRules)>>
+ <<if ($slaves[$i].hColor != $HeadGirl.hColor)>>
+ $HeadGirl.slaveName dyes $slaves[$i].slaveName's hair $HeadGirl.hColor, just like her own, since with nymphomania comes narcissism.
+ <<set $slaves[$i].hColor = $HeadGirl.hColor>>
+ <</if>>
+ <</if>>
+ <<if !hasHStyleRule($slaves[$i],$defaultRules)>>
+ <<if ($slaves[$i].hStyle != $HeadGirl.hStyle)>>
+ $HeadGirl.slaveName styles $slaves[$i].slaveName's hair just like her own, since with nymphomania comes narcissism.
+ <<set $slaves[$i].hStyle = $HeadGirl.hStyle>>
+ <<set $slaves[$i].hLength = $HeadGirl.hLength>>
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if !hasHColorRule($slaves[$i],$defaultRules)>>
+ <<if ($slaves[$i].hColor != $HeadGirl.hColor)>>
+ $HeadGirl.slaveName changes $slaves[$i].slaveName's wig = $HeadGirl.hColor, just like her own hair, since with nymphomania comes narcissism.
+ <<set $slaves[$i].hColor = $HeadGirl.hColor>>
+ <</if>>
+ <</if>>
+ <<if !hasHStyleRule($slaves[$i],$defaultRules)>>
+ <<if ($slaves[$i].hStyle != $HeadGirl.hStyle)>>
+ $HeadGirl.slaveName changes $slaves[$i].slaveName's wig style to look just like her own hair, since with nymphomania comes narcissism.
+ <<set $slaves[$i].hStyle = $HeadGirl.hStyle>>
+ <<set $slaves[$i].hLength = $HeadGirl.hLength>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $slaves[$i].origEye == "none">>
+ <<if !hasEyeColorRule($slaves[$i],$defaultRules)>>
+ <<if ($slaves[$i].eyeColor != $HeadGirl.eyeColor)>>
+ <<set $slaves[$i].eyeColor = $HeadGirl.eyeColor>>
+ $HeadGirl.slaveName gives $slaves[$i].slaveName $slaves[$i].eyeColor glass eyes, to match her own eyes, since with nymphomania comes narcissism.
+ <</if>>
+ <</if>>
+ <<elseif $slaves[$i].origEye == "implant">>
+ <<if !hasEyeColorRule($slaves[$i],$defaultRules)>>
+ <<if ($slaves[$i].eyeColor != $HeadGirl.eyeColor)>>
+ <<set $slaves[$i].eyeColor = $HeadGirl.eyeColor>>
+ $HeadGirl.slaveName changes $slaves[$i].slaveName $slaves[$i].eyeColor eye lenses, to match her own eyes, since with nymphomania comes narcissism.
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if !hasEyeColorRule($slaves[$i],$defaultRules)>>
+ <<if ($slaves[$i].eyeColor != $HeadGirl.eyeColor)>>
+ <<set $slaves[$i].eyeColor = $HeadGirl.eyeColor>>
+ $HeadGirl.slaveName gives $slaves[$i].slaveName $slaves[$i].eyeColor contact lenses, to match her own eyes, since with nymphomania comes narcissism.
+ <</if>>
+ <</if>>
+
<<if !hasHColorRule($slaves[$i],$defaultRules)>>
<<if ($slaves[$i].hColor != $HeadGirl.hColor)>>
$HeadGirl.slaveName dyes $slaves[$i].slaveName's hair $HeadGirl.hColor, just like her own, since with nymphomania comes narcissism.
@@ -626,7 +678,6 @@
$HeadGirl.slaveName gives $slaves[$i].slaveName $slaves[$i].eyeColor contact lenses, to match her own eyes, since with nymphomania comes narcissism.
<</if>>
<</if>>
- <</if>>
<</if>>
<<if ($slaves[$i].weight > 30) && ($slaves[$i].diet != "restricted")>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 37074abad34..521f2a548b8 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4980,6 +4980,21 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
<</if>>
+ <<if $seeAge == 1>>
+ <<if $slaves[$i].visualAge > 20 && $slaves[$i].physicalAge > 20>>
+ <<if $slaves[$i].trust > 95>>
+ <<if $slaves[$i].devotion > 95>>
+ <<if $slaves[$i].ageAdjust == 40>>
+ $possessiveCap has been living a happy, healthy and trusting life under you for so long that you swear @@color:lime;she looks a little younger@@ than a girl her age should.
+ <<set $slaves[$i].visualAge-->>
+ <<set $slaves[$i].ageAdjust = 0>>
+ <<elseif random(1,100) > 60>>
+ <<set $slaves[$i].ageAdjust++>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<<elseif ($slaves[$i].health > 60)>>
<<if ($slaves[$i].energy <= 50)>>
$possessiveCap good health produces a @@color:green;slow improvement in libido.@@
@@ -4999,12 +5014,27 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<if $slaves[$i].trust < random(1,100)>>
<<if $slaves[$i].health < random(1,100)>>
<<if $slaves[$i].physicalAge-30 > random(1,100)>>
- $pronounCap's face looks @@color:orange;just a little older@@ than it did last week. $pronounCap's not getting any younger.
+ $possessive face looks @@color:orange;just a little older@@ than it did last week. $pronounCap's not getting any younger.
<<set $slaves[$i].face -= 2>>
<</if>>
<</if>>
<</if>>
<</if>>
+<<if $seeAge == 1>>
+ <<if $slaves[$i].visualAge > 15 && $slaves[$i].physicalAge > 15>>
+ <<if $slaves[$i].trust < -20>>
+ <<if $slaves[$i].devotion < -20>>
+ <<if $slaves[$i].ageAdjust == -40>>
+ $pronounCap has been living a miserable life under your feet for so long that you swear @@color:lime;she looks a little older@@ than a girl her age should.
+ <<set $slaves[$i].visualAge++>>
+ <<set $slaves[$i].ageAdjust = 0>>
+ <<elseif random(1,100) > 40>>
+ <<set $slaves[$i].ageAdjust-->>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+<</if>>
<<if $slaves[$i].fuckdoll == 0>>
<<if !canWalk($slaves[$i])>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 857f07c6242..546c7665e58 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -1,17 +1,13 @@
-:: Salon
+:: Salon [nobr]
-<<nobr>>
<<set $nextButton = "Continue">>
<<set $nextLink = "Slave Interact">>
<<set $showEncyclopedia = 1>><<set $encyclopedia = "The Auto Salon">>
-<</nobr>>\
-\
$activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your artistic pleasure.
-<<nobr>>
<<if $activeSlave.eyes > -1>>
@@ -27,8 +23,101 @@ $possessiveCap vision is normal, and $pronoun
| [[None|Salon][$activeSlave.eyewear = "none"]]
<br> //Blurring options are annoying and impede performance on some assignments//
+
+<br><br>
+<<if $activeSlave.origEye == "implant">>
+ $pronounCap has artificial eyes, and $pronoun
+ <<if $activeSlave.eyewear = "none">>
+ has no eyewear.
+ <<else>>
+ is wearing $activeSlave.eyewear.
+ <</if>>
+ [[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",$cash -= $modCost]]
+ | [[None|Salon][$activeSlave.eyewear = "none"]]
+ <br>
+<<elseif $activeSlave.eyes < -1>>
+ $pronounCap is blind, and
+ <<if $activeSlave.eyewear == "none">>
+ has no eyewear.
+ <<else>>
+ is wearing $activeSlave.eyewear.
+ <</if>>
+ [[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",$cash -= $modCost]]
+ | [[Blurring glasses|Salon][$activeSlave.eyewear = "blurring glasses",$cash -= $modCost]]
+ | [[Blurring contacts|Salon][$activeSlave.eyewear = "blurring contacts",$cash -= $modCost]]
+ | [[None|Salon][$activeSlave.eyewear = "none"]]
+ <br> //Blurring options are annoying and impede performance on some assignments//
+<<elseif $activeSlave.eyes > -1>>
+ $possessiveCap vision is normal, and $pronoun
+ <<if $activeSlave.eyewear == "none">>
+ has no eyewear.
+ <<else>>
+ is wearing $activeSlave.eyewear.
+ <</if>>
+ [[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",$cash -= $modCost]]
+ | [[Blurring glasses|Salon][$activeSlave.eyewear = "blurring glasses",$cash -= $modCost]]
+ | [[Blurring contacts|Salon][$activeSlave.eyewear = "blurring contacts",$cash -= $modCost]]
+ | [[None|Salon][$activeSlave.eyewear = "none"]]
+ <br> //Blurring options are annoying and impede performance on some assignments//
<<else>>
+ $pronounCap is nearsighted, and $pronoun
+ <<if $activeSlave.eyewear == "none">>
+ has no eyewear.
+ <<else>>
+ is wearing $activeSlave.eyewear.
+ <</if>>
+ [[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",$cash -= $modCost]]
+ | [[Corrective glasses|Salon][$activeSlave.eyewear = "corrective glasses",$cash -= $modCost]]
+ | [[Corrective contacts|Salon][$activeSlave.eyewear = "corrective contacts",$cash -= $modCost]]
+ | [[None|Salon][$activeSlave.eyewear = "none"]]
+ <br> //Nearsightedness will impede performance on some assignments//
+<</if>>
+
+<<if $activeSlave.origEye != "implant">><br><br>
+ <<if $activeSlave.origEye != "none">>
+ $possessiveCap eyes are $activeSlave.eyeColor.
+ <br>
+ Give $possessive cosmetic contact lenses:
+ <<if $activeSlave.origEye != $activeSlave.eyeColor>><br>
+ [[Remove lenses|Salon][$activeSlave.eyeColor = $activeSlave.origEye]] |
+ <</if>>
+ <<else>>
+ <<if $activeSlave.eyeColor == "empty">>
+ $possessiveCap has no eyes.
+ <<else>>
+ $possessiveCap glass eyes are $activeSlave.eyeColor.
+ <</if>>
+ <br>
+ Choose what kind of eyes you want $possessive to have:
+ <<if $activeSlave.eyeColor != "empty">>
+ [[None|Salon][$activeSlave.eyeColor = "empty"]] |
+ <</if>>
+ <</if>>
+ [[Blue|Salon][$activeSlave.eyeColor = "blue",$cash -= $modCost]]
+ | [[Black|Salon][$activeSlave.eyeColor = "black",$cash -= $modCost]]
+ | [[Brown|Salon][$activeSlave.eyeColor = "brown",$cash -= $modCost]]
+ | [[Green|Salon][$activeSlave.eyeColor = "green",$cash -= $modCost]]
+ | [[Turquoise|Salon][$activeSlave.eyeColor = "turquoise",$cash -= $modCost]]
+ | [[Sky-blue|Salon][$activeSlave.eyeColor = "sky-blue",$cash -= $modCost]]
+ | [[Hazel|Salon][$activeSlave.eyeColor = "hazel",$cash -= $modCost]]
+ | [[Pale-grey|Salon][$activeSlave.eyeColor = "pale-grey",$cash -= $modCost]]
+ | [[White|Salon][$activeSlave.eyeColor = "white",$cash -= $modCost]]
+ | [[Pink|Salon][$activeSlave.eyeColor = "pink",$cash -= $modCost]]
+ | [[Amber|Salon][$activeSlave.eyeColor = "amber",$cash -= $modCost]]
+ | [[Red|Salon][$activeSlave.eyeColor = "red",$cash -= $modCost]]
+ | [[Catlike|Salon][$activeSlave.eyeColor = "catlike",$cash -= $modCost]]
+ | [[Serpent-like|Salon][$activeSlave.eyeColor = "serpent-like",$cash -= $modCost]]
+ | [[Devilish|Salon][$activeSlave.eyeColor = "devilish",$cash -= $modCost]]
+ | [[Demonic|Salon][$activeSlave.eyeColor = "demonic",$cash -= $modCost]]
+ | [[Hypnotic|Salon][$activeSlave.eyeColor = "hypnotic",$cash -= $modCost]]
+ | [[Heart-shaped|Salon][$activeSlave.eyeColor = "heart-shaped",$cash -= $modCost]]
+ <br> //Color settings will be applied in addition to eyewear choices.//
+<<else>>
+ $possessiveCap eyes are artificial and can't be set here.
+<</if>>
+
+
$pronounCap is nearsighted, and $pronoun
<<if $activeSlave.eyewear == "none">>
has no eyewear.
@@ -43,8 +132,6 @@ $pronounCap is nearsighted, and $pronoun
<</if>>
-<</nobr>>
-<<nobr>>
$possessiveCap eyes are $activeSlave.eyeColor.
@@ -71,10 +158,10 @@ Give $possessive cosmetic contact lenses:
| [[Heart-shaped|Salon][$activeSlave.eyeColor = "heart-shaped",$cash -= $modCost]]
<br> //Colored contact settings will be applied in addition to eyewear choices.//
-<</nobr>>
-<<nobr>>
+
+<br><br>
<<if $activeSlave.makeup == 1>>
$pronounCap's wearing minimal makeup.
<<elseif $activeSlave.makeup == 2>>
@@ -103,9 +190,9 @@ Give $possessive cosmetic contact lenses:
| [[Color-coordinate metallic makeup with hair|Salon][$activeSlave.makeup = 12,$cash -= $modCost]]
| [[Slutty makeup|Salon][$activeSlave.makeup = 4,$cash -= $modCost]]
-<</nobr>>
-<<nobr>>
+
+<br>
<<if $activeSlave.amp == 1>>
$pronounCap has no hands, and thus, no nails.
<<elseif $activeSlave.nails == 1>>
@@ -129,6 +216,14 @@ Give $possessive cosmetic contact lenses:
<br>
<<if $activeSlave.amp != 1>>
+
+ [[Clip nails|Salon][$activeSlave.nails = 0,$cash -= $modCost]]
+ | [[Extend nails|Salon][$activeSlave.nails = 1,$cash -= $modCost]]
+ | [[Color-coordinate nails with hair|Salon][$activeSlave.nails = 2,$cash -= $modCost]]
+ | [[Sharp, claw-like nails|Salon][$activeSlave.nails = 3,$cash -= $modCost]]
+ | [[Bright, glittery nails|Salon][$activeSlave.nails = 4,$cash -= $modCost]]
+ | [[Streetwalker-style nails|Salon][$activeSlave.nails = 5,$cash -= $modCost]]
+
[[Clip nails|Salon][$activeSlave.nails = 0,$cash -= $modCost]]
| [[Extend nails|Salon][$activeSlave.nails = 1,$cash -= $modCost]]
| [[Color-coordinate nails with hair|Salon][$activeSlave.nails = 2,$cash -= $modCost]]
@@ -136,15 +231,15 @@ Give $possessive cosmetic contact lenses:
| [[Bright, glittery nails|Salon][$activeSlave.nails = 4,$cash -= $modCost]]
| [[Shiny, metallic nails|Salon][$activeSlave.nails = 11,$cash -= $modCost]]
| [[Streetwalker-style nails|Salon][$activeSlave.nails = 5,$cash -= $modCost]]
+
<</if>>
-<</nobr>>
-<<nobr>>
<<set $tannableSkin = ["lightened", "white", "fair", "pale", "light"]>>
<<set $lightenableSkin = ["dark", "olive", "black", "brown", "light brown", "tanned"]>>
<<set $bleachableSkin = ["lightened", "white", "fair", "light"]>>
+<br><br>
$possessiveCap skin is $activeSlave.skin.
<<if ($tannableSkin.indexOf($activeSlave.skin) != -1)>>
@@ -162,10 +257,7 @@ $possessiveCap skin is $activeSlave.skin.
<br>
[[Darken skin|Salon][$activeSlave.skin = "dark",$cash -= $modCost]]
<</if>>
-
-<</nobr>>
-
-<<nobr>>
+<br><br>
<<if ($activeSlave.markings == "beauty mark")>>
$pronounCap has a prominent mole on $possessive face, which
@@ -188,13 +280,42 @@ $possessiveCap skin is $activeSlave.skin.
[[Bleach it|Salon][$activeSlave.markings = "none",$cash -= $modCost]]
<</if>>
-<</nobr>>
-<<nobr>>
-$possessiveCap hair is $activeSlave.hColor.
+<<if $activeSlave.origHColor != "bald">>
+
+ $possessiveCap hair is $activeSlave.hColor.
+
+ <br>
-<br>
+
+ Dye $possessive hair:
+ <<if $activeSlave.origHColor != $activeSlave.hColor>>
+ [[Natural color|Salon][$activeSlave.hColor = $activeSlave.origHColor,$cash -= $modCost]] |
+ <</if>>
+ [[Blonde|Salon][$activeSlave.hColor = "blonde",$cash -= $modCost]]
+ | [[Golden|Salon][$activeSlave.hColor = "golden",$cash -= $modCost]]
+ | [[Platinum Blonde|Salon][$activeSlave.hColor = "platinum blonde",$cash -= $modCost]]
+ | [[Strawberry-blonde|Salon][$activeSlave.hColor = "strawberry-blonde",$cash -= $modCost]]
+ | [[Copper|Salon][$activeSlave.hColor = "copper",$cash -= $modCost]]
+ | [[Ginger|Salon][$activeSlave.hColor = "ginger",$cash -= $modCost]]
+ | [[Red|Salon][$activeSlave.hColor = "red",$cash -= $modCost]]
+ | [[Green|Salon][$activeSlave.hColor = "green",$cash -= $modCost]]
+ | [[Blue|Salon][$activeSlave.hColor = "blue",$cash -= $modCost]]
+ | [[Pink|Salon][$activeSlave.hColor = "pink",$cash -= $modCost]]
+ | [[Dark Brown|Salon][$activeSlave.hColor = "dark brown",$cash -= $modCost]]
+ | [[Brown|Salon][$activeSlave.hColor = "brown",$cash -= $modCost]]
+ | [[Auburn|Salon][$activeSlave.hColor = "auburn",$cash -= $modCost]]
+ | [[Burgundy|Salon][$activeSlave.hColor = "burgundy",$cash -= $modCost]]
+ | [[Chocolate|Salon][$activeSlave.hColor = "chocolate brown",$cash -= $modCost]]
+ | [[Chestnut|Salon][$activeSlave.hColor = "chestnut",$cash -= $modCost]]
+ | [[Hazel|Salon][$activeSlave.hColor = "hazel",$cash -= $modCost]]
+ | [[Black|Salon][$activeSlave.hColor = "black",$cash -= $modCost]]
+ | [[Grey|Salon][$activeSlave.hColor = "grey",$cash -= $modCost]]
+ | [[Silver|Salon][$activeSlave.hColor = "silver",$cash -= $modCost]]
+ | [[White|Salon][$activeSlave.hColor = "white",$cash -= $modCost]]
+ <br><br>
+ $possessiveCap hair is $activeSlave.hStyle.
Dye $possessive hair:
[[Blonde|Salon][$activeSlave.hColor = "blonde",$cash -= $modCost]]
@@ -219,12 +340,34 @@ Dye $possessive hair:
| [[Silver|Salon][$activeSlave.hColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.hColor = "white",$cash -= $modCost]]
-<</nobr>>
-<<nobr>>
$possessiveCap hair is $activeSlave.hStyle.
-<br>
+
+ <br>
+
+
+ <<if $activeSlave.hLength > 1>>
+ Style $possessive hair:
+ [[Neat|Salon][$activeSlave.hStyle = "neat",$cash -= $modCost]]
+ | [[Shaved|Salon][$activeSlave.hStyle = "shaved",$activeSlave.hLength = 0,$cash -= $modCost]]
+ | [[Trimmed short|Salon][$activeSlave.hStyle = "trimmed",$activeSlave.hLength = 10,$cash -= $modCost]]
+ | [[Buzzcut|Salon][$activeSlave.hStyle = "buzzcut",$activeSlave.hLength = 1,$cash -= $modCost]]
+ | [[Up|Salon][$activeSlave.hStyle = "up",$cash -= $modCost]]
+ | [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",$cash -= $modCost]]
+ | [[In a bun|Salon][$activeSlave.hStyle = "bun",$cash -= $modCost]]
+ | [[Curled|Salon][$activeSlave.hStyle = "curls",$cash -= $modCost]]
+ | [[Permed|Salon][$activeSlave.hStyle = "permed",$cash -= $modCost]]
+ | [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",$cash -= $modCost]]
+ | [[Dreadlocks|Salon][$activeSlave.hStyle = "dreadlocks",$cash -= $modCost]]
+ | [[Cornrows|Salon][$activeSlave.hStyle = "cornrows",$cash -= $modCost]]
+ | [[Braided|Salon][$activeSlave.hStyle = "braided",$cash -= $modCost]]
+ | [[In tails|Salon][$activeSlave.hStyle = "tails",$cash -= $modCost]]
+ | [[Afro|Salon][$activeSlave.hStyle = "afro",$cash -= $modCost]]
+ | [[Shaved sides|Salon][$activeSlave.hStyle = "strip",$cash -= $modCost]]
+ <<else>>
+ //$possessiveCap hair is too short to style meaningfully//
+ <</if>>
<<if $activeSlave.hLength > 1>>
Style $possessive hair:
@@ -248,14 +391,24 @@ Style $possessive hair:
//$possessiveCap hair is too short to style meaningfully//
<</if>>
-<br> //General hairstyles will conform to hair length and clothing choices.//
-<</nobr>>
-<<nobr>>
+ <br> //General hairstyles will conform to hair length and clothing choices.//
-$possessiveCap hair is $activeSlave.hLength cm long.
+
+
+
+ $possessiveCap hair is $activeSlave.hLength cm long.
+
+ <br>
-<br>
+
+ <<if $activeSlave.hLength == 1>>
+ [[Apply hair growth stimulating treatment|Salon][$activeSlave.hLength = 1,$cash -= $modCost]]
+ <<elseif $activeSlave.hLength < 150>>
+ [[Extensions|Salon][$activeSlave.hLength += 10,$cash -= $modCost]]
+ <<else>>
+ //$possessiveCap hair is extremely long//
+ <</if>>
<<if $activeSlave.hLength == 1>>
[[Apply hair growth stimulating treatment|Salon][$activeSlave.hLength = 1,$cash -= $modCost]]
@@ -265,7 +418,63 @@ $possessiveCap hair is $activeSlave.hLength cm long.
//$possessiveCap hair is extremely long//
<</if>>
-<br>
+
+ <br>
+
+
+ Cut $possessive hair:
+ <<if $activeSlave.hLength > 5>>
+ [[Very short|Salon][$activeSlave.hLength = 5,$cash -= $modCost]]
+ <<if $activeSlave.hLength > 10>>
+ | [[Short|Salon][$activeSlave.hLength = 10,$cash -= $modCost]]
+ <</if>>
+ <<if $activeSlave.hLength > 30>>
+ | [[Shoulder length|Salon][$activeSlave.hLength = 30,$cash -= $modCost]]
+ <</if>>
+ <<if $activeSlave.hLength > 60>>
+ | [[Long|Salon][$activeSlave.hLength = 60,$cash -= $modCost]]
+ <</if>>
+ <<if $activeSlave.hLength > 100>>
+ | [[Very long|Salon][$activeSlave.hLength = 100,$cash -= $modCost]]
+ <</if>>
+ <<else>>
+ //$possessiveCap hair is already very short//
+ <</if>>
+
+
+<<else>>
+
+ <<if $activeSlave.hStyle == "bald">>
+ $pronounCap is completely bald.
+ <br>
+ <<else>>
+ $pronounCap is wearing a $activeSlave.hColor wig.
+
+ <br>
+
+ Change $possessive wig color:
+ [[Blonde|Salon][$activeSlave.hColor = "blonde",$cash -= $modCost]]
+ | [[Golden|Salon][$activeSlave.hColor = "golden",$cash -= $modCost]]
+ | [[Platinum Blonde|Salon][$activeSlave.hColor = "platinum blonde",$cash -= $modCost]]
+ | [[Strawberry-blonde|Salon][$activeSlave.hColor = "strawberry-blonde",$cash -= $modCost]]
+ | [[Copper|Salon][$activeSlave.hColor = "copper",$cash -= $modCost]]
+ | [[Ginger|Salon][$activeSlave.hColor = "ginger",$cash -= $modCost]]
+ | [[Red|Salon][$activeSlave.hColor = "red",$cash -= $modCost]]
+ | [[Green|Salon][$activeSlave.hColor = "green",$cash -= $modCost]]
+ | [[Blue|Salon][$activeSlave.hColor = "blue",$cash -= $modCost]]
+ | [[Pink|Salon][$activeSlave.hColor = "pink",$cash -= $modCost]]
+ | [[Dark Brown|Salon][$activeSlave.hColor = "dark brown",$cash -= $modCost]]
+ | [[Brown|Salon][$activeSlave.hColor = "brown",$cash -= $modCost]]
+ | [[Auburn|Salon][$activeSlave.hColor = "auburn",$cash -= $modCost]]
+ | [[Burgundy|Salon][$activeSlave.hColor = "burgundy",$cash -= $modCost]]
+ | [[Chocolate|Salon][$activeSlave.hColor = "chocolate brown",$cash -= $modCost]]
+ | [[Chestnut|Salon][$activeSlave.hColor = "chestnut",$cash -= $modCost]]
+ | [[Hazel|Salon][$activeSlave.hColor = "hazel",$cash -= $modCost]]
+ | [[Black|Salon][$activeSlave.hColor = "black",$cash -= $modCost]]
+ | [[Grey|Salon][$activeSlave.hColor = "grey",$cash -= $modCost]]
+ | [[Silver|Salon][$activeSlave.hColor = "silver",$cash -= $modCost]]
+ | [[White|Salon][$activeSlave.hColor = "white",$cash -= $modCost]]
+
Cut $possessive hair:
<<if $activeSlave.hLength > 5>>
@@ -278,21 +487,56 @@ Cut $possessive hair:
<</if>>
<<if $activeSlave.hLength > 60>>
| [[Long|Salon][$activeSlave.hLength = 60,$cash -= $modCost]]
+
<</if>>
- <<if $activeSlave.hLength > 100>>
- | [[Very long|Salon][$activeSlave.hLength = 100,$cash -= $modCost]]
+
+<br><br>
+ <<if $activeSlave.hStyle != "bald">>
+ $possessiveCap wig is in $activeSlave.hStyle style.
+ <<else>>
+ $pronounCap is not wearing a wig.
<</if>>
-<<else>>
- //$possessiveCap hair is already very short//
-<</if>>
-<</nobr>>
+ <br>
-<<nobr>>
+ Change $possessive wig style:
+ <<if $activeSlave.hStyle != "bald">>
+ <<if $activeSlave.hLength == 0>><<set $activeSlave.hLength = 10>><</if>>
+ <</if>>
+ <<if $activeSlave.origHColor == "bald" && $activeSlave.hStyle != "bald">>
+ [[Remove her wig|Salon][$activeSlave.hStyle = "bald",$activeSlave.hLength = 0,$cash -= $modCost]]
+ <</if>>
+ | [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",$cash -= $modCost]]
+ | [[In a bun|Salon][$activeSlave.hStyle = "bun",$cash -= $modCost]]
+ | [[Curled|Salon][$activeSlave.hStyle = "curls",$cash -= $modCost]]
+ | [[Permed|Salon][$activeSlave.hStyle = "permed",$cash -= $modCost]]
+ | [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",$cash -= $modCost]]
+ | [[Dreadlocks|Salon][$activeSlave.hStyle = "dreadlocks",$cash -= $modCost]]
+ | [[Cornrows|Salon][$activeSlave.hStyle = "cornrows",$cash -= $modCost]]
+ | [[Braided|Salon][$activeSlave.hStyle = "braided",$cash -= $modCost]]
+ | [[In tails|Salon][$activeSlave.hStyle = "tails",$cash -= $modCost]]
+ | [[Afro|Salon][$activeSlave.hStyle = "afro",$cash -= $modCost]]
+
+ <br> //General hairstyles will conform to hair length and clothing choices.//
+
+
+ $possessiveCap wig hair is $activeSlave.hLength cm long.
-$possessiveCap pubic hair, if present, is $activeSlave.pubicHColor.
+ <br>
+
+ Set hair length to
+ <<if $activeSlave.hLength != 10>>[[10cm|Salon][$activeSlave.hLength = 10,$cash -= $modCost]]<</if>>
+ <<if $activeSlave.hLength != 30>>[[30cm|Salon][$activeSlave.hLength = 10,$cash -= $modCost]]<</if>>
+ <<if $activeSlave.hLength != 60>>[[60cm|Salon][$activeSlave.hLength = 10,$cash -= $modCost]]<</if>>
+ <<if $activeSlave.hLength != 90>>[[90cm|Salon][$activeSlave.hLength = 10,$cash -= $modCost]]<</if>>
+ <<if $activeSlave.hLength != 120>>[[120cm|Salon][$activeSlave.hLength = 10,$cash -= $modCost]]<</if>>
+ <<if $activeSlave.hLength != 150>>[[150cm|Salon][$activeSlave.hLength = 10,$cash -= $modCost]]<</if>>
-<br>
+ <br>
+
+
+
+<</if>>
Dye $possessive pubic hair:
[[Blonde|Salon][$activeSlave.pubicHColor = "blonde",$cash -= $modCost]]
@@ -316,29 +560,73 @@ Dye $possessive pubic hair:
| [[Grey|Salon][$activeSlave.pubicHColor = "grey",$cash -= $modCost]]
| [[Silver|Salon][$activeSlave.pubicHColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.pubicHColor = "white",$cash -= $modCost]]
-<</nobr>>
-<<nobr>>
+
$possessiveCap pubic hair is $activeSlave.pubicHStyle.
-<br>
-Style $possessive pubic hair:
- [[Hairless|Salon][$activeSlave.pubicHStyle = "hairless",$cash -= $modCost]]
- | [[Waxed|Salon][$activeSlave.pubicHStyle = "waxed",$cash -= $modCost]]
- | [[Landing strip|Salon][$activeSlave.pubicHStyle = "in a strip",$cash -= $modCost]]
- | [[Neat|Salon][$activeSlave.pubicHStyle = "neat",$cash -= $modCost]]
- | [[Bushy in the front|Salon][$activeSlave.pubicHStyle = "bushy in the front and neat in the rear",$cash -= $modCost]]
- | [[Bushy|Salon][$activeSlave.pubicHStyle = "bushy",$cash -= $modCost]]
+<<if $activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless">>
+
+
-<</nobr>>
+ $possessiveCap pubic hair, if present, is $activeSlave.pubicHColor.
-<<nobr>>
+ <br>
+
+ Dye $possessive pubic hair:
+ [[Blonde|Salon][$activeSlave.pubicHColor = "blonde",$cash -= $modCost]]
+ | [[Golden|Salon][$activeSlave.pubicHColor = "golden",$cash -= $modCost]]
+ | [[Platinum blonde|Salon][$activeSlave.pubicHColor = " platinum blonde",$cash -= $modCost]]
+ | [[Strawberry-blonde|Salon][$activeSlave.pubicHColor = "strawberry-blonde",$cash -= $modCost]]
+ | [[Copper|Salon][$activeSlave.pubicHColor = "copper",$cash -= $modCost]]
+ | [[Ginger|Salon][$activeSlave.pubicHColor = "ginger",$cash -= $modCost]]
+ | [[Red|Salon][$activeSlave.pubicHColor = "red",$cash -= $modCost]]
+ | [[Green|Salon][$activeSlave.pubicHColor = "green",$cash -= $modCost]]
+ | [[Blue|Salon][$activeSlave.pubicHColor = "blue",$cash -= $modCost]]
+ | [[Pink|Salon][$activeSlave.pubicHColor = "pink",$cash -= $modCost]]
+ | [[Dark Brown|Salon][$activeSlave.pubicHColor = "dark brown",$cash -= $modCost]]
+ | [[Brown|Salon][$activeSlave.pubicHColor = "brown",$cash -= $modCost]]
+ | [[Auburn|Salon][$activeSlave.pubicHColor = "auburn",$cash -= $modCost]]
+ | [[Burgundy|Salon][$activeSlave.pubicHColor = "burgundy",$cash -= $modCost]]
+ | [[Chocolate|Salon][$activeSlave.pubicHColor = "chocolate brown",$cash -= $modCost]]
+ | [[Chestnut|Salon][$activeSlave.pubicHColor = "chestnut",$cash -= $modCost]]
+ | [[Hazel|Salon][$activeSlave.pubicHColor = "hazel",$cash -= $modCost]]
+ | [[Black|Salon][$activeSlave.pubicHColor = "black",$cash -= $modCost]]
+ | [[Grey|Salon][$activeSlave.pubicHColor = "grey",$cash -= $modCost]]
+ | [[Silver|Salon][$activeSlave.pubicHColor = "silver",$cash -= $modCost]]
+ | [[White|Salon][$activeSlave.pubicHColor = "white",$cash -= $modCost]]
+
+
+ $possessiveCap pubic hair is $activeSlave.pubicHStyle.
-$possessiveCap armpit hair, if present, is $activeSlave.underArmHColor.
+ <br>
+ Style $possessive pubic hair:
+ [[Waxed|Salon][$activeSlave.pubicHStyle = "waxed",$cash -= $modCost]]
+ | [[Landing strip|Salon][$activeSlave.pubicHStyle = "in a strip",$cash -= $modCost]]
+ | [[Neat|Salon][$activeSlave.pubicHStyle = "neat",$cash -= $modCost]]
+ | [[Bushy|Salon][$activeSlave.pubicHStyle = "bushy",$cash -= $modCost]]
+ | [[Bushy in the front|Salon][$activeSlave.pubicHStyle = "bushy in the front and neat in the rear",$cash -= $modCost]]
+ | [[Hairless|Salon][$activeSlave.pubicHStyle = "hairless",$cash -= $modCost]]
+
+<<else>>
+ $possessiveCap body is completely hairless.
+<</if>>
+<br>
+
+$possessiveCap armpit hair is $activeSlave.underArmHStyle.
<br>
+Style $possessive armpit hair:
+ [[Hairless|Salon][$activeSlave.underArmHStyle = "hairless",$cash -= $modCost]]
+ | [[Waxed|Salon][$activeSlave.underArmHStyle = "waxed",$cash -= $modCost]]
+ | [[Shaved|Salon][$activeSlave.underArmHStyle = "shaved",$cash -= $modCost]]
+ | [[Neat|Salon][$activeSlave.underArmHStyle = "neat",$cash -= $modCost]]
+ | [[Bushy|Salon][$activeSlave.underArmHStyle = "bushy",$cash -= $modCost]]
+
+<<if $activeSlave.underArmHStyle != "hairless">>
+<br>
+
Dye $possessive armpit hair:
[[Blonde|Salon][$activeSlave.underArmHColor = "blonde",$cash -= $modCost]]
| [[Golden|Salon][$activeSlave.underArmHColor = "golden",$cash -= $modCost]]
@@ -361,18 +649,9 @@ Dye $possessive armpit hair:
| [[Grey|Salon][$activeSlave.underArmHColor = "grey",$cash -= $modCost]]
| [[Silver|Salon][$activeSlave.underArmHColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.underArmHColor = "white",$cash -= $modCost]]
-<</nobr>>
-<<nobr>>
-
-$possessiveCap armpit hair is $activeSlave.underArmHStyle.
-
-<br>
-
-Style $possessive armpit hair:
- [[Hairless|Salon][$activeSlave.underArmHStyle = "hairless",$cash -= $modCost]]
- | [[Waxed|Salon][$activeSlave.underArmHStyle = "waxed",$cash -= $modCost]]
- | [[Shaved|Salon][$activeSlave.underArmHStyle = "shaved",$cash -= $modCost]]
- | [[Neat|Salon][$activeSlave.underArmHStyle = "neat",$cash -= $modCost]]
- | [[Bushy|Salon][$activeSlave.underArmHStyle = "bushy",$cash -= $modCost]]
+<br>
-<</nobr>>
+<<else>>
+<br>
+$possessiveCap armpit hair would be $activeSlave.underArmHColor, if $pronoun had any.
+<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index d86f9ec3b31..d8ffc5e1fc8 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -121,7 +121,9 @@
<<elseif ($birthee != 0)>>
<<set $birthed = 0>>
<<goto "SE Birth">>
-<<elseif ($recruiterProgress >= 13)>>
+<<elseif ($recruiterEugenics == 0 and $recruiterProgress >= 13)>>
+ <<goto "SE recruiter success">>
+<<elseif ($recruiterEugenics == 1 and $recruiterProgress >= (13 + ($IntelligenceEugenicsSMR+$HeightEugenicsSMR+$FaceEugenicsSMR)*6))>>
<<goto "SE recruiter success">>
<<elseif ($customSlaveOrdered == 1)>>
<<goto "SE custom slave delivery">>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 52eea8edef3..3e2a98fc4d2 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -133,7 +133,7 @@
<<if ($Schoolteacher != 0)>>
<<if $showEWD != 0>>
- <br><br>''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as your schoolteacher.
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -141,7 +141,8 @@
</div>
<</if>>
/* 000-250-006 */
- <br>
+ ''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as your schoolteacher.
+ <br>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -156,7 +157,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[$i].choosesOwnClothes == 1>>
@@ -211,9 +211,7 @@
<</if>>
<</if>>
<<if $showEWD != 0>>
- <<if ($Schoolteacher == 0)>>
- <br><br>
- <</if>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -223,7 +221,7 @@
/* 000-250-006 */
''__@@color:pink;$slaves[$i].slaveName@@__'' is studying in $schoolroomName.
<br> She <<include "SA take classes">>
- <br>
+ <br>
<<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -238,7 +236,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<include "SA take classes">>
@@ -260,7 +257,7 @@
<</if>>
<</for>>
<<if (_restedSlaves > 0)>>
-
+ <br><br>
<<if (_restedSlaves == 1)>>
One slave has
<<else>>
@@ -271,7 +268,7 @@
<<if $schoolroomDecoration != "standard">>
$schoolroomNameCaps's $schoolroomDecoration atmosphere @@color:hotpink;has a minor impact on the students.@@
<</if>>
-<<else>>
- ''$schoolroomNameCaps is empty.''
<</if>>
-<br><br>
+<<if $schoolroomSlaves || $Schoolteacher>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 5f646a606d3..af5f3455001 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -24,6 +24,18 @@
<<set $activeSlave.vaginalSkill = random(15,40)>>
<</if>>
<<set $activeSlave.analSkill = 0>>
+<<if $recruiterEugenics == 1>>
+ <<if $IntelligenceEugenicsSMR == 1>>
+ <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <</if>>
+ <<if $HeightEugenicsSMR == 1>>
+ <<set $activeSlave.height = random(185,190)>>
+ <</if>>
+ <<if $FaceEugenicsSMR == 1>>
+ <<set $activeSlave.face = random(40,100)>>
+ <</if>>
+<</if>>
+
<<set $activeSlave.earPiercing = random(0,1)>>
Your recruiter $Recruiter.slaveName has succeeded; she's convinced a starving young migrant from the old world that she'll have a better chance at survival as one of your slaves.
@@ -38,6 +50,18 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced a starving yo
<<if $activeSlave.balls == 0>>
<<set $activeSlave.balls = random(1,3)>>
<</if>>
+<<if $recruiterEugenics == 1>>
+ <<if $IntelligenceEugenicsSMR == 1>>
+ <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <</if>>
+ <<if $HeightEugenicsSMR == 1>>
+ <<set $activeSlave.height = random(185,190)>>
+ <</if>>
+ <<if $FaceEugenicsSMR == 1>>
+ <<set $activeSlave.face = random(40,100)>>
+ <</if>>
+<</if>>
+
<<set $activeSlave.tonguePiercing = random(0,1)>>
<<set $activeSlave.earPiercing = random(0,1)>>
<<set $activeSlave.nosePiercing = random(0,1)>>
@@ -69,6 +93,17 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an old world
<<set $activeSlave.nipplesPiercing to random(0,1)>>
<<set $activeSlave.clitPiercing to random(0,1)>>
<<set $activeSlave.sexualFlaw to "hates women">>
+<<if $recruiterEugenics == 1>>
+ <<if $IntelligenceEugenicsSMR == 1>>
+ <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <</if>>
+ <<if $HeightEugenicsSMR == 1>>
+ <<set $activeSlave.height = random(185,190)>>
+ <</if>>
+ <<if $FaceEugenicsSMR == 1>>
+ <<set $activeSlave.face = random(40,100)>>
+ <</if>>
+<</if>>
Your recruiter $Recruiter.slaveName has succeeded; she's convinced an old world sissy that she'd be better off as a slave in a society that is so totally sexually libertine as to accept as female and respectable anyone who takes cock.
@@ -86,6 +121,17 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an old world
<<set $activeSlave.boobs += 50*random(0,6)>>
<<set $activeSlave.lactation = random(0,1)>>
<<set $activeSlave.weight = random(0,50)>>
+<<if $recruiterEugenics == 1>>
+ <<if $IntelligenceEugenicsSMR == 1>>
+ <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <</if>>
+ <<if $HeightEugenicsSMR == 1>>
+ <<set $activeSlave.height = random(185,190)>>
+ <</if>>
+ <<if $FaceEugenicsSMR == 1>>
+ <<set $activeSlave.face = random(40,100)>>
+ <</if>>
+<</if>>
Your recruiter $Recruiter.slaveName has succeeded; she's convinced an unhealthy expectant mother that you'll provide her with modern medicine in return for her enslavement.
@@ -121,6 +167,17 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an unhealthy
<<set $activeSlave.navelPiercing = random(0,1)>>
<<set $activeSlave.nipplesPiercing = random(0,1)>>
<<set $activeSlave.clitPiercing = random(0,1)>>
+<<if $recruiterEugenics == 1>>
+ <<if $IntelligenceEugenicsSMR == 1>>
+ <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <</if>>
+ <<if $HeightEugenicsSMR == 1>>
+ <<set $activeSlave.height = random(185,190)>>
+ <</if>>
+ <<if $FaceEugenicsSMR == 1>>
+ <<set $activeSlave.face = random(40,100)>>
+ <</if>>
+<</if>>
Your recruiter $Recruiter.slaveName has succeeded; she's convinced a desperate old world whore that she'd be better off as a slave in $arcologies[0].name than as a free prostitute on the rough streets of a traditional city.
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index b5d23b8f2b6..ff8aa05a7a6 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -2,7 +2,6 @@
<<set $stewardessBonus = 0, _FLsFetish = 0, _DL = $ServQiIDs.length, $servantsQuartersSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
-<<if $servantsQuartersSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $ServQiIDs[_dI].Index, _ID = $ServQiIDs[_dI].ID>>
<<if _ID != $slaves[_i].ID>>
@@ -16,7 +15,6 @@
<</if>>
<</for>>
<<SlaveSort $ServQiIDs>>
-<</if>>
<<if $servantsQuartersDecoration != "standard">>
<<set _devBonus = 1>>
@@ -203,7 +201,7 @@
<<if ($Stewardess != 0)>>
<<if $showEWD != 0>>
- <br><br>''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as your stewardess.
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -211,7 +209,8 @@
</div>
<</if>>
/* 000-250-006 */
- <br>
+ ''__@@color:pink;$slaves[_FLs].slaveName@@__'' is serving as your stewardess.
+ <br>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[_FLs].devotion <= 20)>>
@@ -226,7 +225,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
@@ -250,9 +248,6 @@
<<if $servantsQuartersSlaves > 0>>
<<set $servantMilkersMultiplier = 0.5, _SQMilk = 0, _SQMilkSale = 0>>
- <<if ($Stewardess == 0)>>
- <br><br>
- <</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $ServQiIDs[_dI].Index, $i = _i, $slaves[_i].devotion += _devBonus>>
<<if ($slaves[_i].devotion <= 20) && ($slaves[_i].trust > -20)>>
@@ -277,6 +272,7 @@
<<set $slaves[_i].health += 3>>
<</if>>
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef tinyImg">
@@ -290,7 +286,7 @@
<br> She <<include "SA get milked">>
<<set _SQMilk += $milk, _SQMilkSale += $milkSale>>
<</if>>
- <br>
+ <br>
<<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[_i].devotion <= 20)>>
@@ -305,7 +301,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<include "SA servant">>
@@ -330,22 +325,26 @@
<</silently>>
<</if>>
<</for>>
- <<set $servantMilkersMultiplier = 1, $repGain += $servantsQuartersSlaves*20>>
-
- <<if $servantsQuarters < $servantsQuartersSlaves>>
- <<set $servantsQuartersSpots = 0>>
- <<else>>
- <<set $servantsQuartersSpots = $servantsQuarters - $servantsQuartersSlaves>>
+ <<if _SQMilk || $servantsQuartersDecoration != "standard">>
+ <br><br>
<</if>>
-
<<if _SQMilk > 0>>
Since your lactating servants spend most of their time working in the penthouse, they use the milkers there, giving _SQMilk liters of milk over the week, which is sold for @@color:yellowgreen;¤_SQMilkSale.@@
<</if>>
<<if $servantsQuartersDecoration != "standard">>
$servantsQuartersNameCaps's $servantsQuartersDecoration atmosphere @@color:hotpink;has a minor impact on your servants.@@
<</if>>
+
+ <<set $servantMilkersMultiplier = 1, $repGain += $servantsQuartersSlaves*20>>
+
+ <<if $servantsQuarters < $servantsQuartersSlaves>>
+ <<set $servantsQuartersSpots = 0>>
+ <<else>>
+ <<set $servantsQuartersSpots = $servantsQuarters - $servantsQuartersSlaves>>
+ <</if>>
<<else>>
- ''$servantsQuartersNameCaps is empty.''
<<set $servantsQuartersSpots = $servantsQuarters>>
<</if>>
-<br><br>
+<<if $servantsQuartersSlaves || $Stewardess>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index f00f1022c90..e1e964c8a2d 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -392,6 +392,10 @@
<<unset _ii>>
/** /Accordion */
+<<if ($researchLab.built == "true")>>
+ <<include "Lab Report">><br><br>
+<</if>>
+
<<if $slavesVisible > 0>>
<br>__''Penthouse Report''__<br>
<<for $i = 0; $i < $slaves.length; $i++>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index ff5f1c6c018..126b4efebde 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -33,6 +33,11 @@
<<set $returnTo = "Cellblock">>
<</if>>
<</if>>
+<<if $activeSlave.amp == 1>>
+ <<if ($activeSlave.assignment == "be the Madam") || ($activeSlave.assignment == "be the DJ") || ($activeSlave.assignment == "be the Milkmaid") || ($activeSlave.assignment == "be the Attendant") || ($activeSlave.assignment == "be the Stewardess") || ($activeSlave.assignment == "be the Wardeness")>>
+ <<set $activeSlave.assignment to "rest">>
+ <</if>>
+<</if>>
<<set $encyclopedia = either("Drugs and Their Effects", "From Rebellious to Devoted", "Costs Summary", "Disease in the Free Cities", "Slave Couture", "Nymphomania", "Gender", "Independent Slaves", "Modern Anal")>>
<<if $activeSlave.dick > 0>><<set $showEncyclopedia = 1, $encyclopedia = "Gender">><</if>>
@@ -528,6 +533,7 @@ __Body modification__:
[[Use remote surgery|Remote Surgery][$degradation = 0]]
| [[Use body mod studio|Body Modification][$degradation = 0]]
| [[Use auto salon|Salon][$degradation = 0]]
+<<if $cyberMod == 1>>| [[Configure cybernetics|cyberConfig][$temp = 0]]<</if>>
<br>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 5164dc2a59f..fb6928d8499 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -2,7 +2,6 @@
<<set _flawSoftened = 0, _healthBonus = 0, _idleBonus = 0, _restedSlaves = 0, _trustBonus = 0, _DL = $SpaiIDs.length, $spaSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
-<<if $spaSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $SpaiIDs[_dI].Index, _ID = $SpaiIDs[_dI].ID>>
<<if _ID != $slaves[_i].ID>>
@@ -16,7 +15,6 @@
<</if>>
<</for>>
<<SlaveSort $SpaiIDs>>
-<</if>>
<<if $spaDecoration != "standard">>
<<set _devBonus = 1>>
@@ -284,7 +282,7 @@
<<if $Attendant != 0>>
<<if $showEWD != 0>>
- <br><br>''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Attendant in the spa.
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef smlImg">
@@ -292,7 +290,8 @@
</div>
<</if>>
/* 000-250-006 */
- <br>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Attendant in the spa.
+ <br>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[_FLs].devotion <= 20)>>
@@ -307,7 +306,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[_FLs].choosesOwnClothes == 1>>
@@ -330,9 +328,6 @@
<</if>>
<<if $spaSlaves > 0>>
- <<if $Attendant == 0>>
- <br><br>
- <</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $SpaiIDs[_dI].Index, $i = _i>>
<<set $slaves[_i].devotion += _devBonus, $slaves[_i].trust += _trustBonus, $slaves[_i].health += _healthBonus>>
@@ -352,6 +347,7 @@
<<continue>>
<</if>>
<<if $showEWD != 0>>
+ <br><br>
/* 000-250-006 */
<<if $seeImages == 1 && $imageChoice == 0>>
<div class="imageRef smlImg">
@@ -361,7 +357,7 @@
/* 000-250-006 */
''__@@color:pink;$slaves[$i].slaveName@@__'' is resting in the spa.
<br> She<<include "SA rest">>
- <br>
+ <br>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -376,7 +372,6 @@
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
- <br><br>
<<else>>
<<silently>>
<<if $slaves[$i].choosesOwnClothes == 1>>
@@ -398,6 +393,7 @@
<</if>>
<</for>>
<<if (_restedSlaves > 0)>>
+ <br><br>
<<if (_restedSlaves == 1)>>
One slave has rested until she reached a state of @@color:hotpink;devotion@@ and @@color:mediumaquamarine;trust@@ and will leave the spa before the end of the week.
<<else>>
@@ -407,7 +403,7 @@
$spaNameCaps's $spaDecoration atmosphere @@color:hotpink;had an impact on <<if _restedSlaves == 1>>her while she<<else>>them while they<</if>>@@ were resting.
<</if>>
<</if>>
-<<else>>
- ''$spaNameCaps is empty.''
<</if>>
-<br><br>
+<<if $spaSlaves || $Attendant>>
+ <br><br>
+<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 8a38e842dcf..962e85a9895 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -525,7 +525,11 @@ _Pass $nextLink
<br><span id="LanguageButton"><<link "Language options">><<set $seed = $language>><<goto "Change Language">><</link>></span> @@color:cyan;[L]@@
<br><span id="PAOButton"><<link [[Personal assistant options]]>><</link>></span> @@color:cyan;[T]@@
<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@color:cyan;[U]@@
- <br><span id="WARButton"><<link [[Wardrobe]]>><</link>></span> @@color:cyan;[W]@@<br><br>
+ <br><span id="WARButton"><<link [[Wardrobe]]>><</link>></span> @@color:cyan;[W]@@
+ <<if $cyberMod != 0 && $researchLab.built == "true">>
+ <br>[[Manage Research Lab|Research Lab][$temp to 0]]
+ <</if>>
+ <br><br>
<<else>>
<br><br><br>
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index dfadec26d16..e052b5f7caa 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -25,7 +25,44 @@ As the remote surgery's long recovery cycle completes,
<<case "fuckdoll">>
-<<if $activeSlave.relation != 0>>
+
+<<if $familyTesting == 1>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if $activeSlave.mother == $slaves[$j].ID>>
+ $slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her daughter is now a Fuckdoll.
+ <<set $slaves[$j].devotion -= 40>>
+ <<set $slaves[$j].trust -= 40>>
+ <</if>>
+ <<if $activeSlave.father == $slaves[$j].ID>>
+ $slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her daughter is now a Fuckdoll.
+ <<set $slaves[$j].devotion -= 40>>
+ <<set $slaves[$j].trust -= 40>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[$j].father>>
+ $slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her father is now a Fuckdoll.
+ <<set $slaves[$j].devotion -= 40>>
+ <<set $slaves[$j].trust -= 40>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[$j].mother>>
+ $slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her mother is now a Fuckdoll.
+ <<set $slaves[$j].devotion -= 40>>
+ <<set $slaves[$j].trust -= 40>>
+ <</if>>
+ <<if areSisters($activeSlave, $slaves[$j]) == 1>>
+ $slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her twin is now a Fuckdoll. Is she next?
+ <<set $slaves[$j].devotion -= 50>>
+ <<set $slaves[$j].trust -= 50>>
+ <<elseif areSisters($activeSlave, $slaves[$j]) == 2>>
+ $slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her sister is now a Fuckdoll.
+ <<set $slaves[$j].devotion -= 40>>
+ <<set $slaves[$j].trust -= 40>>
+ <<elseif areSisters($activeSlave, $slaves[$j]) == 3>>
+ $slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her half-sister is now a Fuckdoll.
+ <<set $slaves[$j].devotion -= 30>>
+ <<set $slaves[$j].trust -= 30>>
+ <</if>>
+ <</for>>
+<<else>><<if $activeSlave.relation != 0>>
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].ID == $activeSlave.relationTarget>>
$slaves[$j].slaveName will be @@color:mediumorchid;horrified@@ and @@color:gold;afraid@@ when she finds out that her $activeSlave.relation is now a Fuckdoll.
@@ -35,6 +72,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</for>>
<</if>>
+<</if>> /*closes extended family mode */
<<if $activeSlave.relationship > 0>>
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].ID == $activeSlave.relationshipTarget>>
@@ -125,6 +163,57 @@ The Fuckdoll continues to struggle. Since it is new, it is not yet able to obey
<<set $activeSlave.trust -= 8>>
<<set $activeSlave.devotion -= 8>>
<</if>>
+
+<<case "remove eyes">>
+ Surgery doesn't take long, but since it was invasive there are @@color:red;moderate health consequences.@@ As anesthesia wears off she tries to open her eyes and finds she is unable to.
+ <<if $activeSlave.eyes != -2>>
+ <<if ($activeSlave.devotion > 50)>>
+ When she realizes why, she begins to weep, not understanding what she did to deserve this. After a short cry that trails off into a few sniffles, she carries on.
+ <<elseif ($activeSlave.devotion > 20)>>
+ When she realizes why, she begins to bawl, not understanding what she did to earn this. After a short expurgation of @@color:gold;grief and terror,@@ she takes a deep breath and visibly suppresses her emotions.
+ <<set $activeSlave.trust -= 20>>
+ <<else>>
+ When she realizes what's happened, her face @@color:mediumorchid;clouds with rage.@@ Reflexively, she swings her head around, looking for the source of her woes. She finally understands the true use of blindness when she realizes she won't be able to tell where you are, where anyone is, or even where she is. Her well being is now firmly in the hands of someone she distrusts. She begins to @@color:gold;shake with fear.@@
+ <<set $activeSlave.trust -= 8>>
+ <<set $activeSlave.devotion -= 8>>
+ <</if>>
+ <<else>>
+ <<if ($activeSlave.devotion > 50)>>
+ When she realizes why, she seems suprised since she doesn't see the point of such procedure. As she was already blind, her mental state remains unaffected.
+ <<else>>
+ Her face twists in distaste. Such pointless and invasive procedure drives home just how @@color:gold;expendable@@ she is to you.
+ <<set $activeSlave.devotion -= 5>>
+ <</if>>
+ <</if>>
+ <<set $activeSlave.eyes = -3>>
+
+<<case "ocular implant">>
+ <<if $activeSlave.eyes <= -2>>
+ The implant surgery is @@color:red;invasive@@ and she spends some time in the autosurgery recovering. As soon as she is allowed to open her eyes and look around, her gaze flicks from object to object with manic speed as her new eyes deliver nearly overwhelming amount of visual informantion. Seeing the world as it is is a gift that those who do not need it cannot properly understand.
+ <<set $activeSlave.devotion += 25>>
+ <<set $activeSlave.trust += 25>>
+ <<if ($activeSlave.devotion > 50)>>
+ She loved you before, but she's @@color:hotpink;very grateful,@@ and @@color:mediumaquamarine;more trusting,@@ too. She never realized just how good you looked, and now she can't get your image out of her mind.
+ <<if $activeSlave.relationship == 0>><<set $activeSlave.relationship to -2>><</if>>
+ <<elseif ($activeSlave.devotion > 20)>>
+ She accepted you as her owner before, but she's @@color:hotpink;very grateful,@@ and @@color:mediumaquamarine;more trusting,@@ too.
+ <<else>>
+ She hardly knows what to make of this wonderful present from someone she hates, and struggles with suspicion that the gift conceals some sort of snare. After a while, though, she accepts that you @@color:hotpink;truly did help her,@@ and @@color:mediumaquamarine;might be trustworthy.@@
+ <</if>>
+ <<else>>
+ The implant surgery is @@color:red;invasive@@ and she spends some time in the autosurgery recovering. When she is allowed to open her eyes the amount of visual information makes her reel.
+ <<if ($activeSlave.devotion > 50)>>
+ She is @@color:hotpink;grateful,@@ for her improved vision, and knowing how much you invested in her makes her @@color:mediumaquamarine;trust you more@@ as well.
+ <<set $activeSlave.devotion += 10; $activeSlave.trust += 10>>
+ <<elseif ($activeSlave.devotion > 20)>>
+ She has mixed feelings about her new eyes, but she's @@color:mediumaquamarine;aware@@ how valuable such implants are, and she already @@color:hotpink;accepted@@ that you have complete control over her body.
+ <<set $activeSlave.devotion += 5; $activeSlave.trust += 10>>
+ <<else>>
+ She is @@color:gold;disturbed@@ that you replaced her eyes with artificial ones and afraid of increased control over her that such device grants.
+ <<set $activeSlave.devotion -= 5>>
+ <</if>>
+ <</if>>
+ <<set $activeSlave.eyes = 1>>
<<case "boobs">>
<<if ($activeSlave.areolae < 2)>>
@@ -863,7 +952,78 @@ Even though creating an artificial scar is a trivial process, @@color:red;her he
<<set $activeSlave.trust -= 50>>
<<set $activeSlave.devotion -= 50>>
<</if>>
+
+<<case "amp1">>
+ <<set $nextLink to "Surgery Degradation", $surgeryType to "amp">>
+ Since you invested in cybernetic technology you can install PLimb interface into her body during the operation.<br>
+ Procedure will put additional strain on her health but less so than if you were to perform the procedures separately.<br>
+ <<if $stockpile.basicPLimbInterface > 0>>
+ [[Install basic interface|Surgery Degradation][$activeSlave.PLimb to 1, $activeSlave.health -= 10, $stockpile.basicPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
+ <br><</if>>
+ <<if $stockpile.advPLimbInterface > 0>>
+ [[Install advanced interface|Surgery Degradation][$activeSlave.PLimb to 2, $activeSlave.health -= 10, $stockpile.advPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
+ <</if>>
+
+<<case "amp2">>
+ <<if ($activeSlave.devotion > 50)>>
+ Of course, she could not walk out of the surgery; you carried her. She knows what a slave's life is, but she did not really expect that it would ever come to this for her. Anesthesia has yet to completely wear off so it takes her a while to notice ports in her stumps. When she does, she visibly relaxes, realizing she may yet walk again. She squares her shoulders and visibly resolves to carry on being a good slave as best she can. Since the surgery was invasive, @@color:red;her health has been greatly affected.@@
+ <<elseif ($activeSlave.devotion > 20)>>
+ Of course, she could not walk out of the surgery; you carried her. Despite her obedience, she cries softly the whole time, shoulder and hip stumps moving occasionally as she reflexively tries to stand - to walk - to touch herself - to gesture - all things that she will never do again. She slightly calms down when she <<if canSee($activeSlave)>>sees<<else>>feels<</if>> ports installed in her stumps and realizes her immobility is not permanent. Even so, she is still @@color:gold;terrified@@ of your total power over her body. @@color:mediumorchid;She will struggle greatly with her medically created disability.@@ Since the surgery was invasive, @@color:red;her health has been greatly affected.@@
+ <<set $activeSlave.trust -= 10>>
+ <<set $activeSlave.devotion -= 10>>
+ <<else>>
+ Of course, she could not walk out of the surgery; you carried her. You had a good idea what her reaction would be, so <<if ($activeSlave.teeth is "removable")>>you removed her teeth<<else>>she's muzzled<</if>> to prevent her from trying to bite. She sobs convulsively, and her <<if canSee($activeSlave)>>eyes dart desperately from side to side through her tears, hopelessly imploring the mirror to show her something other than this<<else>>stumps twitch pathetically with her desperate efforts to move her limbs, to prove there is something other than this<</if>>. Anything other than this. @@color:mediumorchid;The surgical invasion has filled her with horror and anger.@@ Since the surgery was invasive, @@color:red;her health has been greatly affected.@@ She is @@color:gold;terrified to the point of insanity@@ of your total power over her body.
+ <<set $activeSlave.trust -= 50>>
+ <<set $activeSlave.devotion -= 50>>
+ <</if>>
+
+<<case "PLimb interface1">>
+ When she is carried out of surgery she <<if canSee($activeSlave)>>cranes her neck to better see the ports<<else>>wiggles her stumps trying to feel the ports<</if>> installed in her stumps. Recovery will be @@color:red;significant,@@ since the surgical implantation of anchor points for the limbs themselves and the installation of nerve impulse detectors constituted major surgery.
+ <<if $activeSlave.devotion > 20>>
+ Nevertheless, she's @@color:hotpink;overwhelmed with gratitude,@@ and thanks you profusely the first chance she gets. She follows the acclimation program diligently, doing her best to learn how to be a good slave despite, or sometimes even because of, her disability. She @@color:mediumaquamarine;places more trust in you,@@ too, since you obviously have her best interests at heart.
+ <<set $activeSlave.devotion += 5>>
+ <<set $activeSlave.trust += 5>>
+ <<elseif $activeSlave.devotion >= -20>>
+ She's @@color:hotpink;overwhelmed with gratitude,@@ in part because she didn't think you'd do something like this for her. She thanks you profusely the first chance she gets, and follows the acclimation program diligently, trying to deserve the expense you went to. She @@color:mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for her.
+ <<set $activeSlave.devotion += 5>>
+ <<set $activeSlave.trust += 5>>
+ <<else>>
+ Despite her hatred of you, she can't help but @@color:mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into her. Your goals might not be hers, but at least she has an indication that you're not toying with her.
+ <<set $activeSlave.trust += 5>>
+ <</if>>
+
+<<case "PLimb interface2">>
+ When she is carried out of surgery she <<if canSee($activeSlave)>>cranes her neck to better see the ports<<else>>wiggles her stumps trying to feel the ports<</if>> installed in her stumps. Her stumps twich slightly as the software begins configuring. Recovery will be @@color:red;significant,@@ since the surgical implantation of anchor points for the limbs themselves and the installation of nerve bridges constituted major surgery.
+ <<if $activeSlave.devotion > 20>>
+ Nevertheless, she's @@color:hotpink;overwhelmed with gratitude,@@ and thanks you profusely the first chance she gets. She follows the acclimation program diligently, doing her best to learn how to be a good slave despite, or sometimes even because of, her disability. She @@color:mediumaquamarine;places more trust in you,@@ too, since you obviously have her best interests at heart.
+ <<set $activeSlave.devotion += 5>>
+ <<set $activeSlave.trust += 5>>
+ <<elseif $activeSlave.devotion >= -20>>
+ She's @@color:hotpink;overwhelmed with gratitude,@@ in part because she didn't think you'd do something like this for her. She thanks you profusely the first chance she gets, and follows the acclimation program diligently, trying to deserve the expense you went to. She @@color:mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for her.
+ <<set $activeSlave.devotion += 5>>
+ <<set $activeSlave.trust += 5>>
+ <<else>>
+ Despite her hatred of you, she can't help but @@color:mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into her. Your goals might not be hers, but at least she has an indication that you're not toying with her.
+ <<set $activeSlave.trust += 5>>
+ <</if>>
+
+<<case "PLimb interface3">>
+ When she is carried out of surgery she <<if canSee($activeSlave)>>cranes her neck to better see the ports<<else>>wiggles her stumps trying to feel the ports<</if>> installed in her stumps. Her stumps twich slightly as the software begins configuring. Since she already had anchors installed in previous surgery this procedure was less invasive and thus @@color:red;her health has been only slightly affected@@.
+ <<if $activeSlave.devotion > 20>>
+ She is @@color:hotpink;overjoyed@@ when she finds out this upgrade will allow her to //feel// with her limbs again and thanks you profusely the first chance she gets. She @@color:mediumaquamarine;places more trust in you,@@ too, since you obviously have her best interests at heart.
+ <<set $activeSlave.devotion += 5>>
+ <<set $activeSlave.trust += 5>>
+ <<elseif $activeSlave.devotion >= -20>>
+ She's @@color:hotpink;overwhelmed with joy and gratitude,@@ when she finds out this upgrade will allow her to //feel// with her limbs again, in part because she didn't think you'd do something like this for her. She thanks you profusely the first chance she gets and is determined to prove herself worthy of the expense you went to for her. She @@color:mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for her.
+ <<set $activeSlave.devotion += 5>>
+ <<set $activeSlave.trust += 5>>
+ <<else>>
+ Despite her hatred of you, she can't help but feel some @@color:mediumaquamarine;trust@@ and @@color:hotpink;gratitude,@@ towards you, since you clearly have a plan that involves putting a good deal of value into her. Your goals might not be hers, but at least she has an indication that you're not toying with her.
+ <<set $activeSlave.devotion += 5>>
+ <<set $activeSlave.trust += 5>>
+ <</if>>
+
<<case "basicPLimbs">>
She exits the surgery hesitantly, the software of her prosthetic limbs and the wetware of her brain working together to figure out how to walk together under the tutelage of a prescribed tutorial. Recovery will be @@color:red;significant,@@ since the surgical implantation of anchor points for the limbs themselves and the installation of nerve impulse detectors constituted major surgery.
<<if $activeSlave.devotion > 20>>
@@ -1294,6 +1454,48 @@ Even though creating an artificial scar is a trivial process, @@color:red;her he
<<case "bellyOut">>
She notices almost immediately that the weight in her middle is gone. She shifts her torso idly; it looks like she doesn't know what to think about having her belly implant removed. As with all surgery @@color:red;her health has been slightly affected.@@
+<<case "body hair removal">>
+ When $pronoun <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $pronoun feels the breeze on $possessive skin and realizes that <<if $activeSlave.origHColor != "bald">>all hair below $possessive neck is missing<<else>>$pronoun is now completely hairless<</if>>.<br>
+ <<if $activeSlave.devotion > 50>>
+ $pronounCap is @@color:hotpink;happy@@ with how smooth $possessive body has become and is already @@color:mediumaquamarine;wondering@@ what new kinky things you have planned for $possessive
+ .<<set $activeSlave.trust += 5>>
+ <<set $activeSlave.devotion += 5>>
+ <<elseif $activeSlave.devotion >= -20>>
+ $possessiveCap new lack of body hair doesn't bother $possessive much, since it just means $pronoun needs to spend less time getting rid of any unseemly hairs.
+ <<set $activeSlave.trust += 5>>
+ <<else>>
+ $pronounCap is @@color:mediumorchid;sad@@ and @@color:gold;frightened@@ that you would force this on $possessive
+ .<<set $activeSlave.trust -= 5>>
+ <<set $activeSlave.devotion -= 5>>
+ <</if>>
+ <br><br>As this was a non-invasive procedure $possessive health was not affected.
+
+<<case "hair removal">>
+ When $pronoun <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $pronoun immediately notices the chill on $possessive head and realizes that $pronoun is bald.<br>
+ <<if $activeSlave.devotion > 50>>
+ <<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishStrength > 50)>>
+ $pronounCap is @@color:hotpink;turned on@@ by how humiliating this is for $possessive and @@color:mediumaquamarine;can't wait@@ for the next time you decide to show $possessive off.
+ <<set $activeSlave.trust += 5>>
+ <<set $activeSlave.devotion += 5>>
+ <<else>>
+ $pronounCap is very devoted to you so $possessive new condition doesn't affect $possessive as much as it would other slaves.
+ <</if>>
+ <<elseif $activeSlave.devotion >= -20>>
+ <<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishStrength > 50)>>
+ $pronounCap is both @@color:hotpink;turned on@@ and @@color:gold;horrified@@ by this humiliation.
+ <<set $activeSlave.trust -= 5>>
+ <<set $activeSlave.devotion += 5>>
+ <<else>>
+ $pronounCap thought $pronoun was used to slavery but this is @@color:gold;too much@@.
+ <<set $activeSlave.trust -= 5>>
+ <</if>>
+ <<else>>
+ $pronounCap is @@color:gold;horrified@@ and @@color:mediumorchid;angry@@ at this new humiliation.
+ <<set $activeSlave.trust -= 5>>
+ <<set $activeSlave.devotion -= 5>>
+ <</if>>
+ <br><br>As this was a non-invasive procedure $possessive health was not affected.
+
<<default>>
ERROR bad/missing surgery descript
Surgtyp: $surgeryType
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 04f60113770..f3f56576cb8 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -7,6 +7,11 @@
<<elseif ($personalAttention == "upkeep")>>You plan to focus on cleaning the penthouse this week.
<<elseif ($personalAttention == "HG")>>You plan to support your Head Girl this week, so $pronoun can give more slaves $possessive attention.
<<elseif ($personalAttention == "sex")>>You plan to have as much sex with your slaves as possible this week.
+<<elseif ($personalAttention == "trading")>>This week you will learn trading.
+<<elseif ($personalAttention == "warfare")>>This week you will learn modern combat tactics.
+<<elseif ($personalAttention == "slaving")>>This week you will learn slaving.
+<<elseif ($personalAttention == "engineering")>>This week you will learn engineering.
+<<elseif ($personalAttention == "medicine")>>This week you will learn medicine.
<<else>>
<<if _PA > -1>>
You plan to train ''__@@color:pink;$slaves[_PA].slaveName@@__'' to $trainingRegimen this week.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index be2a16cb556..cc7bc01eb6a 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -471,7 +471,7 @@
<<set $agentBonus = 0>>
<<for _j = 1; _j < $leaders.length; _j++>>
<<if $arcologies[$i].leaderID == $leaders[_j].ID>>
- <<set $agentBonus == $leaders[_j].intelligence>>
+ <<set $agentBonus = $leaders[_j].intelligence>>
<<set $agentBonus += $leaders[_j].intelligenceImplant>>
<<if $leaders[_j].actualAge > 35>>
<<set $agentBonus += 1>>
--
GitLab