From 7da07c5ef4f0249961bf5a7ccd31ed58021c2df2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 22 Feb 2020 16:51:43 -0500
Subject: [PATCH] .boobsImplantType overhaul
---
src/002-config/fc-version.js | 4 +-
src/cheats/mod_EditChildCheatNew.tw | 12 ++-
src/cheats/mod_EditInfantCheatNew.tw | 12 ++-
src/cheats/mod_EditSlaveCheat.tw | 11 +-
src/cheats/mod_editSlaveCheatNew.tw | 12 ++-
.../updateSlaveObject.js | 16 +++
src/facilities/nursery/nurseryWidgets.js | 14 ++-
src/js/SlaveState.js | 12 ++-
src/js/datatypeCleanupJS.js | 18 +++-
src/js/economyJS.js | 2 +-
src/js/generateGenetics.js | 2 +-
src/js/generateMarketSlave.js | 12 +++
src/js/rulesAutosurgery.js | 2 +-
src/npc/acquisition.tw | 1 +
src/npc/databases/cheatmodeDatabase.tw | 6 +-
src/npc/databases/dSlavesDatabase.tw | 34 +++---
src/npc/databases/ddSlavesDatabase.tw | 20 ++--
src/npc/databases/dfSlavesDatabase.tw | 4 +-
src/npc/rgASDump.tw | 2 +-
src/npc/slaveStats.tw | 3 +-
src/{js => npc/surgery}/surgery.js | 101 ++++++++++++------
src/player/electiveSurgery.tw | 8 +-
src/player/js/PlayerState.js | 12 ++-
src/pregmod/eliteSlave.tw | 7 ++
src/pregmod/newChildIntro.tw | 6 +-
src/pregmod/saAgent.tw | 2 +-
src/pregmod/seHuskSlaveDelivery.tw | 3 +-
src/uncategorized/PESS.tw | 1 +
src/uncategorized/REFS.tw | 1 +
src/uncategorized/RESS.tw | 1 +
src/uncategorized/costsReport.tw | 4 +-
src/uncategorized/genericPlotEvents.tw | 2 +-
src/uncategorized/jeSlaveDispute.tw | 1 +
src/uncategorized/lawCompliance.tw | 2 +
src/uncategorized/newSlaveIntro.tw | 1 +
src/uncategorized/pRivalryActions.tw | 47 +++++++-
src/uncategorized/pRivalryCapture.tw | 2 +
src/uncategorized/prestigiousSlave.tw | 8 ++
src/uncategorized/reBoomerang.tw | 14 +--
src/uncategorized/reFSAcquisition.tw | 6 ++
src/uncategorized/reMalefactor.tw | 2 +
src/uncategorized/reRecruit.tw | 8 +-
src/uncategorized/reRelativeRecruiter.tw | 14 +--
src/uncategorized/recETS.tw | 11 ++
src/uncategorized/remoteSurgery.tw | 65 ++++++++---
src/uncategorized/resFailure.tw | 1 +
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/seCoursing.tw | 2 +
src/uncategorized/seRaiding.tw | 2 +
src/uncategorized/seRecruiterSuccess.tw | 3 +
src/uncategorized/slaveShelter.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 8 +-
52 files changed, 398 insertions(+), 150 deletions(-)
rename src/{js => npc/surgery}/surgery.js (89%)
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index bb79320be10..49ba560ab0b 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,7 @@
App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
- pmod: "3.2.0",
- release: 1060,
+ pmod: "3.3.0",
+ release: 1061,
};
/* Use release as save version */
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 39d5f8b6b34..e6eb9bfe62a 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -1610,11 +1610,13 @@
''Breast Implants:''
<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
<br>
- ''Breast String Implants:''
- <<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
- <<else>>@@.yellow;Yes@@ | <</if>>
- <<radiobutton "$tempSlave.boobsImplantType" 0>> No
- <<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+ ''Breast Implant Type: @@.yellow;$tempSlave.boobsImplantType@@''
+ <<radiobutton "$tempSlave.boobsImplantType" "None">> None
+ <<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+ <<radiobutton "$tempSlave.boobsImplantType" "string">> String
+ <<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+ <<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+ <<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
<br>
''Lactation (none:0 | natural:1 | artificial:2):''
diff --git a/src/cheats/mod_EditInfantCheatNew.tw b/src/cheats/mod_EditInfantCheatNew.tw
index dc00e4f5748..140c10d01ef 100644
--- a/src/cheats/mod_EditInfantCheatNew.tw
+++ b/src/cheats/mod_EditInfantCheatNew.tw
@@ -1612,11 +1612,13 @@
''Breast Implants:''
<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
<br>
- ''Breast String Implants:''
- <<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
- <<else>>@@.yellow;Yes@@ | <</if>>
- <<radiobutton "$tempSlave.boobsImplantType" 0>> No
- <<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+ ''Breast Implant Type: @@.yellow;$tempSlave.boobsImplantType@@''
+ <<radiobutton "$tempSlave.boobsImplantType" "None">> None
+ <<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+ <<radiobutton "$tempSlave.boobsImplantType" "string">> String
+ <<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+ <<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+ <<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
<br>
''Lactation (none:0 | natural:1 | artificial:2):''
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 5acd2d2ede9..da30e4914de 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -687,10 +687,13 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>>
''Breast Implants:''
<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
<br>
-''Breast String Implants (no:0 | yes:1):''
-<<textbox "$tempSlave.boobsImplantType" $tempSlave.boobsImplantType>>
-<<radiobutton "$tempSlave.boobsImplantType" 0>> No
-<<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+''Breast Implant Type:'' // Nonsensical things will be corrected. //
+<<radiobutton "$tempSlave.boobsImplantType" "None">> None
+<<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+<<radiobutton "$tempSlave.boobsImplantType" "string">> String
+<<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+<<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+<<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
<br>
''Lactation (none:0 | natural:1 | artificial:2): $tempSlave.lactation |''
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 9ad7ace8779..16409acc59c 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -2746,11 +2746,13 @@
''Breast Implants:''
<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
<br>
- ''Breast String Implants:''
- <<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
- <<else>>@@.yellow;Yes@@ | <</if>>
- <<radiobutton "$tempSlave.boobsImplantType" 0>> No
- <<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+ ''Breast Implant Type: @@.yellow;$tempSlave.boobsImplantType@@''
+ <<radiobutton "$tempSlave.boobsImplantType" "None">> None
+ <<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+ <<radiobutton "$tempSlave.boobsImplantType" "string">> String
+ <<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+ <<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+ <<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
<br>
''Lactation (none:0 | natural:1 | artificial:2):''
diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js
index ec551c5664c..7b4c32ed072 100644
--- a/src/data/backwardsCompatibility/updateSlaveObject.js
+++ b/src/data/backwardsCompatibility/updateSlaveObject.js
@@ -440,6 +440,22 @@ App.Update.Slave = function(slave) {
}
}
+ if (V.releaseID < 1061) {
+ if (slave.boobsImplantType == 1) {
+ slave.boobsImplantType = "string";
+ } else if (slave.boobsImplant >= 10000) {
+ slave.boobsImplantType = "hyper fillable";
+ } else if (slave.boobsImplant >= 2000) {
+ slave.boobsImplantType = "advanced fillable";
+ } else if (slave.boobsImplant >= 800) {
+ slave.boobsImplantType = "fillable";
+ } else if (slave.boobsImplant > 0) {
+ slave.boobsImplantType = "normal";
+ } else {
+ slave.boobsImplantType = "none";
+ }
+ }
+
if (V.releaseID < 1059) {
if (slave.eyeColor === undefined) {
slave.eyeColor = slave.eyes;
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 869f93e70aa..9e8f1917177 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -15500,7 +15500,7 @@ App.Facilities.Nursery.infantToChild = function infantToChild(child) {
child.boobShape = "normal",
child.boobs = jsRandom(200, 500),
child.boobsImplant = 0,
- child.boobsImplantType = 0,
+ child.boobsImplantType = "none",
child.boobsTat = 0,
child.brand = {},
child.breastMesh = 0,
@@ -16993,8 +16993,16 @@ App.Facilities.Nursery.ChildState = class ChildState {
* * 600+: boobsImplant size fillable implants
*/
this.boobsImplant = 0;
- /** Implants type. 0: normal/none; 1: string */
- this.boobsImplantType = 0;
+ /**
+ * Implant type
+ * * "none"
+ * * "normal"
+ * * "string"
+ * * "fillable"
+ * * "advanced fillable"
+ * * "hyper fillable"
+ */
+ this.boobsImplantType = "none";
/**
* breast shape
* * "normal"
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 28cec7f2c28..cda022f513f 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -881,8 +881,16 @@ App.Entity.SlaveState = class SlaveState {
* * 600+: boobsImplant size fillable implants
*/
this.boobsImplant = 0;
- /** Implants type. 0: normal/none; 1: string */
- this.boobsImplantType = 0;
+ /**
+ * Implant type
+ * * "none"
+ * * "normal"
+ * * "string"
+ * * "fillable"
+ * * "advanced fillable"
+ * * "hyper fillable"
+ */
+ this.boobsImplantType = "none";
/**
* breast shape
* * "normal"
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 0e7768d253f..337b76a4502 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -740,7 +740,11 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.lipsImplant = Math.clamp(+slave.lipsImplant, 0, 100) || 0;
slave.voiceImplant = Math.clamp(+slave.voiceImplant, -1, 1) || 0;
slave.boobsImplant = Math.max(+slave.boobsImplant, 0) || 0;
- slave.boobsImplantType = Math.clamp(+slave.boobsImplantType, 0, 1) || 0;
+ if (slave.boobsImplant === 0) {
+ slave.boobsImplantType = "none";
+ } else if (slave.boobsImplantType === "none") {
+ slave.boobsImplantType = "normal";
+ }
slave.breastMesh = Math.clamp(+slave.breastMesh, 0, 1) || 0;
slave.buttImplant = Math.clamp(+slave.buttImplant, 0, 3) || 0;
slave.buttImplantType = Math.clamp(+slave.buttImplantType, 0, 1) || 0;
@@ -748,6 +752,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.earImplant = Math.clamp(+slave.earImplant, 0, 1) || 0;
slave.shouldersImplant = Math.clamp(+slave.shouldersImplant, -1, 1) || 0;
slave.hipsImplant = Math.clamp(+slave.hipsImplant, -1, 1) || 0;
+
}
/**
@@ -1313,7 +1318,11 @@ window.childImplantsDatatypeCleanup = function childImplantsDatatypeCleanup(chil
child.lipsImplant = Math.clamp(+child.lipsImplant, 0, 100) || 0;
child.voiceImplant = Math.clamp(+child.voiceImplant, -1, 1) || 0;
child.boobsImplant = Math.max(+child.boobsImplant, 0) || 0;
- child.boobsImplantType = Math.clamp(+child.boobsImplantType, 0, 1) || 0;
+ if (child.boobsImplant === 0) {
+ child.boobsImplantType = "none";
+ } else if (child.boobsImplantType === "none") {
+ child.boobsImplantType = "normal";
+ }
child.breastMesh = Math.clamp(+child.breastMesh, 0, 1) || 0;
child.buttImplant = Math.clamp(+child.buttImplant, 0, 3) || 0;
child.buttImplantType = Math.clamp(+child.buttImplantType, 0, 1) || 0;
@@ -1726,6 +1735,11 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
if (PC.indentureRestrictions !== undefined) {
delete PC.indentureRestrictions;
}
+ if (PC.boobsImplant > 0) {
+ PC.boobsImplantType = "normal";
+ } else {
+ PC.boobsImplantType = "none";
+ }
/* None of these are in use */
PC.bellyPreg = PC.belly;
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index e7460549660..dc029a6a9f5 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -871,7 +871,7 @@ window.getSlaveCostArray = function(s) {
}
// Maintenance
- if (s.boobs > 10000 && s.boobsImplantType === 1) {
+ if (s.boobsImplant > 10000 && s.boobsImplantType === "string") {
retval.push({text: "Maintenance cost for oversized string implants", value: 50});
}
if (s.butt > 10 && s.buttImplantType === 1) {
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index ef2fa96e827..a930dfd984c 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -1759,7 +1759,7 @@ window.generateChild = function(mother, ova, destination) {
child.areolaePiercing = 0;
child.corsetPiercing = 0;
child.boobsImplant = 0;
- child.boobsImplantType = 0;
+ child.boobsImplantType = "none";
child.nipplesPiercing = 0;
child.areolaePiercing = 0;
child.lactation = 0;
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index c7d852c1e83..a22301df490 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -416,6 +416,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
V.activeSlave.butt = Math.clamp(V.activeSlave.butt+V.activeSlave.buttImplant, 0, 10);
V.activeSlave.boobsImplant = 600;
V.activeSlave.boobs = Math.clamp(V.activeSlave.boobs+V.activeSlave.boobsImplant, 0, 10000);
+ V.activeSlave.boobsImplantType = "normal";
V.activeSlave.lipsImplant = 20;
V.activeSlave.lips = Math.clamp(V.activeSlave.lips+V.activeSlave.lipsImplant, 0, 55);
} else if (V.corpSpecImplants === 2) {
@@ -423,6 +424,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
V.activeSlave.buttImplant = 4;
V.activeSlave.butt = Math.clamp(V.activeSlave.butt+V.activeSlave.buttImplant, 0, 10);
V.activeSlave.boobsImplant = 2400;
+ V.activeSlave.boobsImplantType = "advanced fillable";
V.activeSlave.boobs = Math.clamp(V.activeSlave.boobs+V.activeSlave.boobsImplant, 0, 10000);
V.activeSlave.lipsImplant = 60;
V.activeSlave.lips = Math.clamp(V.activeSlave.lipsImplant+V.activeSlave.buttImplant, 0, 100);
@@ -772,6 +774,15 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
r += `They vary in terms of what size their implants are, not whether they have them. `;
V.activeSlave.chem += jsRandom(10, 100);
V.activeSlave.boobsImplant = 200*jsRandom(2, 20);
+ if (V.activeSlave.boobsImplant > 10000) {
+ V.activeSlave.boobsImplantType = "hyper fillable";
+ } else if (V.activeSlave.boobsImplant > 2200) {
+ V.activeSlave.boobsImplantType = jsEither(["advanced fillable", "advanced fillable", "advanced fillable", "string"]);
+ } else if (V.activeSlave.boobsImplant > 1000) {
+ V.activeSlave.boobsImplantType = jsEither(["fillable", "fillable", "normal", "string"]);
+ } else {
+ V.activeSlave.boobsImplantType = jsEither(["normal", "normal", "normal", "string"]);
+ }
V.activeSlave.boobs += V.activeSlave.boobsImplant;
V.activeSlave.buttImplant = jsRandom(2, 5);
V.activeSlave.butt += V.activeSlave.buttImplant;
@@ -1536,6 +1547,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
V.activeSlave.butt += V.activeSlave.buttImplant;
V.activeSlave.boobsImplant = (2000-V.activeSlave.boobs);
V.activeSlave.boobs += V.activeSlave.boobsImplant;
+ V.activeSlave.boobsImplantType = "fillable";
V.activeSlave.nipples = "tiny";
V.activeSlave.areolae = 0;
V.activeSlave.clit = 0;
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index fb9d7170fe6..08b8f256dc0 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -170,7 +170,7 @@ window.rulesAutosurgery = (function() {
commitProcedure(`surgery to remove ${his} ${bodyPart} implants`, slave => {
slave[bodyPart] -= slave[`${bodyPart}Implant`];
slave[`${bodyPart}Implant`] = 0;
- slave[`${bodyPart}ImplantType`] = 0;
+ slave[`${bodyPart}ImplantType`] = "none";
});
return;
}
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 9c284ff67bc..4451c719cbb 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -356,6 +356,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.face = Math.trunc($activeSlave.face+$activeSlave.faceImplant/2,-100,100)>>
<<set $activeSlave.boobsImplant = 200*random(4,8)>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.buttImplant = random(2,4)>>
<<set $activeSlave.butt += $activeSlave.buttImplant>>
<<set $activeSlave.lipsImplant = random(1,2)>>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index 49d4fc2a92b..87f267d653d 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -2,7 +2,7 @@
<<set $activeSlave = BaseSlave()>>
<<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.ovaryAge = 42, _HS.ageImplant = 1, setHealth(_HS, 50), _HS.devotion = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "honey blonde", _HS.origSkin = "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.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Anne' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He speaks with the rich accent of the Old South.">>
+<<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.ovaryAge = 42, _HS.ageImplant = 1, setHealth(_HS, 50), _HS.devotion = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "honey blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Anne' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He speaks with the rich accent of the Old South.">>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.pubertyXX = 1>>
<<else>>
@@ -13,7 +13,7 @@
//There are quite a few left; their names are _HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, setHealth(_HS, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.">>
+<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, setHealth(_HS, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.boobsImplantType = "fillable", _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 0>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.pubertyXY = 1>>
<<else>>
@@ -23,7 +23,7 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.relation = "daughter", _HS.relationTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 10), _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
+<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.relation = "daughter", _HS.relationTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 10), _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.pubertyXX = 1>>
<<else>>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 718be20791d..f6ea6c3cb60 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -25,7 +25,7 @@
/*Added origin, made some assumptions about $his background, changed fetish to submissive, added arrogant flaw -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Luna", _HS.birthName = "Luna", _HS.ID = _i++, _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.height = 157, _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 20, _HS.hStyle = "chin-length with bangs over one eye", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.clothes = "uncomfortable straps", _HS.attrXY = 40>>
+<<set _HS.slaveName = "Luna", _HS.birthName = "Luna", _HS.ID = _i++, _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.height = 157, _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 20, _HS.hStyle = "chin-length with bangs over one eye", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.clothes = "uncomfortable straps", _HS.attrXY = 40>>
<<set $heroSlaves.push(_HS)>>
/*Tat should be lower back, "Wears a leather collar, a Scarab clitoris g-string, Tortoise shell leather harness, and a pair of black thigh high boots"*/
/*Corrected piercings -BoneyM*/
@@ -47,7 +47,7 @@
/*Corrected eyes, added combat skill, bisexual and odd, tweaked face -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cuntbitch", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "$He was a slave trader until $he was betrayed by ambitious underlings and sold into enslavement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, setHealth(_HS, 40), _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "black", _HS.hStyle = "long and curly", _HS.boobs = 1400, _HS.boobsImplant = 800, _HS.nipplesPiercing = 2, _HS.boobsTat = "degradation", _HS.butt = 6, _HS.buttImplant = 3, _HS.buttTat = "degradation", _HS.lips = 35, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.combat = 1, _HS.clothes = "restrictive latex", _HS.shoes = "heels", _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has several 'tribal' style tattoos on $his arms from before $his enslavement.", _HS.career = "a slaver">>
+<<set _HS.slaveName = "Cuntbitch", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "$He was a slave trader until $he was betrayed by ambitious underlings and sold into enslavement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, setHealth(_HS, 40), _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "black", _HS.hStyle = "long and curly", _HS.boobs = 1400, _HS.boobsImplant = 800, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 2, _HS.boobsTat = "degradation", _HS.butt = 6, _HS.buttImplant = 3, _HS.buttTat = "degradation", _HS.lips = 35, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.combat = 1, _HS.clothes = "restrictive latex", _HS.shoes = "heels", _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has several 'tribal' style tattoos on $his arms from before $his enslavement.", _HS.career = "a slaver">>
<<set $heroSlaves.push(_HS)>>
/*Set birth name to 'unknown', tweaked obedience downwards, corrected tattoo's, added combat skill, clothes and shoes, arrogant -BoneyM*/
@@ -114,12 +114,12 @@
/*Added 'submissive' and 'bitchy' -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "$He was once the bodyguard to a Russian drug lord, and was sold into slavery after his death by cocaine overdose.", _HS.ID = _i++, _HS.nationality = "Russian", _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.butt = 2, _HS.lips = 25, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has a red star tattoo on $his back, and a hammer and sickle on $his right buttock.", _HS.custom.desc = "$He has a Slavic face with high cheekbones and a strong, pointed jaw. $He is a skilled martial artist.", _HS.faceShape = "masculine", _HS.career = "a bodyguard">>
+<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "$He was once the bodyguard to a Russian drug lord, and was sold into slavery after his death by cocaine overdose.", _HS.ID = _i++, _HS.nationality = "Russian", _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 2, _HS.lips = 25, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has a red star tattoo on $his back, and a hammer and sickle on $his right buttock.", _HS.custom.desc = "$He has a Slavic face with high cheekbones and a strong, pointed jaw. $He is a skilled martial artist.", _HS.faceShape = "masculine", _HS.career = "a bodyguard">>
<<set $heroSlaves.push(_HS)>>
/*Tweaked devotion up, changed eyes to green, corrected tattoo syntax, added combat skill -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Maria", _HS.birthName = "Maria", _HS.origin = "$He was sold into slavery on a legal technicality.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 40), _HS.devotion = 15, _HS.height = 155, _HS.race = "latina", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.buttTat = "tribal patterns", _HS.face = -15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.anus = 1, _HS.analArea = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.sexualFlaw = "hates penetration">>
+<<set _HS.slaveName = "Maria", _HS.birthName = "Maria", _HS.origin = "$He was sold into slavery on a legal technicality.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 40), _HS.devotion = 15, _HS.height = 155, _HS.race = "latina", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.buttTat = "tribal patterns", _HS.face = -15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.anus = 1, _HS.analArea = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.sexualFlaw = "hates penetration">>
<<set $heroSlaves.push(_HS)>>
/*fighter*/
/*Tweaked face down, added 'hates penetration' and combat skill -BoneyM*/
@@ -141,13 +141,13 @@
/*Changed eye color, added odd, tweaked vaginalSkill, added origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Joan", _HS.birthName = "Joan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 20), _HS.devotion = 15, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "brown", _HS.pubicHColor = "brown", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.butt = 4, _HS.face = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 30, _HS.attrXX = 80, _HS.attrXY = 80, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Joan", _HS.birthName = "Joan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 20), _HS.devotion = 15, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "brown", _HS.pubicHColor = "brown", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.face = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 30, _HS.attrXX = 80, _HS.attrXY = 80, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*heterochromia*/
/*Tweaked face upwards, changed eye color, changed health from 20 to 6 -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, $he quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 20), _HS.devotion = -75, _HS.height = 155, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.butt = 4, _HS.buttImplant = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.intelligence = -30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.custom.tattoo = "$His breasts are tattooed with $his implant history, showing repeated additions.", _HS.sexualFlaw = "crude">>
+<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, $he quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 20), _HS.devotion = -75, _HS.height = 155, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.buttImplant = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.intelligence = -30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.custom.tattoo = "$His breasts are tattooed with $his implant history, showing repeated additions.", _HS.sexualFlaw = "crude">>
<<set $heroSlaves.push(_HS)>>
/*rapey implant addict*/
/*Is 'rapey' a quirk? Guess so. Added odd. Changed eye color, added nympho, added origin. -BoneyM*/
@@ -188,7 +188,7 @@
/*Added entertain skill -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Charity", _HS.birthName = "Charity", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 20), _HS.devotion = 90, _HS.race = "middle eastern", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "light olive", _HS.hLength = 80, _HS.hStyle = "very long", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.entertainment = 35, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has 'Charity' tattooed in cursive across the back of $his neck.">>
+<<set _HS.slaveName = "Charity", _HS.birthName = "Charity", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 20), _HS.devotion = 90, _HS.race = "middle eastern", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "light olive", _HS.hLength = 80, _HS.hStyle = "very long", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.entertainment = 35, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has 'Charity' tattooed in cursive across the back of $his neck.">>
<<set $heroSlaves.push(_HS)>>
/*Changed $him to Arabic, corrected tattoo syntax, added entertain skill -BoneyM*/
@@ -338,7 +338,7 @@
/* set nipples to pierced, changed fetish from bisexual to submissive, increased anal skill, dunno how to handle all the techno-implants $his tits etc. have as they don't seem to be size-increasing-focused, lowered health */
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Asha", _HS.birthName = "Asha", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.weight = -20, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 170, _HS.hStyle = "floor length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1200, _HS.boobsImplant = 800, _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 6, _HS.buttImplant = 3, _HS.face = 15, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He loves hair play.", _HS.navelPiercing = 1>>
+<<set _HS.slaveName = "Asha", _HS.birthName = "Asha", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.weight = -20, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 170, _HS.hStyle = "floor length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1200, _HS.boobsImplant = 800, _HS.boobsImplantType = "fillable", _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 6, _HS.buttImplant = 3, _HS.face = 15, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He loves hair play.", _HS.navelPiercing = 1>>
<<set $heroSlaves.push(_HS)>>
/*Reduced weight, increased face and faceimplant, added piercings, corrected tattoo and customdesc syntax -BoneyM*/
@@ -442,7 +442,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Asspussy' Miss Julie O", _HS.birthName = "Leah", _HS.origin = "$He was sentenced to enslavement as a punishment for fraud and theft.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 70), _HS.devotion = 100, _HS.height = 155, _HS.markings = "none", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "fashionable for a Free Cities 3rd Grade Teacher, up in a tight bun", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.boobs = 650, _HS.boobsImplant = 200, _HS.nipples = "huge", _HS.butt = 3, _HS.face = 15, _HS.faceImplant = 65, _HS.anus = 1, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.desc = "$His pale skin is lightly freckled, and $his nipples are dark tan. $He used to be sexually repressed, and used to hate anal sex.">>
+<<set _HS.slaveName = "'Asspussy' Miss Julie O", _HS.birthName = "Leah", _HS.origin = "$He was sentenced to enslavement as a punishment for fraud and theft.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 70), _HS.devotion = 100, _HS.height = 155, _HS.markings = "none", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "fashionable for a Free Cities 3rd Grade Teacher, up in a tight bun", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.boobs = 650, _HS.boobsImplant = 200, _HS.boobsImplantType = "normal", _HS.nipples = "huge", _HS.butt = 3, _HS.face = 15, _HS.faceImplant = 65, _HS.anus = 1, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.desc = "$His pale skin is lightly freckled, and $his nipples are dark tan. $He used to be sexually repressed, and used to hate anal sex.">>
<<set $heroSlaves.push(_HS)>>
/*huge nips*/
@@ -463,7 +463,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Funbags' Young", _HS.birthName = "Young", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, -10), _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 3550, _HS.boobsImplant = 3000, _HS.nipplesPiercing = 1, _HS.areolae = 3, _HS.boobsTat = "degradation", _HS.butt = 2, _HS.face = 15, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.tonguePiercing = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.brand["chest"] = "SLUT", _HS.skill.oral = 100, _HS.aphrodisiacs = 1, _HS.addict = 22, _HS.collar = "shock punishment", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Funbags' Young", _HS.birthName = "Young", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, -10), _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 3550, _HS.boobsImplant = 3000, _HS.boobsImplantType = "advanced fillable", _HS.nipplesPiercing = 1, _HS.areolae = 3, _HS.boobsTat = "degradation", _HS.butt = 2, _HS.face = 15, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.tonguePiercing = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.brand["chest"] = "SLUT", _HS.skill.oral = 100, _HS.aphrodisiacs = 1, _HS.addict = 22, _HS.collar = "shock punishment", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -474,10 +474,6 @@
<<set _HS.slaveName = "Miss Maree", _HS.birthName = "Tina", _HS.origin = "A former headmistress, $he was sentenced to slavery after $he was caught training $his students to be lesbian trophy slaves.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = -50, _HS.weight = 20, _HS.height = 155, _HS.nationality = "American", _HS.eye.origColor = "green", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.origSkin = "pale", _HS.hStyle = "in a large bun", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1500, _HS.areolae = 3, _HS.boobsTat = "advertisements", _HS.butt = 6, _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.vaginaLube = 1, _HS.bellyAccessory = "a corset", _HS.ovaries = 1, _HS.anusTat = "flowers", _HS.earPiercing = 1, _HS.stampTat = "scenes", _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 0, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.sexualFlaw = "hates men", _HS.custom.desc = "$He absolutely detests men.", _HS.career = "a principal">>
<<set $heroSlaves.push(_HS)>>
-<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He was once a rising Free Cities politician who argued for compulsory female enslavement, but $he became an addict, fell into debt, and was subsequently enslaved.", _HS.birthWeek = random(0,51), _HS.genes = "XY", _HS.actualAge = 44, _HS.physicalAge = 44, _HS.visualAge = 44, _HS.ovaryAge = 44, setHealth(_HS, 60), _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.preg = -2, _HS.anus = 2, _HS.anusTat = "bleached", _HS.makeup = 3, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.legsTat = "degradation", _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 15, _HS.skill.entertainment = 35, _HS.drugs = "breast injections", _HS.addict = 1, _HS.clothes = "slutty jewelry", _HS.collar = "tight steel", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has a tattoo down $his left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.custom.desc = "Since becoming a slave $he has been turned into a little bimbo.">>
-<<set $heroSlaves.push(_HS)>>
-
<<if $seePreg != 0>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "$He was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.nationality = "American", _HS.origSkin = "light", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.lactationDuration = 4, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregType = 1, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.counter.births = 1, _HS.counter.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand["right buttock"] = "SLAVE", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 35, _HS.skill.combat = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
@@ -505,7 +501,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Vampire' Elvira", _HS.birthName = "Elvira", _HS.career = "a service worker", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, setHealth(_HS, 90, 0, 0, 0), _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 85, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.boobs = 650, _HS.boobsImplant = 200, _HS.nipplesPiercing = 2, _HS.butt = 3, _HS.buttImplant = 1, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.tonguePiercing = 1, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand["right buttock"] = "your initials", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 15, _HS.rules.living = "luxurious", _HS.clothes = "choosing her own clothes", _HS.collar = "heavy gold", _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Vampire' Elvira", _HS.birthName = "Elvira", _HS.career = "a service worker", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, setHealth(_HS, 90, 0, 0, 0), _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 85, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.boobs = 650, _HS.boobsImplant = 200, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 2, _HS.butt = 3, _HS.buttImplant = 1, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.tonguePiercing = 1, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand["right buttock"] = "your initials", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 15, _HS.rules.living = "luxurious", _HS.clothes = "choosing her own clothes", _HS.collar = "heavy gold", _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -543,7 +539,7 @@
<<if $seePreg != 0>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "$He sold $himself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, setHealth(_HS, 80, 0, 0, 0), _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.counter.births = 2, _HS.counter.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -70, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "$He sold $himself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, setHealth(_HS, 80, 0, 0, 0), _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.boobsImplantType = "string", _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.counter.births = 2, _HS.counter.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -70, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<run App.Utils.removeHeroLimbs(_HS, "all")>>
<<set $heroSlaves.push(_HS)>>
<</if>>
@@ -553,7 +549,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Onahole' Lian the Liberty Whore", _HS.birthName = "Lian", _HS.origin = "$He is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, -50, 10, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _HS.boobs = 2000, _HS.boobsImplant = 600, _HS.areolae = 2, _HS.butt = 8, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clit = 2, _HS.anus = 2, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.collar = "shock punishment", _HS.shoes = "flats", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Onahole' Lian the Liberty Whore", _HS.birthName = "Lian", _HS.origin = "$He is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, -50, 10, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _HS.boobs = 2000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.areolae = 2, _HS.butt = 8, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clit = 2, _HS.anus = 2, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.collar = "shock punishment", _HS.shoes = "flats", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<run App.Utils.removeHeroLimbs(_HS, "all")>>
<<set $heroSlaves.push(_HS)>>
@@ -569,13 +565,13 @@
/*Added 'bitchy' quirk, reduced height and weight, added customdesc -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cunt", _HS.birthName = "Cunt", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, -10), _HS.devotion = 10, _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.heels = 1, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 4, _HS.buttImplant = 2, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 1, _HS.anus = 2, _HS.anusTat = "tribal patterns", _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.intelligence = -70, _HS.attrXY = 40, _HS.attrKnown = 0, _HS.fetish = "mindbroken", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Cunt", _HS.birthName = "Cunt", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, -10), _HS.devotion = 10, _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.heels = 1, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.buttImplant = 2, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 1, _HS.anus = 2, _HS.anusTat = "tribal patterns", _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.intelligence = -70, _HS.attrXY = 40, _HS.attrKnown = 0, _HS.fetish = "mindbroken", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*mindbroken*/
/*Tweaked smart piercing setting, corrected piercings -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person $he originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, setHealth(_HS, 20), _HS.devotion = 60, _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.custom.desc = "$He has many surgical scars and something seems off about $him.">>
+<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person $he originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, setHealth(_HS, 20), _HS.devotion = 60, _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.custom.desc = "$He has many surgical scars and something seems off about $him.">>
<<run App.Medicine.Modification.addScar(_HS, "left breast", "surgical", 2)>>
<<run App.Medicine.Modification.addScar(_HS, "right breast", "surgical", 2)>>
<<run App.Medicine.Modification.addScar(_HS, "left buttock", "surgical", 2)>>
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 5bb5da0afd7..b229897b4ba 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -18,7 +18,7 @@
/*Added odd as a stand-in for the multiple personalities -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lola", _HS.birthName = "Lola", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, 20), _HS.devotion = 35, _HS.height = 175, _HS.origSkin = "white", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.butt = 4, _HS.buttImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 3, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.aphrodisiacs = 1, _HS.addict = 10, _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lola", _HS.birthName = "Lola", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, 20), _HS.devotion = 35, _HS.height = 175, _HS.origSkin = "white", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.buttImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 3, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.aphrodisiacs = 1, _HS.addict = 10, _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Second slave to not need changes -BoneyM*/
@@ -28,13 +28,13 @@
/*Added origin, removed anal virginity -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Mrs.' Maria", _HS.birthName = "Maria", _HS.genes = "XY", _HS.origin = "$He was once a successful drug lord, but was turned into $his current self after making too many enemies.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hLength = 10, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.lips = 55, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.dick = 5, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left testicle"] = "a brand of a former master", _HS.stampTat = "$He has a fairly generic tramp stamp.", _HS.career = "a gang leader">>
+<<set _HS.slaveName = "'Mrs.' Maria", _HS.birthName = "Maria", _HS.genes = "XY", _HS.origin = "$He was once a successful drug lord, but was turned into $his current self after making too many enemies.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hLength = 10, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.lips = 55, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.dick = 5, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left testicle"] = "a brand of a former master", _HS.stampTat = "$He has a fairly generic tramp stamp.", _HS.career = "a gang leader">>
<<set $heroSlaves.push(_HS)>>
/*branded nut*/
/*Added brand to customtat, added origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sugar", _HS.birthName = "Sugar", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, setHealth(_HS, 20), _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "platinum blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1400, _HS.boobsImplant = 1200, _HS.butt = 5, _HS.buttImplant = 4, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.clothes = "slutty jewelry", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.custom.desc = "$He is as dumb as a bag of hammers.">>
+<<set _HS.slaveName = "Sugar", _HS.birthName = "Sugar", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, setHealth(_HS, 20), _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "platinum blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1400, _HS.boobsImplant = 1200, _HS.boobsImplantType = "fillable", _HS.butt = 5, _HS.buttImplant = 4, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.clothes = "slutty jewelry", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.custom.desc = "$He is as dumb as a bag of hammers.">>
<<set $heroSlaves.push(_HS)>>
/*also buttslut*/
/*Added customdesc, changed eye color -BoneyM*/
@@ -69,7 +69,7 @@
/*Removed customdesc copied over from previous slave -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kai", _HS.birthName = "Mordecai", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.height = 191, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "white", _HS.hLength = 140, _HS.hStyle = "knee length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.clothes = "restrictive latex", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He likes hair play.", _HS.navelPiercing = 1>>
+<<set _HS.slaveName = "Kai", _HS.birthName = "Mordecai", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.height = 191, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "white", _HS.hLength = 140, _HS.hStyle = "knee length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.clothes = "restrictive latex", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He likes hair play.", _HS.navelPiercing = 1>>
<<set $heroSlaves.push(_HS)>>
/*Increased height and balls size -BoneyM*/
@@ -116,7 +116,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), setHealth(_HS, 70), _HS.devotion = 100, _HS.eye.origColor = "black", _HS.origHColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.counter.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 2, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand["right buttock"] = "SLUT",_HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 20, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has tattoos of teasing, enticing messages begging others to come taste $his addictive milk.", _HS.custom.desc = "$His musky milky aura drives men and women around $him giggly and dumb with lust.", _HS.horn = "cow horns">>
+<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), setHealth(_HS, 70), _HS.devotion = 100, _HS.eye.origColor = "black", _HS.origHColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.boobsImplantType = "advanced fillable", _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.counter.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 2, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand["right buttock"] = "SLUT",_HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 20, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has tattoos of teasing, enticing messages begging others to come taste $his addictive milk.", _HS.custom.desc = "$His musky milky aura drives men and women around $him giggly and dumb with lust.", _HS.horn = "cow horns">>
<<set $heroSlaves.push(_HS)>>
/*Dropped desc = $He has two cute horns protruding from $his forehead. A few addicted milkslaves of $his own tag along behind $him. */
@@ -133,11 +133,11 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "$He is a former Kkangpae gang member who was sold into slavery by $his former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He is a famed Free Cities whore, and commands top prices.", _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, setHealth(_HS, 50), _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "styled in high chignon resembling a traditional Japanese geisha's Shimada hairstyle, with plenty of decorated hairpins", _HS.waist = -55, _HS.boobs = 6000, _HS.boobsImplant = 3000, _HS.nipples = "huge", _HS.butt = 4.5, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.tonguePiercing = 1, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.anusTat = "bleached", _HS.nails = 3, _HS.earPiercing = 1, _HS.legsTat = "flowers", _HS.stampTat = "flowers", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -3, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has two neon-blue butterflies tattooed on $his right temple and one more right above $his right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on $his right leg.", _HS.custom.desc = "$He is almost never seen without $his long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in $his chignon.", _HS.career = "a gang member">>
+<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "$He is a former Kkangpae gang member who was sold into slavery by $his former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He is a famed Free Cities whore, and commands top prices.", _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, setHealth(_HS, 50), _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "styled in high chignon resembling a traditional Japanese geisha's Shimada hairstyle, with plenty of decorated hairpins", _HS.waist = -55, _HS.boobs = 6000, _HS.boobsImplant = 3000, _HS.boobsImplantType = "advanced fillable", _HS.nipples = "huge", _HS.butt = 4.5, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.tonguePiercing = 1, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.anusTat = "bleached", _HS.nails = 3, _HS.earPiercing = 1, _HS.legsTat = "flowers", _HS.stampTat = "flowers", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -3, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has two neon-blue butterflies tattooed on $his right temple and one more right above $his right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on $his right leg.", _HS.custom.desc = "$He is almost never seen without $his long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in $his chignon.", _HS.career = "a gang member">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Bailey", _HS.birthName = "Bryan", _HS.genes = "XY", _HS.origin = "$He was sold to your predecessor by $his husband to pay off his extreme debt.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, setHealth(_HS, 50), _HS.devotion = -50, _HS.nationality = "American", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "fair", _HS.hLength = 50, _HS.hStyle = "chest-length, styled up in schoolgirl pigtails with bangs", _HS.boobs = 700, _HS.boobsImplant = 400, _HS.butt = 2, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.clothes = "a slutty maid outfit", _HS.shoes = "heels", _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Bailey", _HS.birthName = "Bryan", _HS.genes = "XY", _HS.origin = "$He was sold to your predecessor by $his husband to pay off his extreme debt.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, setHealth(_HS, 50), _HS.devotion = -50, _HS.nationality = "American", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "fair", _HS.hLength = 50, _HS.hStyle = "chest-length, styled up in schoolgirl pigtails with bangs", _HS.boobs = 700, _HS.boobsImplant = 400, _HS.boobsImplantType = "normal", _HS.butt = 2, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.clothes = "a slutty maid outfit", _HS.shoes = "heels", _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -145,7 +145,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "$His origins are unknown, but rumor has it that $he is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 60), _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eye.origColor = "green", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.waist = -100, _HS.boobs = 10000, _HS.boobsImplant = 4800, _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 9, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 35, _HS.vagina = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a string bikini", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "$His origins are unknown, but rumor has it that $he is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 60), _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eye.origColor = "green", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.waist = -100, _HS.boobs = 10000, _HS.boobsImplant = 4800, _HS.boobsImplantType = "advanced fillable", _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 9, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 35, _HS.vagina = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a string bikini", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1>>
<<run setEyeColorFull(_HS, "", "demonic", "", "both")>>
<<set $heroSlaves.push(_HS)>>
@@ -153,6 +153,10 @@
<<set _HS.slaveName = "Fuckmeat", _HS.birthName = "Alva", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He is a famed Free Cities slut, and can please anyone.", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.nationality = "Swedish", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "bushy", _HS.boobs = 1700, _HS.boobsTat = "rude words", _HS.butt = 8, _HS.buttTat = "rude words", _HS.face = 55, _HS.lips = 35, _HS.vagina = -1, _HS.vaginaTat = "rude words", _HS.preg = -2, _HS.anus = 3, _HS.dick = 2, _HS.dickTat = "rude words", _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 2, _HS.anusTat = "rude words", _HS.makeup = 3, _HS.nails = 3, _HS.brand["cheek"] = "a penis symbol",_HS.shouldersTat = "rude words", _HS.armsTat = "rude words", _HS.legsTat = "rude words", _HS.stampTat = "rude words", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.diet = "muscle building", _HS.clothes = "harem gauze", _HS.collar = "heavy gold", _HS.shoes = "boots", _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishStrength = 0, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has a swastika tattooed on $his ballsack.">>
<<set $heroSlaves.push(_HS)>>
+<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
+<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He was once a rising Free Cities politician who argued for compulsory female enslavement, but $he became an addict, fell into debt, and was subsequently enslaved.", _HS.birthWeek = random(0,51), _HS.genes = "XY", _HS.actualAge = 44, _HS.physicalAge = 44, _HS.visualAge = 44, _HS.ovaryAge = 44, setHealth(_HS, 60), _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.preg = -2, _HS.anus = 2, _HS.anusTat = "bleached", _HS.makeup = 3, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.legsTat = "degradation", _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 15, _HS.skill.entertainment = 35, _HS.drugs = "breast injections", _HS.addict = 1, _HS.clothes = "slutty jewelry", _HS.collar = "tight steel", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has a tattoo down $his left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.custom.desc = "Since becoming a slave $he has been turned into a little bimbo.">>
+<<set $heroSlaves.push(_HS)>>
+
<<if $seeExtreme == 1>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
diff --git a/src/npc/databases/dfSlavesDatabase.tw b/src/npc/databases/dfSlavesDatabase.tw
index cbd3291ad2e..21a58a988be 100644
--- a/src/npc/databases/dfSlavesDatabase.tw
+++ b/src/npc/databases/dfSlavesDatabase.tw
@@ -7,12 +7,12 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Strawberry", _HS.birthName = "Strawberry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 30, _HS.physicalAge = 30, _HS.visualAge = 30, _HS.ovaryAge = 30, setHealth(_HS, 20), _HS.devotion = 40, _HS.height = 175, _HS.eye.origColor = "dark brown", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.lipsTat = "Strawberries are tattooed on $his left cheek.", _HS.buttTat = "Strawberries are tattooed on $his right buttock.", _HS.clitPiercing = 2, _HS.counter.birthsTotal = 2>>
+<<set _HS.slaveName = "Strawberry", _HS.birthName = "Strawberry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 30, _HS.physicalAge = 30, _HS.visualAge = 30, _HS.ovaryAge = 30, setHealth(_HS, 20), _HS.devotion = 40, _HS.height = 175, _HS.eye.origColor = "dark brown", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 400, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.lipsTat = "Strawberries are tattooed on $his left cheek.", _HS.buttTat = "Strawberries are tattooed on $his right buttock.", _HS.clitPiercing = 2, _HS.counter.birthsTotal = 2>>
/*vibe nips, muscles*/
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Melon", _HS.birthName = "Melon", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 50, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 1800, _HS.boobsImplant = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.lipsTat = "Watermelons are tattooed on $his face.", _HS.buttTat = "Watermelons are tattooed on $his buttocks.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.counter.birthsTotal = 1>>
+<<set _HS.slaveName = "Melon", _HS.birthName = "Melon", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 50, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 1800, _HS.boobsImplant = 800, _HS.boobsImplantType = "fillable", _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.lipsTat = "Watermelons are tattooed on $his face.", _HS.buttTat = "Watermelons are tattooed on $his buttocks.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.counter.birthsTotal = 1>>
/*vibe nips, saliva implant*/
<<set $heroSlaves.push(_HS)>>
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index fa63877df97..0df8fade39c 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -47,7 +47,7 @@
<<elseif $PC.career == "slaver">>
<<set $activeSlave.devotion += 10>>
<<elseif $PC.career == "medicine">>
- <<set $activeSlave.boobs += 600, $activeSlave.boobsImplant += 600, $activeSlave.butt += 2, $activeSlave.buttImplant += 2, $activeSlave.lips += 10, $activeSlave.lipsImplant += 10, $activeSlave.waist = -55>>
+ <<set $activeSlave.boobs += 600, $activeSlave.boobsImplant += 600, $activeSlave.boobsImplant = "normal", $activeSlave.butt += 2, $activeSlave.buttImplant += 2, $activeSlave.lips += 10, $activeSlave.lipsImplant += 10, $activeSlave.waist = -55>>
<<elseif $PC.career == "celebrity">>
<<if $activeSlave.skill.entertainment < 60>><<set $activeSlave.skill.entertainment += 20>><</if>>
<<elseif $PC.career == "servant">>
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index 3dca1aae144..2aa43002fb9 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -259,8 +259,9 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
<br>Nails: $activeSlave.nails
<br><br>Boobs: $activeSlave.boobs,
+ Implant Type: $activeSlave.boobsImplantType,
+ Implant Volume: $activeSlave.boobsImplant
<br>Milk: $activeSlave.boobsMilk,
- Type: $activeSlave.boobsImplantType,
Qunantity: $activeSlave.counter.milk
<br>Shape: $activeSlave.boobShape
<br>nipples: $activeSlave.nipples,
diff --git a/src/js/surgery.js b/src/npc/surgery/surgery.js
similarity index 89%
rename from src/js/surgery.js
rename to src/npc/surgery/surgery.js
index dd95e5408b3..a2fbc09fd6f 100644
--- a/src/js/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -138,7 +138,7 @@ App.Medicine.Surgery.ListHelpers = class {
/**
* @param {string} name
- * @param {number} implantType
+ * @param {string} implantType
* @param {number} size
* @returns {App.Medicine.Surgery.Procedure}
*/
@@ -160,7 +160,7 @@ App.Medicine.Surgery.ListHelpers = class {
slave => {
slave[`${this._bodyPart}`] -= slave[`${this._bodyPart}Implant`];
slave[`${this._bodyPart}Implant`] = 0;
- slave[`${this._bodyPart}ImplantType`] = 0;
+ slave[`${this._bodyPart}ImplantType`] = "none";
}, this._V.surgeryCost, 5, `${this._bodyPart}Loss`
);
}
@@ -300,66 +300,77 @@ App.Medicine.Surgery.sizingProcedures = function() {
const types = App.Medicine.Keys.Surgery.Target.breast; // shortcuts
const helper = new App.Medicine.Surgery.ListHelpers(slave, "boobs", types, pronouns, V.showBoobCCs);
- const areStringsInstalled = slave.boobsImplantType === 1;
+ const areStringsInstalled = slave.boobsImplantType === "string";
+ const areFillablesInstalled = ["fillable", "advanced fillable", "hyper fillable"].includes(slave.boobsImplantType);
const curSize = slave.boobsImplant;
+ const implantType = slave.boobsImplantType;
let r = [];
if (options.augmentation) {
- if (slave.boobs > 50000) {
- r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} breasts are as large as ${he} can physically support</em>`));
- } else if (curSize > 10000 && !largeImplantsAvailable && !areStringsInstalled) {
- r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} implants are filled to capacity</em>`));
- } else if (slave.indentureRestrictions >= 2) {
+ if (slave.indentureRestrictions >= 2) {
r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Change boob size", `<em>${His} indenture forbids elective surgery</em>`));
} else if (slave.breastMesh === 1) {
r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Put implants", `<em>${His} supportive mesh implant blocks implantation</em>`));
} else if (curSize === 0) {
if (options.strings) {
- r.push(helper.installImplants("string", 1, 400));
+ r.push(helper.installImplants("string", "string", 400));
}
if (V.surgeryUpgrade === 1) {
- r.push(helper.installImplants("large", 0, 600));
+ r.push(helper.installImplants("large", "normal", 600));
+ }
+ r.push(helper.installImplants("standard", "normal", 400));
+ r.push(helper.installImplants("small", "normal", 200));
+ } else if (implantType === "normal") {
+ if (curSize > 400) {
+ r.push(helper.replaceImplants("fillable", "fillable", 800));
+ } else if (curSize > 200) {
+ r.push(helper.replaceImplants("large", "normal", 600));
+ } else {
+ r.push(helper.replaceImplants("standard", "normal", 400));
+ r.push(helper.replaceImplants("large", "normal", 600));
+ }
+ } else if (implantType === "hyper fillable") {
+ if (slave.boobs >= 50000) {
+ r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} breasts are as large as ${he} can physically support</em>`));
+ } else {
+ r.push(helper.fillUp(1000));
+ }
+ } else if (implantType === "advanced fillable") {
+ if (curSize >= 10000) {
+ r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} implants are filled to capacity</em>`));
+ if (largeImplantsAvailable) {
+ r.push(helper.replaceImplants("hyper fillable", "hyper fillable", 11000));
+ }
+ } else {
+ r.push(helper.fillUp(400));
+ }
+ } else if (implantType === "fillable") {
+ if (curSize >= 1800) {
+ r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Add inert filler", `<em>${His} implants are filled to capacity</em>`));
+ r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", "advanced fillable", 2200)));
+ } else {
+ r.push(helper.fillUp(200));
}
- r.push(helper.installImplants("standard", 0, 400));
- r.push(helper.installImplants("small", 0, 200));
- } else if (curSize > 10000 && !areStringsInstalled && advancedFillableImplantsAvailable) {
- r.push(helper.fillUp(1000));
- } else if (curSize > 9800 && !areStringsInstalled && advancedFillableImplantsAvailable) {
- r.push(helper.replaceImplants("hyper fillable", 0, 11000));
- } else if (curSize > 2000 && !areStringsInstalled) {
- r.push(helper.fillUp(400));
- } else if (curSize > 1800 && !areStringsInstalled) {
- r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Add inert filler", `<em>${His} implants are filled to capacity</em>`));
- r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", 0, 2200)));
- } else if (curSize > 600 && !areStringsInstalled) {
- r.push(helper.fillUp(200));
- } else if (curSize > 400 && !areStringsInstalled) {
- r.push(helper.replaceImplants("fillable", 0, 800));
- } else if (curSize > 200 && !areStringsInstalled) {
- r.push(helper.replaceImplants("large", 0, 600));
- } else if (curSize > 0 && !areStringsInstalled) {
- r.push(helper.replaceImplants("standard", 0, 400));
- r.push(helper.replaceImplants("large", 0, 600));
}
}
if (options.replace && slave.indentureRestrictions < 2 && curSize > 0) {
if (!areStringsInstalled && curSize < 600) {
- r.push(helper.replaceImplants("string", 1, 400));
+ r.push(helper.replaceImplants("string", "string", 400));
} else if (areStringsInstalled){
// we have engorged string implants, suggest replacing with normal implants of similar size
if (curSize > 10000) {
if (largeImplantsAvailable) {
if (slave.boobs < 50000) {
- r.push(helper.replaceImplants("hyper fillable", 0, Math.round(curSize / 1000) * 1000));
+ r.push(helper.replaceImplants("hyper fillable", "hyper fillable", Math.round(curSize / 1000) * 1000));
}
}
} else if (curSize > 2200) {
- r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", 0, Math.round(curSize / 400) * 400)));
+ r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", "advanced fillable", Math.round(curSize / 400) * 400)));
} else if (curSize > 400) {
- r.push(helper.replaceImplants("fillable", 0, Math.round(curSize / 200) * 200));
+ r.push(helper.replaceImplants("fillable", "fillable", Math.round(curSize / 200) * 200));
} else {
- r.push(helper.replaceImplants("standard", 0, 400));
+ r.push(helper.replaceImplants("standard", "normal", 400));
}
}
}
@@ -378,6 +389,26 @@ App.Medicine.Surgery.sizingProcedures = function() {
} else if (curSize > 500) {
r.push(helper.drain(100));
}
+ } else if (areFillablesInstalled) {
+ if (implantType === "hyper fillable") {
+ if (curSize <= 10000) {
+ r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+ } else {
+ r.push(helper.drain(1000));
+ }
+ } else if (implantType === "advanced fillable") {
+ if (curSize <= 1000) {
+ r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+ } else {
+ r.push(helper.drain(500));
+ }
+ } else if (implantType === "fillable") {
+ if (curSize <= 500) {
+ r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+ } else {
+ r.push(helper.drain(100));
+ }
+ }
}
r.push(helper.removeImplants());
}
diff --git a/src/player/electiveSurgery.tw b/src/player/electiveSurgery.tw
index 696abc429d6..484a1508953 100644
--- a/src/player/electiveSurgery.tw
+++ b/src/player/electiveSurgery.tw
@@ -148,7 +148,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.boobs >= 1400>>
<<if $PC.boobsImplant > 0>>
You have a @@.orange;pair of round H-cup breasts;@@ they are very obviously implants.
- <br>//You are starting to experience back pain; any bigger and they might seriously impede your ability to run your arcology.// | [[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]]
+ <br>//You are starting to experience back pain; any bigger and they might seriously impede your ability to run your arcology.// | [[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, $PC.boobsImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]]
<<else>>
You have a @@.orange;heavy H-cup bust.@@ They tend to sag a little when you free them from your top, though they have some perk to them.
<br>//You are starting to experience back pain; any bigger and they might seriously impede your ability to run your arcology.// | [[Have tissue removed|PC Surgery Degradation][$PC.boobs = 1300, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]]
@@ -156,7 +156,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<elseif $PC.boobs >= 1200>>
<<if $PC.boobsImplant > 0>>
You have a @@.orange;pair of rounded G-cup breasts;@@ they are a little too perky for their size to pass as natural.
- <br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
+ <br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, $PC.boobsImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
<<else>>
You have a @@.orange;huge G-cup bust.@@
<br>[[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have tissue removed|PC Surgery Degradation][$PC.boobs -= 200, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]]
@@ -164,14 +164,14 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<elseif $PC.boobs >= 1000>>
<<if $PC.boobsImplant > 0>>
You have a @@.orange;pair of perky F-cup breasts;@@ you can barely tell they are implanted.
- <br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
+ <br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, $PC.boobsImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
<<else>>
You have a @@.orange;hefty F-cup bust.@@
<br>[[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have tissue removed|PC Surgery Degradation][$PC.boobs -= 200, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]]
<</if>>
<<elseif $PC.boobs >= 800>>
You have a @@.orange;big pair of DD-cup breasts.@@
- <br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobs = 700, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 100, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "flatChest"]]
+ <br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, $PC.boobsImplantType = "normal", cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobs = 700, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 100, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "flatChest"]]
<<elseif $PC.boobs >= 650>>
You have a @@.orange;pair of D-cup breasts.@@
<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobs = 600, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 100, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "flatChest"]]
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 03965b9d258..48425e3110d 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -648,8 +648,16 @@ App.Entity.PlayerState = class PlayerState {
* * 600+: boobsImplant size fillable implants
*/
this.boobsImplant = 0;
- /** Implants type. 0: normal/none; 1: string */
- this.boobsImplantType = 0;
+ /**
+ * Implant type
+ * * "none"
+ * * "normal"
+ * * "string"
+ * * "fillable"
+ * * "advanced fillable"
+ * * "hyper fillable"
+ */
+ this.boobsImplantType = "none";
/**
* breast shape
* * "normal"
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 816c9ebe7df..b4ab4ecee96 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -118,6 +118,11 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlave.butt = random(6,20)>>
<<if $arcologies[0].FSTransformationFetishist > 20>>
<<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+ <<if $activeSlave.boobsImplant > 10000>>
+ <<set $activeSlave.boobsImplant = "hyper fillable">>
+ <<else>>
+ <<set $activeSlave.boobsImplant = "advanced fillable">>
+ <</if>>
<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
<</if>>
<<elseif $arcologies[0].FSSlimnessEnthusiast > 20>>
@@ -125,6 +130,7 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlave.butt = random(0,2)>>
<<if $arcologies[0].FSTransformationFetishist > 20>>
<<set $activeSlave.boobsImplant = $activeSlave.boobs-50>>
+ <<set $activeSlave.boobsImplant = "normal">>
<<if $activeSlave.butt > 1>>
<<set $activeSlave.buttImplant = 1>>
<</if>>
@@ -134,6 +140,7 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlave.butt = random(3,7)>>
<<if $arcologies[0].FSTransformationFetishist > 20>>
<<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+ <<set $activeSlave.boobsImplant = "normal">>
<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
<</if>>
<</if>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index ca5307df6a9..15b0bedc3c5 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1294,6 +1294,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<<set $activeSlave.trust += 20>>
<<set $activeSlave.boobs += 4000>>
<<set $activeSlave.boobsImplant += 4000>>
+ <<set $activeSlave.boobsImplantType = "advanced fillable">>
<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
<<run surgeryDamage($activeSlave, 10)>>
<<set $activeSlave.boobShape = "normal">>
@@ -1306,7 +1307,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<<set $activeSlave.trust += 25>>
<<set $activeSlave.boobs += 7500>>
<<set $activeSlave.boobsImplant += 7500>>
- <<set $activeSlave.boobsImplantType = 1>>
+ <<set $activeSlave.boobsImplantType = "string">>
<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
<<run surgeryDamage($activeSlave, 10)>>
<<set $activeSlave.boobShape = "normal">>
@@ -1320,6 +1321,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<<set $activeSlave.trust += 10>>
<<set $activeSlave.boobs += 1000>>
<<set $activeSlave.boobsImplant += 1000>>
+ <<set $activeSlave.boobsImplantType = "fillable">>
<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
<<run surgeryDamage($activeSlave, 10)>>
<<set $activeSlave.boobShape = "normal">>
@@ -1332,7 +1334,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<<set $activeSlave.trust += 15>>
<<set $activeSlave.boobs += 1500>>
<<set $activeSlave.boobsImplant += 1500>>
- <<set $activeSlave.boobsImplantType = 1>>
+ <<set $activeSlave.boobsImplantType = "string">>
<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
<<run surgeryDamage($activeSlave, 10)>>
<<set $activeSlave.boobShape = "normal">>
diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw
index 3e3ebaec442..8598d98a849 100644
--- a/src/pregmod/saAgent.tw
+++ b/src/pregmod/saAgent.tw
@@ -2,7 +2,7 @@
<<set _gigantomastiaMod = $slaves[$i].geneticQuirks.gigantomastia == 2 ? ($slaves[$i].geneticQuirks.macromastia == 2 ? 3 : 2) : 1>>
-<<if $slaves[$i].boobsImplantType == 1>>
+<<if $slaves[$i].boobsImplantType == "string">>
<<set $slaves[$i].boobsImplant += 50, $slaves[$i].boobs += 50>>
<<if ($slaves[$i].boobs > 50000)>>
<<set $slaves[$i].boobs -= 100, $slaves[$i].boobsImplant -= 100>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 376c21d52c5..9c91a1469ad 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -12,8 +12,9 @@
<</if>>
<<if $huskSlave.sex == 2>>
<<set $activeSlave = GenerateNewSlave("XY")>>
- <<set $activeSlave.boobs = 0>>
+ <<set $activeSlave.boobs = 50>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<else>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<</if>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 1afe67e5360..0258a2e5e66 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -271,6 +271,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<if $slaves[$i].boobs < 400>>
<<set $slaves[$i].boobs += 200>>
<<set $slaves[$i].boobsImplant += 200>>
+ <<set $slaves[$i].boobsImplantType = "normal">>
<<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].butt < 3>>
<<set $slaves[$i].butt += 1>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index cf44241fc84..d098433061e 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -126,6 +126,7 @@
<<run setHealth($activeSlave, jsRandom(10, 20), jsRandom(10, 20))>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.boobsImplant = 600>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.lips += 10>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 46bef6d85db..44c9ac2fb3a 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -106,6 +106,7 @@
<<set _meanGirl.muscles = random(0,15)>>
<<set _meanGirl.boobsImplant = 200*random(0,3)>>
<<set _meanGirl.boobs += _meanGirl.boobsImplant>>
+ <<set _meanGirl.boobsImplantType = "normal">>
<<set _meanGirl.buttImplant = random(0,2)>>
<<set _meanGirl.butt += _meanGirl.buttImplant>>
<<set _meanGirl.butt += 1>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 6f1b0fdcab8..7b912179178 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -730,8 +730,8 @@ $researchLab.level > 0>>
<<set _individualCosts += $rulesCost>>
<</if>>
<</if>>
- <<if $slaves[$i].boobs > 10000>>
- <<if $slaves[$i].boobsImplantType == 1>>
+ <<if $slaves[$i].boobsImplant > 10000>>
+ <<if $slaves[$i].boobsImplantType == "string">>
<br> <i>Maintenance cost for oversized string implants:</i>
@@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 3553703c7a9..23f73d85b12 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -99,7 +99,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
<<set $activeSlave.skill.whoring = 35>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.boobsImplant = 600>>
- <<set $activeSlave.boobsImplantType = 1>>
+ <<set $activeSlave.boobsImplantType = "string">>
<<set $activeSlave.lipsPiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
<<set $activeSlave.nosePiercing = 1>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 1ca2f96ae08..82769444321 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -125,6 +125,7 @@
<<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.boobsImplant = 600>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.lips += 10>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index 754f33e4b55..6a6cb61cac4 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -179,6 +179,7 @@
<<if $activeSlave.boobsImplant > 0>>
<<set $activeSlave.boobs -= $activeSlave.boobsImplant>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<</if>>
<<if $activeSlave.buttImplant > 0>>
<<set $activeSlave.butt -= $activeSlave.buttImplant>>
@@ -199,6 +200,7 @@
<<if $activeSlave.boobsImplant == 0>>
<<set $activeSlave.boobsImplant = 400>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<</if>>
<<if $activeSlave.buttImplant == 0>>
<<set $activeSlave.buttImplant = 1>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 19a2711b0a8..243edb9554a 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -929,6 +929,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.boobs -= $activeSlave.boobsImplant>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.lips -= $activeSlave.lipsImplant>>
<<set $activeSlave.lipsImplant = 0>>
<<set $activeSlave.butt -= $activeSlave.buttImplant>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 8a4ce82adf2..867c0810a8e 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -148,6 +148,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.boobs += 2000>>
<<set $hostage.boobsImplant += 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
<<set $hostage.behavioralFlaw = "anorexic">>
<<set $hostage.sexualFlaw = "shamefast">>
struggling against $his restraints on the operating table as a pair of 2000cc implants are forced into $his chest.
@@ -409,6 +410,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.boobs += 2000>>
<<set $hostage.boobsImplant += 2000>>
+ <<if $hostage.boobsImplant > 10000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
+ <</if>>
<<set $hostage.fetish = "boobs">>
<<set $hostage.fetishStrength = 10>>
blushing as $he attempts to get dressed with $his massive <<print $hostage.boobs>>cc fake tits getting in the way.
@@ -537,6 +541,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
get a big pair of fillable implants in you right away."
<<set $hostage.boobs += 1000>>
<<set $hostage.boobsImplant += 1000>>
+ <<set $hostage.boobsImplantType = "fillable">>
<<case "sadist">>
have a sissy little bitch in reach for you to torment as you please."
<<case "masochist">>
@@ -805,6 +810,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.boobs += 2000>>
<<set $hostage.boobsImplant += 2000>>
+ <<if $hostage.boobsImplant > 10000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
+ <</if>>
<<set $hostage.butt = 7>>
<<set $hostage.buttImplant = 4>>
<<set $hostage.behavioralFlaw = "none">>
@@ -909,6 +917,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "boobs">>
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
+ <<if $hostage.boobsImplant > 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
+ <</if>>
<<case "pregnancy">>
<<set $hostage.preg++>>
<<set $hostage.pregKnown = 1>>
@@ -1187,6 +1198,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.boobs += 2000>>
<<set $hostage.boobsImplant += 2000>>
+ <<if $hostage.boobsImplant > 10000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
+ <</if>>
<<set $hostage.fetishStrength = 100>>
<<set $hostage.sexualFlaw = "breast growth">>
getting $his taut <<print $hostage.boobs>>cc tits massaged by a pair of flat slaves. $He is rambling on about how much happier $he is with $his massive implants than when $he was flat like them.
@@ -1263,6 +1277,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "boobs">>
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
+ <<if $hostage.boobsImplant > 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
+ <</if>>
<<case "pregnancy">>
<<set $hostage.preg++>>
<<set $hostage.pregKnown = 1>>
@@ -1498,7 +1515,8 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<</if>>
<<case "Body Purism">>
<<set $hostage.boobs = 50000>>
- <<set $hostage.boobsImplant 45000>>
+ <<set $hostage.boobsImplant = 45000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
giving an interview. $He gushes over how great it feels being more silicone than $girl and how terrible it is that some people want to deny girls this pleasure.
<<case "Transformation Fetishism">>
<<set $hostage.counter.vaginal += 1>>
@@ -1557,6 +1575,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
"I love my big boobs and get off watching them get bigger!"
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
+ <<if $hostage.boobsImplant > 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
+ <</if>>
<<set $hostage.sexualFlaw = "breast growth">>
<<case "sadist">>
"Nothing turns me on more than crushing my lovers' nuts! That or maybe whipping or cutting them... Or anything that makes them bleed..."
@@ -2160,6 +2181,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.boobs += 2000>>
<<set $hostage.boobsImplant += 2000>>
+ <<if $hostage.boobsImplant > 10000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
+ <</if>>
<<set _hostageAction.push("trying desperately to stand despite $his massive <<print $hostage.boobs>>cc fake tits.")>>
<<set _hostageAction.push("crying while trying to get comfortable with $his <<print $hostage.boobs>>cc fake tits.")>>
<<set _hostageAction.push("sobbing as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2169,6 +2193,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.fetishStrength += 5>>
<<set $hostage.boobs += 1000>>
<<set $hostage.boobsImplant += 1000>>
+ <<if $hostage.boobsImplant > 10000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
+ <</if>>
<<set _hostageAction.push("reluctantly exploring $his new massive <<print $hostage.boobs>>cc implants.")>>
<<set _hostageAction.push("reluctantly exploring new resting positions due to $his <<print $hostage.boobs>>cc implants.")>>
<<set _hostageAction.push("crying as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2178,6 +2205,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.fetishStrength += 5>>
<<set $hostage.boobs += 1000>>
<<set $hostage.boobsImplant += 1000>>
+ <<if $hostage.boobsImplant > 10000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
+ <</if>>
<<set _hostageAction.push("happily playing with $his truly immense <<print $hostage.boobs>>cc breast implants and huge butt implants.")>>
<<set _hostageAction.push("happily resting $his head on $his <<print $hostage.boobs>>cc breast implants.")>>
<<set _hostageAction.push("blushing as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2186,6 +2216,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.boobs += 1000>>
<<set $hostage.boobsImplant += 1000>>
+ <<if $hostage.boobsImplant > 10000>>
+ <<set $hostage.boobsImplantType = "hyper fillable">>
+ <</if>>
<<set _hostageAction.push("happily getting titfucked against $his anchoring <<print $hostage.boobs>>cc fake tits.")>>
<<set _hostageAction.push("contently resting against $his <<print $hostage.boobs>>cc fake tits.")>>
<<set _hostageAction.push("getting excited as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2520,6 +2553,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "boobs">>
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
+ <<if $hostage.boobsImplant > 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
+ <</if>>
<<case "pregnancy">>
<<set $hostage.preg++>>
<<set $hostage.pregKnown = 1>>
@@ -2564,6 +2600,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "boobs">>
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
+ <<if $hostage.boobsImplant > 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
+ <</if>>
<<case "pregnancy">>
<<set $hostage.preg++>>
<<set $hostage.pregKnown = 1>>
@@ -2607,6 +2646,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "boobs">>
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
+ <<if $hostage.boobsImplant > 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
+ <</if>>
<<case "pregnancy">>
<<set $hostage.preg++>>
<<set $hostage.pregKnown = 1>>
@@ -2647,6 +2689,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "boobs">>
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
+ <<if $hostage.boobsImplant > 2000>>
+ <<set $hostage.boobsImplantType = "advanced fillable">>
+ <</if>>
<<case "pregnancy">>
<<set $hostage.preg++>>
<<set $hostage.pregKnown = 1>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 8eb1226e652..00840571e63 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -199,6 +199,7 @@
<<set $activeSlave.boobs -= 100>>
<<set $activeSlave.boobsImplant = either(400, 600, 800)>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.clit = 2>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 1>>
@@ -345,6 +346,7 @@
<<set $activeSlave.butt += $activeSlave.buttImplant>>
<<set $activeSlave.boobsImplant = either(600, 800, 1000)>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = -1>>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 1e4a8425c76..aad7f02c77f 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -51,6 +51,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "a porn star">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "string">>
<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
<<set $activeSlave.areolae = 1>>
<<set $activeSlave.butt += 1>>
@@ -94,6 +95,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "a trophy wife">>
<<set $activeSlave.boobsImplant += random(1,3)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
<<set $activeSlave.lips += 10>>
@@ -214,6 +216,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.boobsImplant += random(10,15)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "fillable">>
<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
<<set $activeSlave.areolae = 2>>
<<set $activeSlave.butt += 4>>
@@ -266,6 +269,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "an actress">>
<<set $activeSlave.boobs += 200>>
<<set $activeSlave.boobsImplant += 200>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
<<set $activeSlave.lips += 10>>
@@ -366,6 +370,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "an arcology owner">>
<<set $activeSlave.boobsImplant += random(20,40)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "advanced fillable">>
<<set $activeSlave.boobs += 1000>>
<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
<<set $activeSlave.areolae = 2>>
@@ -527,6 +532,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "a porn star">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "fillable">>
<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
<<set $activeSlave.areolae = 1>>
<<set $activeSlave.butt += 1>>
@@ -682,6 +688,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "a prostitute">>
<<set $activeSlave.boobsImplant += random(10,15)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "advanced fillable">>
<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
<<set $activeSlave.areolae = 2>>
<<set $activeSlave.butt += 4>>
@@ -736,6 +743,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "an actress">>
<<set $activeSlave.boobs += 200>>
<<set $activeSlave.boobsImplant += 200>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
<<set $activeSlave.lips += 10>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index b078353ab7f..53a7d91b459 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -178,7 +178,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "hates men">>
<<case "slimness enthusiast arcology">>
"It wa<<s>> horrible." You sold $him to a pleasant Slimness Enthusiast arcology, but somehow $he's acquired grotesque implants. "The arcology got a new owner." $He shudders. "I gue<<ss>> the ni<<c>>e one wa<<s>> weak, and, and the new one i<<s>> changing thing<<s>>. <<Sh>>-<<sh>>e l-like<<s>> t-to ruin the <<s>>lim one<<s>>." It's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation.
- <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
<<set $activeSlave.lipsImplant = 10*random(1,3), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
<<case "asset expansionist arcology">>
@@ -194,7 +194,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.behavioralFlaw = "anorexic">>
<<case "transformation fetishist arcology">>
"It wa<<s>> horrible." You sold $him to a Transformation Fetishist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "They were giving me new boob implant<<s>> every two week<<s>>. I ran away before another <<s>>et. I c-couldn't take any more <<s>>-<<s>>urgery."
- <<set $activeSlave.boobsImplant = 200*random(9,12), $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplant = 200*random(9,12), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
<<case "physical idealist arcology">>
"It wa<<s>> horrible." You sold $him to a Physical Idealist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "It should have been called a <<S>>teroid Enthu<<s>>ia<<s>>t arcology." $He shivers. "The <<s>>ide effect<<s>> are terrible. I can't <<s>>leep. I can barely eat. They had to feed me with a tube."
<<set $activeSlave.muscles = 100, $activeSlave.weight = random(-85,-75)>>
@@ -212,7 +212,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
"It wa<<s>> horrible." You sold $him to an Egyptian Revivalist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "My new owner wa<<s>> old, and he wa<<s>> really into <<s>>ome of the tomb <<s>>tuff. If he died, I'd have been buried with him."
<<case "body purist arcology">>
"It wa<<s>> horrible." You sold $him to a pleasant Body Purist arcology, but somehow $he's acquired grotesque implants. "The arcology got a new owner." $He shudders. "I gue<<ss>> the ni<<c>>e one wa<<s>> weak, and, and the new one i<<s>> changing thing<<s>>. <<Sh>>-<<sh>>e l-like<<s>> t-to ruin the pure one<<s>>." It's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation.
- <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
<<set $activeSlave.lipsImplant = 10*random(1,3), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
<<case "D milf staffing" "trainer staffing">>
@@ -226,12 +226,12 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.behavioralFlaw = "hates penetration", $activeSlave.sexualFlaw = "apathetic">>
<<case "implanting trainer">>
"I d-don't want to be c-cut again," $he <<say>>s hollowly. $His buyer planned to use $him as a surgical teaching tool. "E-every time I'm healed, they implant me again. B-bigger."
- <<set $activeSlave.boobsImplant = 200*random(8,12), $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplant = 200*random(8,12), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "advanced fillable">>
<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
<<set $activeSlave.lipsImplant = 10*random(1,3), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
<<case "purifying trainer">>
"It w-wa<<s>>n't like I thought it would be," $he <<say>>s. "The trainer you <<s>>old me to took out my implant<<s>>. B-but then they <<s>>aid my boob<<s>> had to be rebuilt, only with drug<<s>> thi<<s>> time." $He shivers. "The <<s>>ide effect<<s>> are terrible. I can't <<s>>leep. I can barely eat. They had to feed me with a tube."
- <<set $activeSlave.boobs -= $activeSlave.boobsImplant, $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobs -= $activeSlave.boobsImplant, $activeSlave.boobsImplant = 0, $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt -= $activeSlave.buttImplant, $activeSlave.buttImplant = 0>>
<<set $activeSlave.lips -= $activeSlave.lipsImplant, $activeSlave.lipsImplant = 0>>
<<set $activeSlave.boobs = Math.clamp($activeSlave.boobs+50*random(20,40),0,10000)>>
@@ -259,7 +259,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.weight = Math.clamp($activeSlave.weight+random(50,100),-100,200)>>
<<case "clipping trainer">>
"All I do i<<s>> <<s>>uck dick<<s>> and get fucked in the butt." You sold $him to a trainer who specializes in clipping and improving overly masculine slaves, and $he's definitely more feminine, if bitterly unhappy. "They're going to <<s>>ell me to a bitch brothel <<s>>oon, I know it. Plea<<s>>e, nobody'<<s>> even <<s>>aid anything to me other than '<<s>>uck my cock' or 'bend over bitch' in week<<s>>."
- <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.buttImplant = random(1,2), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
<<set $activeSlave.lipsImplant = 10*random(1,2), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
<<set $activeSlave.waist = Math.clamp($activeSlave.waist+random(20,50),-100,100)>>
@@ -268,7 +268,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<if $activeSlave.faceShape == "masculine">><<set $activeSlave.faceShape = "androgynous">><</if>>
<<case "reassignment trainer">>
"I m-mi<<ss>> my dick." You sold $him to a trainer who specializes in gender reassignment, and $he's definitely more feminine, if bitterly unhappy. "P-plea<<s>>e, even if you won't f-fi<<x>> me, plea<<s>>e take me back. I'll b-be a <<s>>e<<x>> <<s>>lave, I ju<<s>>t don't want to be a woman."
- <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.buttImplant = random(1,2), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
<<set $activeSlave.lipsImplant = 10*random(1,2), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
<<set $activeSlave.waist = Math.clamp($activeSlave.waist+random(20,50),-100,100)>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index bc12b1b9acd..2c9e8ceee22 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -251,6 +251,7 @@
<<set $activeSlave.origin = "$He was sold to you by an anonymous person who wanted $him to suffer.">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplant = "normal">>
<<set $activeSlave.nipples = "huge">>
<<set $activeSlave.areolae = 1>>
<<set $activeSlave.butt += 1>>
@@ -292,6 +293,7 @@
<<set $activeSlave.origin = "$He was sold to you by an anonymous slave breaking group.">>
<<set $activeSlave.boobsImplant += random(3,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplant = "normal">>
<<set $activeSlave.areolae = 1>>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
@@ -376,6 +378,7 @@
<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement after realizing $his career was over.">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplant = "fillable">>
<<set $activeSlave.lips = 60>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
<<set $activeSlave.devotion = random(20,45)>>
@@ -611,6 +614,7 @@
<<set $activeSlave.geneticQuirks.dwarfism = 2>>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplant = "string">>
<<set $activeSlave.buttImplant += 2>>
<<set $activeSlave.butt += $activeSlave.buttImplant>>
<<set $activeSlave.hips = 2>>
@@ -680,6 +684,7 @@
<<set $activeSlave.origin = "You received $him from a surgeon who botched an implant operation on $him and needed to get $him out of sight.">>
<<set $activeSlave.boobsImplant += random(10,20)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplant = "advanced fillable">>
<<set $activeSlave.nipples = "tiny">>
<<set $activeSlave.areolae = 2>>
<<set $activeSlave.buttImplant += random(2,4)>>
@@ -709,6 +714,7 @@
<<set $activeSlave.career = "a trophy wife">>
<<set $activeSlave.boobsImplant += random(5,10)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplant = "fillable">>
<<set $activeSlave.nipples = "tiny">>
<<set $activeSlave.areolae = 2>>
<<set $activeSlave.buttImplant += random(2,4)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 68df0769421..e43d9aa8e09 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -152,6 +152,7 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 2>>
<<set $activeSlave.buttImplant = 2>>
<<run setHealth($activeSlave, jsRandom(20, 40))>>
@@ -187,6 +188,7 @@
<<set $activeSlave.skill.whoring = 35>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.lips += 10>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index d1f4f9575c9..ac8159c6b66 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -114,6 +114,7 @@
<<set $activeSlave.skill.whoring = 35>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.boobsImplant = 600>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.lips += 10>>
@@ -343,6 +344,7 @@
<<set $activeSlave.butt = random(4,5)>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.boobs = random(8,10)*100>>
<<set $activeSlave.lipsImplant = 10>>
<<set $activeSlave.anus = 0>>
@@ -372,6 +374,7 @@
<<set $activeSlave.face = 15>>
<<set $activeSlave.boobs = random(5,6)*100>>
<<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt = random(2,3)>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.dick = 1>>
@@ -470,6 +473,7 @@
<<set $activeSlave.skill.oral = 15>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.lips += 10>>
@@ -676,6 +680,7 @@
<<set $activeSlave.skill.oral = random(15,40)>>
<<set $activeSlave.skill.whoring = 0>>
<<set $activeSlave.boobsImplant = random(3,6)*100>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.boobs = $activeSlave.boobsImplant+150>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.skill.vaginal = 0>>
@@ -716,8 +721,9 @@
<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.skill.oral = 35>>
<<set $activeSlave.skill.whoring = 0>>
-<<set $activeSlave.boobs = 150>>
<<set $activeSlave.boobsImplant = random(2,6)*100>>
+<<set $activeSlave.boobs = 150 + $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.preg = -1>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 875814f49ba..0d5a48022c3 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -95,7 +95,7 @@
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.corsetPiercing = 0>>
<<set $activeSlave.boobsImplant = 0>>
- <<set $activeSlave.boobsImplantType = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.nipplesPiercing = 0>>
<<set $activeSlave.areolae = 0>>
<<set $activeSlave.areolaePiercing = 0>>
@@ -205,7 +205,7 @@
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.boobs = (random(5,6)*100)>>
<<set $activeSlave.boobsImplant = 0>>
- <<set $activeSlave.boobsImplantType = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt = random(4,6)>>
<<set $activeSlave.actualAge = ($eventSlave.actualAge+random(15,20))>>
@@ -216,6 +216,7 @@
<<set $activeSlave.preg = -1>>
<<set $activeSlave.boobs = (random(8,10)*100)>>
<<set $activeSlave.boobsImplant = 600>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.skill.oral += random(0,20)>>
<<set $activeSlave.skill.vaginal += random(0,20)>>
<<set $activeSlave.skill.anal += random(0,20)>>
@@ -243,6 +244,7 @@
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.boobs = (random(6,8)*100)>>
<<set $activeSlave.boobsImplant = 600>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.skill.oral += random(0,20)>>
<<set $activeSlave.skill.anal += random(0,20)>>
<<set $activeSlave.skill.entertainment += random(0,20)>>
@@ -298,7 +300,7 @@
<<set $activeSlave.dick = 5>>
<<set $activeSlave.boobs = 50>>
<<set $activeSlave.boobsImplant = 0>>
- <<set $activeSlave.boobsImplantType = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.balls = 4>>
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.actualAge = Math.clamp($eventSlave.actualAge, $retirementAge, $eventSlave.actualAge + _siblingGap)>>
@@ -317,7 +319,7 @@
<<set $activeSlave.genes = "XY">>
<<set $activeSlave.boobs = (random(20,40)*100)>>
<<set $activeSlave.boobsImplant = $activeSlave.boobs - 100>>
- <<set $activeSlave.boobsImplantType = 1>>
+ <<set $activeSlave.boobsImplantType = "string">>
<<set $activeSlave.butt = random(7,8)>>
<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
<<set $activeSlave.buttImplantType = 1>>
@@ -542,7 +544,7 @@
<<s>>welling with life
<<elseif $eventSlave.anus > 2>>
getting <<his 2>> butt <<s>>tretched out
-<<elseif $eventSlave.boobsImplant > 20>>
+<<elseif $eventSlave.boobsImplant > 500>>
getting turned into a bimbo <<s>>lut
<<else>>
the feeling of your cock in _him2
@@ -1067,7 +1069,7 @@ $eventSlave.slaveName requests an interview with you. $He's a devoted slave, and
<<s>>welling with life
<<elseif $eventSlave.anus > 2>>
getting <<his 2>> butt <<s>>tretched out
-<<elseif $eventSlave.boobsImplant > 20>>
+<<elseif $eventSlave.boobsImplant > 500>>
getting turned into a bimbo <<s>>lut
<<else>>
the feeling of your cock in _him2
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 3ef861bbf0f..cae5a9fda1d 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -124,6 +124,7 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.clothes = "nice business attire">>
@@ -168,6 +169,7 @@
<<set $activeSlave.lactation = 1>>
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt += 2>>
<<set $activeSlave.buttImplant = 0>>
<<set $activeSlave.clothes = "conservative clothing">>
@@ -440,6 +442,7 @@
<<set $activeSlave.lactation = 1>>
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt += 2>>
<<set $activeSlave.buttImplant = 0>>
<<set $activeSlave.clothes = "conservative clothing">>
@@ -517,6 +520,7 @@
<<set $activeSlave.skill.anal = 15>>
<<set $activeSlave.boobs = 600>>
<<set $activeSlave.boobsImplant = 400>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt = either(1, 2)>>
<<set $activeSlave.preg = -2>>
<<set $activeSlave.birthWeek = 0>>
@@ -566,6 +570,7 @@
<<set $activeSlave.skill.anal = 15>>
<<set $activeSlave.boobs = either(500,600)>>
<<set $activeSlave.boobsImplant = 400>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt = either(2, 3)>>
<<set $activeSlave.buttImplant = 1>>
<<set $activeSlave.preg = -3>>
@@ -622,6 +627,7 @@
<<if $activeSlave.physicalAge >= random(13,17)>>
<<set $activeSlave.boobs = either(500,600)>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt = either(2, 3)>>
<<set $activeSlave.buttImplant = 0>>
<</if>>
@@ -676,6 +682,7 @@
<<if $activeSlave.physicalAge >= random(13,17)>>
<<set $activeSlave.boobs = either(500,600)>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt = either(2, 3)>>
<<set $activeSlave.buttImplant = 0>>
<</if>>
@@ -812,6 +819,7 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.boobs -= 400>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt -= 1>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.anus = 0>>
@@ -1107,6 +1115,7 @@
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.lactationDuration = 0>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt -= 2>>
<<if $familyTesting == 1>>
<<set $activeSlave.mother = $activeSlave.ID - 1000>>
@@ -1179,6 +1188,7 @@
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.boobs = either(400, 500)>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt = either(2, 3)>>
<<if $activeSlave.actualAge < 12>>
<<set $activeSlave.actualAge = 16>>
@@ -1207,6 +1217,7 @@
<<set $activeSlave.balls = 0>>
<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.boobsImplant = 0>>
+ <<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.buttImplant = 0>>
<<if $familyTesting == 1>>
<<else>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index e76f31c0eea..a457eaa93ac 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -645,23 +645,54 @@
<div>
$He has
<<if $activeSlave.boobsImplant > 0>>
- <<if $activeSlave.boobsImplant > 600>>
- <<print $activeSlave.boobsImplant>>cc
- <<elseif $activeSlave.boobsImplant > 400>>
- large, <<print $activeSlave.boobsImplant>>cc
- <<elseif $activeSlave.boobsImplant > 200>>
- moderate, <<print $activeSlave.boobsImplant>>cc
- <<elseif $activeSlave.boobsImplant > 0>>
- small, <<print $activeSlave.boobsImplant>>cc
- <</if>>
- <<if $activeSlave.boobsImplantType == 1>>
- string
- <<elseif $activeSlave.boobsImplant >= 800>>
- fillable
- <</if>>
- breast implants.
- <<if $activeSlave.boobsImplant > 8000 && $activeSlave.boobsImplantType == 1>>
- <span class="yellow">Large string based implants are a risk to a slave's health.</span>
+ <<if ["fillable", "advanced fillable", "hyper fillable"].includes($activeSlave.boobsImplantType)>>
+ <<if $activeSlave.boobsImplantType == "hyper fillable">>
+ <<if $activeSlave.boobsImplant < 20000>>
+ underfilled,
+ <<else>>
+ enormous,
+ <</if>>
+ <<elseif $activeSlave.boobsImplantType == "advanced fillable">>
+ <<if $activeSlave.boobsImplant <= 1000>>
+ deflated,
+ <<elseif $activeSlave.boobsImplant < 2200>>
+ underfilled,
+ <<else>>
+ massive,
+ <</if>>
+ <<else>>
+ <<if $activeSlave.boobsImplant <= 500>>
+ deflated,
+ <<elseif $activeSlave.boobsImplant < 800>>
+ underfilled,
+ <<elseif $activeSlave.boobsImplant > 1000>>
+ massive,
+ <<elseif $activeSlave.boobsImplant >= 800>>
+ giant,
+ <</if>>
+ <</if>>
+ <<print $activeSlave.boobsImplant>>cc $activeSlave.boobsImplantType breast implants.
+ <<else>>
+ <<if $activeSlave.boobsImplant > 1000>>
+ massive, <<print $activeSlave.boobsImplant>>cc
+ <<elseif $activeSlave.boobsImplant > 800>>
+ giant, <<print $activeSlave.boobsImplant>>cc
+ <<elseif $activeSlave.boobsImplant > 600>>
+ huge, <<print $activeSlave.boobsImplant>>cc
+ <<elseif $activeSlave.boobsImplant > 400>>
+ large, <<print $activeSlave.boobsImplant>>cc
+ <<elseif $activeSlave.boobsImplant > 200>>
+ moderate, <<print $activeSlave.boobsImplant>>cc
+ <<elseif $activeSlave.boobsImplant > 0>>
+ small, <<print $activeSlave.boobsImplant>>cc
+ <</if>>
+ <<if $activeSlave.boobsImplantType != "normal">>
+ $activeSlave.boobsImplantType
+ <</if>>
+ breast implants.
+ <<if $activeSlave.boobsImplant > 8000 && $activeSlave.boobsImplantType == "string">>
+ <span class="yellow">Large string based implants are a risk to a slave's health.</span>
+ <</if>>
<</if>>
<<else>>
no implants.
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 9cc44e84055..1362a04cceb 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -241,6 +241,7 @@
<<set $activeSlave.butt += $activeSlave.buttImplant>>
<<set $activeSlave.boobsImplant = (2000-$activeSlave.boobs)>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+ <<set $activeSlave.boobsImplantType = "fillable">>
<<set $activeSlave.nipples = "tiny">>
<<set $activeSlave.areolae = 0>>
<<set $activeSlave.clit = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 70c2204f58f..276fee5e232 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3161,7 +3161,7 @@
/* IMPLANT EFFECTS ON UNDERLYING FLESH */
-<<if ($slaves[$i].boobsImplantType == 1)>>
+<<if ($slaves[$i].boobsImplantType == "string")>>
$His string implants absorb fluid @@.lime;slowly swelling $his breasts.@@
<<set $slaves[$i].boobsImplant += 50, $slaves[$i].boobs += 50>>
<<set _effect = random(1,10)>>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 68cebeea596..3c1a7286802 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -140,6 +140,7 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
<<set $activeSlave.face = 55>>
@@ -211,6 +212,7 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
+ <<set $activeSlave.boobsImplantType = "fillable">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 4620e2caa93..e5128751d4d 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -79,6 +79,7 @@ target
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
+ <<set $activeSlave.boobsImplantType = "normal">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
<<set $activeSlave.face = 55>>
@@ -330,6 +331,7 @@ target
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
+ <<set $activeSlave.boobsImplantType = "fillable">>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
<<set $activeSlave.face = 55>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index ded170cbec9..ad67ec1c4e0 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -182,6 +182,9 @@
<<set $activeSlave.skill.whoring = random(15,40)>>
<<set $activeSlave.boobsImplant = random(0,3)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<if $activeSlave.boobsImplant > 0>>
+ <<set $activeSlave.boobsImplant = "normal">>
+<</if>>
<<set $activeSlave.buttImplant = random(0,2)>>
<<set $activeSlave.butt = $activeSlave.buttImplant>>
<<set $activeSlave.lipsImplant = either(0,10)>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index ea9c22f03b0..ac1da272899 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -169,7 +169,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.trust = random(-100,-90)>>
<<run setHealth($shelterSlave, jsRandom(-60,-40), normalRandInt(10, 3), normalRandInt(20, 3))>>
<<set $shelterSlave.boobs = 0>>
- <<set $shelterSlave.boobsImplant = 0>>
+ <<set $shelterSlave.boobsImplant = "none">>
<<set $shelterSlave.nipples = "tiny">>
<<set $shelterSlave.behavioralFlaw = either("anorexic", "anorexic", "anorexic", "odd")>>
<<set $shelterSlave.sexualFlaw = either("apathetic", "neglectful", "self hating")>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index f515471455a..e6cd844979c 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -17137,6 +17137,8 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
They're very minimal.
<</if>>
<</switch>>
+ <<elseif $activeSlave.boobShape == "deflated">>
+ /* WIP */
<<elseif ($activeSlave.boobsImplant <= 400)>>
<<if ($activeSlave.boobs > 800)>>
$He has <<print $activeSlave.boobsImplant>>cc breast implants. $His tits look fairly natural, but defy gravity more than could be expected given their size.
@@ -17163,11 +17165,11 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<</if>>
<<else>>
<<if ($activeSlave.boobs > 2000)>>
- $He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == 1>>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the unnatural size of $his boobs.
+ $He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == "string">>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the unnatural size of $his boobs.
<<elseif $activeSlave.boobs - $activeSlave.boobsImplant > 800>>
- $He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == 1>>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the roundness of $his fake tits.
+ $He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == "string">>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the roundness of $his fake tits.
<<else>>
- $He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == 1>>engorged string<<else>>fillable breast<</if>> implants. They are extremely obvious; with little natural breast tissue to support them, they look like a pair of balloons attached to $his chest.
+ $He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == "string">>engorged string<<else>>fillable breast<</if>> implants. They are extremely obvious; with little natural breast tissue to support them, they look like a pair of balloons attached to $his chest.
<</if>>
<<if $arcologies[0].FSTransformationFetishist != "unset">>
<<if $activeSlave.boobsImplant > 0>>
--
GitLab