From 5269467f0bbba7e0f117c6c80eb6d82a86ea8423 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 24 Jul 2019 18:15:04 +0200
Subject: [PATCH] add .missingLimbs chnges to .amp changes
---
src/SecExp/attackHandler.tw | 4 ++++
src/SecExp/rebellionReport.tw | 8 ++++++++
src/js/datatypeCleanupJS.js | 4 ++++
src/npc/databases/dSlavesDatabase.tw | 12 ++++++------
src/npc/databases/ddSlavesDatabase.tw | 2 +-
src/npc/startingGirls/startingGirls.tw | 2 +-
src/pregmod/pRaped.tw | 2 +-
src/pregmod/widgets/bodyswapWidgets.tw | 2 ++
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/customSlave.tw | 4 ++++
src/uncategorized/multiImplant.tw | 10 +++++-----
src/uncategorized/pRivalryActions.tw | 2 ++
src/uncategorized/reMalefactor.tw | 2 ++
src/uncategorized/reRecruit.tw | 4 +++-
src/uncategorized/reRelativeRecruiter.tw | 2 ++
src/uncategorized/saLiveWithHG.tw | 2 +-
src/uncategorized/seCustomSlaveDelivery.tw | 2 ++
src/uncategorized/slaveShelter.tw | 2 ++
src/uncategorized/surgeryDegradation.tw | 2 ++
19 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 99d02c0ac8b..4616011f604 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -342,6 +342,8 @@
<<set $slaves[_i].health -= 30>>
<<elseif $woundType == 3>>
<<set $slaves[_i].amp = 1>>
+ <<set $slaves[_i].missingArms = 3>>
+ <<set $slaves[_i].missingLegs = 3>>
<<set $slaves[_i].health = -80>>
<<elseif $woundType >= 4>>
<<if $slaves[_i].health >= -60>>
@@ -470,6 +472,8 @@
<<set $slaves[_i].health -= 30>>
<<elseif $woundType == 3>>
<<set $slaves[_i].amp = 1>>
+ <<set $slaves[_i].missingArms = 3>>
+ <<set $slaves[_i].missingLegs = 3>>
<<set $slaves[_i].health = -80>>
<<elseif $woundType >= 4>>
<<if $slaves[_i].health >= -60>>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index cc3663d7339..241fc79d0de 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -669,6 +669,8 @@
<<elseif $woundType == 3>>
an explosion near $him caused the loss of all $his limbs.
<<set $Concubine.amp = 1>>
+ <<set $Concubine.missingArms = 3>>
+ <<set $Concubine.missingLegs = 3>>
<<elseif $woundType >= 4>>
a stray shot severely wounded $him.
<<if $Concubine.health >= -60>>
@@ -732,6 +734,8 @@
<<elseif $woundType == 3>>
An explosion near _him2 caused the loss of all _his2 limbs.
<<set $Bodyguard.amp = 1>>
+ <<set $Bodyguard.missingArms = 3>>
+ <<set $Bodyguard.missingLegs = 3>>
<<elseif $woundType >= 4>>
A stray shot severely wounded _him2.
<<if $Bodyguard.health >= -60>>
@@ -843,6 +847,8 @@
<<elseif $woundType == 3>>
an explosion near $him caused the loss of all $his limbs.
<<set $Concubine.amp = 1>>
+ <<set $Concubine.missingArms = 3>>
+ <<set $Concubine,missingLegs = 3>>
<<elseif $woundType >= 4>>
a stray shot severely wounded $him.
<<if $Concubine.health >= -60>>
@@ -955,6 +961,8 @@
<<elseif $woundType == 3>>
an explosion near $him caused the loss of all $his limbs.
<<set $Concubine.amp = 1>>
+ <<set $Concubine.missingArms = 3>>
+ <<set $Concubine.missingLegs = 3>>
<<elseif $woundType >= 4>>
a stray shot severely wounded $him.
<<if $Concubine.health >= -60>>
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 1150685937b..f9974b18c51 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -979,6 +979,10 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
}
slave.heels = Math.clamp(+slave.heels, 0, 1) || 0;
slave.amp = Math.clamp(+slave.amp, -5, 1) || 0;
+ if (slave.amp == 1) {
+ slave.missingArms = 3;
+ slave.missingLegs = 3;
+ }
slave.PLimb = Math.clamp(+slave.PLimb, 0, 1) || 0;
if (slave.voice !== 0) {
slave.voice = Math.clamp(+slave.voice, 0, 3) || 1;
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 0ba2cc5e6a9..a8df5bcf97b 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -516,23 +516,23 @@
<<if $seeExtreme == 1>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Mouse", _HS.birthName = "Mouse", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -50, _HS.weight = 20, _HS.height = 152, _HS.override_H_Color = 1, _HS.pubicHColor = "purple", _HS.skin = "pale", _HS.eyeColor = "blue", _HS.hColor = "purple", _HS.hLength = 10, _HS.amp = 1, _HS.boobs = 1000, _HS.areolae = 1, _HS.butt = 5, _HS.lipsTat = "permanent makeup", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.analArea = 1, _HS.ovaries = 1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.voice = 0, _HS.nipples = "puffy">>
+<<set _HS.slaveName = "Mouse", _HS.birthName = "Mouse", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -50, _HS.weight = 20, _HS.height = 152, _HS.override_H_Color = 1, _HS.pubicHColor = "purple", _HS.skin = "pale", _HS.eyeColor = "blue", _HS.hColor = "purple", _HS.hLength = 10, _HS.amp = 1, _HS.missingArms = 3, _HS.missingLegs = 3, _HS.boobs = 1000, _HS.areolae = 1, _HS.butt = 5, _HS.lipsTat = "permanent makeup", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.analArea = 1, _HS.ovaries = 1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.voice = 0, _HS.nipples = "puffy">>
<<set $heroSlaves.push(_HS)>>
/*Increased nipples and areolae, changed eye color, added mute -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Box", _HS.birthName = "Box", _HS.origin = "When you took $him from $his previous owner, $he was locked into a beautiful rosewood box lined with red velvet, crying.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.devotion = -75, _HS.weight = 20, _HS.eyes = -2, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "pale", _HS.hColor = "golden blonde", _HS.hStyle = "long", _HS.amp = 1, _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = -50, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "$His amputation sites have titanium rings that go through to the bone. $He has been chemically blinded.">>
+<<set _HS.slaveName = "Box", _HS.birthName = "Box", _HS.origin = "When you took $him from $his previous owner, $he was locked into a beautiful rosewood box lined with red velvet, crying.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.devotion = -75, _HS.weight = 20, _HS.eyes = -2, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "pale", _HS.hColor = "golden blonde", _HS.hStyle = "long", _HS.amp = 1, _HS.missingArms = 3, _HS.missingLegs = 3, _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = -50, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "$His amputation sites have titanium rings that go through to the bone. $He has been chemically blinded.">>
<<set $heroSlaves.push(_HS)>>
/* put some of $his custom description in $his origin (box stuff), tagged as amp, lowered obedience, increased weight but lowered health, changed skin color from white to pale */
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Yukiko", _HS.birthName = "Yukiko", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = 100, _HS.weight = -20, _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "very fair", _HS.hStyle = "long, and in a hime cut", _HS.amp = 1, _HS.boobs = 500, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.clothes = "a slave gown", _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.custom.desc = "$He is a work of art: stoic, mysterious, doll-like, — and always smiling.", _HS.voice = 0>>
+<<set _HS.slaveName = "Yukiko", _HS.birthName = "Yukiko", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = 100, _HS.weight = -20, _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "very fair", _HS.hStyle = "long, and in a hime cut", _HS.amp = 1, _HS.missingArms = 3, _HS.missingLegs = 3, _HS.boobs = 500, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.clothes = "a slave gown", _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.custom.desc = "$He is a work of art: stoic, mysterious, doll-like, — and always smiling.", _HS.voice = 0>>
<<set $heroSlaves.push(_HS)>>
/* not much to change, lowered weight ('perfect slim body'), set to mute and changed flaw to odd- described as creepy */
<<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, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _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, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, HS.missingArms = 3, _HS.missingLegs = 3, _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 $heroSlaves.push(_HS)>>
<</if>>
@@ -541,7 +541,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, _HS.health = -70, _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _HS.amp = 1, _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, _HS.health = -70, _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _HS.amp = 1, _HS.missingArms = 3, _HS.missingLegs = 3, _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 $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -549,7 +549,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Flora", _HS.birthName = "Flora", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 25, _HS.weight = -20, _HS.height = 155, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.amp = 1, _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 35, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.custom.desc = "$He fits perfectly into a pillowcase.">>
+<<set _HS.slaveName = "Flora", _HS.birthName = "Flora", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 25, _HS.weight = -20, _HS.height = 155, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.amp = 1, _HS.missingArms = 3, _HS.missingLegs = 3, _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 35, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.custom.desc = "$He fits perfectly into a pillowcase.">>
<<set $heroSlaves.push(_HS)>>
/*bitchy arrogant*/
/*Added 'bitchy' quirk, reduced height and weight, added customdesc -BoneyM*/
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 4f26d9ea64e..16b40c9421f 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -180,7 +180,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Danny 'The D'", _HS.slaveSurname = "Ildoe", _HS.birthName = "Danny 'The D'", _HS.birthSurname = "Ildoe", _HS.origin = "Born without limbs and abandoned by $his parents, $he was taken in by a posh family, given a massive cock, and trained to be the wealthy lady's perfect living sex toy.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.visualAge = 28, _HS.physicalAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.amp = 1, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 94, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.waist = 55, _HS.boobs = 50, _HS.hips = -1, _HS.butt = 0, _HS.face = 45, _HS.vagina = -1, _HS.preg = 0, _HS.dick = 6, _HS.balls = 10, _HS.scrotum = 7, _HS.prostate = 2, _HS.anusTat = "bleached", _HS.energy = 95, _HS.intelligenceImplant = 30, _HS.attrXX = 100, _HS.attrXY = 0, _HS.skill.oral = 95, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.behavioralQuirk = "advocate">>
+<<set _HS.slaveName = "Danny 'The D'", _HS.slaveSurname = "Ildoe", _HS.birthName = "Danny 'The D'", _HS.birthSurname = "Ildoe", _HS.origin = "Born without limbs and abandoned by $his parents, $he was taken in by a posh family, given a massive cock, and trained to be the wealthy lady's perfect living sex toy.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.visualAge = 28, _HS.physicalAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.amp = 1, _HS.missingArms = 3, _HS.missingLegs = 3, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 94, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.waist = 55, _HS.boobs = 50, _HS.hips = -1, _HS.butt = 0, _HS.face = 45, _HS.vagina = -1, _HS.preg = 0, _HS.dick = 6, _HS.balls = 10, _HS.scrotum = 7, _HS.prostate = 2, _HS.anusTat = "bleached", _HS.energy = 95, _HS.intelligenceImplant = 30, _HS.attrXX = 100, _HS.attrXY = 0, _HS.skill.oral = 95, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.behavioralQuirk = "advocate">>
<<set $heroSlaves.push(_HS)>>
/* needed an amputated slave for debug reasons -prndev */
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index b84c705e5e5..2aa68eee8e2 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -1630,7 +1630,7 @@ __You are customizing this slave:__
<br>
<<link "Onahole">>
<<StartingGirlsWorkaround>>
- <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetish = "mindbroken", $activeSlave.amp = 1, $activeSlave.voice = 0, $activeSlave.eyes = 1, $activeSlave.hears = 0>>
+ <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetish = "mindbroken", $activeSlave.amp = 1, $activeSlave.missingLegs = 3, $activeSlave.missingArms = 3, $activeSlave.voice = 0, $activeSlave.eyes = 1, $activeSlave.hears = 0>>
<<goto "Starting Girls">>
<</link>>
//A living cocksleeve//
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 3f1d2bfc818..ab50868e155 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -305,7 +305,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<<if $seeExtreme > 0>>
<br><<link "Punitively amputate $his limbs, and then enslave $him">>
<<set $activeSlave.health -= 20>>
- <<set $activeSlave.amp = 1>>
+ <<set $activeSlave.amp = 1, $activeSlave.missingLegs = 3, $activeSlave.missingArms = 3>>
<<set $activeSlave.heels = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index dd9d583e64e..2d3ffb6877d 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -46,6 +46,8 @@
<<set $args[0].waist = $args[1].waist>>
<<set $args[0].corsetPiercing = $args[1].corsetPiercing>>
<<set $args[0].amp = $args[1].amp>>
+<<set $args[0].missingArms = $args[1].missingArms>>
+<<set $args[0].missingLegs = $args[1].missingLegs>>
<<set $args[0].PLimb = $args[1].PLimb>>
<<set $args[0].readyProsthetics = $args[1].readyProsthetics>>
<<set $args[0].heels = $args[1].heels>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 63598605f91..fd8e34aa35e 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -7840,7 +7840,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
The simple thing to do would be to sedate $activeSlave.slaveName and haul $him to the remote surgery for $his punishment. That would deny $him the added weight of terror, however, and would stop your other slaves from learning by the sight of it. So, you restrain $him, pronounce judgment, and drag $his struggling, weeping form through the penthouse to the surgery. $activeSlave.slaveName is @@.mediumorchid;filled with implacable hatred@@ by this terrible punishment, and $his @@.red;health is damaged@@ by the major surgery. However, every single one of your other slaves not already obedient to you is @@.gold;utterly terrified@@ by the example set.
- <<set $activeSlave.devotion -= 50, $activeSlave.trust -= 50, $activeSlave.health -= 40, $activeSlave.amp = 1, $activeSlave.shoes = "none", $activeSlave.diet = "healthy", $activeSlave.heels = 0>>
+ <<set $activeSlave.devotion -= 50, $activeSlave.trust -= 50, $activeSlave.health -= 40, $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.shoes = "none", $activeSlave.diet = "healthy", $activeSlave.heels = 0>>
<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 10; } })>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index 5b86c52805c..2e22d22bef2 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -1243,11 +1243,15 @@ Skin tone: <span id = "skin">
</span>
<<link "Limbless">>
<<set $customSlave.amp = 1>>
+ <<set $customSlave.missingArms = 3>>
+ <<set $customSlave.missingLegs = 3>>
<<CustomSlaveAmp>>
<</link>>
|
<<link "Limbed">>
<<set $customSlave.amp = 0>>
+ <<set $customSlave.missingArms = 0>>
+ <<set $customSlave.missingLegs = 0>>
<<CustomSlaveAmp>>
<</link>>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index be6ae3ddaf0..0028b375cdd 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -1064,35 +1064,35 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<else>>
<<if _p.id == "basicL">>
<<if $activeSlave.amp > 0>>
- <<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
+ <<set $activeSlave.amp = -1, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "basicPLimbs">>
<<include "Prosthetics Configuration">>
<<else>>
//Since $he already has more advanced prosthetic limbs attached the <<= setup.prosthetics.basicL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "sexL">>
<<if $activeSlave.amp >= -1>>
- <<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
+ <<set $activeSlave.amp = -2, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "sexPLimbs">>
<<include "Prosthetics Configuration">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.sexL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "beautyL">>
<<if $activeSlave.amp >= -1>>
- <<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
+ <<set $activeSlave.amp = -3, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "beautyPLimbs">>
<<include "Prosthetics Configuration">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.beautyL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "combatL">>
<<if $activeSlave.amp >= -1>>
- <<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
+ <<set $activeSlave.amp = -4, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "combatPLimbs">>
<<include "Prosthetics Configuration">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.combatL.name>> will be put into storage.//
<</if>>
<<else>>
<<if $activeSlave.PLimb == 2>>
- <<set $activeSlave.amp = -5, $prostheticsConfig = "cyberPLimbs">>
+ <<set $activeSlave.amp = -5, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "cyberPLimbs">>
<<include "Prosthetics Configuration">>
<<else>>
//Since $he must have <<= addA(setup.prosthetics.interfaceP2.name)>> installed to attach cybernetic limbs the <<= setup.prosthetics.cyberneticL.name>> will be put into storage.//
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 69a82112c52..aa212706caa 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -1423,6 +1423,8 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.counter.anal += 50>>
<<set $hostage.counter.mammary += 50>>
<<set $hostage.amp = 1>>
+ <<set $hostage.missingArms = 3>>
+ <<set $hostage.missingLegs = 3>>
<<set $hostage.heels = 0>>
<<set $hostage.earPiercing = 2>>
<<set $hostage.nosePiercing = 2>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index d1c895fe414..d97776a9b03 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -522,6 +522,8 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
<br><<link "Punitively amputate $his limbs, and then enslave $him">>
<<set $activeSlave.health -= 20>>
<<set $activeSlave.amp = 1>>
+ <<set $activeSlave.missingArms = 3>>
+ <<set $activeSlave.missingLegs = 3>>
<<set $activeSlave.heels = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index bea77efdc78..8b7e0ad216f 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1794,6 +1794,8 @@
<<set $activeSlave.waist = random(-11, -40)>>
<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.amp = -5>>
+<<set $activeSlave.missingArms = 0>>
+<<set $activeSlave.missingLegs = 0>>
<<set $activeSlave.teeth = "pointy">>
<<set $activeSlave.muscles = random(30,70)>>
<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]}))>>
@@ -2405,7 +2407,7 @@ While digging through the database of a POW camp for anything of value, you find
<br>Upon $his inevitable arrival in your penthouse, you see
<<if $seeExtreme == 1>>
the traces of $his wounds, that $he has been greatly modified for war, and that $he had been raped, repeatedly, despite $his powerful body.
- <<set $activeSlave.amp = -5, $activeSlave.teeth = "pointy", $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.chem = 1000, $activeSlave.attrXX = 0, $activeSlave.attrXY = 0>>
+ <<set $activeSlave.amp = -5, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $activeSlave.teeth = "pointy", $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.chem = 1000, $activeSlave.attrXX = 0, $activeSlave.attrXY = 0>>
<<else>>
the traces of $his wounds, that $he had been left bound long enough for $his body to atrophy, and that $he had been raped, repeatedly.
<<if $seePreg == 1>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index a1e1dc38213..833c61034a4 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -380,6 +380,8 @@
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.ageImplant = 0>>
<<set $activeSlave.amp = 0>>
+<<set $activeSlave.missingArms = 0>>
+<<set $activeSlave.missingLegs = 0>>
<<set $activeSlave.heels = 0>>
<<if $activeSlave.career != "a Futanari Sister">><<set $activeSlave.career = "a slave">><</if>>
<<set $activeSlave.relationship = 0>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index f93f4e4bc0a..a9bbee817e8 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -923,7 +923,7 @@
<<if ($slaves[$i].health > 40)>>
<<if ($slaves[$i].amp != 1) && ($slaves[$i].devotion < -20)>>
$HeadGirl.slaveName decides to extract the ultimate in sadistic pleasure from $slaves[$i].slaveName, and directs the autosurgery to @@.red;amputate $his arms and legs.@@ _He2 carefully describes the entire process to the sobbing slave @@.gold;in minute detail@@ before allowing $him to be sedated.
- <<set $slaves[$i].devotion -= 20, $slaves[$i].trust -= 20, $slaves[$i].health -= 40, $slaves[$i].amp = 1>>
+ <<set $slaves[$i].devotion -= 20, $slaves[$i].trust -= 20, $slaves[$i].health -= 40, $slaves[$i].amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3>>
<</if>>
<<if ($slaves[$i].balls > 0) && ($slaves[$i].devotion <= 50)>>
$HeadGirl.slaveName decides to have some once-only sadistic pleasure, and carefully straps $slaves[$i].slaveName into the surgery until $he's completely immobile. $HeadGirl.slaveName situates <<if canSee($slaves[$i])>>a mirror so the terrified $girl can see $his own crotch<<else>>$him so that the terrified $girl can sense what part of $his body is being manipulated even through the anesthetics<</if>>, gets behind $him, and carefully sodomizes $him during the entire process of @@.red;castration.@@ $slaves[$i].slaveName is anesthetized down there and can't feel the brutal anal rape, but $his abuser orgasms repeatedly to $him @@.gold;weeping at the <<if canSee($slaves[$i])>>sight<<else>>muted sensation<</if>> of being gelded and raped at once.@@
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 055d43008d1..650584973a6 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -196,6 +196,8 @@
<<set $activeSlave.smells = $customSlave.smells>>
<<set $activeSlave.tastes = $customSlave.tastes>>
<<set $activeSlave.amp = $customSlave.amp>>
+<<set $activeSlave.missingArms = $customSlave.missingArms>>
+<<set $activeSlave.missingLegs = $customSlave.missingLegs>>
<<set $activeSlave.weekAcquired = $week>>
<<set $activeSlave.origin = "You purchased $him by special order.">>
<<set $activeSlave.career = "a slave">>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index a0b92eb25d4..59fedd55e99 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -65,6 +65,8 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.origin = "It's not clear why $his previous owner cut $his arms and legs off.">>
<<set $shelterSlave.career = "a slave">>
<<set $shelterSlave.amp = 1>>
+ <<set $shelterSlave.missingArms = 3>>
+ <<set $shelterSlave.missingLegs = 3>>
<<set $shelterSlave.devotion = random(-100,-90)>>
<<set $shelterSlave.trust = random(-100,-90)>>
<<set $shelterSlave.health = random(-80,-60)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 397b2909f74..6e73d1e2f77 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -243,6 +243,8 @@ As the remote surgery's long recovery cycle completes,
<<if $activeSlave.amp < 0>>
Its P-Limbs have been removed, since they aren't compatible with Fuckdoll suits.
<<set $activeSlave.amp = 1>>
+ <<set $activeSlave.missingArms = 3>>
+ <<set $activeSlave.missingLegs = 3>>
<</if>>
The Fuckdoll's limbless torso rocks back and forth slightly.
<</if>>
--
GitLab