From b85c18c4d1d1498a4f9b41dce0d1f9b4796db74a Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 17 Aug 2018 22:53:08 -0500
Subject: [PATCH] Testing
---
devNotes/twine JS.txt | 4 +-
slave variables documentation - Pregmod.txt | 11 +++++-
src/art/vector/Boob.tw | 10 ++---
src/cheats/mod_editSlaveCheatNew.tw | 24 +++++++-----
src/js/eventSelectionJS.tw | 4 +-
src/npc/uploadSlave.tw | 1 +
src/pregmod/widgets/bodyswapWidgets.tw | 1 +
src/uncategorized/BackwardsCompatibility.tw | 11 ++++++
src/uncategorized/RESS.tw | 6 +--
src/uncategorized/reRelativeRecruiter.tw | 3 ++
src/uncategorized/remoteSurgery.tw | 8 ++--
src/uncategorized/sellSlave.tw | 2 +-
src/uncategorized/surgeryDegradation.tw | 6 +--
src/utility/descriptionWidgetsFlesh.tw | 10 ++---
src/utility/descriptionWidgetsPiercings.tw | 41 ++++++++++-----------
src/utility/slaveCreationWidgets.tw | 30 +++++++--------
16 files changed, 99 insertions(+), 73 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 8d6f8d99764..12a4ea7ab69 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -5366,7 +5366,7 @@ if(eventSlave.fetish != "mindbroken") {
}
if(eventSlave.boobs > 1200) {
- if(eventSlave.areolae > 3) {
+ if(eventSlave.areolaeShape != "circle") {
if(eventSlave.devotion > 50) {
State.variables.RESSevent.push("shaped areolae");
}
@@ -6548,7 +6548,7 @@ if(eventSlave.fetish != "mindbroken") {
}
if(eventSlave.boobs > 1200) {
- if(eventSlave.areolae > 3) {
+ if(eventSlave.areolaeShape != "circle") {
if(eventSlave.devotion > 50) {
State.variables.RESSevent.push("shaped areolae");
}
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 6c4f26829a3..03c0ba429c3 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1385,6 +1385,15 @@ slave areolae
4 - heart shaped
5 - star shaped
+areolaeShape:
+
+slave areolae shape
+accepts string
+
+"heart"
+"star"
+"circle"
+
areolaePiercing:
edge of areolae are pierced
@@ -3101,7 +3110,7 @@ How to set up your own hero slave.
-The default slave template used:
-<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, tankBaby: 0}>>
+<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
Making your slave; add their name to the following, then go down the documentation adding in your changes.
-each variable must be separated from the last by a comma followed by a space
diff --git a/src/art/vector/Boob.tw b/src/art/vector/Boob.tw
index 8ec493d0d50..88160acbeee 100644
--- a/src/art/vector/Boob.tw
+++ b/src/art/vector/Boob.tw
@@ -42,7 +42,11 @@ _art_transform will affect the display.
<</if>>
<</if>>
<<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "attractive lingerie" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "an apron" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<if _artSlave.areolae == "0">>
+ <<if _artSlave.areolaeShape == "star">>
+ <<include Art_Vector_Boob_Areola_Star>>
+ <<elseif _artSlave.areolaeShape == "heart">>
+ <<include Art_Vector_Boob_Areola_Heart>>
+ <<elseif _artSlave.areolae == "0">>
<<include Art_Vector_Boob_Areola>>
<<elseif _artSlave.areolae == "2">>
<<include Art_Vector_Boob_Areola_Wide>>
@@ -50,10 +54,6 @@ _art_transform will affect the display.
<<include Art_Vector_Boob_Areola_Large>>
<<elseif _artSlave.areolae == "3">>
<<include Art_Vector_Boob_Areola_Huge>>
- <<elseif _artSlave.areolae == "5">>
- <<include Art_Vector_Boob_Areola_Star>>
- <<elseif _artSlave.areolae == "4">>
- <<include Art_Vector_Boob_Areola_Heart>>
<</if>>
<<if _artSlave.nipples == "tiny">>
<<include Art_Vector_Boob_NippleTiny>>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 0349445dbc6..0094627735b 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -2029,12 +2029,12 @@
''Breast Shape: @@.yellow;$tempSlave.boobShape@@''
<br>
- <<radiobutton "$tempSlave.boobShape" "normal">> normal
- <<radiobutton "$tempSlave.boobShape" "perky">> perky
- <<radiobutton "$tempSlave.boobShape" "torpedo-shaped">> torpedo-shaped
- <<radiobutton "$tempSlave.boobShape" "wide-set">> wide-set
- <<radiobutton "$tempSlave.boobShape" "downward-facing">> downward-facing
- <<radiobutton "$tempSlave.boobShape" "saggy">> saggy
+ <<radiobutton "$tempSlave.boobShape" "normal">> Normal
+ <<radiobutton "$tempSlave.boobShape" "perky">> Perky
+ <<radiobutton "$tempSlave.boobShape" "torpedo-shaped">> Torpedo-Shaped
+ <<radiobutton "$tempSlave.boobShape" "wide-set">> Wide-Set
+ <<radiobutton "$tempSlave.boobShape" "downward-facing">> Downward-Facing
+ <<radiobutton "$tempSlave.boobShape" "saggy">> Saggy
<br>
@@ -2042,14 +2042,14 @@
<<radiobutton "$tempSlave.nipples" "tiny">> Tiny
<<radiobutton "$tempSlave.nipples" "cute">> Cute
<<radiobutton "$tempSlave.nipples" "puffy">> Puffy
- <<radiobutton "$tempSlave.nipples" "partially inverted">> Partially inverted
+ <<radiobutton "$tempSlave.nipples" "partially inverted">> Partially Inverted
<<radiobutton "$tempSlave.nipples" "inverted">> Inverted
<<radiobutton "$tempSlave.nipples" "huge">> Huge
<<radiobutton "$tempSlave.nipples" "fuckable">> Penetrable
<br>
- ''Areolae (Normal:0 to Huge:3): ''
+ ''Areolae Size (Normal:0 to Huge:3): ''
<<switch $tempSlave.areolae>>
<<case 0>>@@.yellow;Normal@@
<<case 1>>@@.yellow;Large@@
@@ -2063,9 +2063,13 @@
<<radiobutton "$tempSlave.areolae" 1>> Large
<<radiobutton "$tempSlave.areolae" 2>> Wide
<<radiobutton "$tempSlave.areolae" 3>> Huge
- <<radiobutton "$tempSlave.areolae" 4>> Heart-shaped
- <<radiobutton "$tempSlave.areolae" 5>> Star-shaped
+
<br>
+
+ ''Areolae Shape:''
+ <<textbox "$tempSlave.areolaeShape" $tempSlave.areolaeShape>>
+ <br>
+
<</widget>>
<<widget ButtTab>>
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index c2282fd3a72..15102f8b21d 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1674,7 +1674,7 @@ if(eventSlave.fetish != "mindbroken") {
}
if(eventSlave.boobs > 1200) {
- if(eventSlave.areolae > 3) {
+ if(eventSlave.areolaeShape != "circle") {
if(eventSlave.devotion > 50) {
State.variables.RESSevent.push("shaped areolae");
}
@@ -2856,7 +2856,7 @@ if(eventSlave.fetish != "mindbroken") {
}
if(eventSlave.boobs > 1200) {
- if(eventSlave.areolae > 3) {
+ if(eventSlave.areolaeShape != "circle") {
if(eventSlave.devotion > 50) {
State.variables.RESSevent.push("shaped areolae");
}
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index e754213ea14..2f7d450c7cf 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -82,6 +82,7 @@ nipplesPiercing: $activeSlave.nipplesPiercing,
nipplesAccessory: $activeSlave.nipplesAccessory,
areolae: $activeSlave.areolae,
areolaePiercing: $activeSlave.areolaePiercing,
+areolaeShape: $activeSlave.areolaeShape,
boobsTat: "$activeSlave.boobsTat",
lactation: $activeSlave.lactation,
lactationAdaptation: 0,
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index b5bc4a328dd..79c4533a0ca 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -93,6 +93,7 @@
<<set $args[0].nipplesAccessory = $args[1].nipplesAccessory>>
<<set $args[0].areolae = $args[1].areolae>>
<<set $args[0].areolaePiercing = $args[1].areolaePiercing>>
+<<set $args[0].areolaeShape = $args[1].areolaeShape>>
<<set $args[0].boobsTat = $args[1].boobsTat>>
<<set $args[0].lactation = $args[1].lactation>>
<<set $args[0].lactationAdaptation = $args[1].lactationAdaptation>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 815a0988be8..70b583c401b 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2436,6 +2436,17 @@ Setting missing slave variables:
<<set _Slave.backTat = 0>>
<</if>>
+<<if ndef _Slave.areolaeShape>>
+ <<if _Slave.areolae == 4>>
+ <<set _Slave.areolaeShape = "heart">>
+ <<set _Slave.areolae = 3>>
+ <<elseif _Slave.areolae == 5>>
+ <<set _Slave.areolaeShape = "star">>
+ <<set _Slave.areolae = 3>>
+ <<else>>
+ <<set _Slave.areolaeShape = "circle">>
+<</if>>
+
<<if ndef _Slave.hStyle>>
<<set _Slave.hColor = either("black", "blonde", "red", "brown")>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 65738bf2792..863fc54cdfb 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1326,7 +1326,7 @@ into your bedroom. Since she is not allowed to ask questions, she says nothing,
<<case "shaped areolae">>
-<<EventNameLink $activeSlave>>'s breasts are real works of art. <<if $activeSlave.boobsImplant > 0>>Her massive fake tits dominate her figure,<<else>>Her massive, sagging natural tits dominate her figure,<</if>> but the real attention getter are her unique, <<if $activeSlave.areolae == 4>>heart-shaped<<else>>star-shaped<</if>> areolae. The darker flesh around her nipples would be - should be - circular in any other woman, and the cute <<if $activeSlave.areolae == 4>>hearts<<else>>stars<</if>> around $activeSlave.slaveName's nipples are proof of just how much you've modified her. She's devoted to you, so much so that she loves showing off her special assets.
+<<EventNameLink $activeSlave>>'s breasts are real works of art. <<if $activeSlave.boobsImplant > 0>>Her massive fake tits dominate her figure,<<else>>Her massive, sagging natural tits dominate her figure,<</if>> but the real attention getter are her unique, <<if $activeSlave.areolaeShape == "heart">>heart-shaped<<elseif $activeSlave.areolaeShape == "star">>star-shaped<</if>> areolae. The darker flesh around her nipples would be - should be - circular in any other woman, and the cute <<if $activeSlave.areolaeShape == "heart">>hearts<<elseif $activeSlave.areolaeShape == "star">>stars<</if>> around $activeSlave.slaveName's nipples are proof of just how much you've modified her. She's devoted to you, so much so that she loves showing off her special assets.
<<case "huge tits">>
@@ -9344,7 +9344,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
$arcologies[0].name's clubs.
<</if>>
<</if>>
- $activeSlave.slaveName <<if canSee($activeSlave)>>is blinded by the silk over her face<<else>>may not be able to see<</if>>, but she can still hear the appreciative murmurs of onlookers as they eye her magnificent breasts with their <<if $activeSlave.areolae == 4>>heart-shaped<<else>>star-shaped<</if>> areolae. She shivers a little with suppressed pride. @@.hotpink;Her devotion to you has increased,@@ and @@.green;your reputation as a person with unique property grows.@@
+ $activeSlave.slaveName <<if canSee($activeSlave)>>is blinded by the silk over her face<<else>>may not be able to see<</if>>, but she can still hear the appreciative murmurs of onlookers as they eye her magnificent breasts with their <<if $activeSlave.areolaeShape == "heart">>heart-shaped<<elseif $activeSlave.areolaeShape == "star">>star-shaped<</if>> areolae. She shivers a little with suppressed pride. @@.hotpink;Her devotion to you has increased,@@ and @@.green;your reputation as a person with unique property grows.@@
<<set $activeSlave.devotion += 4>>
<<set $rep += 100>>
<</replace>>
@@ -9352,7 +9352,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<br><<link "Use that pride as an advertisement">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- There's all sorts of business going on in $arcologies[0].name, from flesh rented or bought down to more pedestrian affairs. Advertisement never goes amiss. You place $activeSlave.slaveName naked on a slowly rotating pedestal surrounded by a clear plastiglass tube on a busy thoroughfare in the lower parts of $arcologies[0].name. These devices are often used to display slaves for sale or slave whores for rent; $activeSlave.slaveName is simply identified by your name as arcology owner, which is thus @@.yellowgreen;identified with business prosperity.@@ She spends the day serving as eye candy for passersby, rotating gently on the pedestal as she shows off her body, giving pride of place to her <<if $activeSlave.areolae == 4>>heart-shaped<<else>>star-shaped<</if>> areolae. She loves all the attention, and @@.hotpink;her devotion to you has increased.@@
+ There's all sorts of business going on in $arcologies[0].name, from flesh rented or bought down to more pedestrian affairs. Advertisement never goes amiss. You place $activeSlave.slaveName naked on a slowly rotating pedestal surrounded by a clear plastiglass tube on a busy thoroughfare in the lower parts of $arcologies[0].name. These devices are often used to display slaves for sale or slave whores for rent; $activeSlave.slaveName is simply identified by your name as arcology owner, which is thus @@.yellowgreen;identified with business prosperity.@@ She spends the day serving as eye candy for passersby, rotating gently on the pedestal as she shows off her body, giving pride of place to her <<if $activeSlave.areolaeShape == "heart">>heart-shaped<<elseif $activeSlave.areolaeShape == "star">>star-shaped<</if>> areolae. She loves all the attention, and @@.hotpink;her devotion to you has increased.@@
<<set $activeSlave.devotion += 4>>
<<set $cash += 100>>
<</replace>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index b19d6ac12e8..9fe7aced3c6 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -92,6 +92,7 @@
<<set $activeSlave.nipplesPiercing = 0>>
<<set $activeSlave.areolae = 0>>
<<set $activeSlave.areolaePiercing = 0>>
+ <<set $activeSlave.areolaeShape = "circle">>
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.hipsImplant = 0>>
<<set $activeSlave.buttImplant = 0>>
@@ -514,6 +515,8 @@ She waits anxiously for your decision.
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.minorInjury = "">>
<<set $activeSlave.eyewear = "none">>
+<<set $activeSlave.earwear = "none">>
+<<set $activeSlave.earImplant = 0>>
<<set $activeSlave.voiceImplant = 0>>
<<set $activeSlave.shouldersImplant = 0>>
<<set $activeSlave.boobsTat = 0>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index d2d45fc073b..3b458d50bfa 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -488,12 +488,12 @@ Work on her chest:
<<elseif ($activeSlave.areolae > 1) && ($activeSlave.areolae < 4)>>
<<if $activeSlave.indentureRestrictions < 2>>
$He has big areolae that could be reshaped into a pattern. Graft skin to make $his areolae:
- [[Heart-shaped|Surgery Degradation][$activeSlave.areolae = 4,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
- | [[Star-shaped|Surgery Degradation][$activeSlave.areolae = 5,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] |
+ [[Heart-shaped|Surgery Degradation][$activeSlave.areolaeShape = "heart",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
+ | [[Star-shaped|Surgery Degradation][$activeSlave.areolaeShape = "star",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] |
<</if>>
-<<elseif $activeSlave.areolae == 4>>
+<<elseif $activeSlave.areolaeShape == "heart">>
$His huge areolae have been surgically altered to be heart-shaped.
-<<else>>
+<<elseif $activeSlave.areolaeShape == "star">>
$His huge areolae have been surgically altered to be star-shaped.
<</if>>
<<if $activeSlave.areolae > 1>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index a2bd355c5f0..e6fdcce454a 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -671,7 +671,7 @@ __Bids Received__
<<elseif ($activeSlave.anusTat > 1) && ($activeSlave.buttTat > 1) && (random(1,100) > 80)>>
<br>''<<print cashFormat($seed)>>'' from a citizen who is clearly aroused by her slutty tattoos.
<<set $seed = 1>>
-<<elseif ($activeSlave.boobs > 800) && ($activeSlave.areolae > 3) && (random(1,100) > 80)>>
+<<elseif ($activeSlave.boobs > 800) && ($activeSlave.areolaeShape != "circle") && (random(1,100) > 80)>>
<br>''<<print cashFormat($seed)>>'' from a citizen who can't take his eyes off her unique areolae.
<<set $seed = 1>>
<<elseif ($activeSlave.clit > 2) && (random(1,100) > 80)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index a2f7a922fe4..a1a5545f705 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -584,11 +584,11 @@ As the remote surgery's long recovery cycle completes,
<<case "areolae">>
<<if ($activeSlave.devotion > 20) && ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
- <<if $activeSlave.amp != 1>>$He's barely out of the surgery before $he's playing with her new nipples despite the pain.<<else>>$He's barely out of the surgery before $he's rubbing her new nipples against anything $he can reach, despite the pain.<</if>> $He's @@.hotpink;deliriously happy@@ with your changes to what $he thinks of as her primary sexual organs, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@
+ <<if $activeSlave.amp != 1>>$He's barely out of the surgery before $he's playing with $his new nipples despite the pain.<<else>>$He's barely out of the surgery before $he's rubbing $his new nipples against anything $he can reach, despite the pain.<</if>> $He's @@.hotpink;deliriously happy@@ with your changes to what $he thinks of as $his primary sexual organs, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.trust += 4>>
<<set $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion > 50)>>
- <<if $activeSlave.amp != 1>>$He runs a finger over her new nipples experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel the new nipples capping her tits turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's happy with your changes to $his nipples.@@ As with all surgery @@.red;$his health has been slightly affected.@@
+ <<if $activeSlave.amp != 1>>$He runs a finger over $his new nipples experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel the new nipples capping her tits turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's happy with your changes to $his nipples.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion >= -20)>>
<<if canSee($activeSlave)>>$He eyes her new nipples skeptically<<else>>The cool air flowing over her new nipples draws a skeptical expression to her face<</if>>. <<if $activeSlave.amp != 1>>$He's still sore, so $he doesn't touch them.<<else>>$He's still sore, so $he keeps $his body still.<</if>> $He's come to terms with the fact that $he's a slave, so $he isn't much affected mentally despite the surprise of having $his nipples reshaped. As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body.
@@ -1364,7 +1364,7 @@ As the remote surgery's long recovery cycle completes,
<<case "teeth">>
<<if ($activeSlave.devotion > 50)>>
- $He clearly feels quite normal except for a vague ache around her jaw. It takes a good while for $him to figure out what has happened, but eventually $he gets enough sensation in her mouth to realize that $he is wearing prosthetic teeth that $he can remove. $He gasps with shock, but figures out the idea quickly enough by experimentally <<if $activeSlave.amp != 1>>sucking on two fingers.<<else>>simulating oral sex with her own tongue.<</if>> @@.hotpink;$He has become more submissive due to your radical reshaping of $his body.@@ Since the surgery was invasive, @@.red;$his health has been greatly affected.@@
+ $He clearly feels quite normal except for a vague ache around her jaw. It takes a good while for $him to figure out what has happened, but eventually $he gets enough sensation in $his mouth to realize that $he is wearing prosthetic teeth that $he can remove. $He gasps with shock, but figures out the idea quickly enough by experimentally <<if $activeSlave.amp != 1>>sucking on two fingers.<<else>>simulating oral sex with $his own tongue.<</if>> @@.hotpink;$He has become more submissive due to your radical reshaping of $his body.@@ Since the surgery was invasive, @@.red;$his health has been greatly affected.@@
<<set $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion > 20)>>
$He clearly feels quite normal except for a vague ache around her jaw. It takes a good while for $him to figure out what has happened, but eventually $he gets enough sensation in her mouth to realize that $he is wearing prosthetic teeth that $he can remove. $He gasps with shock, but eventually her shoulders slump and $he tries to carry on. $He isn't much affected mentally. Since the surgery was invasive, @@.red;$his health has been greatly affected.@@
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 4520e13925d..55cc2b3c16c 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1241,14 +1241,14 @@ $His
$His areolae are unusually wide, eye-catching circles of _nipColor skin around each nipple.
<<case 3>>
$His _nipColor areolae are unnaturally broad, covering much of the <<if $activeSlave.boobShape == "saggy">>bottom<<else>>front<</if>> of each breast.
- <<case 4>>
- <<if $activeSlave.boobShape == "saggy">>$His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
- $His huge _nipColor areolae are heart-shaped, an obvious surgical alteration.
- <<case 5>>
- $His huge _nipColor areolae are star-shaped, an obvious surgical alteration.
<<default>>
$His $activeSlave.nipples nipples are surrounded by a minimal _nipColor areolae.
<</switch>>
+ <<if $activeSlave.areolaeShape == "heart">>
+ $His _nipColor areolae are heart-shaped, an obvious surgical alteration.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
+ <<elseif $activeSlave.areolaeShape == "star">>
+ $His _nipColor areolae are star-shaped, an obvious surgical alteration.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the pointed top of each star visible.<</if>>
+ <</if>>
<<else>>
<<areolaePiercingDescription>>
<</if>>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 82bdb116ed9..b303d4ffda9 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -193,28 +193,25 @@
<<set $seed = nippleColor($activeSlave)>>
<<if $activeSlave.fuckdoll == 0>>
<<if $activeSlave.areolaePiercing > 0>>
- <<switch $activeSlave.areolae>>
- <<case 1>>
- $His areolae form large, lovely circles of $seed skin around each nipple.
- $He has stud piercings around their borders, enhancing the contrast.
- <<case 2>>
- $His areolae are unusually wide, eye-catching circles of $seed skin around each nipple.
- $He has stud piercings around their borders, enhancing the contrast.
- <<case 3>>
- $His $seed areolae are unnaturally broad, covering much of the <<if $activeSlave.boobShape == "saggy">>bottom<<else>>front<</if>> of each breast.
- $He has many stud piercings around their edges, forming a metal border between $seed nipple and breast.
- <<case 4>>
- $His huge $seed areolae are heart-shaped, an obvious surgical alteration.
- <<if $activeSlave.boobShape == "saggy">>$His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
- Their borders are defined by stud piercings with pink stones.
- <<case 5>>
- $His huge $seed areolae are star-shaped, an obvious surgical alteration.
- <<if $activeSlave.boobShape == "saggy">>$His motherly boobs point downward, though, leaving only the pointed top of each star visible.<</if>>
- Their borders are defined by shiny stud piercings.
- <<default>>
- $He has stud piercings in circles around the edges of $his minimal $seed areolae.
- $His $activeSlave.nipples nipples are surrounded by a minimal $seed areolae.
- <</switch>>
+ <<switch $activeSlave.areolae>>
+ <<case 1>>
+ $His areolae form large, lovely circles of $seed skin around each nipple.
+ $He has stud piercings around their borders, enhancing the contrast.
+ <<case 2>>
+ $His areolae are unusually wide, eye-catching circles of $seed skin around each nipple.
+ $He has stud piercings around their borders, enhancing the contrast.
+ <<case 3>>
+ $His $seed areolae are unnaturally broad, covering much of the <<if $activeSlave.boobShape == "saggy">>bottom<<else>>front<</if>> of each breast.
+ $He has many stud piercings around their edges, forming a metal border between $seed nipple and breast.
+ <<default>>
+ $He has stud piercings in circles around the edges of $his minimal $seed areolae.
+ $His $activeSlave.nipples nipples are surrounded by a minimal $seed areolae.
+ <</switch>>
+ <<if $activeSlave.areolaeShape == "heart">>
+ $His $seed areolae are heart-shaped, an obvious surgical alteration. Their borders are defined by stud piercings with pink stones.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
+ <<elseif $activeSlave.areolaeShape == "star">>
+ $His $seed areolae are star-shaped, an obvious surgical alteration. Their borders are defined by shiny stud piercings.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the pointed top of each star visible.<</if>>
+ <</if>>
<</if>>
<</if>>
<</widget>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index faa430c948b..acefdef5cd5 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -6,7 +6,7 @@
Called from Gen XX, Gen XY, CheatMode DB, InitNationalities.
%/
<<widget "BaseSlave">>
- <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
+ <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, areolaeShape = "circle", boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
<</widget>>
/%
@@ -4505,9 +4505,9 @@
your corporation
<<case "neighbor">>
<<if $args[1]>>
- <<print $arcologies[$args[1]].name>>
+ <<print $arcologies[$args[1]].name>>
<<else>>
- <<print $arcologies[1].name>>
+ <<print $arcologies[1].name>>
<</if>>
<<case "kidnappers">>
the Kidnappers' Market
@@ -4541,24 +4541,24 @@
The Futanari Sisters
<<case HA>>
The Hippolyta Academy
-<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">>
+<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">>
the prisoner sale
<<default>>
- Someone messed up. _market is not known.
+ Someone messed up. _market is not known.
<</switch>>
<</widget>>
/%
- Call as <<MarketNamePeriod 'market' ['arcology']>>
+ Call as <<MarketNamePeriod 'market' ['arcology']>>
If $args[0] is undefined, will generate a kidnapper's market slave.
If $args[0] is "corporate" and $args[1] is undefined, will use neighboring arcology 1.
%/
<<widget MarketNamePeriod>>
<<if $args[0]>>
- <<set _market = $args[0]>>
+ <<set _market = $args[0]>>
<<else>>
- <<set _market = "kidnappers">>
+ <<set _market = "kidnappers">>
<</if>>
<<switch _market>>
@@ -4566,9 +4566,9 @@
your corporation.
<<case "neighbor">>
<<if $args[1]>>
- <<print $arcologies[$args[1]].name>>.
+ <<print $arcologies[$args[1]].name>>.
<<else>>
- <<print $arcologies[1].name>>.
+ <<print $arcologies[1].name>>.
<</if>>
<<case "kidnappers">>
the Kidnappers' Market.
@@ -4602,10 +4602,10 @@
The Futanari Sisters.
<<case HA>>
The Hippolyta Academy.
-<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">>
+<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">>
the prisoner sale.
<<default>>
- Someone messed up. _market is not known.
+ Someone messed up. _market is not known.
<</switch>>
<</widget>>
@@ -4622,7 +4622,7 @@
<<if $activeSlave.faceShape == "masculine">>
<<set $activeSlave.faceShape = "sensual">>
<</if>>
- <<if $activeSlave.boobShape == "saggy" || $activeSlave.boobShape == "downward-facing">>
+ <<if $activeSlave.boobShape == "saggy" || $activeSlave.boobShape == "downward-facing">>
<<set $activeSlave.boobShape = "perky">>
<</if>>
<<set $activeSlave.eyes = 1, $activeSlave.hears = 0, $activeSlave.voice = 2>>
@@ -4632,7 +4632,7 @@
<<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.health = random(51,60), $activeSlave.intelligenceImplant = 1, $activeSlave.intelligence = 3, $activeSlave.combatSkill = 1>>
<<set $activeSlave.career = either("a bodyguard", "a law enforcement officer", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia", "a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a private detective", "a security guard", "a street thug", "an enforcer")>>
<<case "Bodyguard">>
- <<set $activeSlave.devotion = 90, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.health = 100, $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("pointy", "normal"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.devotion = 90, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.health = 100, $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("pointy", "normal"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>>
<<set $activeSlave.career = either("a bodyguard", "a kunoichi", "a law enforcement officer", "a military brat", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia")>>
<<case "Wardeness">>
<<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.energy = random(80,100), $activeSlave.sexualFlaw = either("malicious", "none", "none", "none", "none"), $activeSlave.fetish = "sadist", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(50,80), $activeSlave.combatSkill = 1>>
@@ -4667,7 +4667,7 @@
<<set $activeSlave.actualAge = random(36,$retirementAge-3)>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<case "Motherly Attendant">>
- <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.health = random(80,95), $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.face = random(60,90)>>
+ <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.health = random(80,95), $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.face = random(60,90)>>
<<set $activeSlave.career = either("a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a psychologist", "a therapist"), $activeSlave.birthsTotal = random(1,3), $activeSlave.pregKnown = 1, $activeSlave.preg = random(20,35), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregType = 1>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.actualAge = random(36,$retirementAge-3)>>
--
GitLab